Keyserver access is now supported under W32

27 files changed, 6576 insertions, 6017 deletions

diff --git a/ChangeLog b/ChangeLog
index 998306ced..d61c5bdbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-13  Werner Koch  <[email protected]>
+
+	* configure.in: Add copyright notice and -lwsock32.
+
 2001-03-12  Werner Koch  <[email protected]>
 
 	* INSTALL: Add a note to VPATH builds. 
diff --git a/NEWS b/NEWS
index b7f08ee71..b593f2282 100644
--- a/NEWS
+++ b/NEWS
@@ -32,6 +32,9 @@
 
     * New option --ignore-crc-error
 
+    * Keyserver support for the W32 version.
+
+
 Noteworthy changes in version 1.0.4 (2000-10-17)
 ------------------------------------------------
 
diff --git a/TODO b/TODO
index e59ae875e..469c4d901 100644
--- a/TODO
+++ b/TODO
@@ -8,11 +8,6 @@
 
   * Can we output things like the preferences?      
 
-  ** Check whether the use of -u and --clearsign created 2 signatures.
-     removed dups from the skclist.
-
-  * Replace mkinstalldir etc. with nnewer copies.
-
   * We need another special packet at the end of a clearsign message to mark
     it's end and allow for multiple signature for one message.
 
@@ -23,23 +18,20 @@
   * If there is no secure memory, allocate more memory for the secure
     memory block or do it in all cases.
 
-  * List all UserID with GOODSIG?
-
   * add a way to set expiration time for key signatures.
 
   * add some minor things vor VMS.
 
   * Don't get the ultimately trusted keys from the secring but store
     it permanently in the trustdb.  This way we don't need a secring at all.
-    [ Solved by re-introducing --trusted-key ]
+    [ currently solved by re-introducing --trusted-key ]  Eventually we
+    will have commands --{add,remove}-trusted-key which keeps them in
+    special trustdb records.
 
   * Use DSA keys with the test suite.
 
   * g10/trustdb.c (make_sig_records): fix the fixme.
 
-  * No TCP support yet for W32? arggg - should go into a separate program
-    anyway.
-
   * Replace Valid/Invalid by Known/Unknown?
 
   * Fix the bug in the mips assembler code
diff --git a/configure.in b/configure.in
index 7039c47ff..0d05528bf 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,21 @@
+dnl Configure script for GnuPG
+dnl Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 dnl
-dnl Configure template for GNUPG
+dnl This file is part of GnuPG.
+dnl
+dnl GnuPG is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl 
+dnl GnuPG is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl 
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 dnl
 dnl (Process this file with autoconf to produce a configure script.)
 AC_REVISION($Revision$)dnl
@@ -693,6 +709,17 @@ GNUPG_DO_LINK_FILES
 
 GNUPG_CHECK_GNUMAKE
 
+# add some extra libs here so that previous tests don't fail for
+# mysterious reasons - the final link step shoudl bail out. 
+case "${target}" in
+    *-*-mingw32*)
+        LIBS="$LIBS -lwsock32"
+        ;;
+    *)
+       ;;
+esac
+
+
 if test "$GCC" = yes; then
     if test "$MAINTAINER_MODE" = "yes"; then
         CFLAGS="$CFLAGS -Wall -Wcast-align -Wshadow -Wstrict-prototypes"
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 5acdaf4a1..4894e9dbd 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,15 @@
+2001-03-13  Werner Koch  <[email protected]>
+
+	* ringedit.c (keyring_copy): flush the new iobuf chaces before
+	rename or remove operations.  This is mainly needed for W32.
+
+	* hkp.c [HAVE_DOSISH_SYSTEM]: Removed the disabled code because we
+	have now W32 socket support in ../util/http.c
+
+	* skclist.c (key_present_in_sk_list): New.
+	(is_duplicated_entry): New.
+	(build_sk_list): Check for duplicates and do that before unlocking.
+
 2001-03-12  Werner Koch  <[email protected]>
 
 	* armor.c (parse_header_line): Removed double empty line check.
diff --git a/g10/hkp.c b/g10/hkp.c
index c4be4df4a..e9428bbef 100644
--- a/g10/hkp.c
+++ b/g10/hkp.c
@@ -38,15 +38,6 @@
 static int urlencode_filter( void *opaque, int control,
 			     IOBUF a, byte *buf, size_t *ret_len);
 
-#ifdef HAVE_DOSISH_SYSTEM
-static void
-not_implemented(void)
-{
-    log_error("keyserver access is not yet available for MS-Windows\n");
-}
-#endif
-
-
 /****************
  * Try to import the key with KEYID from a keyserver but ask the user
  * before doing so.
@@ -58,10 +49,6 @@ not_implemented(void)
 int
 hkp_ask_import( u32 *keyid )
 {
-  #ifdef HAVE_DOSISH_SYSTEM
-    not_implemented();
-    return -1;
-  #else
     struct http_context hd;
     char *request;
     int rc;
@@ -93,7 +80,6 @@ hkp_ask_import( u32 *keyid )
 
     m_free( request );
     return rc;
-  #endif
 }
 
 
@@ -101,10 +87,6 @@ hkp_ask_import( u32 *keyid )
 int
 hkp_import( STRLIST users )
 {
-  #ifdef HAVE_DOSISH_SYSTEM
-    not_implemented();
-    return -1;
-  #else
     if( !opt.keyserver_name ) {
 	log_error(_("no keyserver known (use option --keyserver)\n"));
 	return -1;
@@ -125,17 +107,12 @@ hkp_import( STRLIST users )
 	    log_inc_errorcount();
     }
     return 0;
-  #endif
 }
 
 
 int
 hkp_export( STRLIST users )
 {
-  #ifdef HAVE_DOSISH_SYSTEM
-    not_implemented();
-    return -1;
-  #else
     int rc;
     armor_filter_context_t afx;
     IOBUF temp = iobuf_temp();
@@ -211,7 +188,6 @@ hkp_export( STRLIST users )
     }
     http_close( &hd );
     return rc;
-  #endif
 }
 
 static int
diff --git a/g10/mainproc.c b/g10/mainproc.c
index 71d6a0f7f..c307b2702 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -143,7 +143,8 @@ add_gpg_control( CTX c, PACKET *pkt )
     }   
     else if ( pkt->pkt.gpg_control->control == 2 ) {
         /* Pipemode control packet */
-#warning We have to do some sanity checks all over the place 
+#warning the --pipemode does not yet work 
+        /* FIXME: We have to do more sanity checks all over the place */
         if ( pkt->pkt.gpg_control->datalen < 2 ) 
             log_fatal ("invalid pipemode control packet length\n");
         if (pkt->pkt.gpg_control->data[0] == 1) {
diff --git a/g10/ringedit.c b/g10/ringedit.c
index 9bf7faff6..a4cf263de 100644
--- a/g10/ringedit.c
+++ b/g10/ringedit.c
@@ -1529,6 +1529,8 @@ keyring_copy( KBPOS *kbpos, int mode, KBNODE root )
 
     /* rename and make backup file */
     if( !rentry->secret ) {  /* but not for secret keyrings */
+        iobuf_ioctl (NULL, 2, 0, bakfname );
+        iobuf_ioctl (NULL, 2, 0, rentry->fname );
       #ifdef HAVE_DOSISH_SYSTEM
 	remove( bakfname );
       #endif
@@ -1539,6 +1541,8 @@ keyring_copy( KBPOS *kbpos, int mode, KBNODE root )
 	    goto leave;
 	}
     }
+    iobuf_ioctl (NULL, 2, 0, tmpfname );
+    iobuf_ioctl (NULL, 2, 0, rentry->fname );
   #ifdef HAVE_DOSISH_SYSTEM
     remove( rentry->fname );
   #endif
diff --git a/g10/skclist.c b/g10/skclist.c
index 41ff171de..dfa4d9865 100644
--- a/g10/skclist.c
+++ b/g10/skclist.c
@@ -60,6 +60,27 @@ is_insecure( PKT_secret_key *sk )
 }
 
 
+static int
+key_present_in_sk_list(SK_LIST sk_list, PKT_secret_key *sk)
+{
+    for (; sk_list; sk_list = sk_list->next) {
+	if ( !cmp_secret_keys(sk_list->sk, sk) )
+	    return 0;
+    }
+    return -1;
+}
+
+static int
+is_duplicated_entry (STRLIST list, STRLIST item)
+{
+    for(; list && list != item; list = list->next) {
+        if ( !strcmp (list->d, item->d) )
+            return 1;
+    }
+    return 0;
+}
+
+
 int
 build_sk_list( STRLIST locusr, SK_LIST *ret_sk_list, int unlock,
 							unsigned use )
@@ -78,6 +99,7 @@ build_sk_list( STRLIST locusr, SK_LIST *ret_sk_list, int unlock,
 	}
 	else if( !(rc=check_pubkey_algo2(sk->pubkey_algo, use)) ) {
 	    SK_LIST r;
+
 	    if( sk->version == 4 && (use & PUBKEY_USAGE_SIG)
 		&& sk->pubkey_algo == PUBKEY_ALGO_ELGAMAL_E ) {
 		log_info("this is a PGP generated "
@@ -103,17 +125,36 @@ build_sk_list( STRLIST locusr, SK_LIST *ret_sk_list, int unlock,
 	}
     }
     else {
+        STRLIST locusr_orig = locusr;
 	for(; locusr; locusr = locusr->next ) {
 	    PKT_secret_key *sk;
-
+            
+            rc = 0;
+            /* Do an early check agains duplicated entries.  However this
+             * won't catch all duplicates because the user IDs may be
+             * specified in different ways.
+             */
+            if ( is_duplicated_entry ( locusr_orig, locusr ) ) {
+		log_error(_("skipped `%s': duplicated\n"), locusr->d );
+                continue;
+            }
 	    sk = m_alloc_clear( sizeof *sk );
 	    sk->req_usage = use;
-	    if( (rc = get_seckey_byname( sk, locusr->d, unlock )) ) {
+	    if( (rc = get_seckey_byname( sk, locusr->d, 0 )) ) {
 		free_secret_key( sk ); sk = NULL;
 		log_error(_("skipped `%s': %s\n"), locusr->d, g10_errstr(rc) );
 	    }
+            else if ( key_present_in_sk_list(sk_list, sk) == 0) {
+                free_secret_key(sk); sk = NULL;
+                log_debug(_("skipped: secret key already present\n"));
+            }
+            else if ( unlock && (rc = check_secret_key( sk, 0 )) ) {
+		free_secret_key( sk ); sk = NULL;
+		log_error(_("skipped `%s': %s\n"), locusr->d, g10_errstr(rc) );
+            }
 	    else if( !(rc=check_pubkey_algo2(sk->pubkey_algo, use)) ) {
 		SK_LIST r;
+
 		if( sk->version == 4 && (use & PUBKEY_USAGE_SIG)
 		    && sk->pubkey_algo == PUBKEY_ALGO_ELGAMAL_E ) {
 		    log_info(_("skipped `%s': this is a PGP generated "
diff --git a/include/iobuf.h b/include/iobuf.h
index 3c222689b..f13ba154b 100644
--- a/include/iobuf.h
+++ b/include/iobuf.h
@@ -79,10 +79,12 @@ IOBUF iobuf_temp(void);
 IOBUF iobuf_temp_with_content( const char *buffer, size_t length );
 IOBUF iobuf_open( const char *fname );
 IOBUF iobuf_fdopen( int fd, const char *mode );
+IOBUF iobuf_sockopen( int fd, const char *mode );
 IOBUF iobuf_fopen( const char *fname, const char *mode );
 IOBUF iobuf_create( const char *fname );
 IOBUF iobuf_append( const char *fname );
 IOBUF iobuf_openrw( const char *fname );
+int   iobuf_ioctl ( IOBUF a, int cmd, int intval, void *ptrval );
 int   iobuf_close( IOBUF iobuf );
 int   iobuf_cancel( IOBUF iobuf );
 
diff --git a/po/da.po b/po/da.po
index 7006cde2f..928901fde 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-02-07 16:46+0100\n"
+"POT-Creation-Date: 2001-03-13 13:40+0100\n"
 "PO-Revision-Date: 2000-03-07 22:51+01:00\n"
 "Last-Translator: Birger Langkjer <[email protected]>\n"
 "Language-Team: Danish <[email protected]>\n"
@@ -43,7 +43,7 @@ msgstr "n"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:308
 msgid "quit"
 msgstr "afslut"
 
@@ -247,6 +247,17 @@ msgstr "ikke krypteret"
 msgid "not processed"
 msgstr "ikke bearbejdet"
 
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+#, fuzzy
+msgid "unusable public key"
+msgstr "d�rlig offentlig n�gle"
+
+#: util/errors.c:106
+#, fuzzy
+msgid "unusable secret key"
+msgstr "d�rlig hemmelig n�gle"
+
 #: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -257,63 +268,63 @@ msgstr "... dette er en fejl (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du fandt en fejl ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
+#: cipher/random.c:309 g10/import.c:129 g10/keygen.c:1256
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:313
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:318
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:325
+#: cipher/random.c:323
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:331
+#: cipher/random.c:329
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:339
+#: cipher/random.c:337
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:375
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:397
+#: cipher/random.c:395
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:402
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:405
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:416
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:650
+#: cipher/random.c:648
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ADVARSEL: bruger usikker tilf�ldig-nummer-generator!!!\n"
 
-#: cipher/random.c:651
+#: cipher/random.c:649
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -338,7 +349,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:212
+#: g10/g10.c:213
 msgid ""
 "@Commands:\n"
 " "
@@ -346,139 +357,139 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "|[file]|make a signature"
 msgstr "|[filer]|opret en signatur"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "|[file]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "make a detached signature"
 msgstr "opret en separat signatur"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "encrypt data"
 msgstr "krypt�r data"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "encryption only with symmetric cipher"
 msgstr "krypt�r kun med symmetriske cifre"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "store only"
 msgstr "gem kun"
 
-#: g10/g10.c:220
+#: g10/g10.c:221
 msgid "decrypt data (default)"
 msgstr "afkrypt�r data (standard)"
 
-#: g10/g10.c:221
+#: g10/g10.c:222
 msgid "verify a signature"
 msgstr "godkend en signatur"
 
-#: g10/g10.c:223
+#: g10/g10.c:224
 msgid "list keys"
 msgstr "vis n�gler"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "list keys and signatures"
 msgstr "vis n�gler og signaturer"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "check key signatures"
 msgstr "tjek n�glesignaturer"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "list keys and fingerprints"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "list secret keys"
 msgstr "vis hemmelige n�gler"
 
-#: g10/g10.c:229
+#: g10/g10.c:230
 msgid "generate a new key pair"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
 msgid "remove key from the public keyring"
 msgstr "fjern n�gle fra den offentlige n�glering"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "remove key from the secret keyring"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign a key"
 msgstr "sign�r en n�gle"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "sign a key locally"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "sign or edit a key"
 msgstr "sign�r eller redig�r en n�gle"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "generate a revocation certificate"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "export keys"
 msgstr "eksport�r n�gler"
 
-#: g10/g10.c:238
+#: g10/g10.c:239
 msgid "export keys to a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/g10.c:239
+#: g10/g10.c:240
 msgid "import keys from a key server"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/g10.c:243
+#: g10/g10.c:244
 msgid "import/merge keys"
 msgstr "import�r/fusion�r n�gler"
 
-#: g10/g10.c:245
+#: g10/g10.c:246
 msgid "list only the sequence of packets"
 msgstr "vis kun pakkesekvensen"
 
-#: g10/g10.c:247
+#: g10/g10.c:248
 msgid "export the ownertrust values"
 msgstr "eksport�r ejertillidsv�rdierne"
 
-#: g10/g10.c:249
+#: g10/g10.c:250
 msgid "import ownertrust values"
 msgstr "import�r ejertillidsv�rdierne"
 
-#: g10/g10.c:251
+#: g10/g10.c:252
 msgid "update the trust database"
 msgstr "opdat�r tillidsdatabasen"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMES]|tjek tillidsdatabasen"
 
-#: g10/g10.c:254
+#: g10/g10.c:255
 msgid "fix a corrupted trust database"
 msgstr "repar�r en �delagt tillidsdatabase"
 
-#: g10/g10.c:255
+#: g10/g10.c:256
 msgid "De-Armor a file or stdin"
 msgstr "De-beskydt en fil el. stdin"
 
-#: g10/g10.c:257
+#: g10/g10.c:258
 msgid "En-Armor a file or stdin"
 msgstr "Beskydt en fil el. stdin"
 
-#: g10/g10.c:259
+#: g10/g10.c:260
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|print meddelelsesresum�"
 
-#: g10/g10.c:263
+#: g10/g10.c:264
 msgid ""
 "@\n"
 "Options:\n"
@@ -488,162 +499,162 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/g10.c:265
+#: g10/g10.c:266
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
 
-#: g10/g10.c:267
+#: g10/g10.c:268
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|krypt�r for NAME"
 
-#: g10/g10.c:270
+#: g10/g10.c:271
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|brug NAME som standard modtager"
 
-#: g10/g10.c:272
+#: g10/g10.c:273
 msgid "use the default key as default recipient"
 msgstr "brug standard n�glen som standard modtager"
 
-#: g10/g10.c:276
+#: g10/g10.c:277
 msgid "use this user-id to sign or decrypt"
 msgstr "brug denne bruger-id til at signere eller dekryptere"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|s�t kompresningsniveau N (0 = sl�et fra)"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "verbose"
 msgstr "meddelsom"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "be somewhat more quiet"
 msgstr "v�r mere stille"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "don't use the terminal at all"
 msgstr "brug overhovedet ikke terminalen"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "force v3 signatures"
 msgstr "tving v3 signaturer"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "always use a MDC for encryption"
 msgstr "brug altid en MDC for kryptering"
 
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "do not make any changes"
 msgstr "lav ingen �ndringer"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "batch mode: never ask"
 msgstr "k�rselsmodus: sp�rg aldrig"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "assume yes on most questions"
 msgstr "forvent ja til de fleste spr�gsm�l"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "assume no on most questions"
 msgstr "forvent nej til de fleste spr�gsm�l"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "add this keyring to the list of keyrings"
 msgstr "tilf�j denne n�glering til n�gleringslisten"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "add this secret keyring to the list"
 msgstr "tilf�j denne hemmeligen�glering til listen"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|brug NAME som standard hemmelign�gle"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|brug denne n�gletjener til at sl� n�gler op"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|s�t terminal karakters�t til NAME"
 
-#: g10/g10.c:297
+#: g10/g10.c:298
 msgid "read options from file"
 msgstr "l�s indstillinger fra fil"
 
-#: g10/g10.c:301
+#: g10/g10.c:302
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinfo til denne FD"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "emulate the mode described in RFC1991"
 msgstr "emul�r modusen beskrevet i RFC1991"
 
-#: g10/g10.c:309
+#: g10/g10.c:310
 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:310
+#: g10/g10.c:311
 msgid "|N|use passphrase mode N"
 msgstr "|N|brug pasfrasemodus N"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|brug meddelelses resum�algoritme NAME for pasfrase"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|brug cifrealgoritme NAME for pasfrase"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|brug cifferalgoritme NAME"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|brug meddelelsesresum� algoritme NAME"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "|N|use compress algorithm N"
 msgstr "|N|brug kompresalgoritme N"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 
-#: g10/g10.c:319
+#: g10/g10.c:320
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=VALUE|brug denne notationsdata"
 
-#: g10/g10.c:322
+#: g10/g10.c:323
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:325
+#: g10/g10.c:326
 msgid ""
 "@\n"
 "Examples:\n"
@@ -663,16 +674,16 @@ msgstr ""
 " --list-keys [navne]        vis n�gler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/g10.c:431
+#: g10/g10.c:432
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
 
-#: g10/g10.c:435
+#: g10/g10.c:436
 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:438
+#: g10/g10.c:439
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -682,7 +693,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: g10/g10.c:445
+#: g10/g10.c:446
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -690,287 +701,287 @@ msgstr ""
 "\n"
 "Underst�ttede algoritmer:\n"
 
-#: g10/g10.c:524
+#: g10/g10.c:525
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/g10.c:577
+#: g10/g10.c:578
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/g10.c:727
+#: g10/g10.c:728
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/g10.c:731
+#: g10/g10.c:732
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: g10/g10.c:738
+#: g10/g10.c:739
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/g10.c:943
+#: g10/g10.c:944
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/g10.c:1014
+#: g10/g10.c:1015
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:1018 g10/g10.c:1027
+#: g10/g10.c:1019 g10/g10.c:1028
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1021
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/g10.c:1023
+#: g10/g10.c:1024
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/g10.c:1043 g10/g10.c:1055
+#: g10/g10.c:1044 g10/g10.c:1056
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/g10.c:1049 g10/g10.c:1061
+#: g10/g10.c:1050 g10/g10.c:1062
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/g10.c:1065
+#: g10/g10.c:1066
 msgid "the given policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1069
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr ""
 
-#: g10/g10.c:1070
+#: g10/g10.c:1071
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/g10.c:1072
+#: g10/g10.c:1073
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/g10.c:1074
+#: g10/g10.c:1075
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:1077
+#: g10/g10.c:1078
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: simpel S2K modus (0) frar�des p� det skarpeste\n"
 
-#: g10/g10.c:1081
+#: g10/g10.c:1082
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
 # er det klogt at overs�tte TrustDB?
-#: g10/g10.c:1166
+#: g10/g10.c:1167
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/g10.c:1172
+#: g10/g10.c:1173
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1180
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:1187
+#: g10/g10.c:1188
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/g10.c:1200
+#: g10/g10.c:1201
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/g10.c:1213
+#: g10/g10.c:1214
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:1227
+#: g10/g10.c:1228
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1245
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1261
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/g10.c:1268
+#: g10/g10.c:1269
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/g10.c:1284
+#: g10/g10.c:1285
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key bruger-id"
 
-#: g10/g10.c:1287
+#: g10/g10.c:1288
 msgid "--delete-key user-id"
 msgstr "--delete-key bruger-id"
 
-#: g10/g10.c:1295
+#: g10/g10.c:1296
 #, fuzzy
 msgid "--delete-secret-and-public-key user-id"
 msgstr "--delete-secret-key bruger-id"
 
-#: g10/encode.c:268 g10/g10.c:1332 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1333 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/g10.c:1347
+#: g10/g10.c:1348
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [bruger-id] [n�glering]"
 
-#: g10/g10.c:1413
+#: g10/g10.c:1414
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:1421
+#: g10/g10.c:1422
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1493
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/g10.c:1579
+#: g10/g10.c:1580
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/g10.c:1583
+#: g10/g10.c:1584
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1586 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1587 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:1795
+#: g10/g10.c:1796
 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:1801
+#: g10/g10.c:1802
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1807
+#: g10/g10.c:1808
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1815
+#: g10/g10.c:1816
 msgid "a notation value must not use any control characters\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
-#: g10/armor.c:302
+#: g10/armor.c:304
 #, c-format
 msgid "armor: %s\n"
 msgstr "panser: %s\n"
 
-#: g10/armor.c:331
+#: g10/armor.c:333
 msgid "invalid armor header: "
 msgstr "ugyldigt panserhoved: "
 
-#: g10/armor.c:338
+#: g10/armor.c:340
 msgid "armor header: "
 msgstr "panserhoved: "
 
-#: g10/armor.c:349
+#: g10/armor.c:351
 msgid "invalid clearsig header\n"
 msgstr ""
 
-#: g10/armor.c:401
+#: g10/armor.c:403
 msgid "nested clear text signatures\n"
 msgstr ""
 
-#: g10/armor.c:525
+#: g10/armor.c:527
 msgid "invalid dash escaped line: "
 msgstr ""
 
-#: g10/armor.c:537
+#: g10/armor.c:539
 msgid "unexpected armor:"
 msgstr "uforventet beskyttelse:"
 
-#: g10/armor.c:663
+#: g10/armor.c:665
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "ugyldigt radix64 tegn %02x udeladt\n"
 
-#: g10/armor.c:706
+#: g10/armor.c:708
 msgid "premature eof (no CRC)\n"
 msgstr "for tidlig eof (ingen CRC)\n"
 
-#: g10/armor.c:740
+#: g10/armor.c:742
 msgid "premature eof (in CRC)\n"
 msgstr "for tidlig eof (i CRC)\n"
 
-#: g10/armor.c:744
+#: g10/armor.c:746
 msgid "malformed CRC\n"
 msgstr "d�rlig CRC\n"
 
-#: g10/armor.c:748
+#: g10/armor.c:750
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "CRC fejl; %06lx - %06lx\n"
 
-#: g10/armor.c:765
+#: g10/armor.c:767
 msgid "premature eof (in Trailer)\n"
 msgstr "for tidlig eof (i trailer)\n"
 
-#: g10/armor.c:769
+#: g10/armor.c:771
 msgid "error in trailer line\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/armor.c:915
+#: g10/armor.c:917
 msgid "For info see http://www.gnupg.org"
 msgstr ""
 
-#: g10/armor.c:1043
+#: g10/armor.c:1045
 msgid "no valid OpenPGP data found.\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/armor.c:1048
+#: g10/armor.c:1050
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ugyldigt panser: linie l�ngere end %d tegn\n"
 
-#: g10/armor.c:1052
+#: g10/armor.c:1054
 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:1189 g10/pkclist.c:53
+#: g10/keyedit.c:1190 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "             Fingeraftryk:"
 
@@ -1173,17 +1184,17 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Det er ikke sikkert at signaturen tilh�rer ejeren.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:826 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: udelod: offentlig n�gle er allerede tilstede\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:853
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1191,42 +1202,42 @@ msgstr ""
 "Du angav ikke en bruger-id. (du kan bruge \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:863
 msgid "Enter the user ID: "
 msgstr "Indtast bruger-id: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:875
 msgid "No such user ID.\n"
 msgstr "Ingen s�dan bruger-id.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:880
 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:904
+#: g10/pkclist.c:903
 msgid "Public key is disabled.\n"
 msgstr "Offentlig n�gle er sl�et fra.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:910
 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:942
+#: g10/pkclist.c:941
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:974
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: fejl ved unders�gelse af n�gle: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: udelod: offentlign�gle er sl�et fra\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1017
 msgid "no valid addressees\n"
 msgstr "ingen gyldige adresser\n"
 
@@ -1483,7 +1494,7 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:955
+#: g10/keyedit.c:469 g10/keygen.c:955
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
 
@@ -1598,285 +1609,278 @@ msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 msgid "key %08lX: not protected - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:232
+#: g10/export.c:236
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:208
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:350
+#: g10/getkey.c:443
 msgid "too many entries in unk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
-msgid "RSA key cannot be used in this version\n"
-msgstr "RSA n�gle kan ikke bruges i denne version\n"
-
-#: g10/getkey.c:1310 g10/getkey.c:1349
-msgid "No key for user ID\n"
-msgstr "Ingen n�gle for bruger-ID\n"
-
-#: g10/getkey.c:1388 g10/getkey.c:1428
-msgid "No user ID for key\n"
-msgstr "Ingen bruger-ID for n�gle\n"
-
-#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
+#: g10/getkey.c:2143
 #, 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:2050
+#: g10/getkey.c:2185 g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr ""
+
+#: g10/getkey.c:2473
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: bruger ikke fundet\n"
 
-#: g10/import.c:182
+#: g10/import.c:184
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "sprang over blok af typen %d\n"
 
-#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu n�gler behandlet indtil nu\n"
 
-#: g10/import.c:194
+#: g10/import.c:196
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/import.c:204
+#: g10/import.c:206
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totalt antal behandlede: %lu\n"
 
-#: g10/import.c:206
+#: g10/import.c:208
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       nye undern�gler: %lu\n"
 
-#: g10/import.c:209
+#: g10/import.c:211
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:211
+#: g10/import.c:213
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importerede: %lu"
 
-#: g10/import.c:217
+#: g10/import.c:219
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              u�ndrede: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:221
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nye bruger-id'er: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:223
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nye undern�gler: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:225
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        nye signaturer: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:227
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  nye n�gletilbagekald: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:229
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " hemmelige n�gler l�st: %lu\n"
 
-#: g10/import.c:229
+#: g10/import.c:231
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/import.c:231
+#: g10/import.c:233
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "hemmelige n�gler u�ndre: %lu\n"
 
-#: g10/import.c:391 g10/import.c:600
+#: g10/import.c:408 g10/import.c:617
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:405
+#: g10/import.c:422
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:407
+#: g10/import.c:424
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:418 g10/import.c:667
+#: g10/import.c:435 g10/import.c:684
 #, 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:423
+#: g10/import.c:440
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:431
+#: g10/import.c:448
 msgid "no default public keyring\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
+#: g10/import.c:452 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:615 g10/import.c:716
+#: 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:441 g10/import.c:499 g10/import.c:618 g10/import.c:719
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:463
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "n�gle %08lX: stemmer ikke med vores kopi\n"
 
-#: g10/import.c:472 g10/import.c:675
+#: g10/import.c:489 g10/import.c:692
 #, 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:478 g10/import.c:681
+#: g10/import.c:495 g10/import.c:698
 #, 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:505
+#: g10/import.c:522
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr ""
 
-#: g10/import.c:508
+#: g10/import.c:525
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr ""
 
-#: g10/import.c:511
+#: g10/import.c:528
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr ""
 
-#: g10/import.c:514
+#: g10/import.c:531
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr ""
 
-#: g10/import.c:517
+#: g10/import.c:534
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr ""
 
-#: g10/import.c:520
+#: g10/import.c:537
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr ""
 
-#: g10/import.c:530
+#: g10/import.c:547
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr ""
 
-#: g10/import.c:593
+#: g10/import.c:610
 #, c-format
 msgid "secret key %08lX not imported (use %s to allow for it)\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:640
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr ""
 
 #. we can't merge secret keys
-#: g10/import.c:627
+#: g10/import.c:644
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr ""
 
-#: g10/import.c:632
+#: g10/import.c:649
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr ""
 
-#: g10/import.c:661
+#: g10/import.c:678
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 
-#: g10/import.c:692
+#: g10/import.c:709
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 
-#: g10/import.c:724
+#: g10/import.c:741
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr ""
 
-#: g10/import.c:766
+#: g10/import.c:783
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr ""
 
-#: g10/import.c:773 g10/import.c:797
+#: g10/import.c:790 g10/import.c:814
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr ""
 
-#: g10/import.c:774
+#: g10/import.c:791
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr ""
 
-#: g10/import.c:789
+#: g10/import.c:806
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr ""
 
-#: g10/import.c:798
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr ""
 
-#: g10/import.c:825
+#: g10/import.c:842
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr ""
 
-#: g10/import.c:854
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr ""
 
-#: g10/import.c:877
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr ""
@@ -1885,32 +1889,32 @@ 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:902
+#: g10/import.c:919
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr ""
 
-#: g10/import.c:911
+#: g10/import.c:928
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:919
+#: g10/import.c:936
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 
-#: g10/import.c:1019
+#: g10/import.c:1036
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1071
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr ""
 
-#: g10/import.c:1185 g10/import.c:1238
+#: g10/import.c:1202 g10/import.c:1255
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr ""
@@ -1920,562 +1924,562 @@ msgstr ""
 msgid "%s: user not found\n"
 msgstr "%s: bruger ikke fundet\n"
 
-#: g10/keyedit.c:155
+#: g10/keyedit.c:156
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:157
 msgid "[self-signature]"
 msgstr "[selv-signatur]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:221
 msgid "1 bad signature\n"
 msgstr "1 d�rlig signature\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:223
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d d�rlige signaturer\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:225
 msgid "1 signature not checked due to a missing key\n"
 msgstr ""
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr ""
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 msgid "1 signature not checked due to an error\n"
 msgstr ""
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:231
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr ""
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:233
 msgid "1 user ID without valid self-signature detected\n"
 msgstr ""
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:235
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:317
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr ""
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:325
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr ""
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr ""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:343
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:348
 msgid "Really sign? "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
+#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:136
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:428
 msgid "This key is not protected.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:432
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:436
 msgid "Key is protected.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan ikke redigere denne n�gle: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:461
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:473
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:476
 msgid "Do you really want to do this? "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:540
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "q"
 msgstr "a"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save"
 msgstr "gem"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save and quit"
 msgstr "gem og afslut"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "help"
 msgstr "hj�lp"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "show this help"
 msgstr "vis denne hj�lp"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "show fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list"
 msgstr "vis"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list key and user IDs"
 msgstr "vis n�gler og bruger-id'er"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "key"
 msgstr "n�gle"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "select secondary key N"
 msgstr "v�lg sekund�r n�gle N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "check"
 msgstr "tjek"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "list signatures"
 msgstr "vis signaturer"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign"
 msgstr "sign�r"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign the key"
 msgstr "sign�r n�glen"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "lsign"
 msgstr "lsign�r"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "sign the key locally"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "debug"
 msgstr "aflus"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "adduid"
 msgstr "tilf�j-bid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "add a user ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "deluid"
 msgstr "sletbid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "delete user ID"
 msgstr "slet bruger id"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "addkey"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "add a secondary key"
 msgstr "tilf�j sekund�r n�gle"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delkey"
 msgstr "sletn�gle"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delete a secondary key"
 msgstr "slet sekund�r n�gle"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delsig"
 msgstr "sletsig"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delete signatures"
 msgstr "slet signaturer"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "expire"
 msgstr "udl�b"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "change the expire date"
 msgstr "�ndr udl�bsdatoen"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle"
 msgstr "skift"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle between secret and public key listing"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "t"
 msgstr "s"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "pref"
 msgstr "pr�f"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "list preferences"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
 msgid "passwd"
 msgstr "kodeord"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
 msgid "change the passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
 msgid "trust"
 msgstr "betro"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
 msgid "revsig"
 msgstr ""
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
 msgid "revoke signatures"
 msgstr ""
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 msgid "revkey"
 msgstr ""
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 msgid "revoke a secondary key"
 msgstr ""
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 msgid "disable"
 msgstr "sl�fra"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 msgid "disable a key"
 msgstr "sl� n�gle fra"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
 msgid "enable"
 msgstr "sl�til"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
 msgid "enable a key"
 msgstr "sl� n�gle til"
 
-#: g10/delkey.c:110 g10/keyedit.c:631
+#: g10/delkey.c:110 g10/keyedit.c:632
 msgid "can't do that in batchmode\n"
 msgstr ""
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:669
+#: g10/keyedit.c:670
 msgid "Secret key is available.\n"
 msgstr ""
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 msgid "Command> "
 msgstr ""
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:729
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:733
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 msgid "Really sign all user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 msgid "Hint: Select the user IDs to sign\n"
 msgstr ""
 
-#: g10/keyedit.c:812 g10/keyedit.c:994
+#: g10/keyedit.c:813 g10/keyedit.c:995
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:823 g10/keyedit.c:844
+#: g10/keyedit.c:824 g10/keyedit.c:845
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:829
 msgid "Really remove all selected user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:830
 msgid "Really remove this user ID? "
 msgstr ""
 
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:866 g10/keyedit.c:888
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:870
 msgid "Do you really want to delete the selected keys? "
 msgstr ""
 
-#: g10/keyedit.c:870
+#: g10/keyedit.c:871
 msgid "Do you really want to delete this key? "
 msgstr ""
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "Do you really want to revoke the selected keys? "
 msgstr ""
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:893
 msgid "Do you really want to revoke this key? "
 msgstr ""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:959
 msgid "Save changes? "
 msgstr "Gem �ndringer? "
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:962
 msgid "Quit without saving? "
 msgstr "Afslut uden at gemme? "
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:973
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:980
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:987
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1002
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
-#: g10/keyedit.c:1081 g10/keyedit.c:1107
+#: g10/keyedit.c:1082 g10/keyedit.c:1108
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1090
+#: g10/keyedit.c:1091
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1095
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1124
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1127
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "  nye n�gletilbagekald: %lu\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1129
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1371
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1375
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1381
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettede %d signatur.\n"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1396
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1468
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1474
 msgid "Please select at most one secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1478
 msgid "Changing expiration time for a secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1480
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1522
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1538
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1599
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:1644
+#: g10/keyedit.c:1645
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ingen sekund�r n�gle med indeks %d\n"
 
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:1743
 msgid "user ID: \""
 msgstr "bruger-id: \""
 
-#: g10/keyedit.c:1745
+#: g10/keyedit.c:1746
 #, c-format
 msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1750
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr ""
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1774
 msgid "You have signed these user IDs:\n"
 msgstr ""
 
-#: g10/keyedit.c:1787 g10/keyedit.c:1822
+#: g10/keyedit.c:1788 g10/keyedit.c:1823
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1793
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1813
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:1830
+#: g10/keyedit.c:1831
 msgid "Really create the revocation certificates? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1860
 msgid "no secret key\n"
 msgstr ""
 
@@ -2489,128 +2493,128 @@ msgid "revoked"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:404 g10/mainproc.c:836
+#: g10/keylist.c:402 g10/mainproc.c:837
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/mainproc.c:270
+#: g10/mainproc.c:271
 #, c-format
 msgid "public key is %08lX\n"
 msgstr ""
 
-#: g10/mainproc.c:315
+#: g10/mainproc.c:316
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:367
+#: g10/mainproc.c:368
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr ""
 
-#: g10/mainproc.c:377
+#: g10/mainproc.c:378
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr ""
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:392
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:431
+#: g10/mainproc.c:432
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:437
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:441
+#: g10/mainproc.c:442
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:461
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:462
+#: g10/mainproc.c:463
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:617
+#: g10/mainproc.c:618
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:704 g10/mainproc.c:713
+#: g10/mainproc.c:705 g10/mainproc.c:714
 msgid "WARNING: invalid notation data found\n"
 msgstr ""
 
-#: g10/mainproc.c:716
+#: g10/mainproc.c:717
 msgid "Notation: "
 msgstr ""
 
-#: g10/mainproc.c:725
+#: g10/mainproc.c:726
 msgid "Policy: "
 msgstr "Politik: "
 
-#: g10/mainproc.c:1235
+#: g10/mainproc.c:1177
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1272
+#: g10/mainproc.c:1214
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1307 g10/mainproc.c:1318
+#: g10/mainproc.c:1242 g10/mainproc.c:1250
 msgid "BAD signature from \""
 msgstr "D�RLIG signatur fra \""
 
-#: g10/mainproc.c:1308 g10/mainproc.c:1319
+#: g10/mainproc.c:1243 g10/mainproc.c:1251
 msgid "Good signature from \""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1310
+#: g10/mainproc.c:1266
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1366
+#: g10/mainproc.c:1316
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/mainproc.c:1423 g10/mainproc.c:1438 g10/mainproc.c:1500
+#: g10/mainproc.c:1373 g10/mainproc.c:1388 g10/mainproc.c:1450
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:1449
+#: g10/mainproc.c:1399
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1454
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) signatur\n"
 
-#: g10/mainproc.c:1509
+#: g10/mainproc.c:1459
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:97
+#: g10/misc.c:98
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan ikke sl� core-dump fra: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:208
 msgid "Experimental algorithms should not be used!\n"
 msgstr ""
 
-#: g10/misc.c:237
+#: g10/misc.c:238
 msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
 msgstr ""
 
@@ -2619,7 +2623,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:990
+#: g10/parse-packet.c:1010
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -2632,7 +2636,7 @@ msgstr ""
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:170 g10/passphrase.c:248
+#: g10/hkp.c:147 g10/passphrase.c:248
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
@@ -2754,36 +2758,36 @@ msgstr ""
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr ""
 
-#: g10/hkp.c:72
+#: g10/hkp.c:59
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr ""
 
-#: g10/hkp.c:85
+#: g10/hkp.c:72
 #, fuzzy, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/hkp.c:109 g10/hkp.c:148
+#: g10/hkp.c:91 g10/hkp.c:125
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/hkp.c:117
+#: g10/hkp.c:99
 #, fuzzy, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/hkp.c:194
+#: g10/hkp.c:171
 #, fuzzy, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:183
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:209
+#: g10/hkp.c:186
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
@@ -2798,11 +2802,11 @@ msgstr "hemmelig n�gle ikke tilg�ngelig"
 msgid "protection algorithm %d is not supported\n"
 msgstr ""
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:184
 msgid "Invalid passphrase; please try again ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:242
+#: g10/seckey-cert.c:240
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 
@@ -3067,11 +3071,6 @@ msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr ""
 
-#: g10/trustdb.c:577
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr ""
-
 #: g10/trustdb.c:584
 #, c-format
 msgid "key %08lX: secret and public key don't match\n"
@@ -3301,34 +3300,44 @@ msgstr ""
 msgid "%s: keyring created\n"
 msgstr ""
 
-#: g10/ringedit.c:1551
+#: g10/ringedit.c:1555
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/ringedit.c:1552
+#: g10/ringedit.c:1556
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr ""
 
-#: g10/ringedit.c:1553
+#: g10/ringedit.c:1557
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/ringedit.c:1554
+#: g10/ringedit.c:1558
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
-#: g10/skclist.c:88 g10/skclist.c:125
+#: 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 ""
 
-#: g10/skclist.c:113
+#: g10/skclist.c:138
+#, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr ""
+
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr ""
 
-#: g10/skclist.c:119
+#: g10/skclist.c:149
+#, fuzzy
+msgid "skipped: secret key already present\n"
+msgstr "%s: udelod: offentlig n�gle er allerede tilstede\n"
+
+#: g10/skclist.c:160
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3422,11 +3431,11 @@ msgstr "Slet denne n�gle fra n�gleringen? "
 msgid "This is a secret key! - really delete? "
 msgstr ""
 
-#: g10/delkey.c:182
+#: g10/delkey.c:181
 msgid "there is a secret key for this public key!\n"
 msgstr ""
 
-#: g10/delkey.c:184
+#: g10/delkey.c:183
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr ""
 
@@ -3622,6 +3631,15 @@ msgstr "Ingen hj�lp tilg�ngelig"
 msgid "No help available for `%s'"
 msgstr "Ingen hj�lp tilg�ngelig for `%s'"
 
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "RSA n�gle kan ikke bruges i denne version\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Ingen n�gle for bruger-ID\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Ingen bruger-ID for n�gle\n"
+
 #~ msgid "set debugging flags"
 #~ msgstr "s�t aflusningsflag"
 
diff --git a/po/de.po b/po/de.po
index 153f97997..182ae4308 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-02-17 02:26+0000\n"
+"POT-Creation-Date: 2001-03-13 13:40+0100\n"
 "PO-Revision-Date: 2001-02-20 21:20+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -43,7 +43,7 @@ msgstr "nein"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:308
 msgid "quit"
 msgstr "quit"
 
@@ -247,6 +247,17 @@ msgstr "nicht verschl�sselt"
 msgid "not processed"
 msgstr "nicht bearbeitet"
 
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+#, fuzzy
+msgid "unusable public key"
+msgstr "Falscher �ffentlicher Sch�ssel"
+
+#: util/errors.c:106
+#, fuzzy
+msgid "unusable secret key"
+msgstr "Falscher geheimer Schl�ssel"
+
 #: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -257,64 +268,64 @@ msgstr "... dies ist ein Bug (Programmfehler) (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
+#: cipher/random.c:309 g10/import.c:129 g10/keygen.c:1256
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:313
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "Status von '%s' ist nicht feststellbar: %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:318
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' ist keine normale Datei - sie bleibt unbeachtet\n"
 
-#: cipher/random.c:325
+#: cipher/random.c:323
 msgid "note: random_seed file is empty\n"
 msgstr "Hinweis: 'random_seed'-Datei ist leer\n"
 
-#: cipher/random.c:331
+#: cipher/random.c:329
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 "Warnung: Falsche Gr��e der 'random_seed'-Datei - sie wird nicht verwendet\n"
 
-#: cipher/random.c:339
+#: cipher/random.c:337
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "'%s' ist unlesbar: %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:375
 msgid "note: random_seed file not updated\n"
 msgstr "Hinweis: 'random_seed'-Datei bleibt unver�ndert\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:395
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:402
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kann '%s' nicht schreiben: %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:405
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kann '%s' nicht schliessen: %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:416
 #, 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:650
+#: cipher/random.c:648
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "WARNUNG: Der Zufallsgenerator erzeugt keine echten Zufallszahlen!\n"
 
-#: cipher/random.c:651
+#: cipher/random.c:649
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -340,7 +351,7 @@ msgstr ""
 "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n"
 "(Es werden noch %d Byte ben�tigt.)\n"
 
-#: g10/g10.c:212
+#: g10/g10.c:213
 msgid ""
 "@Commands:\n"
 " "
@@ -348,139 +359,139 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "|[file]|make a signature"
 msgstr "|[Datei]|Eine Unterschrift erzeugen"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "encrypt data"
 msgstr "Daten verschl�sseln"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschl�sseln"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "store only"
 msgstr "Nur speichern"
 
-#: g10/g10.c:220
+#: g10/g10.c:221
 msgid "decrypt data (default)"
 msgstr "Daten entschl�sseln (Voreinstellung)"
 
-#: g10/g10.c:221
+#: g10/g10.c:222
 msgid "verify a signature"
 msgstr "Signatur pr�fen"
 
-#: g10/g10.c:223
+#: g10/g10.c:224
 msgid "list keys"
 msgstr "Liste der Schl�ssel"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "list keys and signatures"
 msgstr "Liste der Schl�ssel und ihrer Signaturen"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "check key signatures"
 msgstr "Signaturen der Schl�ssel pr�fen"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "list keys and fingerprints"
 msgstr "Liste der Schl�ssel und ihrer \"Fingerabdr�cke\""
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "list secret keys"
 msgstr "Liste der geheimen Schl�ssel"
 
-#: g10/g10.c:229
+#: g10/g10.c:230
 msgid "generate a new key pair"
 msgstr "Ein neues Schl�sselpaar erzeugen"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
 msgid "remove key from the public keyring"
 msgstr "Schl�ssel aus dem �ff. Schl�sselbund entfernen"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "remove key from the secret keyring"
 msgstr "Schl�ssel aus dem geh. Schl�sselbund entfernen"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign a key"
 msgstr "Schl�ssel signieren"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "sign a key locally"
 msgstr "Schl�ssel nur auf diesem Rechner signieren"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "sign or edit a key"
 msgstr "Unterschreiben oder Bearbeiten eines Schl."
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "generate a revocation certificate"
 msgstr "Ein Schl�sselwiderruf-Zertifikat erzeugen"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "export keys"
 msgstr "Schl�ssel exportieren"
 
-#: g10/g10.c:238
+#: g10/g10.c:239
 msgid "export keys to a key server"
 msgstr "Schl�ssel zu einem Schl�.server exportieren"
 
-#: g10/g10.c:239
+#: g10/g10.c:240
 msgid "import keys from a key server"
 msgstr "Schl�ssel von einem Schl�.server importieren"
 
-#: g10/g10.c:243
+#: g10/g10.c:244
 msgid "import/merge keys"
 msgstr "Schl�ssel importieren/kombinieren"
 
-#: g10/g10.c:245
+#: g10/g10.c:246
 msgid "list only the sequence of packets"
 msgstr "Lediglich Struktur der Datenpakete anzeigen"
 
-#: g10/g10.c:247
+#: g10/g10.c:248
 msgid "export the ownertrust values"
 msgstr "Exportieren der \"Owner trust\" Werte"
 
-#: g10/g10.c:249
+#: g10/g10.c:250
 msgid "import ownertrust values"
 msgstr "Importieren der \"Owner trust\" Werte"
 
-#: g10/g10.c:251
+#: g10/g10.c:252
 msgid "update the trust database"
 msgstr "�ndern der \"Trust\"-Datenbank"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMEN]|�berpr�fen der \"Trust\"-Datenbank"
 
-#: g10/g10.c:254
+#: g10/g10.c:255
 msgid "fix a corrupted trust database"
 msgstr "Reparieren einer besch�digten \"Trust\"-Datenb."
 
-#: g10/g10.c:255
+#: g10/g10.c:256
 msgid "De-Armor a file or stdin"
 msgstr "Datei oder stdin von der ASCII-H�lle befreien"
 
-#: g10/g10.c:257
+#: g10/g10.c:258
 msgid "En-Armor a file or stdin"
 msgstr "Datei oder stdin in eine ASCII-H�lle einpacken"
 
-#: g10/g10.c:259
+#: g10/g10.c:260
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests f�r die Dateien ausgeben"
 
-#: g10/g10.c:263
+#: g10/g10.c:264
 msgid ""
 "@\n"
 "Options:\n"
@@ -490,160 +501,160 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/g10.c:265
+#: g10/g10.c:266
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-H�lle versehen"
 
-#: g10/g10.c:267
+#: g10/g10.c:268
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschl�sseln f�r NAME"
 
-#: g10/g10.c:270
+#: g10/g10.c:271
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|NAME als voreingestellten Empf�nger benutzen"
 
-#: g10/g10.c:272
+#: g10/g10.c:273
 msgid "use the default key as default recipient"
 msgstr ""
 "Den Standardschl�ssel als voreingestellten\n"
 "Empf�nger benutzen"
 
-#: g10/g10.c:276
+#: g10/g10.c:277
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "don't use the terminal at all"
 msgstr "das Terminal gar nicht benutzen"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "force v3 signatures"
 msgstr "v3 Signaturen erzwingen"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "always use a MDC for encryption"
 msgstr "Beim Verschl�sseln ein Siegel (MDC) verwenden"
 
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "do not make any changes"
 msgstr "Keine wirklichen �nderungen durchf�hren"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "use the gpg-agent"
 msgstr "verwende den GPG-Agent"
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "add this keyring to the list of keyrings"
 msgstr "Als �ffentlichen Schl�sselbund mitbenutzen"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "add this secret keyring to the list"
 msgstr "Als geheimen Schl�sselbund mitbenutzen"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten Schl�ssel benutzen"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|Schl�ssel bei diesem Server nachschlagen"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|Terminalzeichensatz NAME benutzen"
 
-#: g10/g10.c:297
+#: g10/g10.c:298
 msgid "read options from file"
 msgstr "Optionen aus der Datei lesen"
 
-#: g10/g10.c:301
+#: g10/g10.c:302
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "|KEYID|ulimately trust this key"
 msgstr "|KEYID|diesem Schl�ssel uneingeschr�nkt vertrauen"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "|FILE|load extension module FILE"
 msgstr "|DATEI|Erweiterungsmodul DATEI laden"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "emulate the mode described in RFC1991"
 msgstr "Den in RFC1991 beschriebenen Modus nachahmen"
 
-#: g10/g10.c:309
+#: g10/g10.c:310
 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:310
+#: g10/g10.c:311
 msgid "|N|use passphrase mode N"
 msgstr "|N|Verwenden des Mantra-Modus N"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|Hashverfahren NAME f�r Mantras benutzen"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|Verschl�.verfahren NAME f�r Mantras benutzen"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Verschl�.verfahren NAME benutzen"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Hashverfahren NAME benutzen"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "|N|use compress algorithm N"
 msgstr "|N|Komprimierverfahren N benutzen"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "throw keyid field of encrypted packets"
 msgstr "Entferne Empf�nger-ID verschl�sselter Pakete"
 
-#: g10/g10.c:319
+#: g10/g10.c:320
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=WERT|verwende diese \"notation\"-Daten"
 
-#: g10/g10.c:322
+#: g10/g10.c:323
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -652,7 +663,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollst�ndige Liste aller Kommandos und "
 "Optionen)\n"
 
-#: g10/g10.c:325
+#: g10/g10.c:326
 msgid ""
 "@\n"
 "Examples:\n"
@@ -672,17 +683,17 @@ msgstr ""
 " --list-keys [Namen]        Schl�ssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdr�cke\" anzeigen\n"
 
-#: g10/g10.c:431
+#: g10/g10.c:432
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Berichte �ber Bugs (Programmfehler) bitte an <[email protected]>.\n"
 "Sinn- oder Schreibfehler in den deutschen Texten bitte an <[email protected]>.\n"
 
-#: g10/g10.c:435
+#: g10/g10.c:436
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
 
-#: g10/g10.c:438
+#: g10/g10.c:439
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -692,7 +703,7 @@ msgstr ""
 "Signieren, pr�fen, verschl�sseln, entschl�sseln\n"
 "Die voreingestellte Operation ist abh�ngig von den Eingabedaten\n"
 
-#: g10/g10.c:445
+#: g10/g10.c:446
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -700,192 +711,192 @@ msgstr ""
 "\n"
 "Unterst�tzte Verfahren:\n"
 
-#: g10/g10.c:524
+#: g10/g10.c:525
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/g10.c:577
+#: g10/g10.c:578
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/g10.c:727
+#: g10/g10.c:728
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/g10.c:731
+#: g10/g10.c:732
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/g10.c:738
+#: g10/g10.c:739
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:943
+#: g10/g10.c:944
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ist kein g�ltiger Zeichensatz.\n"
 
-#: g10/g10.c:1014
+#: g10/g10.c:1015
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm k�nnte eine core-dump-Datei schreiben!\n"
 
-#: g10/g10.c:1018 g10/g10.c:1027
+#: g10/g10.c:1019 g10/g10.c:1028
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Hinweis: %s ist nicht f�r den �blichen Gebrauch gedacht!\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1021
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/g10.c:1023
+#: g10/g10.c:1024
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/g10.c:1043 g10/g10.c:1055
+#: g10/g10.c:1044 g10/g10.c:1056
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgew�hlte Verschl�sslungsverfahren ist ung�ltig\n"
 
-#: g10/g10.c:1049 g10/g10.c:1061
+#: g10/g10.c:1050 g10/g10.c:1062
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:1065
+#: g10/g10.c:1066
 msgid "the given policy URL is invalid\n"
 msgstr "Die angegebene URL f�r Richtlinien ist ung�ltig\n"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1069
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "Das Komprimierverfahren mu� im Bereich %d bis %d liegen\n"
 
-#: g10/g10.c:1070
+#: g10/g10.c:1071
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m�ssen gr��er als 0 sein\n"
 
-#: g10/g10.c:1072
+#: g10/g10.c:1073
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed m�ssen gr��er als 1 sein\n"
 
-#: g10/g10.c:1074
+#: g10/g10.c:1075
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth mu� im Bereich 1 bis 255 liegen\n"
 
-#: g10/g10.c:1077
+#: g10/g10.c:1078
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:1081
+#: g10/g10.c:1082
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ung�ltiger \"simple S2K\"-Modus; Wert mu� 0, 1 oder 3 sein\n"
 
-#: g10/g10.c:1166
+#: g10/g10.c:1167
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:1172
+#: g10/g10.c:1173
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1180
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:1187
+#: g10/g10.c:1188
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:1200
+#: g10/g10.c:1201
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:1213
+#: g10/g10.c:1214
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:1227
+#: g10/g10.c:1228
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1245
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1261
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/g10.c:1268
+#: g10/g10.c:1269
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/g10.c:1284
+#: g10/g10.c:1285
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key User-ID"
 
-#: g10/g10.c:1287
+#: g10/g10.c:1288
 msgid "--delete-key user-id"
 msgstr "--delete-key User-ID"
 
-#: g10/g10.c:1295
+#: g10/g10.c:1296
 msgid "--delete-secret-and-public-key user-id"
 msgstr "--delete-secret-and-public-key User-ID"
 
-#: g10/encode.c:268 g10/g10.c:1332 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1333 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
 
-#: g10/g10.c:1347
+#: g10/g10.c:1348
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schl�sselbund]"
 
-#: g10/g10.c:1413
+#: g10/g10.c:1414
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1421
+#: g10/g10.c:1422
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1493
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ung�ltiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:1579
+#: g10/g10.c:1580
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:1583
+#: g10/g10.c:1584
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1586 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1587 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:1795
+#: g10/g10.c:1796
 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:1801
+#: g10/g10.c:1802
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -893,88 +904,88 @@ msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und mu� mit einem '=' enden\n"
 
-#: g10/g10.c:1807
+#: g10/g10.c:1808
 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:1815
+#: g10/g10.c:1816
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
-#: g10/armor.c:302
+#: g10/armor.c:304
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII-H�lle: %s\n"
 
-#: g10/armor.c:331
+#: g10/armor.c:333
 msgid "invalid armor header: "
 msgstr "Ung�ltige ASCII-H�lle"
 
-#: g10/armor.c:338
+#: g10/armor.c:340
 msgid "armor header: "
 msgstr "ASCII-H�lle: "
 
-#: g10/armor.c:349
+#: g10/armor.c:351
 msgid "invalid clearsig header\n"
 msgstr "Ung�ltige Klartextsignatur-Einleitung\n"
 
-#: g10/armor.c:401
+#: g10/armor.c:403
 msgid "nested clear text signatures\n"
 msgstr "verschachtelte Klartextunterschriften\n"
 
-#: g10/armor.c:525
+#: g10/armor.c:527
 msgid "invalid dash escaped line: "
 msgstr "Ung�ltige mit Bindestrich \"escapte\" Zeile: "
 
-#: g10/armor.c:537
+#: g10/armor.c:539
 msgid "unexpected armor:"
 msgstr "Unerwartete ASCII-H�lle:"
 
-#: g10/armor.c:663
+#: g10/armor.c:665
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Ung�ltiges \"radix64\" Zeichen %02x ignoriert\n"
 
-#: g10/armor.c:706
+#: g10/armor.c:708
 msgid "premature eof (no CRC)\n"
 msgstr "vorzeitiges Dateiende (keine Pr�fsumme)\n"
 
-#: g10/armor.c:740
+#: g10/armor.c:742
 msgid "premature eof (in CRC)\n"
 msgstr "vorzeitiges Dateiende (innerhalb der Pr�fsumme)\n"
 
-#: g10/armor.c:744
+#: g10/armor.c:746
 msgid "malformed CRC\n"
 msgstr "Falsch aufgebaute Pr�fsumme\n"
 
-#: g10/armor.c:748
+#: g10/armor.c:750
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "Pr�fsummenfehler; %06lx - %06lx\n"
 
-#: g10/armor.c:765
+#: g10/armor.c:767
 msgid "premature eof (in Trailer)\n"
 msgstr "vorzeitiges Dateiende (im Nachsatz)\n"
 
-#: g10/armor.c:769
+#: g10/armor.c:771
 msgid "error in trailer line\n"
 msgstr "Fehler in der Nachsatzzeile\n"
 
-#: g10/armor.c:915
+#: g10/armor.c:917
 msgid "For info see http://www.gnupg.org"
 msgstr "Weitere Infos: siehe http://www.gnupg.org"
 
-#: g10/armor.c:1043
+#: g10/armor.c:1045
 msgid "no valid OpenPGP data found.\n"
 msgstr "Keine g�ltigen OpenPGP-Daten gefunden.\n"
 
-#: g10/armor.c:1048
+#: g10/armor.c:1050
 #, 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:1052
+#: g10/armor.c:1054
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -983,7 +994,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1189 g10/pkclist.c:53
+#: g10/keyedit.c:1190 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "           Fingerabdruck:"
 
@@ -1222,17 +1233,17 @@ msgstr ""
 "         Es ist nicht sicher, da� die Signatur wirklich dem vorgeblichen "
 "Besitzer geh�rt.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: �bersprungen: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:826 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: �bersprungen: �ffentlicher Schl�ssel bereits vorhanden\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:853
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1240,44 +1251,44 @@ msgstr ""
 "Sie haben keine User-ID angegeben (Benutzen Sie die Option \"-r\").\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:863
 msgid "Enter the user ID: "
 msgstr "Geben Sie die User-ID ein: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:875
 msgid "No such user ID.\n"
 msgstr "Keine solche User-ID vorhanden.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:880
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "�bersprungen: �ffentlicher Schl�ssel bereits als Standardempf�nger gesetzt\n"
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:903
 msgid "Public key is disabled.\n"
 msgstr "�ffentlicher Schl�ssel ist abgeschaltet.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:910
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr ""
 "�bersprungen: �ffentlicher Schl�ssel bereits mittels --encrypt-to gesetzt\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:941
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "Unbekannter voreingestellter Empf�nger '%s'\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:974
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: Fehler beim Pr�fen des Schl�ssels: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: �bersprungen: �ffentlicher Schl�ssel ist abgeschaltet\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1017
 msgid "no valid addressees\n"
 msgstr "Keine g�ltigen Adressaten\n"
 
@@ -1556,7 +1567,7 @@ msgstr ""
 "Sie ben�tigen ein Mantra, um den geheimen Schl�ssel zu sch�tzen.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:955
+#: g10/keyedit.c:469 g10/keygen.c:955
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "Mantra wurde nicht richtig wiederholt; noch einmal versuchen.\n"
 
@@ -1686,287 +1697,287 @@ msgstr "Schl�ssel %08lX: dies ist kein RFC2440-Sch�ssel - �bersprungen\n"
 msgid "key %08lX: not protected - skipped\n"
 msgstr "Schl�ssel %08lX: ungesch�tzt - �bersprungen\n"
 
-#: g10/export.c:232
+#: g10/export.c:236
 msgid "WARNING: nothing exported\n"
 msgstr "WARNUNG: Nichts exportiert\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:208
 msgid "too many entries in pk cache - disabled\n"
 msgstr "zu viele Eintr�ge im pk-Lager - abgeschaltet\n"
 
-#: g10/getkey.c:445
+#: g10/getkey.c:443
 msgid "too many entries in unk cache - disabled\n"
 msgstr "zu viele Eintr�ge im unk-Lager - abgeschaltet\n"
 
-#: g10/getkey.c:2100
+#: g10/getkey.c:2143
 #, 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:2141 g10/trustdb.c:577
+#: g10/getkey.c:2185 g10/trustdb.c:577
 #, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr ""
 "Schl�ssel %08lX: geheimer Schl�ssel, aber ohne �ffentlichen Schl�ssel - "
 "�bersprungen\n"
 
-#: g10/getkey.c:2424
+#: g10/getkey.c:2473
 msgid "[User id not found]"
 msgstr "[User-ID nicht gefunden]"
 
-#: g10/import.c:182
+#: g10/import.c:184
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "�berspringe den Block vom Typ %d\n"
 
-#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu Schl�ssel bislang bearbeitet\n"
 
-#: g10/import.c:194
+#: g10/import.c:196
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Fehler beim Lesen von `%s': %s\n"
 
-#: g10/import.c:204
+#: g10/import.c:206
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Anzahl insgesamt bearbeiteter Schl�ssel: %lu\n"
 
-#: g10/import.c:206
+#: g10/import.c:208
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "              ignorierte neue Schl�ssel: %lu\n"
 
-#: g10/import.c:209
+#: g10/import.c:211
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                           ohne User-ID: %lu\n"
 
-#: g10/import.c:211
+#: g10/import.c:213
 #, c-format
 msgid "              imported: %lu"
 msgstr "                             importiert: %lu"
 
-#: g10/import.c:217
+#: g10/import.c:219
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                            unver�ndert: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:221
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "                          neue User-IDs: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:223
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "                    neue Unterschl�ssel: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:225
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                        neue Signaturen: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:227
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "                neue Schl�sselwiderrufe: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:229
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "             gelesene geheime Schl�ssel: %lu\n"
 
-#: g10/import.c:229
+#: g10/import.c:231
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "           geheime Schl�ssel importiert: %lu\n"
 
-#: g10/import.c:231
+#: g10/import.c:233
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "                 unver�nderte geh.Schl.: %lu\n"
 
-#: g10/import.c:391 g10/import.c:600
+#: g10/import.c:408 g10/import.c:617
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "Schl�ssel %08lX: Keine User-ID\n"
 
-#: g10/import.c:405
+#: g10/import.c:422
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "Schl�ssel %08lX: Keine g�ltigen User-IDs\n"
 
-#: g10/import.c:407
+#: g10/import.c:424
 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:418 g10/import.c:667
+#: g10/import.c:435 g10/import.c:684
 #, 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:423
+#: g10/import.c:440
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "Schl�ssel %08lX: neuer Schl�ssel - �bersprungen\n"
 
-#: g10/import.c:431
+#: g10/import.c:448
 msgid "no default public keyring\n"
 msgstr "Kein voreingestellter �ffentlicher Schl�sselbund\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
+#: g10/import.c:452 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:615 g10/import.c:716
+#: 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:441 g10/import.c:499 g10/import.c:618 g10/import.c:719
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des Schl�sselbundes `%s': %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel importiert\n"
 
-#: g10/import.c:463
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "Schl�ssel %08lX: Stimmt nicht mit unserer Kopie �berein\n"
 
-#: g10/import.c:472 g10/import.c:675
+#: g10/import.c:489 g10/import.c:692
 #, 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:478 g10/import.c:681
+#: g10/import.c:495 g10/import.c:698
 #, 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:505
+#: g10/import.c:522
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "Schl�ssel %08lX: 1 neue User-ID\n"
 
-#: g10/import.c:508
+#: g10/import.c:525
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "Schl�ssel %08lX: %d neue User-IDs\n"
 
-#: g10/import.c:511
+#: g10/import.c:528
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "Schl�ssel %08lX: 1 neue Signatur\n"
 
-#: g10/import.c:514
+#: g10/import.c:531
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "Schl�ssel %08lX: %d neue Signaturen\n"
 
-#: g10/import.c:517
+#: g10/import.c:534
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "Schl�ssel %08lX: 1 neuer Unterschl�ssel\n"
 
-#: g10/import.c:520
+#: g10/import.c:537
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "Schl�ssel %08lX: %d neue Unterschl�ssel\n"
 
-#: g10/import.c:530
+#: g10/import.c:547
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "Schl�ssel %08lX: Nicht ge�ndert\n"
 
-#: g10/import.c:593
+#: g10/import.c:610
 #, 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:623
+#: g10/import.c:640
 #, 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:627
+#: g10/import.c:644
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "Schl�ssel %08lX: Ist bereits im geheimen Schl�sselbund\n"
 
-#: g10/import.c:632
+#: g10/import.c:649
 #, 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:661
+#: g10/import.c:678
 #, 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:692
+#: g10/import.c:709
 #, 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:724
+#: g10/import.c:741
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat importiert\n"
 
-#: g10/import.c:766
+#: g10/import.c:783
 #, 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:773 g10/import.c:797
+#: g10/import.c:790 g10/import.c:814
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "Schl�ssel %08lX: Nicht unterst�tztes Public-Key-Verfahren\n"
 
-#: g10/import.c:774
+#: g10/import.c:791
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Eigenbeglaubigung\n"
 
-#: g10/import.c:789
+#: g10/import.c:806
 #, 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:798
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung\n"
 
-#: g10/import.c:825
+#: g10/import.c:842
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "Schl�ssel %08lX: Nicht eigenbeglaubigte User-ID �bernommen'"
 
-#: g10/import.c:854
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "Schl�ssel %08lX: User-ID �bergangen '"
 
-#: g10/import.c:877
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "Schl�ssel %08lX: Unterschl�ssel ignoriert\n"
@@ -1975,33 +1986,33 @@ msgstr "Schl�ssel %08lX: Unterschl�ssel ignoriert\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:902
+#: g10/import.c:919
 #, 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:911
+#: g10/import.c:928
 #, 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:919
+#: g10/import.c:936
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - �bergangen\n"
 
-#: g10/import.c:1019
+#: g10/import.c:1036
 #, 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:1071
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat hinzugef�gt\n"
 
-#: g10/import.c:1185 g10/import.c:1238
+#: g10/import.c:1202 g10/import.c:1255
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "Schl�ssel %08lX: Unsere Kopie hat keine Eigenbeglaubigung\n"
@@ -2011,63 +2022,63 @@ msgstr "Schl�ssel %08lX: Unsere Kopie hat keine Eigenbeglaubigung\n"
 msgid "%s: user not found\n"
 msgstr "%s: Benutzer nicht gefunden\n"
 
-#: g10/keyedit.c:155
+#: g10/keyedit.c:156
 msgid "[revocation]"
 msgstr "[Widerruf]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:157
 msgid "[self-signature]"
 msgstr "[Eigenbeglaubigung]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:221
 msgid "1 bad signature\n"
 msgstr "1 falsche Beglaubigung\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:223
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d falsche Beglaubigungen\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:225
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 Beglaubigung wegen fehlendem Schl�ssel nicht gepr�ft\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d Beglaubigungen wegen fehlenden Schl�sseln nicht gepr�ft\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 msgid "1 signature not checked due to an error\n"
 msgstr "1 Beglaubigung aufgrund von Fehler nicht gepr�ft\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:231
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d Beglaubigungen aufgrund von Fehlern nicht gepr�ft\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:233
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Eine User-ID ohne g�ltige Eigenbeglaubigung entdeckt\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:235
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d User-IDs ohne g�ltige Eigenbeglaubigung entdeckt\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:317
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Ist bereits durch Schl�ssel %08lX beglaubigt.\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:325
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nichts zu beglaubigen f�r Schl�ssel %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2075,7 +2086,7 @@ msgstr ""
 "Sind Sie wirklich sicher, da� Sie vorstehenden Schl�ssel mit Ihrem\n"
 "Schl�ssel beglaubigen wollen: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:343
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2083,33 +2094,33 @@ msgstr ""
 "Die Unterschrift wird als nicht exportf�hig markiert werden.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:348
 msgid "Really sign? "
 msgstr "Wirklich unterschreiben? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
+#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:136
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:428
 msgid "This key is not protected.\n"
 msgstr "Dieser Schl�ssel ist nicht gesch�tzt.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:432
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Geheime Teile des Haupschl�ssels sind nicht vorhanden\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:436
 msgid "Key is protected.\n"
 msgstr "Schl�ssel ist gesch�tzt.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Dieser Schl�ssel kann nicht editiert werden: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:461
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2117,7 +2128,7 @@ msgstr ""
 "Geben Sie das neue Mantra f�r diesen geheimen Schl�ssel ein.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:473
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2125,420 +2136,420 @@ msgstr ""
 "Sie wollen kein Mantra - dies ist bestimmt *keine* gute Idee!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:476
 msgid "Do you really want to do this? "
 msgstr "M�chten Sie dies wirklich tun? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:540
 msgid "moving a key signature to the correct place\n"
 msgstr "schiebe eine Beglaubigung an die richtige Stelle\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
 msgid "quit this menu"
 msgstr "Men� verlassen"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save and quit"
 msgstr "speichern und Men� verlassen"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "show fingerprint"
 msgstr "\"Fingerabdruck\" anzeigen"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list"
 msgstr "Liste der Schl�ssel"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list key and user IDs"
 msgstr "Schl�ssel und User-IDs auflisten"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "select user ID N"
 msgstr "User-ID N ausw�hlen"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "select secondary key N"
 msgstr "Zweitschl�ssel N ausw�hlen"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "list signatures"
 msgstr "Liste der Signaturen"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign the key"
 msgstr "Den Schl�ssel signieren"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "sign the key locally"
 msgstr "Den Schl�ssel nur auf diesem Rechner signieren"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "add a user ID"
 msgstr "Eine User-ID hinzuf�gen"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "delete user ID"
 msgstr "User-ID entfernen"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "add a secondary key"
 msgstr "Einen Zweitschl�ssel hinzuf�gen"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delete a secondary key"
 msgstr "Einen Zweitschl�ssel entfernen"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delete signatures"
 msgstr "Signatur entfernen"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "change the expire date"
 msgstr "�ndern des Verfallsdatums"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle between secret and public key listing"
 msgstr "Umschalten zwischen Anzeige geheimer und �ffentlicher Schl�ssel"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "list preferences"
 msgstr "Liste der Voreinstellungen"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
 msgid "change the passphrase"
 msgstr "Das Mantra �ndern"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
 msgid "change the ownertrust"
 msgstr "Den \"Owner trust\" �ndern"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
 msgid "revoke signatures"
 msgstr "Signaturen widerrufen"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 msgid "revoke a secondary key"
 msgstr "Einen Zweitschl�ssel widerrufen"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 msgid "disable a key"
 msgstr "Schl�ssel abschalten"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
 msgid "enable a key"
 msgstr "Schl�ssel anschalten"
 
-#: g10/delkey.c:110 g10/keyedit.c:631
+#: g10/delkey.c:110 g10/keyedit.c:632
 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:669
+#: g10/keyedit.c:670
 msgid "Secret key is available.\n"
 msgstr "Geheimer Schl�ssel ist vorhanden.\n"
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 msgid "Command> "
 msgstr "Befehl> "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:729
 msgid "Need the secret key to do this.\n"
 msgstr "Hierzu wird der geheime Schl�ssel ben�tigt.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:733
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bitte verwenden sie zun�chst den Befehl \"toggle\"\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 msgid "Really sign all user IDs? "
 msgstr "Wirklich alle User-IDs beglaubigen? "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 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:812 g10/keyedit.c:994
+#: g10/keyedit.c:813 g10/keyedit.c:995
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "�nderung der \"Trust-DB\" fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:823 g10/keyedit.c:844
+#: g10/keyedit.c:824 g10/keyedit.c:845
 msgid "You must select at least one user ID.\n"
 msgstr "Zumindestens eine User-ID mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "You can't delete the last user ID!\n"
 msgstr "Die letzte User-ID kann nicht gel�scht werden!\n"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:829
 msgid "Really remove all selected user IDs? "
 msgstr "M�chten Sie alle ausgew�hlten User-IDs wirklich entfernen? "
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:830
 msgid "Really remove this user ID? "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:866 g10/keyedit.c:888
 msgid "You must select at least one key.\n"
 msgstr "Zumindestens ein Schl�ssel mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:870
 msgid "Do you really want to delete the selected keys? "
 msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich entfernen? "
 
-#: g10/keyedit.c:870
+#: g10/keyedit.c:871
 msgid "Do you really want to delete this key? "
 msgstr "M�chten Sie diesen Schl�ssel wirklich entfernen? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "Do you really want to revoke the selected keys? "
 msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich widerrufen? "
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:893
 msgid "Do you really want to revoke this key? "
 msgstr "M�chten Sie diesen Schl�ssel wirklich wiederrufen? "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:959
 msgid "Save changes? "
 msgstr "�nderungen speichern? "
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:962
 msgid "Quit without saving? "
 msgstr "Beenden ohne zu speichern? "
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:973
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�nderung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:980
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "�nderung des Geheimnisses fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:987
 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:1001
+#: g10/keyedit.c:1002
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ung�ltiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
-#: g10/keyedit.c:1081 g10/keyedit.c:1107
+#: g10/keyedit.c:1082 g10/keyedit.c:1108
 #, 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:1090
+#: g10/keyedit.c:1091
 #, c-format
 msgid " trust: %c/%c"
 msgstr " Vertrauen: %c/%c"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1095
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schl�ssel ist abgeschaltet"
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1124
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! Unterschl�ssel wurde widerrufen: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1127
 msgid "rev- faked revocation found\n"
 msgstr "rev- gef�lschter Schl�sselwiderruf entdeckt\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1129
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? Schwierigkeiten bei der Widerruf-�berpr�fung: %s\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1371
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ung�ltige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1375
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1381
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1396
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1468
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schl�sseln.\n"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1474
 msgid "Please select at most one secondary key.\n"
 msgstr "Bitte w�hlen Sie h�chstens einen Zweitschl�ssel aus.\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1478
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "�ndern des Verfallsdatums des Zweitschl�ssels.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1480
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�ndern des Verfallsdatums des Hauptschl�ssels.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1522
 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:1537
+#: g10/keyedit.c:1538
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1599
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:1644
+#: g10/keyedit.c:1645
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Kein Zweitschl�ssel mit Index %d\n"
 
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:1743
 msgid "user ID: \""
 msgstr "User-ID: \""
 
-#: g10/keyedit.c:1745
+#: g10/keyedit.c:1746
 #, c-format
 msgid ""
 "\"\n"
@@ -2547,34 +2558,34 @@ msgstr ""
 "\"\n"
 "unterschrieben mit Ihrem Schl�ssel %08lX um %s\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1750
 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:1773
+#: g10/keyedit.c:1774
 msgid "You have signed these user IDs:\n"
 msgstr "Sie haben folgende User-IDs beglaubigt:\n"
 
-#: g10/keyedit.c:1787 g10/keyedit.c:1822
+#: g10/keyedit.c:1788 g10/keyedit.c:1823
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   beglaubigt durch %08lX um %s\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1793
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   widerrufen durch %08lX um %s\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1813
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:1830
+#: g10/keyedit.c:1831
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1860
 msgid "no secret key\n"
 msgstr "Kein geheimer Schl�ssel\n"
 
@@ -2587,132 +2598,132 @@ msgid "revoked"
 msgstr "widerrufen"
 
 #. of subkey
-#: g10/keylist.c:404 g10/mainproc.c:836
+#: g10/keylist.c:402 g10/mainproc.c:837
 #, c-format
 msgid " [expires: %s]"
 msgstr " [verf�llt: %s]"
 
-#: g10/mainproc.c:270
+#: g10/mainproc.c:271
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "�ffentlicher Schl�ssel ist %08lX\n"
 
-#: g10/mainproc.c:315
+#: g10/mainproc.c:316
 msgid "public key encrypted data: good DEK\n"
 msgstr "Mit �ffentlichem Sch�ssel verschl�sselte Daten: Korrekte DEK\n"
 
-#: g10/mainproc.c:367
+#: g10/mainproc.c:368
 #, 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:377
+#: g10/mainproc.c:378
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "verschl�sselt mit %s Schl�ssel, ID %08lX\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:392
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Entschl�sselung mit �ffentlichem Schl�ssel fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:431
+#: g10/mainproc.c:432
 msgid "decryption okay\n"
 msgstr "Enschl�sselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:437
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Warnung: Verschl�sselte Botschaft ist manipuliert worden!\n"
 
-#: g10/mainproc.c:441
+#: g10/mainproc.c:442
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Enschl�sselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:461
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 "Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:462
+#: g10/mainproc.c:463
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Urspr�nglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:617
+#: g10/mainproc.c:618
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "Einzelner Widerruf - verwenden Sie \"gpg --import\" um ihn anzuwenden\n"
 
-#: g10/mainproc.c:704 g10/mainproc.c:713
+#: g10/mainproc.c:705 g10/mainproc.c:714
 msgid "WARNING: invalid notation data found\n"
 msgstr "WARNUNG: Ung�ltige \"Notation\"-Daten gefunden\n"
 
-#: g10/mainproc.c:716
+#: g10/mainproc.c:717
 msgid "Notation: "
 msgstr "\"Notation\": "
 
-#: g10/mainproc.c:725
+#: g10/mainproc.c:726
 msgid "Policy: "
 msgstr "Richtlinie: "
 
-#: g10/mainproc.c:1235
+#: g10/mainproc.c:1177
 msgid "signature verification suppressed\n"
 msgstr "Unterschriften-�berpr�fung unterdr�ckt\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1272
+#: g10/mainproc.c:1214
 #, 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:1307 g10/mainproc.c:1318
+#: g10/mainproc.c:1242 g10/mainproc.c:1250
 msgid "BAD signature from \""
 msgstr "FALSCHE Unterschrift von \""
 
-#: g10/mainproc.c:1308 g10/mainproc.c:1319
+#: g10/mainproc.c:1243 g10/mainproc.c:1251
 msgid "Good signature from \""
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:1310
+#: g10/mainproc.c:1266
 msgid "                aka \""
 msgstr "                    alias \""
 
-#: g10/mainproc.c:1366
+#: g10/mainproc.c:1316
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht gepr�ft werden: %s\n"
 
-#: g10/mainproc.c:1423 g10/mainproc.c:1438 g10/mainproc.c:1500
+#: g10/mainproc.c:1373 g10/mainproc.c:1388 g10/mainproc.c:1450
 msgid "not a detached signature\n"
 msgstr "keine abgetrennte Unterschrift\n"
 
-#: g10/mainproc.c:1449
+#: g10/mainproc.c:1399
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Unterschrift der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1454
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:1509
+#: g10/mainproc.c:1459
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ung�ltiges root-Paket in proc_tree() entdeckt\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:98
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "core-dump-Dateierzeugung kann nicht abgeschaltet werden: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:208
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Experimentiermethoden sollten nicht benutzt werden!\n"
 
-#: g10/misc.c:237
+#: g10/misc.c:238
 msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
 msgstr "Es ist davon abzuraten, diese Verschl�sselungsmethode zu benutzen!\n"
 
@@ -2721,7 +2732,7 @@ msgstr "Es ist davon abzuraten, diese Verschl�sselungsmethode zu benutzen!\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
 
-#: g10/parse-packet.c:998
+#: g10/parse-packet.c:1010
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
@@ -2734,7 +2745,7 @@ 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:170 g10/passphrase.c:248
+#: g10/hkp.c:147 g10/passphrase.c:248
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
@@ -2861,36 +2872,36 @@ msgstr "Hinweis: Verfahren %d ist kein bevorzugtes Verschl�sselungsverfahren\n"
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "Hinweis: geheimer Schl�ssel %08lX verf�llt am %s\n"
 
-#: g10/hkp.c:72
+#: g10/hkp.c:59
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr "Schl�ssel %08lX von %s wird angefordert ...\n"
 
-#: g10/hkp.c:85
+#: g10/hkp.c:72
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "Schl�ssel ist beim Schl�sselserver nicht erh�ltlich: %s\n"
 
-#: g10/hkp.c:109 g10/hkp.c:148
+#: g10/hkp.c:91 g10/hkp.c:125
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "Kein Schl�sselserver bekannt (Option --keyserver verwenden)\n"
 
-#: g10/hkp.c:117
+#: g10/hkp.c:99
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s: Dies ist keine g�ltige Schl�ssel-ID\n"
 
-#: g10/hkp.c:194
+#: g10/hkp.c:171
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "Fehler beim Senden an `%s': %s\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:183
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "Senden an `%s' erfolgreich (status=%u)\n"
 
-#: g10/hkp.c:209
+#: g10/hkp.c:186
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "Senden an `%s' erfolglos (status=%u)\n"
@@ -3423,36 +3434,46 @@ msgstr "%s: Schl�sselbund kann nicht erzeugt werden: %s\n"
 msgid "%s: keyring created\n"
 msgstr "%s: Schl�sselbund erstellt\n"
 
-#: g10/ringedit.c:1551
+#: g10/ringedit.c:1555
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "Warnung: Zwei Dateien mit vertraulichem Inhalt vorhanden.\n"
 
-#: g10/ringedit.c:1552
+#: g10/ringedit.c:1556
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ist der Unver�nderte\n"
 
-#: g10/ringedit.c:1553
+#: g10/ringedit.c:1557
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s ist der Neue\n"
 
-#: g10/ringedit.c:1554
+#: g10/ringedit.c:1558
 msgid "Please fix this possible security flaw\n"
 msgstr "Bitte diesen potentiellen Sicherheitsmangel beseitigen\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
+#: 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 ""
 "Schl�ssel ist nicht als unsicher gekennzeichnet - er ist nur mit einem\n"
 "echten Zufallsgenerator verwendbar\n"
 
-#: g10/skclist.c:113
+#: g10/skclist.c:138
+#, fuzzy, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "�bersprungen '%s': %s\n"
+
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "�bersprungen '%s': %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:149
+#, fuzzy
+msgid "skipped: secret key already present\n"
+msgstr "%s: �bersprungen: �ffentlicher Schl�ssel bereits vorhanden\n"
+
+#: g10/skclist.c:160
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
diff --git a/po/eo.po b/po/eo.po
index a664ef53d..7b54a2577 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.1e\n"
-"POT-Creation-Date: 2001-02-07 16:46+0100\n"
+"POT-Creation-Date: 2001-03-13 13:40+0100\n"
 "PO-Revision-Date: 2000-08-16 23:19+01:00\n"
 "Last-Translator: Edmund GRIMLEY EVANS <[email protected]>\n"
 "Language-Team: Esperanto <[email protected]>\n"
@@ -41,7 +41,7 @@ msgstr "ne"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:308
 msgid "quit"
 msgstr "fini"
 
@@ -245,6 +245,17 @@ msgstr "ne �ifrita"
 msgid "not processed"
 msgstr "ne traktita"
 
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+#, fuzzy
+msgid "unusable public key"
+msgstr "malbona publika �losilo"
+
+#: util/errors.c:106
+#, fuzzy
+msgid "unusable secret key"
+msgstr "malbona sekreta �losilo"
+
 #: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -255,63 +266,63 @@ msgstr "... �i tio estas cimo (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vi trovis cimon ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
+#: cipher/random.c:309 g10/import.c:129 g10/keygen.c:1256
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:313
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "ne povas stat-i '%s': %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:318
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' ne estas normala dosiero - ignorita\n"
 
-#: cipher/random.c:325
+#: cipher/random.c:323
 msgid "note: random_seed file is empty\n"
 msgstr "noto: dosiero random_seed estas malplena\n"
 
-#: cipher/random.c:331
+#: cipher/random.c:329
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr "averto: nevalida grando de la dosiero random_seen - ne uzita\n"
 
-#: cipher/random.c:339
+#: cipher/random.c:337
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "ne povas legi '%s': %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:375
 msgid "note: random_seed file not updated\n"
 msgstr "noto: dosiero random_seed ne aktualigita\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:395
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:402
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "ne povas skribi '%s': %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:405
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:416
 #, 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:650
+#: cipher/random.c:648
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVERTO: uzas malsekuran stokastilon!!\n"
 
-#: cipher/random.c:651
+#: cipher/random.c:649
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -336,7 +347,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:212
+#: g10/g10.c:213
 msgid ""
 "@Commands:\n"
 " "
@@ -344,139 +355,139 @@ msgstr ""
 "@Komandoj:\n"
 " "
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "|[file]|make a signature"
 msgstr "|[dosiero]|fari subskribon"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "encrypt data"
 msgstr "�ifri datenojn"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "encryption only with symmetric cipher"
 msgstr "�ifri nur kun simetria �ifro"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "store only"
 msgstr "nur skribi"
 
-#: g10/g10.c:220
+#: g10/g10.c:221
 msgid "decrypt data (default)"
 msgstr "mal�ifri datenojn (implicita elekto)"
 
-#: g10/g10.c:221
+#: g10/g10.c:222
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/g10.c:223
+#: g10/g10.c:224
 msgid "list keys"
 msgstr "listigi �losilojn"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "list keys and signatures"
 msgstr "listigi �losilojn kaj subskribojn"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "check key signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "list keys and fingerprints"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "list secret keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: g10/g10.c:229
+#: g10/g10.c:230
 msgid "generate a new key pair"
 msgstr "krei novan �losilparon"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
 msgid "remove key from the public keyring"
 msgstr "forigi �losilon de la publika �losilaro"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "remove key from the secret keyring"
 msgstr "forigi �losilon de la sekreta �losilaro"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign a key"
 msgstr "subskribi �losilon"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "sign a key locally"
 msgstr "subskribi �losilon loke"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "sign or edit a key"
 msgstr "subskribi a� redakti �losilon"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "export keys"
 msgstr "eksporti �losilojn"
 
-#: g10/g10.c:238
+#: g10/g10.c:239
 msgid "export keys to a key server"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/g10.c:239
+#: g10/g10.c:240
 msgid "import keys from a key server"
 msgstr "importi �losilojn de �losilservilo"
 
-#: g10/g10.c:243
+#: g10/g10.c:244
 msgid "import/merge keys"
 msgstr "importi/kunfandi �losilojn"
 
-#: g10/g10.c:245
+#: g10/g10.c:246
 msgid "list only the sequence of packets"
 msgstr "listigi nur la sinsekvon de paketoj"
 
-#: g10/g10.c:247
+#: g10/g10.c:248
 msgid "export the ownertrust values"
 msgstr "eksporti la posedantofido-valorojn"
 
-#: g10/g10.c:249
+#: g10/g10.c:250
 msgid "import ownertrust values"
 msgstr "importi posedantofido-valorojn"
 
-#: g10/g10.c:251
+#: g10/g10.c:252
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMOJ]|kontroli la fido-datenaron"
 
-#: g10/g10.c:254
+#: g10/g10.c:255
 msgid "fix a corrupted trust database"
 msgstr "ripari fu�itan fido-datenaron"
 
-#: g10/g10.c:255
+#: g10/g10.c:256
 msgid "De-Armor a file or stdin"
 msgstr "elkirasigi dosieron a� la normalan enigon"
 
-#: g10/g10.c:257
+#: g10/g10.c:258
 msgid "En-Armor a file or stdin"
 msgstr "enkirasigi dosieron a� la normalan enigon"
 
-#: g10/g10.c:259
+#: g10/g10.c:260
 msgid "|algo [files]|print message digests"
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/g10.c:263
+#: g10/g10.c:264
 msgid ""
 "@\n"
 "Options:\n"
@@ -486,156 +497,156 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: g10/g10.c:265
+#: g10/g10.c:266
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/g10.c:267
+#: g10/g10.c:268
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMO|�ifri por NOMO"
 
-#: g10/g10.c:270
+#: g10/g10.c:271
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: g10/g10.c:272
+#: g10/g10.c:273
 msgid "use the default key as default recipient"
 msgstr "uzi la implicitan �losilon kiel implicitan ricevonton"
 
-#: g10/g10.c:276
+#: g10/g10.c:277
 msgid "use this user-id to sign or decrypt"
 msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "use canonical text mode"
 msgstr "uzi tekstan re�imon"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "verbose"
 msgstr "detala eligo"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "don't use the terminal at all"
 msgstr "tute ne uzi la terminalon"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "force v3 signatures"
 msgstr "devigi v3-subskribojn"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "always use a MDC for encryption"
 msgstr "�iam uzi sigelon (MDC) por �ifrado"
 
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "batch mode: never ask"
 msgstr "neinteraga re�imo: neniam demandi"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "assume yes on most questions"
 msgstr "supozi \"jes\" �e la plej multaj demandoj"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "assume no on most questions"
 msgstr "supozi \"ne\" �e la plej multaj demandoj"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "add this keyring to the list of keyrings"
 msgstr "aldoni �i tiun �losilaron al la listo de �losilaroj"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "add this secret keyring to the list"
 msgstr "aldoni �i tiun sekretan �losilaron al la listo"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVILO|uzi �i tiun �losilservilon por ser�i �losilojn"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
 
-#: g10/g10.c:297
+#: g10/g10.c:298
 msgid "read options from file"
 msgstr "legi la opciojn el dosiero"
 
-#: g10/g10.c:301
+#: g10/g10.c:302
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "|FILE|load extension module FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "emulate the mode described in RFC1991"
 msgstr "imiti la re�imon priskribitan en RFC 1991"
 
-#: g10/g10.c:309
+#: g10/g10.c:310
 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:310
+#: g10/g10.c:311
 msgid "|N|use passphrase mode N"
 msgstr "|N|uzi pasfraz-re�imon N"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOMO|uzi kompendi-metodon NOMO por pasfrazoj"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO por pasfrazoj"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMO|uzi kompendi-metodon NOMO"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "|N|use compress algorithm N"
 msgstr "|N|uzi densig-metodon N"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "throw keyid field of encrypted packets"
 msgstr "forigi la �losilidentigilon de �ifritaj paketoj"
 
-#: g10/g10.c:319
+#: g10/g10.c:320
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOMO=VALORO|uzi �i tiun notacian datenon"
 
-#: g10/g10.c:322
+#: g10/g10.c:323
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -643,7 +654,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
 
-#: g10/g10.c:325
+#: g10/g10.c:326
 msgid ""
 "@\n"
 "Examples:\n"
@@ -663,15 +674,15 @@ msgstr ""
 " --list-keys [nomoj]        montri �losilojn\n"
 " --fingerprint [nomoj]      montri fingro�purojn\n"
 
-#: g10/g10.c:431
+#: g10/g10.c:432
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
 
-#: g10/g10.c:435
+#: g10/g10.c:436
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/g10.c:438
+#: g10/g10.c:439
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -681,7 +692,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/g10.c:445
+#: g10/g10.c:446
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -689,191 +700,191 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/g10.c:524
+#: g10/g10.c:525
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/g10.c:577
+#: g10/g10.c:578
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/g10.c:727
+#: g10/g10.c:728
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/g10.c:731
+#: g10/g10.c:732
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: g10/g10.c:738
+#: g10/g10.c:739
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/g10.c:943
+#: g10/g10.c:944
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/g10.c:1014
+#: g10/g10.c:1015
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/g10.c:1018 g10/g10.c:1027
+#: g10/g10.c:1019 g10/g10.c:1028
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1021
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/g10.c:1023
+#: g10/g10.c:1024
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/g10.c:1043 g10/g10.c:1055
+#: g10/g10.c:1044 g10/g10.c:1056
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/g10.c:1049 g10/g10.c:1061
+#: g10/g10.c:1050 g10/g10.c:1062
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:1065
+#: g10/g10.c:1066
 msgid "the given policy URL is invalid\n"
 msgstr "la donita gvidlinia URL ne validas\n"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1069
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "la densig-metodo devas esti inter %d kaj %d\n"
 
-#: g10/g10.c:1070
+#: g10/g10.c:1071
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/g10.c:1072
+#: g10/g10.c:1073
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/g10.c:1074
+#: g10/g10.c:1075
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth devas esti inter 1 kaj 255\n"
 
-#: g10/g10.c:1077
+#: g10/g10.c:1078
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/g10.c:1081
+#: g10/g10.c:1082
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "nevalida S2K-re�imo; devas esti 0, 1 a� 3\n"
 
-#: g10/g10.c:1166
+#: g10/g10.c:1167
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/g10.c:1172
+#: g10/g10.c:1173
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1180
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/g10.c:1187
+#: g10/g10.c:1188
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/g10.c:1200
+#: g10/g10.c:1201
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/g10.c:1213
+#: g10/g10.c:1214
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:1227
+#: g10/g10.c:1228
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1245
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1261
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/g10.c:1268
+#: g10/g10.c:1269
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/g10.c:1284
+#: g10/g10.c:1285
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key uzantidentigilo"
 
-#: g10/g10.c:1287
+#: g10/g10.c:1288
 msgid "--delete-key user-id"
 msgstr "--delete-key uzantidentigilo"
 
-#: g10/g10.c:1295
+#: g10/g10.c:1296
 #, fuzzy
 msgid "--delete-secret-and-public-key user-id"
 msgstr "--delete-secret-key uzantidentigilo"
 
-#: g10/encode.c:268 g10/g10.c:1332 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1333 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/g10.c:1347
+#: g10/g10.c:1348
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [uzantidentigilo] [�losilaro]"
 
-#: g10/g10.c:1413
+#: g10/g10.c:1414
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:1421
+#: g10/g10.c:1422
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1493
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/g10.c:1579
+#: g10/g10.c:1580
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/g10.c:1583
+#: g10/g10.c:1584
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1586 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1587 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:1795
+#: g10/g10.c:1796
 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:1801
+#: g10/g10.c:1802
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -881,87 +892,87 @@ msgstr ""
 "notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
 "kaj fini per '='\n"
 
-#: g10/g10.c:1807
+#: g10/g10.c:1808
 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:1815
+#: g10/g10.c:1816
 msgid "a notation value must not use any control characters\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/armor.c:302
+#: g10/armor.c:304
 #, c-format
 msgid "armor: %s\n"
 msgstr "kiraso: %s\n"
 
-#: g10/armor.c:331
+#: g10/armor.c:333
 msgid "invalid armor header: "
 msgstr "nevalida kiraso�apo: "
 
-#: g10/armor.c:338
+#: g10/armor.c:340
 msgid "armor header: "
 msgstr "kiraso�apo: "
 
-#: g10/armor.c:349
+#: g10/armor.c:351
 msgid "invalid clearsig header\n"
 msgstr "nevalida �apo de klarteksta subskribo\n"
 
-#: g10/armor.c:401
+#: g10/armor.c:403
 msgid "nested clear text signatures\n"
 msgstr "ingitaj klartekstaj subskriboj\n"
 
-#: g10/armor.c:525
+#: g10/armor.c:527
 msgid "invalid dash escaped line: "
 msgstr "nevalida strek-eskapita linio: "
 
-#: g10/armor.c:537
+#: g10/armor.c:539
 msgid "unexpected armor:"
 msgstr "neatendita kiraso:"
 
-#: g10/armor.c:663
+#: g10/armor.c:665
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "nevalida signo %02x en bazo 64 ignorita\n"
 
-#: g10/armor.c:706
+#: g10/armor.c:708
 msgid "premature eof (no CRC)\n"
 msgstr "tro frua dosierfino (nenia CRC)\n"
 
-#: g10/armor.c:740
+#: g10/armor.c:742
 msgid "premature eof (in CRC)\n"
 msgstr "tro frua dosierfino (en CRC)\n"
 
-#: g10/armor.c:744
+#: g10/armor.c:746
 msgid "malformed CRC\n"
 msgstr "misformita CRC\n"
 
-#: g10/armor.c:748
+#: g10/armor.c:750
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "CRC-eraro; %06lx - %06lx\n"
 
-#: g10/armor.c:765
+#: g10/armor.c:767
 msgid "premature eof (in Trailer)\n"
 msgstr "tro frua dosierfino (en vosto)\n"
 
-#: g10/armor.c:769
+#: g10/armor.c:771
 msgid "error in trailer line\n"
 msgstr "eraro en vostolinio\n"
 
-#: g10/armor.c:915
+#: g10/armor.c:917
 msgid "For info see http://www.gnupg.org"
 msgstr "Por informoj vidu http://www.gnupg.org"
 
-#: g10/armor.c:1043
+#: g10/armor.c:1045
 msgid "no valid OpenPGP data found.\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/armor.c:1048
+#: g10/armor.c:1050
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "nevalida kiraso: linio pli longa ol %d signojn\n"
 
-#: g10/armor.c:1052
+#: g10/armor.c:1054
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -970,7 +981,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1189 g10/pkclist.c:53
+#: g10/keyedit.c:1190 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "             Fingrospuro:"
 
@@ -1198,17 +1209,17 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Ne estas certe, ke la subskribo apartenas al la posedanto.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorita: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:826 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorita: publika �losilo jam �eestas\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:853
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1216,42 +1227,42 @@ msgstr ""
 "Vi ne specifis uzantidentigilon. (Vi povas uzi \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:863
 msgid "Enter the user ID: "
 msgstr "Donu la uzantidentigilon: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:875
 msgid "No such user ID.\n"
 msgstr "Uzantidentigilo ne ekzistas.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:880
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorita: publika �losilo jam difinita kiel implicita ricevonto\n"
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:903
 msgid "Public key is disabled.\n"
 msgstr "Publika �losilo estas mal�altita.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:910
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "ignorita: publika �losilo jam difinita per --encrypt-to\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:941
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:974
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: eraro dum kontrolo de �losilo: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorita: publika �losilo estas mal�altita\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1017
 msgid "no valid addressees\n"
 msgstr "mankas validaj adresitoj\n"
 
@@ -1527,7 +1538,7 @@ msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:955
+#: g10/keyedit.c:469 g10/keygen.c:955
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove.\n"
 
@@ -1656,285 +1667,278 @@ msgstr "�losilo %08lX: ne estas RFC-2440-�losilo - ignorita\n"
 msgid "key %08lX: not protected - skipped\n"
 msgstr "�losilo %08lX: ne protektita - ignorita\n"
 
-#: g10/export.c:232
+#: g10/export.c:236
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:208
 msgid "too many entries in pk cache - disabled\n"
 msgstr "tro da registroj en pk-staplo - mal�altas\n"
 
-#: g10/getkey.c:350
+#: g10/getkey.c:443
 msgid "too many entries in unk cache - disabled\n"
 msgstr "tro da registroj en unk-staplo - mal�altas\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
-msgid "RSA key cannot be used in this version\n"
-msgstr "RSA-�losilo ne estas uzebla kun �i tiu versio\n"
-
-#: g10/getkey.c:1310 g10/getkey.c:1349
-msgid "No key for user ID\n"
-msgstr "Mankas �losilo por uzantidentigilo\n"
-
-#: g10/getkey.c:1388 g10/getkey.c:1428
-msgid "No user ID for key\n"
-msgstr "Mankas uzantidentigilo por �losilo\n"
-
-#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
+#: g10/getkey.c:2143
 #, 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:2050
+#: g10/getkey.c:2185 g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
+
+#: g10/getkey.c:2473
 msgid "[User id not found]"
 msgstr "[Uzantidentigilo ne trovita]"
 
-#: g10/import.c:182
+#: g10/import.c:184
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignoras blokon de speco %d\n"
 
-#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu �losiloj jam traktitaj\n"
 
-#: g10/import.c:194
+#: g10/import.c:196
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/import.c:204
+#: g10/import.c:206
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "      Nombro traktita entute: %lu\n"
 
-#: g10/import.c:206
+#: g10/import.c:208
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "           novaj sub�losiloj: %lu\n"
 
-#: g10/import.c:209
+#: g10/import.c:211
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         sen uzantidentigilo: %lu\n"
 
-#: g10/import.c:211
+#: g10/import.c:213
 #, c-format
 msgid "              imported: %lu"
 msgstr "                  importitaj: %lu"
 
-#: g10/import.c:217
+#: g10/import.c:219
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  ne�an�itaj: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:221
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      novaj uzantidentigiloj: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:223
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novaj sub�losiloj: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:225
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "            novaj subskriboj: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:227
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "         novaj �losilrevokoj: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:229
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   sekretaj �losiloj legitaj: %lu\n"
 
-#: g10/import.c:229
+#: g10/import.c:231
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "sekretaj �losiloj importitaj: %lu\n"
 
-#: g10/import.c:231
+#: g10/import.c:233
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "sekretaj �losiloj ne�an�itaj: %lu\n"
 
-#: g10/import.c:391 g10/import.c:600
+#: g10/import.c:408 g10/import.c:617
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/import.c:405
+#: g10/import.c:422
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "�losilo %08lX: mankas valida uzantidentigilo\n"
 
-#: g10/import.c:407
+#: g10/import.c:424
 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:418 g10/import.c:667
+#: g10/import.c:435 g10/import.c:684
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n"
 
-#: g10/import.c:423
+#: g10/import.c:440
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "�losilo %08lX: ne estas RFC-2440-�losilo - ignorita\n"
 
-#: g10/import.c:431
+#: g10/import.c:448
 msgid "no default public keyring\n"
 msgstr "mankas implicita publika �losilaro\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
+#: g10/import.c:452 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:615 g10/import.c:716
+#: 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:441 g10/import.c:499 g10/import.c:618 g10/import.c:719
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "�losilo %08lX: publika �losilo importita\n"
 
-#: g10/import.c:463
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "�losilo %08lX: diferencas de nia kopio\n"
 
-#: g10/import.c:472 g10/import.c:675
+#: g10/import.c:489 g10/import.c:692
 #, 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:478 g10/import.c:681
+#: g10/import.c:495 g10/import.c:698
 #, 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:505
+#: g10/import.c:522
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "�losilo %08lX: 1 nova uzantidentigilo\n"
 
-#: g10/import.c:508
+#: g10/import.c:525
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:511
+#: g10/import.c:528
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "�losilo %08lX: 1 nova subskribo\n"
 
-#: g10/import.c:514
+#: g10/import.c:531
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:517
+#: g10/import.c:534
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "�losilo %08lX: 1 nova sub�losilo\n"
 
-#: g10/import.c:520
+#: g10/import.c:537
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "�losilo %08lX: %d novaj sub�losiloj\n"
 
-#: g10/import.c:530
+#: g10/import.c:547
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "�losilo %08lX: ne �an�ita\n"
 
-#: g10/import.c:593
+#: g10/import.c:610
 #, c-format
 msgid "secret key %08lX not imported (use %s to allow for it)\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:640
 #, 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:627
+#: g10/import.c:644
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "�losilo %08lX: jam en sekreta �losilaro\n"
 
-#: g10/import.c:632
+#: g10/import.c:649
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "�losilo %08lX: sekreta �losilo ne trovita: %s\n"
 
-#: g10/import.c:661
+#: g10/import.c:678
 #, 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:692
+#: g10/import.c:709
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
 
-#: g10/import.c:724
+#: g10/import.c:741
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "�losilo %08lX: revokatestilo importita\n"
 
-#: g10/import.c:766
+#: g10/import.c:783
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo por subskribo\n"
 
-#: g10/import.c:773 g10/import.c:797
+#: g10/import.c:790 g10/import.c:814
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:774
+#: g10/import.c:791
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/import.c:789
+#: g10/import.c:806
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:798
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:825
+#: g10/import.c:842
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "�losilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
 
-#: g10/import.c:854
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "�losilo %08lX: ignoris uzantidentigilon '"
 
-#: g10/import.c:877
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "�losilo %08lX: ignoris sub�losilon\n"
@@ -1943,32 +1947,32 @@ msgstr "�losilo %08lX: ignoris sub�losilon\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:902
+#: g10/import.c:919
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:911
+#: g10/import.c:928
 #, 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:919
+#: g10/import.c:936
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - ignorita\n"
 
-#: g10/import.c:1019
+#: g10/import.c:1036
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
 
-#: g10/import.c:1071
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: g10/import.c:1185 g10/import.c:1238
+#: g10/import.c:1202 g10/import.c:1255
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "�losilo %08lX: nia kopio ne havas mem-subskribon\n"
@@ -1978,63 +1982,63 @@ msgstr "�losilo %08lX: nia kopio ne havas mem-subskribon\n"
 msgid "%s: user not found\n"
 msgstr "%s: uzanto ne trovita\n"
 
-#: g10/keyedit.c:155
+#: g10/keyedit.c:156
 msgid "[revocation]"
 msgstr "[revoko]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:157
 msgid "[self-signature]"
 msgstr "[mem-subskribo]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:221
 msgid "1 bad signature\n"
 msgstr "1 malbona subskribo\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:223
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d malbonaj subskriboj\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:225
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 subskribo ne kontrolita pro manko de �losilo\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d subskriboj ne kontrolitaj pro manko de �losiloj\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 msgid "1 signature not checked due to an error\n"
 msgstr "1 subskribo ne kontrolita pro eraro\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:231
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d subskriboj ne kontrolitaj pro eraroj\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:233
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 uzantidentigilo sen valida mem-subskribo estis trovita\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:235
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d uzantidentigiloj sen valida mem-subskribo estis trovitaj\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:317
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Jam subskribita per �losilo %08lX\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:325
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nenio por subskribi per �losilo %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2042,7 +2046,7 @@ msgstr ""
 "�u vi estas tute certa, ke vi volas subskribi �i tiun �losilon\n"
 "per via �losilo: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:343
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2050,33 +2054,33 @@ msgstr ""
 "La subskribo estos markita kiel neeksportebla.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:348
 msgid "Really sign? "
 msgstr "�u vere subskribi? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
+#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:136
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:428
 msgid "This key is not protected.\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:432
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:436
 msgid "Key is protected.\n"
 msgstr "�losilo estas protektita.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ne povas redakti �i tiun �losilon: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:461
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2084,7 +2088,7 @@ msgstr ""
 "Donu la novan pasfrazon por �i tiu sekreta �losilo.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:473
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2092,420 +2096,420 @@ msgstr ""
 "Vi ne deziras pasfrazon - tio ver�ajne estas *malbona* ideo!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:476
 msgid "Do you really want to do this? "
 msgstr "�u vi vere volas fari tion? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:540
 msgid "moving a key signature to the correct place\n"
 msgstr "movas �losilsubskribon al la �usta loko\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
 msgid "quit this menu"
 msgstr "forlasi �i tiun menuon"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "q"
 msgstr "f"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save"
 msgstr "skribi"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save and quit"
 msgstr "skribi kaj fini"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "help"
 msgstr "helpo"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "show this help"
 msgstr "montri �i tiun helpon"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "fpr"
 msgstr "fsp"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "show fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list"
 msgstr "listo"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list key and user IDs"
 msgstr "listigi �losilojn kaj uzantidentigilojn"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "select user ID N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "key"
 msgstr "�losilo"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "select secondary key N"
 msgstr "elekti flankan �losilon N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "check"
 msgstr "kontroli"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "list signatures"
 msgstr "listigi subskribojn"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "c"
 msgstr "k"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign"
 msgstr "subskribi"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign the key"
 msgstr "subskribi la �losilon"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "lsign"
 msgstr "lsub"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "sign the key locally"
 msgstr "subskribi la �losilon loke"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "debug"
 msgstr "spuri"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "adduid"
 msgstr "aluid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "add a user ID"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "deluid"
 msgstr "foruid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "delete user ID"
 msgstr "forvi�i uzantidentigilon"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "addkey"
 msgstr "al"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "add a secondary key"
 msgstr "aldoni flankan �losilon"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delkey"
 msgstr "for"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delete a secondary key"
 msgstr "forvi�i flankan �losilon"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delsig"
 msgstr "forsig"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delete signatures"
 msgstr "forvi�i subskribojn"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "expire"
 msgstr "eksval"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "change the expire date"
 msgstr "�an�i la daton de eksvalidi�o"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle"
 msgstr "alia"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle between secret and public key listing"
 msgstr "de sekreta a� publika listo iri al la alia"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "t"
 msgstr "a"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "list preferences"
 msgstr "listigi preferojn"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
 msgid "passwd"
 msgstr "pasf"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
 msgid "change the passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
 msgid "trust"
 msgstr "fido"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
 msgid "change the ownertrust"
 msgstr "�an�i la posedantofidon"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
 msgid "revoke signatures"
 msgstr "revoki subskribojn"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 msgid "revkey"
 msgstr "rev"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 msgid "revoke a secondary key"
 msgstr "revoki flankan �losilon"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 msgid "disable"
 msgstr "el"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 msgid "disable a key"
 msgstr "mal�alti �losilon"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
 msgid "enable"
 msgstr "en"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
 msgid "enable a key"
 msgstr "�alti �losilon"
 
-#: g10/delkey.c:110 g10/keyedit.c:631
+#: g10/delkey.c:110 g10/keyedit.c:632
 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:669
+#: g10/keyedit.c:670
 msgid "Secret key is available.\n"
 msgstr "Sekreta �losilo estas havebla.\n"
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 msgid "Command> "
 msgstr "Komando> "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:729
 msgid "Need the secret key to do this.\n"
 msgstr "Bezonas la sekretan �losilon por fari tion.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:733
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 msgid "Really sign all user IDs? "
 msgstr "�u vere subskribi �iujn uzantidentigilojn? "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:812 g10/keyedit.c:994
+#: g10/keyedit.c:813 g10/keyedit.c:995
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "aktualigo de fido-datenaro malsukcesis: %s\n"
 
-#: g10/keyedit.c:823 g10/keyedit.c:844
+#: g10/keyedit.c:824 g10/keyedit.c:845
 msgid "You must select at least one user ID.\n"
 msgstr "Vi devas elekti almena� unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "You can't delete the last user ID!\n"
 msgstr "Vi ne povas forvi�i la lastan uzantidentigilon!\n"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:829
 msgid "Really remove all selected user IDs? "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:830
 msgid "Really remove this user ID? "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:866 g10/keyedit.c:888
 msgid "You must select at least one key.\n"
 msgstr "Vi devas elekti almena� unu �losilon.\n"
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:870
 msgid "Do you really want to delete the selected keys? "
 msgstr "�u vi vere volas forvi�i la elektitajn �losilojn? "
 
-#: g10/keyedit.c:870
+#: g10/keyedit.c:871
 msgid "Do you really want to delete this key? "
 msgstr "�u vi vere volas forvi�i �i tiun �losilon? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "Do you really want to revoke the selected keys? "
 msgstr "�u vi vere volas revoki la elektitajn �losilojn? "
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:893
 msgid "Do you really want to revoke this key? "
 msgstr "�u vi vere volas revoki �i tiun �losilon? "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:959
 msgid "Save changes? "
 msgstr "�u skribi �an�ojn? "
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:962
 msgid "Quit without saving? "
 msgstr "�u fini sen skribi �an�ojn? "
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:973
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:980
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:987
 msgid "Key not changed so no update needed.\n"
 msgstr "�losilo ne �an�ita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1002
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
-#: g10/keyedit.c:1081 g10/keyedit.c:1107
+#: g10/keyedit.c:1082 g10/keyedit.c:1108
 #, 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:1090
+#: g10/keyedit.c:1091
 #, c-format
 msgid " trust: %c/%c"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1095
 msgid "This key has been disabled"
 msgstr "�i tiu �losilo estas mal�altita"
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1124
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! sub�losilo estas revokita: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1127
 msgid "rev- faked revocation found\n"
 msgstr "rev- falsita revoko trovita\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1129
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problemo en kontrolo de revoko: %s\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1371
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1375
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1381
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Forvi�is %d subskribon.\n"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1396
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Forvi�is %d subskribojn.\n"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forvi�ita.\n"
 
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1468
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bonvolu malelekti la sekretajn �losilojn.\n"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1474
 msgid "Please select at most one secondary key.\n"
 msgstr "Bonvolu elekti maksimume unu flankan �losilon.\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1478
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1480
 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:1521
+#: g10/keyedit.c:1522
 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:1537
+#: g10/keyedit.c:1538
 msgid "No corresponding signature in secret ring\n"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1599
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:1644
+#: g10/keyedit.c:1645
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Mankas flanka �losilo kun indekso %d\n"
 
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:1743
 msgid "user ID: \""
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:1745
+#: g10/keyedit.c:1746
 #, c-format
 msgid ""
 "\"\n"
@@ -2514,34 +2518,34 @@ msgstr ""
 "\"\n"
 "subskribita per via �losilo %08lX je %s\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1750
 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:1773
+#: g10/keyedit.c:1774
 msgid "You have signed these user IDs:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:1787 g10/keyedit.c:1822
+#: g10/keyedit.c:1788 g10/keyedit.c:1823
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   subskribita per %08lX je %s\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1793
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1813
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:1830
+#: g10/keyedit.c:1831
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "�u vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1860
 msgid "no secret key\n"
 msgstr "mankas sekreta �losilo\n"
 
@@ -2556,128 +2560,128 @@ msgid "revoked"
 msgstr "rev"
 
 #. of subkey
-#: g10/keylist.c:404 g10/mainproc.c:836
+#: g10/keylist.c:402 g10/mainproc.c:837
 #, c-format
 msgid " [expires: %s]"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/mainproc.c:270
+#: g10/mainproc.c:271
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "publika �losilo estas %08lX\n"
 
-#: g10/mainproc.c:315
+#: g10/mainproc.c:316
 msgid "public key encrypted data: good DEK\n"
 msgstr "publik�losile �ifritaj datenoj: bona DEK\n"
 
-#: g10/mainproc.c:367
+#: g10/mainproc.c:368
 #, 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:377
+#: g10/mainproc.c:378
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "�ifrita per %s-�losilo, %08lX\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:392
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "publik�losila mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:431
+#: g10/mainproc.c:432
 msgid "decryption okay\n"
 msgstr "mal�ifrado sukcesis\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:437
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTO: �ifrita mesa�o estis manipulita!\n"
 
-#: g10/mainproc.c:441
+#: g10/mainproc.c:442
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:461
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:462
+#: g10/mainproc.c:463
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originala dosiernomo='%.*s'\n"
 
-#: g10/mainproc.c:617
+#: g10/mainproc.c:618
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "memstara revoko - uzu \"gpg --import\" por apliki �in\n"
 
-#: g10/mainproc.c:704 g10/mainproc.c:713
+#: g10/mainproc.c:705 g10/mainproc.c:714
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVERTO: nevalida notacia dateno trovita\n"
 
-#: g10/mainproc.c:716
+#: g10/mainproc.c:717
 msgid "Notation: "
 msgstr "Notacio: "
 
-#: g10/mainproc.c:725
+#: g10/mainproc.c:726
 msgid "Policy: "
 msgstr "Gvidlinio: "
 
-#: g10/mainproc.c:1235
+#: g10/mainproc.c:1177
 msgid "signature verification suppressed\n"
 msgstr "kontrolo de subskribo estas mal�altita\n"
 
-#: g10/mainproc.c:1272
+#: g10/mainproc.c:1214
 #, 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:1307 g10/mainproc.c:1318
+#: g10/mainproc.c:1242 g10/mainproc.c:1250
 msgid "BAD signature from \""
 msgstr "MALBONA subskribo de \""
 
-#: g10/mainproc.c:1308 g10/mainproc.c:1319
+#: g10/mainproc.c:1243 g10/mainproc.c:1251
 msgid "Good signature from \""
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1310
+#: g10/mainproc.c:1266
 msgid "                aka \""
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1366
+#: g10/mainproc.c:1316
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/mainproc.c:1423 g10/mainproc.c:1438 g10/mainproc.c:1500
+#: g10/mainproc.c:1373 g10/mainproc.c:1388 g10/mainproc.c:1450
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "fari apartan subskribon"
 
-#: g10/mainproc.c:1449
+#: g10/mainproc.c:1399
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1454
 msgid "old style (PGP 2.x) signature\n"
 msgstr "malnovstila subskribo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1509
+#: g10/mainproc.c:1459
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nevalida radikpaketo trovita en proc_tree()\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:98
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ne povas mal�alti kreadon de core-dosieroj: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:208
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Eksperimentaj metodoj ne estu uzataj!\n"
 
-#: g10/misc.c:237
+#: g10/misc.c:238
 #, fuzzy
 msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
 msgstr "�i tiu �ifrad-metodo estas malrekomendata; bonvolu uzi pli normalan!\n"
@@ -2687,7 +2691,7 @@ msgstr "�i tiu �ifrad-metodo estas malrekomendata; bonvolu uzi pli normalan!\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "ne povas trakti publik�losilan metodon %d\n"
 
-#: g10/parse-packet.c:990
+#: g10/parse-packet.c:1010
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
@@ -2700,7 +2704,7 @@ msgstr ""
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:170 g10/passphrase.c:248
+#: g10/hkp.c:147 g10/passphrase.c:248
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ne povas konekti�i al '%s': %s\n"
@@ -2829,36 +2833,36 @@ msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
 
-#: g10/hkp.c:72
+#: g10/hkp.c:59
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr "petas la �losilon %08lX de %s ...\n"
 
-#: g10/hkp.c:85
+#: g10/hkp.c:72
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "ne povas akiri �losilon de �losilservilo: %s\n"
 
-#: g10/hkp.c:109 g10/hkp.c:148
+#: g10/hkp.c:91 g10/hkp.c:125
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "neniu �losilservilo konata (uzu la opcion --keyserver)\n"
 
-#: g10/hkp.c:117
+#: g10/hkp.c:99
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s: ne valida �losilidentigilo\n"
 
-#: g10/hkp.c:194
+#: g10/hkp.c:171
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:183
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "sukceso dum sendo al '%s' (statuso=%u)\n"
 
-#: g10/hkp.c:209
+#: g10/hkp.c:186
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "malsukceso dum sendo al '%s': statuso=%u\n"
@@ -2872,11 +2876,11 @@ msgstr "sekretaj �losilpartoj ne estas disponataj\n"
 msgid "protection algorithm %d is not supported\n"
 msgstr "protekto-metodo %d ne estas realigita\n"
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:184
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Nevalida pasfrazo; bonvolu provi denove ...\n"
 
-#: g10/seckey-cert.c:242
+#: g10/seckey-cert.c:240
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVERTO: Malforta �losilo trovita - bonvolu �an�i la pasfrazon denove.\n"
@@ -3144,11 +3148,6 @@ msgstr "�losilo %08lX: ne protektita - ignorita\n"
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "NOTO: sekreta �losilo %08lX NE estas protektita.\n"
 
-#: g10/trustdb.c:577
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
-
 #: g10/trustdb.c:584
 #, c-format
 msgid "key %08lX: secret and public key don't match\n"
@@ -3382,36 +3381,46 @@ msgstr "%s: ne povas krei �losilaron: %s\n"
 msgid "%s: keyring created\n"
 msgstr "%s: �losilaro kreita\n"
 
-#: g10/ringedit.c:1551
+#: g10/ringedit.c:1555
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVERTO: ekzistas 2 dosieroj kun sekretaj informoj.\n"
 
-#: g10/ringedit.c:1552
+#: g10/ringedit.c:1556
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s estas la ne�an�ita\n"
 
-#: g10/ringedit.c:1553
+#: g10/ringedit.c:1557
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s estas la nova\n"
 
-#: g10/ringedit.c:1554
+#: g10/ringedit.c:1558
 msgid "Please fix this possible security flaw\n"
 msgstr "Bonvolu ripari �i tiun eblan sekurecproblemon\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
+#: 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 ""
 "�losilo ne estas markita kiel malsekura - ne povas uzi �in kun falsa "
 "stokastilo!\n"
 
-#: g10/skclist.c:113
+#: g10/skclist.c:138
+#, fuzzy, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "ignoris '%s': %s\n"
+
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "ignoris '%s': %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:149
+#, fuzzy
+msgid "skipped: secret key already present\n"
+msgstr "%s: ignorita: publika �losilo jam �eestas\n"
+
+#: g10/skclist.c:160
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3511,11 +3520,11 @@ msgstr "�u forvi�i �i tiun �losilon de la �losilaro? "
 msgid "This is a secret key! - really delete? "
 msgstr "Tio estas sekreta �losilo! �u vere forvi�i �in? "
 
-#: g10/delkey.c:182
+#: g10/delkey.c:181
 msgid "there is a secret key for this public key!\n"
 msgstr "mankas sekreta �losilo por �i tiu publika �losilo!\n"
 
-#: g10/delkey.c:184
+#: g10/delkey.c:183
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr "uzu la opcion \"--delete-secret-key\" por forvi�i �in unue.\n"
 
@@ -3778,6 +3787,15 @@ msgstr "Nenia helpo disponata"
 msgid "No help available for `%s'"
 msgstr "Nenia helpo disponata por '%s'"
 
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "RSA-�losilo ne estas uzebla kun �i tiu versio\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Mankas �losilo por uzantidentigilo\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Mankas uzantidentigilo por �losilo\n"
+
 #~ msgid "no secret key for decryption available\n"
 #~ msgstr "mankas sekreta �losilo por mal�ifrado\n"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index cdfe6473e..fff2f2a61 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-02-07 16:46+0100\n"
+"POT-Creation-Date: 2001-03-13 13:40+0100\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"
@@ -50,7 +50,7 @@ msgstr ""
 msgid "nN"
 msgstr ""
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:308
 msgid "quit"
 msgstr ""
 
@@ -255,6 +255,17 @@ msgstr "No cifrado"
 msgid "not processed"
 msgstr "se han procesado %lu claves\n"
 
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+#, fuzzy
+msgid "unusable public key"
+msgstr "Clave p�blica incorrecta"
+
+#: util/errors.c:106
+#, fuzzy
+msgid "unusable secret key"
+msgstr "Clave secreta incorrecta"
+
 #: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -265,64 +276,64 @@ msgstr "... esto es un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Ha encontrado Vd. un bug... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
+#: cipher/random.c:309 g10/import.c:129 g10/keygen.c:1256
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:313
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:318
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:325
+#: cipher/random.c:323
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:331
+#: cipher/random.c:329
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:339
+#: cipher/random.c:337
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:375
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:397
+#: cipher/random.c:395
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no puede crearse %s: %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:402
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:405
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:416
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:650
+#: cipher/random.c:648
 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:651
+#: cipher/random.c:649
 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 +359,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:212
+#: g10/g10.c:213
 msgid ""
 "@Commands:\n"
 " "
@@ -356,140 +367,140 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "|[file]|make a signature"
 msgstr "|[file]|hace una firma"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|hace una firma en texto claro"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "make a detached signature"
 msgstr "hace una firma separada"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "store only"
 msgstr "s�lo almacenar"
 
-#: g10/g10.c:220
+#: g10/g10.c:221
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/g10.c:221
+#: g10/g10.c:222
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:223
+#: g10/g10.c:224
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "check key signatures"
 msgstr "comprueba las firmas de las claves"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/g10.c:229
+#: g10/g10.c:230
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
 msgid "remove key from the public keyring"
 msgstr "elimina la clave del anillo p�blico"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 #, fuzzy
 msgid "remove key from the secret keyring"
 msgstr "elimina la clave del anillo p�blico"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocaci�n"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/g10.c:238
+#: g10/g10.c:239
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/g10.c:239
+#: g10/g10.c:240
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/g10.c:243
+#: g10/g10.c:244
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/g10.c:245
+#: g10/g10.c:246
 msgid "list only the sequence of packets"
 msgstr "lista s�lo la secuencia de paquetes"
 
-#: g10/g10.c:247
+#: g10/g10.c:248
 msgid "export the ownertrust values"
 msgstr "exporta los valores de confianza"
 
-#: g10/g10.c:249
+#: g10/g10.c:250
 msgid "import ownertrust values"
 msgstr "importa los valores de confianza"
 
-#: g10/g10.c:251
+#: g10/g10.c:252
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMBRES]|comprueba la base de datos de confianza"
 
-#: g10/g10.c:254
+#: g10/g10.c:255
 msgid "fix a corrupted trust database"
 msgstr "arregla una base de datos de confianza da�ada"
 
-#: g10/g10.c:255
+#: g10/g10.c:256
 msgid "De-Armor a file or stdin"
 msgstr "quita la armadura de un fichero o stdin"
 
-#: g10/g10.c:257
+#: g10/g10.c:258
 msgid "En-Armor a file or stdin"
 msgstr "crea la armadura a un fichero o stdin"
 
-#: g10/g10.c:259
+#: g10/g10.c:260
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime res�menes de mensaje"
 
-#: g10/g10.c:263
+#: g10/g10.c:264
 msgid ""
 "@\n"
 "Options:\n"
@@ -499,168 +510,168 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/g10.c:265
+#: g10/g10.c:266
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/g10.c:267
+#: g10/g10.c:268
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/g10.c:270
+#: g10/g10.c:271
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
 
-#: g10/g10.c:272
+#: g10/g10.c:273
 msgid "use the default key as default recipient"
 msgstr "usa la clave por defecto como destinatario"
 
-#: g10/g10.c:276
+#: g10/g10.c:277
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivel de compresi�n N (0 no comprime)"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "verbose"
 msgstr "prolijo"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "be somewhat more quiet"
 msgstr "algo m�s discreto"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "don't use the terminal at all"
 msgstr "no usa la terminal en absoluto"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "force v3 signatures"
 msgstr "fuerza firmas v3"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "always use a MDC for encryption"
 msgstr "siempre usa un MCD para cifrar"
 
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "assume yes on most questions"
 msgstr "asume \"s�\" en casi todas las preguntas"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "add this keyring to the list of keyrings"
 msgstr "a�ade este anillo a la lista de anillos"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "add this secret keyring to the list"
 msgstr "a�ade este anillo secreto a la lista"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVIDOR|usa este servidor de claves"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
 
-#: g10/g10.c:297
+#: g10/g10.c:298
 msgid "read options from file"
 msgstr "lee opciones del fichero"
 
-#: g10/g10.c:301
+#: g10/g10.c:302
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe informaci�n de estado en descriptor DF"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "|KEYID|ulimately trust this key"
 msgstr "|ID-CLAVE|conf�a plenamente en esta clave"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "emulate the mode described in RFC1991"
 msgstr "emula el modo descrito en la RFC1991"
 
-#: g10/g10.c:309
+#: g10/g10.c:310
 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:310
+#: g10/g10.c:311
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa modo de contrase�a N"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 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:314
+#: g10/g10.c:315
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las\n"
 "contrase�as"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa el algoritmo de compresi�n N"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina campo keyid de los paquetes cifrados"
 
-#: g10/g10.c:319
+#: g10/g10.c:320
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOMBRE=VALOR|usa estos datos de notaci�n"
 
-#: g10/g10.c:322
+#: g10/g10.c:323
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:325
+#: g10/g10.c:326
 msgid ""
 "@\n"
 "Examples:\n"
@@ -680,15 +691,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/g10.c:431
+#: g10/g10.c:432
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
-#: g10/g10.c:435
+#: g10/g10.c:436
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/g10.c:438
+#: g10/g10.c:439
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -698,7 +709,7 @@ msgstr ""
 "Firma, comprueba, cifra o descifra.\n"
 "La operaci�n por defecto depende del tipo de datos de entrada.\n"
 
-#: g10/g10.c:445
+#: g10/g10.c:446
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -706,191 +717,191 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/g10.c:524
+#: g10/g10.c:525
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/g10.c:577
+#: g10/g10.c:578
 msgid "conflicting commands\n"
 msgstr "comandos incompatibles\n"
 
-#: g10/g10.c:727
+#: g10/g10.c:728
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/g10.c:731
+#: g10/g10.c:732
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/g10.c:738
+#: g10/g10.c:739
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/g10.c:943
+#: g10/g10.c:944
 #, 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:1014
+#: g10/g10.c:1015
 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:1018 g10/g10.c:1027
+#: g10/g10.c:1019 g10/g10.c:1028
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1021
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/g10.c:1023
+#: g10/g10.c:1024
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/g10.c:1043 g10/g10.c:1055
+#: g10/g10.c:1044 g10/g10.c:1056
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado no es v�lido\n"
 
-#: g10/g10.c:1049 g10/g10.c:1061
+#: g10/g10.c:1050 g10/g10.c:1062
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no es v�lido\n"
 
-#: g10/g10.c:1065
+#: g10/g10.c:1066
 msgid "the given policy URL is invalid\n"
 msgstr "URL de pol�tica no v�lida\n"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1069
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "el algoritmo de compresi�n debe estar en el rango %d-%d\n"
 
-#: g10/g10.c:1070
+#: g10/g10.c:1071
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/g10.c:1072
+#: g10/g10.c:1073
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/g10.c:1074
+#: g10/g10.c:1075
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth debe estar en el rango 1-255\n"
 
-#: g10/g10.c:1077
+#: g10/g10.c:1078
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
 
-#: g10/g10.c:1081
+#: g10/g10.c:1082
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
 
-#: g10/g10.c:1166
+#: g10/g10.c:1167
 #, 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:1172
+#: g10/g10.c:1173
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1180
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:1187
+#: g10/g10.c:1188
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/g10.c:1200
+#: g10/g10.c:1201
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/g10.c:1213
+#: g10/g10.c:1214
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:1227
+#: g10/g10.c:1228
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1245
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1261
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/g10.c:1268
+#: g10/g10.c:1269
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [comandos]"
 
-#: g10/g10.c:1284
+#: g10/g10.c:1285
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-usuario"
 
-#: g10/g10.c:1287
+#: g10/g10.c:1288
 msgid "--delete-key user-id"
 msgstr "--delete-key id-usuario"
 
-#: g10/g10.c:1295
+#: g10/g10.c:1296
 #, fuzzy
 msgid "--delete-secret-and-public-key user-id"
 msgstr "--delete-secret-key id-usuario"
 
-#: g10/encode.c:268 g10/g10.c:1332 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1333 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: g10/g10.c:1347
+#: g10/g10.c:1348
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/g10.c:1413
+#: g10/g10.c:1414
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:1421
+#: g10/g10.c:1422
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1493
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n no v�lido `%s'\n"
 
-#: g10/g10.c:1579
+#: g10/g10.c:1580
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
-#: g10/g10.c:1583
+#: g10/g10.c:1584
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1586 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1587 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:1795
+#: g10/g10.c:1796
 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:1801
+#: g10/g10.c:1802
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -898,87 +909,87 @@ msgstr ""
 "un nombre de notaci�n debe tener s�lo letras, d�gitos, puntos o subrayados, "
 "y acabar con un '='\n"
 
-#: g10/g10.c:1807
+#: g10/g10.c:1808
 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:1815
+#: g10/g10.c:1816
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notaci�n no debe usar ning�n caracter de control\n"
 
-#: g10/armor.c:302
+#: g10/armor.c:304
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:331
+#: g10/armor.c:333
 msgid "invalid armor header: "
 msgstr "cabecera de armadura no v�lida: "
 
-#: g10/armor.c:338
+#: g10/armor.c:340
 msgid "armor header: "
 msgstr "cabecera de armadura: "
 
-#: g10/armor.c:349
+#: g10/armor.c:351
 msgid "invalid clearsig header\n"
 msgstr "cabecera de firma clara no v�lida\n"
 
-#: g10/armor.c:401
+#: g10/armor.c:403
 msgid "nested clear text signatures\n"
 msgstr "firmas en texto claro anidadas\n"
 
-#: g10/armor.c:525
+#: g10/armor.c:527
 msgid "invalid dash escaped line: "
 msgstr "L�nea con guiones no v�lida: "
 
-#: g10/armor.c:537
+#: g10/armor.c:539
 msgid "unexpected armor:"
 msgstr "armadura inesperada"
 
-#: g10/armor.c:663
+#: g10/armor.c:665
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracteres no v�lidos radix64 %02x ignorados\n"
 
-#: g10/armor.c:706
+#: g10/armor.c:708
 msgid "premature eof (no CRC)\n"
 msgstr "Fin de fichero prematuro\n"
 
-#: g10/armor.c:740
+#: g10/armor.c:742
 msgid "premature eof (in CRC)\n"
 msgstr "Fin de suma de comprobaci�n prematuro\n"
 
-#: g10/armor.c:744
+#: g10/armor.c:746
 msgid "malformed CRC\n"
 msgstr "Suma de comprobaci�n mal creada\n"
 
-#: g10/armor.c:748
+#: g10/armor.c:750
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "Error en suma de comprobaci�n: %06lx - %06lx\n"
 
-#: g10/armor.c:765
+#: g10/armor.c:767
 msgid "premature eof (in Trailer)\n"
 msgstr "fin de fichero prematuro (en el cierre)\n"
 
-#: g10/armor.c:769
+#: g10/armor.c:771
 msgid "error in trailer line\n"
 msgstr "error en la l�nea de cierre\n"
 
-#: g10/armor.c:915
+#: g10/armor.c:917
 msgid "For info see http://www.gnupg.org"
 msgstr ""
 
-#: g10/armor.c:1043
+#: g10/armor.c:1045
 msgid "no valid OpenPGP data found.\n"
 msgstr "no se han encontrados datos OpenPGP v�lidos\n"
 
-#: g10/armor.c:1048
+#: g10/armor.c:1050
 #, 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:1052
+#: g10/armor.c:1054
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -987,7 +998,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1189 g10/pkclist.c:53
+#: g10/keyedit.c:1190 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "         Huella dactilar:"
 
@@ -1219,17 +1230,17 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "          No es seguro que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:826 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: clave p�blica ya presente\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:853
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1237,42 +1248,42 @@ msgstr ""
 "No se ha especificado un ID de usuario (puede usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:863
 msgid "Enter the user ID: "
 msgstr "Introduzca el ID de usuario: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:875
 msgid "No such user ID.\n"
 msgstr "ID de usuario inexistente.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:880
 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:904
+#: g10/pkclist.c:903
 msgid "Public key is disabled.\n"
 msgstr "Clave p�blica deshabilitada.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:910
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "ignorado: clave p�blica ya designada con --encrypt-to\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:941
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "desconocido el destinatario predefinido `%s'\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:974
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: error comprobando la clave: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: clave p�blica deshabilitada\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1017
 msgid "no valid addressees\n"
 msgstr "no hay direcciones v�lidas\n"
 
@@ -1552,7 +1563,7 @@ msgstr ""
 "Necesita una contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:955
+#: g10/keyedit.c:469 g10/keygen.c:955
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "contrase�a repetida incorrecta, int�ntelo de nuevo.\n"
 
@@ -1683,287 +1694,280 @@ msgstr "clave %08lX: no es conforme a rfc2440 - ignorada\n"
 msgid "key %08lX: not protected - skipped\n"
 msgstr "clave %08lX: no es conforme a rfc2440 - ignorada\n"
 
-#: g10/export.c:232
+#: g10/export.c:236
 msgid "WARNING: nothing exported\n"
 msgstr "ATENCI�N: no se ha exportado nada\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:208
 msgid "too many entries in pk cache - disabled\n"
 msgstr "demasiados registros en la cache pk - anulada\n"
 
-#: g10/getkey.c:350
+#: g10/getkey.c:443
 msgid "too many entries in unk cache - disabled\n"
 msgstr "demasiados registros en la cache unk - anulada\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
-msgid "RSA key cannot be used in this version\n"
-msgstr "No puede usarse clave RSA en esta versi�n\n"
-
-#: g10/getkey.c:1310 g10/getkey.c:1349
-msgid "No key for user ID\n"
-msgstr "No hay clave para tal usuario\n"
-
-#: g10/getkey.c:1388 g10/getkey.c:1428
-msgid "No user ID for key\n"
-msgstr "No hay clave secreta para tal usuario\n"
-
-#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
+#: g10/getkey.c:2143
 #, 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:2050
+#: g10/getkey.c:2185 g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "clave %08lX: clave secreta sin clave p�blica - ignorada\n"
+
+#: g10/getkey.c:2473
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: usuario no encontrado\n"
 
-#: g10/import.c:182
+#: g10/import.c:184
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloque de tipo %d\n"
 
-#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "hasta ahora se han procesado %lu claves\n"
 
-#: g10/import.c:194
+#: g10/import.c:196
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: g10/import.c:204
+#: g10/import.c:206
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "   Cantidad total procesada: %lu\n"
 
-#: g10/import.c:206
+#: g10/import.c:208
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "           nuevas subclaves: %lu\n"
 
-#: g10/import.c:209
+#: g10/import.c:211
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         sin identificativo: %lu\n"
 
-#: g10/import.c:211
+#: g10/import.c:213
 #, c-format
 msgid "              imported: %lu"
 msgstr "                 importadas: %lu"
 
-#: g10/import.c:217
+#: g10/import.c:219
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                sin cambios: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:221
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "     nuevos identificativos: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:223
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nuevas subclaves: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:225
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              nuevas firmas: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:227
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "        nuevas revocaciones: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:229
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     claves secretas le�das: %lu\n"
 
-#: g10/import.c:229
+#: g10/import.c:231
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " claves secretas importadas: %lu\n"
 
-#: g10/import.c:231
+#: g10/import.c:233
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claves secretas sin cambios: %lu\n"
 
-#: g10/import.c:391 g10/import.c:600
+#: g10/import.c:408 g10/import.c:617
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "clave %08lX: no hay identificativo de usuario\n"
 
-#: g10/import.c:405
+#: g10/import.c:422
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "clave %08lX: no hay identificativos de usuario v�lidos\n"
 
-#: g10/import.c:407
+#: g10/import.c:424
 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:418 g10/import.c:667
+#: g10/import.c:435 g10/import.c:684
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "clave %08lX: clave p�blica no encontrada: %s\n"
 
-#: g10/import.c:423
+#: g10/import.c:440
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "clave %08lX: no es conforme a rfc2440 - ignorada\n"
 
-#: g10/import.c:431
+#: g10/import.c:448
 msgid "no default public keyring\n"
 msgstr "no hay anillo p�blico por defecto\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
+#: g10/import.c:452 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:615 g10/import.c:716
+#: 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:441 g10/import.c:499 g10/import.c:618 g10/import.c:719
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "clave %08lX: clave p�blica importada\n"
 
-#: g10/import.c:463
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "clave %08lX: no se corresponde con nuestra copia\n"
 
-#: g10/import.c:472 g10/import.c:675
+#: g10/import.c:489 g10/import.c:692
 #, 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:478 g10/import.c:681
+#: g10/import.c:495 g10/import.c:698
 #, 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:505
+#: g10/import.c:522
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "clave %08lX: 1 nuevo identificativo de usuario\n"
 
-#: g10/import.c:508
+#: g10/import.c:525
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "clave %08lX: %d nuevos identificativos de usuario\n"
 
-#: g10/import.c:511
+#: g10/import.c:528
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "clave %08lX: 1 nueva firma\n"
 
-#: g10/import.c:514
+#: g10/import.c:531
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "clave %08lX: %d nuevas firmas\n"
 
-#: g10/import.c:517
+#: g10/import.c:534
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "clave %08lX: 1 nueva subclave\n"
 
-#: g10/import.c:520
+#: g10/import.c:537
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "clave %08lX: %d nuevas subclaves\n"
 
-#: g10/import.c:530
+#: g10/import.c:547
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "clave %08lX: sin cambios\n"
 
-#: g10/import.c:593
+#: g10/import.c:610
 #, c-format
 msgid "secret key %08lX not imported (use %s to allow for it)\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:640
 #, 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:627
+#: g10/import.c:644
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "clave %08lX: ya estaba en el anillo secreto\n"
 
-#: g10/import.c:632
+#: g10/import.c:649
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "clave %08lX: clave secreta no encontrada: %s\n"
 
-#: g10/import.c:661
+#: g10/import.c:678
 #, 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:692
+#: g10/import.c:709
 #, 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:724
+#: g10/import.c:741
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "clave %08lX: certificado de revocaci�n importado\n"
 
-#: g10/import.c:766
+#: g10/import.c:783
 #, 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:773 g10/import.c:797
+#: g10/import.c:790 g10/import.c:814
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "clave %08lX: algoritmo de clave p�blica no soportado\n"
 
-#: g10/import.c:774
+#: g10/import.c:791
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "clave %08lX: autofirma no v�lida\n"
 
-#: g10/import.c:789
+#: g10/import.c:806
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "clave %08lX: no hay subclave para unir\n"
 
-#: g10/import.c:798
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "clave %08lX.%lu: uni�n de subclave no v�lida\n"
 
-#: g10/import.c:825
+#: g10/import.c:842
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "clave %08lX: aceptado ID de usuario sin autofirma '"
 
-#: g10/import.c:854
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "clave %08lX: ignorado ID de usuario '"
 
-#: g10/import.c:877
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "clave %08lX: subclave ignorada\n"
@@ -1972,33 +1976,33 @@ 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:902
+#: g10/import.c:919
 #, 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:911
+#: g10/import.c:928
 #, 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:919
+#: g10/import.c:936
 #, 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:1019
+#: g10/import.c:1036
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "clave %08lX: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:1071
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "clave %08lX: certificado de revocaci�n a�adido\n"
 
-#: g10/import.c:1185 g10/import.c:1238
+#: g10/import.c:1202 g10/import.c:1255
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "clave %08lX: nuestra copia no tiene autofirma\n"
@@ -2008,63 +2012,63 @@ msgstr "clave %08lX: nuestra copia no tiene autofirma\n"
 msgid "%s: user not found\n"
 msgstr "%s: usuario no encontrado\n"
 
-#: g10/keyedit.c:155
+#: g10/keyedit.c:156
 msgid "[revocation]"
 msgstr "[revocaci�n]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:157
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:221
 msgid "1 bad signature\n"
 msgstr "1 firma incorrecta\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:223
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firmas incorrectas\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:225
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 firma no comprobada por falta de clave\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d firmas no comprobadas por falta de clave\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 msgid "1 signature not checked due to an error\n"
 msgstr "1 firma no comprobada por causa de un error\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:231
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firmas no comprobadas por causa de un error\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:233
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Detectado 1 identificativo de usuario sin autofirma v�lida\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:235
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Detectados %d identificativos de usuario sin autofirma v�lida\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:317
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Ya firmada por la clave %08lX\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:325
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada que firmar con la clave %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2072,7 +2076,7 @@ msgstr ""
 "�Est� realmente seguro de querer firmar esta clave\n"
 "con su clave: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:343
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2080,34 +2084,34 @@ msgstr ""
 "La firma se marcar� como no exportable.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:348
 msgid "Really sign? "
 msgstr "�Firmar de verdad? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
+#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:136
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:428
 msgid "This key is not protected.\n"
 msgstr "Esta clave no est� protegida.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:432
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Clave secreta no disponible"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:436
 msgid "Key is protected.\n"
 msgstr "La clave est� protegida.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No puede editarse esta clave: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:461
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2115,7 +2119,7 @@ msgstr ""
 "Introduzca la nueva contrase�a para esta clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:473
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2123,421 +2127,421 @@ msgstr ""
 "No ha especificado contrase�a. Esto es probablemente una *mala* idea.\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:476
 msgid "Do you really want to do this? "
 msgstr "�Realmente quiere hacer esto? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:540
 msgid "moving a key signature to the correct place\n"
 msgstr "moviendo la firma de la clave al lugar correcto\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
 msgid "quit this menu"
 msgstr "sale de este men�"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "q"
 msgstr ""
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save"
 msgstr ""
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save and quit"
 msgstr "graba y sale"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "help"
 msgstr ""
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "fpr"
 msgstr ""
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "show fingerprint"
 msgstr "muestra huella dactilar"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list"
 msgstr ""
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list key and user IDs"
 msgstr "lista clave e identificativos de usuario"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "l"
 msgstr ""
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "uid"
 msgstr ""
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "select user ID N"
 msgstr "selecciona identificativo de usuario N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "key"
 msgstr ""
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "select secondary key N"
 msgstr "selecciona clave secundaria N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "check"
 msgstr ""
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "list signatures"
 msgstr "lista firmas"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "c"
 msgstr ""
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign"
 msgstr ""
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign the key"
 msgstr "firma la clave"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "s"
 msgstr ""
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "lsign"
 msgstr ""
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "sign the key locally"
 msgstr "firma la clave localmente"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "debug"
 msgstr ""
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "adduid"
 msgstr ""
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "add a user ID"
 msgstr "a�ade un identificativo de usuario"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "deluid"
 msgstr ""
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "delete user ID"
 msgstr "borra un identificativo de usuario"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "addkey"
 msgstr ""
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "add a secondary key"
 msgstr "a�ade una clave secundaria"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delkey"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delete a secondary key"
 msgstr "borra una clave secundaria"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delsig"
 msgstr ""
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delete signatures"
 msgstr "borra firmas"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "expire"
 msgstr ""
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "change the expire date"
 msgstr "cambia fecha de caducidad"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle"
 msgstr ""
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle between secret and public key listing"
 msgstr "cambia entre lista de claves secretas y p�blicas"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "t"
 msgstr ""
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "pref"
 msgstr ""
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "list preferences"
 msgstr "muestra preferencias"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
 msgid "passwd"
 msgstr ""
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
 msgid "change the passphrase"
 msgstr "cambia la contrase�a"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
 msgid "trust"
 msgstr ""
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
 msgid "change the ownertrust"
 msgstr "cambia valores de confianza"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
 msgid "revsig"
 msgstr ""
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
 msgid "revoke signatures"
 msgstr "revoca firmas"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 msgid "revkey"
 msgstr ""
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 msgid "revoke a secondary key"
 msgstr "revoca una clave secundaria"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 msgid "disable"
 msgstr ""
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 msgid "disable a key"
 msgstr "deshabilita una clave"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
 msgid "enable"
 msgstr ""
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
 msgid "enable a key"
 msgstr "habilita una clave"
 
-#: g10/delkey.c:110 g10/keyedit.c:631
+#: g10/delkey.c:110 g10/keyedit.c:632
 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:669
+#: g10/keyedit.c:670
 msgid "Secret key is available.\n"
 msgstr "Clave secreta disponible.\n"
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:729
 msgid "Need the secret key to do this.\n"
 msgstr "Se necesita la clave secreta para hacer esto.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:733
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 msgid "Really sign all user IDs? "
 msgstr "�Firmar realmente todos los identificativos de usuario? "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugerencia: seleccione los identificativos de usuario a firmar\n"
 
-#: g10/keyedit.c:812 g10/keyedit.c:994
+#: g10/keyedit.c:813 g10/keyedit.c:995
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "actualizaci�n de confianza fallida: %s\n"
 
-#: g10/keyedit.c:823 g10/keyedit.c:844
+#: g10/keyedit.c:824 g10/keyedit.c:845
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar por lo menos un identificativo de usuario.\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "You can't delete the last user ID!\n"
 msgstr "�No puede borrar el �ltimo identificativo de usuario!\n"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:829
 msgid "Really remove all selected user IDs? "
 msgstr "�Borrar realmente todos los identificativos seleccionados? "
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:830
 msgid "Really remove this user ID? "
 msgstr "�Borrar realmente este identificativo? "
 
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:866 g10/keyedit.c:888
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar por lo menos una clave.\n"
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:870
 msgid "Do you really want to delete the selected keys? "
 msgstr "�Borrar realmente las claves seleccionadas? "
 
-#: g10/keyedit.c:870
+#: g10/keyedit.c:871
 msgid "Do you really want to delete this key? "
 msgstr "�Borrar realmente esta clave? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "Do you really want to revoke the selected keys? "
 msgstr "�Revocar realmente las claves seleccionadas? "
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:893
 msgid "Do you really want to revoke this key? "
 msgstr "�Revocar realmente esta clave? "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:959
 msgid "Save changes? "
 msgstr "�Grabar cambios? "
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:962
 msgid "Quit without saving? "
 msgstr "�Salir sin grabar? "
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:973
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:980
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:987
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1002
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando no v�lido (pruebe \"help\")\n"
 
-#: g10/keyedit.c:1081 g10/keyedit.c:1107
+#: g10/keyedit.c:1082 g10/keyedit.c:1108
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1090
+#: g10/keyedit.c:1091
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1095
 msgid "This key has been disabled"
 msgstr "Esta clave est� deshabilitada"
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1124
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "clave %08lX: �esta subclave ha sido revocada!\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1127
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "        nuevas revocaciones: %lu\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1129
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1371
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta firma no v�lida? (s/N/q)"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1375
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1381
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1396
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas borradas\n"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "Nothing deleted.\n"
 msgstr "No se borr� nada\n"
 
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1468
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite la selecci�n de las claves secretas.\n"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1474
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1478
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambiando caducidad de clave secundaria.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1480
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1522
 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:1537
+#: g10/keyedit.c:1538
 msgid "No corresponding signature in secret ring\n"
 msgstr "No hay firma correspondiente en anillo secreto\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1599
 #, 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:1644
+#: g10/keyedit.c:1645
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "No hay ninguna clave secundaria con el �ndice %d\n"
 
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:1743
 msgid "user ID: \""
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:1745
+#: g10/keyedit.c:1746
 #, c-format
 msgid ""
 "\"\n"
@@ -2546,34 +2550,34 @@ msgstr ""
 "\"\n"
 "firmada con su clave %08lX el %s\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1750
 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:1773
+#: g10/keyedit.c:1774
 msgid "You have signed these user IDs:\n"
 msgstr "Ha firmado los siguientes IDs de usuario:\n"
 
-#: g10/keyedit.c:1787 g10/keyedit.c:1822
+#: g10/keyedit.c:1788 g10/keyedit.c:1823
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   firmada por %08lX el %s\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1793
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revocada por %08lX el %s\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1813
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va Vd. a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:1830
+#: g10/keyedit.c:1831
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "�Crear los certificados de revocaci�n realmente? (s/N)"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1860
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
@@ -2587,128 +2591,128 @@ msgid "revoked"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:404 g10/mainproc.c:836
+#: g10/keylist.c:402 g10/mainproc.c:837
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "La clave caduca el %s\n"
 
-#: g10/mainproc.c:270
+#: g10/mainproc.c:271
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la clave p�blica es %08lX\n"
 
-#: g10/mainproc.c:315
+#: g10/mainproc.c:316
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados de la clave p�blica: DEK bueno\n"
 
-#: g10/mainproc.c:367
+#: g10/mainproc.c:368
 #, 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:377
+#: g10/mainproc.c:378
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "cifrado con clave %s, ID %08lX\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:392
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave p�blica fallido: %s\n"
 
-#: g10/mainproc.c:431
+#: g10/mainproc.c:432
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:437
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCI�N: �el mensaje cifrado ha sido manipulado!\n"
 
-#: g10/mainproc.c:441
+#: g10/mainproc.c:442
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:461
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitente solicit� \"s�lo-para-tus-ojos\"\n"
 
-#: g10/mainproc.c:462
+#: g10/mainproc.c:463
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:617
+#: g10/mainproc.c:618
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:704 g10/mainproc.c:713
+#: g10/mainproc.c:705 g10/mainproc.c:714
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATENCI�N: encontrados datos de notaci�n no v�lidos\n"
 
-#: g10/mainproc.c:716
+#: g10/mainproc.c:717
 msgid "Notation: "
 msgstr "Notaci�n: "
 
-#: g10/mainproc.c:725
+#: g10/mainproc.c:726
 msgid "Policy: "
 msgstr "Pol�tica: "
 
-#: g10/mainproc.c:1235
+#: g10/mainproc.c:1177
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificaci�n de la firma\n"
 
-#: g10/mainproc.c:1272
+#: g10/mainproc.c:1214
 #, 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:1307 g10/mainproc.c:1318
+#: g10/mainproc.c:1242 g10/mainproc.c:1250
 msgid "BAD signature from \""
 msgstr "Firma INCORRECTA de \""
 
-#: g10/mainproc.c:1308 g10/mainproc.c:1319
+#: g10/mainproc.c:1243 g10/mainproc.c:1251
 msgid "Good signature from \""
 msgstr "Firma correcta de \""
 
-#: g10/mainproc.c:1310
+#: g10/mainproc.c:1266
 msgid "                aka \""
 msgstr "tambi�n conocido como \""
 
-#: g10/mainproc.c:1366
+#: g10/mainproc.c:1316
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:1423 g10/mainproc.c:1438 g10/mainproc.c:1500
+#: g10/mainproc.c:1373 g10/mainproc.c:1388 g10/mainproc.c:1450
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "hace una firma separada"
 
-#: g10/mainproc.c:1449
+#: g10/mainproc.c:1399
 #, fuzzy, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Clase de firma desconocida"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1454
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1509
+#: g10/mainproc.c:1459
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z no v�lido detectado en proc_tree()\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:98
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "no se pueden desactivar los core dumps: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:208
 msgid "Experimental algorithms should not be used!\n"
 msgstr "�No se deber�an usar algoritmos experimentales!\n"
 
-#: g10/misc.c:237
+#: g10/misc.c:238
 #, fuzzy
 msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
 msgstr ""
@@ -2720,7 +2724,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:990
+#: g10/parse-packet.c:1010
 #, 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"
@@ -2733,7 +2737,7 @@ msgstr ""
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:170 g10/passphrase.c:248
+#: g10/hkp.c:147 g10/passphrase.c:248
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
@@ -2864,36 +2868,36 @@ msgstr "NOTA: algoritmo de cifrado %d no encontrado en las preferencias\n"
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: clave de la firma caducada el %s\n"
 
-#: g10/hkp.c:72
+#: g10/hkp.c:59
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr ""
 
-#: g10/hkp.c:85
+#: g10/hkp.c:72
 #, fuzzy, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "no puede escribirse en el anillo: %s\n"
 
-#: g10/hkp.c:109 g10/hkp.c:148
+#: g10/hkp.c:91 g10/hkp.c:125
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/hkp.c:117
+#: g10/hkp.c:99
 #, 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:194
+#: g10/hkp.c:171
 #, fuzzy, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:183
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:209
+#: g10/hkp.c:186
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
@@ -2908,11 +2912,11 @@ msgstr "Clave secreta no disponible"
 msgid "protection algorithm %d is not supported\n"
 msgstr "el algoritmo de protecci�n %d no est� soportado\n"
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:184
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Contrase�a incorrecta, int�ntelo de nuevo...\n"
 
-#: g10/seckey-cert.c:242
+#: g10/seckey-cert.c:240
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "ATENCI�N: detectada clave d�bil - por favor cambie la contrase�a.\n"
 
@@ -3182,11 +3186,6 @@ msgstr "clave %08lX: clave de confianza sin clave p�blica - ignorada\n"
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "NOTA: la clave secreta %08lX NO est� protegida.\n"
 
-#: g10/trustdb.c:577
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "clave %08lX: clave secreta sin clave p�blica - ignorada\n"
-
 #: g10/trustdb.c:584
 #, c-format
 msgid "key %08lX: secret and public key don't match\n"
@@ -3419,34 +3418,44 @@ msgstr "%s: no se puede crear el anillo: %s\n"
 msgid "%s: keyring created\n"
 msgstr "%s: anillo creado\n"
 
-#: g10/ringedit.c:1551
+#: g10/ringedit.c:1555
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATENCI�N: existen 2 ficheros con informaci�n confidencial.\n"
 
-#: g10/ringedit.c:1552
+#: g10/ringedit.c:1556
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s es el que no se ha modificado\n"
 
-#: g10/ringedit.c:1553
+#: g10/ringedit.c:1557
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s es el nuevo\n"
 
-#: g10/ringedit.c:1554
+#: g10/ringedit.c:1558
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor arregle este posible fallo de seguridad\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
+#: 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"
 
-#: g10/skclist.c:113
+#: g10/skclist.c:138
+#, fuzzy, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "`%s' ignorado: %s\n"
+
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s' ignorado: %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:149
+#, fuzzy
+msgid "skipped: secret key already present\n"
+msgstr "%s: ignorado: clave p�blica ya presente\n"
+
+#: g10/skclist.c:160
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3546,11 +3555,11 @@ msgstr "�Eliminar esta clave del anillo? "
 msgid "This is a secret key! - really delete? "
 msgstr "�Esta es una clave secreta! �Eliminar realmente? "
 
-#: g10/delkey.c:182
+#: g10/delkey.c:181
 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:184
+#: g10/delkey.c:183
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr "use la opci�n \"--delete-secret-key\" para borrarla antes.\n"
 
@@ -3798,6 +3807,15 @@ msgstr "Ayuda no disponible"
 msgid "No help available for `%s'"
 msgstr "Ayuda no disponible para `%s'"
 
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "No puede usarse clave RSA en esta versi�n\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "No hay clave para tal usuario\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "No hay clave secreta para tal usuario\n"
+
 #~ msgid "no secret key for decryption available\n"
 #~ msgstr "clave secreta para descifrado no disponible\n"
 
diff --git a/po/fr.po b/po/fr.po
index de2280f85..24a9c446e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.1h\n"
-"POT-Creation-Date: 2001-02-07 16:46+0100\n"
+"POT-Creation-Date: 2001-03-13 13:40+0100\n"
 "PO-Revision-Date: 2000-06-28 18:41+02:00\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -48,7 +48,7 @@ msgstr "non"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:308
 msgid "quit"
 msgstr "quitter"
 
@@ -252,6 +252,17 @@ msgstr "non chiffr�"
 msgid "not processed"
 msgstr "non trait�"
 
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+#, fuzzy
+msgid "unusable public key"
+msgstr "mauvaise cl� publique"
+
+#: util/errors.c:106
+#, fuzzy
+msgid "unusable secret key"
+msgstr "mauvaise cl� secr�te"
+
 #: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -262,68 +273,68 @@ msgstr "... c'est un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vous avez trouv� un bug... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
+#: cipher/random.c:309 g10/import.c:129 g10/keygen.c:1256
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:313
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "impossible d'acc�der � `%s': %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:318
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' n'est pas un fichier r�gulier - ignor�\n"
 
-#: cipher/random.c:325
+#: cipher/random.c:323
 msgid "note: random_seed file is empty\n"
 msgstr "note: le fichier `random_seed' est vide\n"
 
-#: cipher/random.c:331
+#: cipher/random.c:329
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 "avertissement: la taille du fichier `random_seed' est invalide.\n"
 "Celui-ci ne sera pas utilis�.\n"
 
-#: cipher/random.c:339
+#: cipher/random.c:337
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "impossible de lire `%s': %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:375
 msgid "note: random_seed file not updated\n"
 msgstr "note: le fichier `random_seed' n'a pas �t� mis � jour\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:395
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:402
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "impossible d'�crire `%s': %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:405
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "impossible de fermer `%s': %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:416
 #, 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:650
+#: cipher/random.c:648
 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:651
+#: cipher/random.c:649
 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 +359,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:212
+#: g10/g10.c:213
 msgid ""
 "@Commands:\n"
 " "
@@ -356,139 +367,139 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "make a detached signature"
 msgstr "faire une signature d�tach�e"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "encrypt data"
 msgstr "chiffrer les donn�es"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement sym�trique seulement"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "store only"
 msgstr "pas d'action"
 
-#: g10/g10.c:220
+#: g10/g10.c:221
 msgid "decrypt data (default)"
 msgstr "d�chiffrer les donn�es (d�faut)"
 
-#: g10/g10.c:221
+#: g10/g10.c:222
 msgid "verify a signature"
 msgstr "v�rifier une signature"
 
-#: g10/g10.c:223
+#: g10/g10.c:224
 msgid "list keys"
 msgstr "lister les cl�s"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "list keys and signatures"
 msgstr "lister les cl�s et les signatures"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "check key signatures"
 msgstr "v�rifier les signatures des cl�s"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "list keys and fingerprints"
 msgstr "lister les cl�s et les empreintes"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "list secret keys"
 msgstr "lister les cl�s secr�tes"
 
-#: g10/g10.c:229
+#: g10/g10.c:230
 msgid "generate a new key pair"
 msgstr "g�n�rer une nouvelle paire de cl�s"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
 msgid "remove key from the public keyring"
 msgstr "enlever la cl� du porte-cl�s public"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "remove key from the secret keyring"
 msgstr "enlever la cl� du porte-cl�s secret"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign a key"
 msgstr "signer une cl�"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "sign a key locally"
 msgstr "signer une cl� localement"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "sign or edit a key"
 msgstr "signer ou �diter une cl�"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "generate a revocation certificate"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "export keys"
 msgstr "exporter les cl�s"
 
-#: g10/g10.c:238
+#: g10/g10.c:239
 msgid "export keys to a key server"
 msgstr "exporter les cl�s vers un serveur de cl�s"
 
-#: g10/g10.c:239
+#: g10/g10.c:240
 msgid "import keys from a key server"
 msgstr "importer les cl�s d'un serveur de cl�s"
 
-#: g10/g10.c:243
+#: g10/g10.c:244
 msgid "import/merge keys"
 msgstr "importer/fusionner les cl�s"
 
-#: g10/g10.c:245
+#: g10/g10.c:246
 msgid "list only the sequence of packets"
 msgstr "ne lister que les paquets"
 
-#: g10/g10.c:247
+#: g10/g10.c:248
 msgid "export the ownertrust values"
 msgstr "exporter les indices de confiance"
 
-#: g10/g10.c:249
+#: g10/g10.c:250
 msgid "import ownertrust values"
 msgstr "importer les indices de confiance"
 
-#: g10/g10.c:251
+#: g10/g10.c:252
 msgid "update the trust database"
 msgstr "mettre la base de confiance � jour"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMS]|v�rifier la base de confiance"
 
-#: g10/g10.c:254
+#: g10/g10.c:255
 msgid "fix a corrupted trust database"
 msgstr "r�parer une base de confiance corrompue"
 
-#: g10/g10.c:255
+#: g10/g10.c:256
 msgid "De-Armor a file or stdin"
 msgstr "Enlever l'armure d'un fichier ou de stdin"
 
-#: g10/g10.c:257
+#: g10/g10.c:258
 msgid "En-Armor a file or stdin"
 msgstr "Mettre une armure � un fichier ou � stdin"
 
-#: g10/g10.c:259
+#: g10/g10.c:260
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/g10.c:263
+#: g10/g10.c:264
 msgid ""
 "@\n"
 "Options:\n"
@@ -498,156 +509,156 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/g10.c:265
+#: g10/g10.c:266
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: g10/g10.c:267
+#: g10/g10.c:268
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/g10.c:270
+#: g10/g10.c:271
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOM|utiliser NOM comme r�cipient par d�faut"
 
-#: g10/g10.c:272
+#: g10/g10.c:273
 msgid "use the default key as default recipient"
 msgstr "utiliser la cl� par d�f. comme r�cipient"
 
-#: g10/g10.c:276
+#: g10/g10.c:277
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou d�chiffrer"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 d�sactive)"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "verbose"
 msgstr "bavard"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "don't use the terminal at all"
 msgstr "ne pas utiliser du tout le terminal"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "force v3 signatures"
 msgstr "forcer les signatures en v3"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "always use a MDC for encryption"
 msgstr "toujours utiliser un sceau pour le chiffrement"
 
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "batch mode: never ask"
 msgstr "mode automatique: ne jamais rien demander"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "assume yes on most questions"
 msgstr "r�pondre oui � la plupart des questions"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "assume no on most questions"
 msgstr "r�pondre non � la plupart des questions"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "add this keyring to the list of keyrings"
 msgstr "ajouter ce porte-cl�s � la liste"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "add this secret keyring to the list"
 msgstr "ajouter ce porte-cl�s secret � la liste"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|utiliser NOM comme cl� secr�te par d�faut"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|H�TE|utiliser ce serveur pour chercher des cl�s"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|le terminal utilise la table de caract�res NOM"
 
-#: g10/g10.c:297
+#: g10/g10.c:298
 msgid "read options from file"
 msgstr "lire les options du fichier"
 
-#: g10/g10.c:301
+#: g10/g10.c:302
 msgid "|FD|write status info to this FD"
 msgstr "|FD|�crire l'�tat sur ce descripteur"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "|FILE|load extension module FILE"
 msgstr "|FICH|charger le module d'extension FICH"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "emulate the mode described in RFC1991"
 msgstr "imiter le mode d�crit dans la RFC1991"
 
-#: g10/g10.c:309
+#: g10/g10.c:310
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "utiliser le comportement d�fini par OpenPGP"
 
-#: g10/g10.c:310
+#: g10/g10.c:311
 msgid "|N|use passphrase mode N"
 msgstr "|N|coder les mots de passe suivant le mode N"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le hachage NOM pour les mots de passe"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|utiliser la fonction de hachage NOM"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "|N|use compress algorithm N"
 msgstr "|N|utiliser l'algorithme de compression N"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "throw keyid field of encrypted packets"
 msgstr "supprimer l'ident. des paquets chiffr�s"
 
-#: g10/g10.c:319
+#: g10/g10.c:320
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOM=VALEUR|utiliser ces donn�es de notation"
 
-#: g10/g10.c:322
+#: g10/g10.c:323
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -655,7 +666,7 @@ msgstr ""
 "@\n"
 "(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
 
-#: g10/g10.c:325
+#: g10/g10.c:326
 msgid ""
 "@\n"
 "Examples:\n"
@@ -675,17 +686,17 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les cl�s\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/g10.c:431
+#: g10/g10.c:432
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Signaler toutes anomalies � <[email protected]> (en anglais)\n"
 "et tout probl�me de traduction � <[email protected]>.\n"
 
-#: g10/g10.c:435
+#: g10/g10.c:436
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/g10.c:438
+#: g10/g10.c:439
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -695,7 +706,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:445
+#: g10/g10.c:446
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -703,193 +714,193 @@ msgstr ""
 "\n"
 "Algorithmes support�s:\n"
 
-#: g10/g10.c:524
+#: g10/g10.c:525
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/g10.c:577
+#: g10/g10.c:578
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/g10.c:727
+#: g10/g10.c:728
 #, 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:731
+#: g10/g10.c:732
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: g10/g10.c:738
+#: g10/g10.c:739
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/g10.c:943
+#: g10/g10.c:944
 #, 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:1014
+#: g10/g10.c:1015
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/g10.c:1018 g10/g10.c:1027
+#: g10/g10.c:1019 g10/g10.c:1028
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE: %s n'est pas pour une utilisation normale !\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1021
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/g10.c:1023
+#: g10/g10.c:1024
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/g10.c:1043 g10/g10.c:1055
+#: g10/g10.c:1044 g10/g10.c:1056
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/g10.c:1049 g10/g10.c:1061
+#: g10/g10.c:1050 g10/g10.c:1062
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/g10.c:1065
+#: g10/g10.c:1066
 msgid "the given policy URL is invalid\n"
 msgstr "l'URL de politique donn�e est invalide\n"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1069
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "l'algorithme de compression doit faire partie de l'intervalle %d..%d\n"
 
-#: g10/g10.c:1070
+#: g10/g10.c:1071
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/g10.c:1072
+#: g10/g10.c:1073
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/g10.c:1074
+#: g10/g10.c:1075
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "�max-cert-depth� doit �tre compris entre 1 et 255\n"
 
-#: g10/g10.c:1077
+#: g10/g10.c:1078
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: le mode S2K simple (0) est fortement d�conseill�\n"
 
-#: g10/g10.c:1081
+#: g10/g10.c:1082
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K invalide; ce doit �tre 0, 1 ou 3\n"
 
-#: g10/g10.c:1166
+#: g10/g10.c:1167
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/g10.c:1172
+#: g10/g10.c:1173
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1180
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/g10.c:1187
+#: g10/g10.c:1188
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/g10.c:1200
+#: g10/g10.c:1201
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/g10.c:1213
+#: g10/g10.c:1214
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:1227
+#: g10/g10.c:1228
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1245
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1261
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/g10.c:1268
+#: g10/g10.c:1269
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/g10.c:1284
+#: g10/g10.c:1285
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key utilisateur"
 
-#: g10/g10.c:1287
+#: g10/g10.c:1288
 msgid "--delete-key user-id"
 msgstr "--delete-key utilisateur"
 
-#: g10/g10.c:1295
+#: g10/g10.c:1296
 #, fuzzy
 msgid "--delete-secret-and-public-key user-id"
 msgstr "--delete-secret-key utilisateur"
 
-#: g10/encode.c:268 g10/g10.c:1332 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1333 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossible d'ouvrir %s: %s\n"
 
-#: g10/g10.c:1347
+#: g10/g10.c:1348
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
 
-#: g10/g10.c:1413
+#: g10/g10.c:1414
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/g10.c:1421
+#: g10/g10.c:1422
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1493
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/g10.c:1579
+#: g10/g10.c:1580
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/g10.c:1583
+#: g10/g10.c:1584
 msgid "Go ahead and type your message ...\n"
 msgstr "Continuez et tapez votre message...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1586 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1587 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:1795
+#: g10/g10.c:1796
 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:1801
+#: g10/g10.c:1802
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -898,89 +909,89 @@ msgstr ""
 "des points ou des traits de soulignement et doit se terminer par un signe "
 "�gal\n"
 
-#: g10/g10.c:1807
+#: g10/g10.c:1808
 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:1815
+#: g10/g10.c:1816
 msgid "a notation value must not use any control characters\n"
 msgstr "une valeur de notation ne doit utiliser aucun caract�re de contr�le\n"
 
-#: g10/armor.c:302
+#: g10/armor.c:304
 #, c-format
 msgid "armor: %s\n"
 msgstr "armure: %s\n"
 
-#: g10/armor.c:331
+#: g10/armor.c:333
 msgid "invalid armor header: "
 msgstr "en-t�te d'armure invalide: "
 
-#: g10/armor.c:338
+#: g10/armor.c:340
 msgid "armor header: "
 msgstr "en-t�te d'armure: "
 
-#: g10/armor.c:349
+#: g10/armor.c:351
 msgid "invalid clearsig header\n"
 msgstr "en-t�te de signature claire invalide\n"
 
-#: g10/armor.c:401
+#: g10/armor.c:403
 msgid "nested clear text signatures\n"
 msgstr "signatures en texte clair imbriqu�es\n"
 
-#: g10/armor.c:525
+#: g10/armor.c:527
 msgid "invalid dash escaped line: "
 msgstr "ligne �chapp�e par `-' invalide: "
 
-#: g10/armor.c:537
+#: g10/armor.c:539
 msgid "unexpected armor:"
 msgstr "armure inattendue:"
 
-#: g10/armor.c:663
+#: g10/armor.c:665
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caract�re %02x invalide en base 64 ignor�\n"
 
-#: g10/armor.c:706
+#: g10/armor.c:708
 msgid "premature eof (no CRC)\n"
 msgstr "fin de fichier pr�matur�e (pas de CRC)\n"
 
-#: g10/armor.c:740
+#: g10/armor.c:742
 msgid "premature eof (in CRC)\n"
 msgstr "fin de fichier pr�matur�e (dans le CRC)\n"
 
-#: g10/armor.c:744
+#: g10/armor.c:746
 msgid "malformed CRC\n"
 msgstr "CRC d�form�\n"
 
-#: g10/armor.c:748
+#: g10/armor.c:750
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "Erreur de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:765
+#: g10/armor.c:767
 msgid "premature eof (in Trailer)\n"
 msgstr "fin de fichier pr�matur�e (dans la remorque)\n"
 
-#: g10/armor.c:769
+#: g10/armor.c:771
 msgid "error in trailer line\n"
 msgstr "erreur dans la ligne de remorque\n"
 
-#: g10/armor.c:915
+#: g10/armor.c:917
 msgid "For info see http://www.gnupg.org"
 msgstr "Pour information voir http://www.gnupg.org"
 
-#: g10/armor.c:1043
+#: g10/armor.c:1045
 msgid "no valid OpenPGP data found.\n"
 msgstr "aucune donn�e OpenPGP valide n'a �t� trouv�e.\n"
 
-#: g10/armor.c:1048
+#: g10/armor.c:1050
 #, 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:1052
+#: g10/armor.c:1054
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -989,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:1189 g10/pkclist.c:53
+#: g10/keyedit.c:1190 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "               Empreinte:"
 
@@ -1221,17 +1232,17 @@ msgstr ""
 "            Il n'est pas s�r que la signature appartient � son "
 "propri�taire.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignor�: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:826 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignor�: cl� publique d�j� pr�sente\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:853
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1239,42 +1250,42 @@ msgstr ""
 "Vous n'avez pas sp�cifi� de nom d'utilisateur. (vous pouvez utiliser �-r�)\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:863
 msgid "Enter the user ID: "
 msgstr "Entrez le nom d'utilisateur: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:875
 msgid "No such user ID.\n"
 msgstr "Pas d'utilisateur de ce nom.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:880
 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:904
+#: g10/pkclist.c:903
 msgid "Public key is disabled.\n"
 msgstr "La cl� publique est d�sactiv�e.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:910
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "ignor�: cl� publique configur�e par --encrypt-to\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:941
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "r�cipient par d�faut `%s' inconnu\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:974
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: erreur pendant la v�rification de la cl�: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignor�: la cl� publique est d�sactiv�e\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1017
 msgid "no valid addressees\n"
 msgstr "pas de destinataire valide\n"
 
@@ -1554,7 +1565,7 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour prot�ger votre cl� secr�te.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:955
+#: g10/keyedit.c:469 g10/keygen.c:955
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "le mot de passe n'a pas �t� r�p�t� � l'identique; recommencez.\n"
 
@@ -1685,288 +1696,281 @@ msgstr "cl� %08lX: ce n'est pas une cl� rfc2440 - ignor�e\n"
 msgid "key %08lX: not protected - skipped\n"
 msgstr "cl� %08lX: non prot�g�e - ignor�e\n"
 
-#: g10/export.c:232
+#: g10/export.c:236
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENTION: rien n'a �t� export�\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:208
 msgid "too many entries in pk cache - disabled\n"
 msgstr "trop d'entr�es dans le cache pk - d�sactiv�\n"
 
-#: g10/getkey.c:350
+#: g10/getkey.c:443
 msgid "too many entries in unk cache - disabled\n"
 msgstr "trop d'entr�es dans le cache unk - d�sactiv�\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
-msgid "RSA key cannot be used in this version\n"
-msgstr "les cl�s RSA ne peuvent �tre utilis�es dans cette version\n"
-
-#: g10/getkey.c:1310 g10/getkey.c:1349
-msgid "No key for user ID\n"
-msgstr "Pas de cl� pour l'utilisateur\n"
-
-#: g10/getkey.c:1388 g10/getkey.c:1428
-msgid "No user ID for key\n"
-msgstr "Pas d'utilisateur pour la cl�\n"
-
-#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
+#: g10/getkey.c:2143
 #, 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:2050
+#: g10/getkey.c:2185 g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "cl� %08lX: cl� secr�te sans cl� publique - non prise en compte\n"
+
+#: g10/getkey.c:2473
 msgid "[User id not found]"
 msgstr "[Nom utilisateur introuvable]"
 
-#: g10/import.c:182
+#: g10/import.c:184
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "un bloc de type %d a �t� ignor�\n"
 
-#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu cl�s trait�es jusqu'ici\n"
 
-#: g10/import.c:194
+#: g10/import.c:196
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: g10/import.c:204
+#: g10/import.c:206
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "       Quantit� totale trait�e: %lu\n"
 
-#: g10/import.c:206
+#: g10/import.c:208
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "           nouvelles sous-cl�s: %lu\n"
 
-#: g10/import.c:209
+#: g10/import.c:211
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "        sans nom d'utilisateur: %lu\n"
 
-#: g10/import.c:211
+#: g10/import.c:213
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      import�e: %lu"
 
-#: g10/import.c:217
+#: g10/import.c:219
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                     inchang�e: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:221
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "  nouveaux noms d'utilisateurs: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:223
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nouvelles sous-cl�s: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:225
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "          nouvelles signatures: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:227
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr " nouvelles r�vocations de cl�s: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:229
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "            cl�s secr�tes lues: %lu\n"
 
-#: g10/import.c:229
+#: g10/import.c:231
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "       cl�s secr�tes import�es: %lu\n"
 
-#: g10/import.c:231
+#: g10/import.c:233
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      cl�s secr�tes inchang�es: %lu\n"
 
-#: g10/import.c:391 g10/import.c:600
+#: g10/import.c:408 g10/import.c:617
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "cl� %08lX: pas de nom d'utilisateur\n"
 
-#: g10/import.c:405
+#: g10/import.c:422
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "cl� %08lX: pas de nom d'utilisateur valide\n"
 
-#: g10/import.c:407
+#: g10/import.c:424
 msgid "this may be caused by a missing self-signature\n"
 msgstr "cela peut provenir d'une auto-signature manquante\n"
 
-#: g10/import.c:418 g10/import.c:667
+#: g10/import.c:435 g10/import.c:684
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "cl� %08lX: cl� publique pas trouv�e: %s\n"
 
-#: g10/import.c:423
+#: g10/import.c:440
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "cl� %08lX: ce n'est pas une cl� rfc2440 - ignor�e\n"
 
-#: g10/import.c:431
+#: g10/import.c:448
 msgid "no default public keyring\n"
 msgstr "pas de porte-cl�s public par d�faut\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
+#: g10/import.c:452 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�criture de `%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:615 g10/import.c:716
+#: 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:441 g10/import.c:499 g10/import.c:618 g10/import.c:719
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "cl� %08lX: cl� publique import�e\n"
 
-#: g10/import.c:463
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "cl� %08lX: ne ressemble pas � notre copie\n"
 
-#: g10/import.c:472 g10/import.c:675
+#: g10/import.c:489 g10/import.c:692
 #, 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:478 g10/import.c:681
+#: g10/import.c:495 g10/import.c:698
 #, 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:505
+#: g10/import.c:522
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "cl� %08lX: un nouvel utilisateur\n"
 
-#: g10/import.c:508
+#: g10/import.c:525
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "cl� %08lX: %d nouveaux utilisateurs\n"
 
-#: g10/import.c:511
+#: g10/import.c:528
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "cl� %08lX: une nouvelle signature\n"
 
-#: g10/import.c:514
+#: g10/import.c:531
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "cl� %08lX: %d nouvelles signatures\n"
 
-#: g10/import.c:517
+#: g10/import.c:534
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "cl� %08lX: une nouvelle sous-cl�\n"
 
-#: g10/import.c:520
+#: g10/import.c:537
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "cl� %08lX: %d nouvelles sous-cl�s\n"
 
-#: g10/import.c:530
+#: g10/import.c:547
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "cl� %08lX: n'a pas chang�\n"
 
-#: g10/import.c:593
+#: g10/import.c:610
 #, c-format
 msgid "secret key %08lX not imported (use %s to allow for it)\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:640
 #, 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:627
+#: g10/import.c:644
 #, 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:632
+#: g10/import.c:649
 #, 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:661
+#: g10/import.c:678
 #, 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:692
+#: g10/import.c:709
 #, 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:724
+#: g10/import.c:741
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "cl� %08lX: certificat de r�vocation import�\n"
 
-#: g10/import.c:766
+#: g10/import.c:783
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "cl� %08lX: pas d'utilisateur pour la signature\n"
 
-#: g10/import.c:773 g10/import.c:797
+#: g10/import.c:790 g10/import.c:814
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "cl� %08lX: algorithme de cl� publique non support�\n"
 
-#: g10/import.c:774
+#: g10/import.c:791
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "cl� %08lX: auto-signature invalide\n"
 
-#: g10/import.c:789
+#: g10/import.c:806
 #, 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:798
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "cl� %08lX: liaison avec la sous-cl� invalide\n"
 
-#: g10/import.c:825
+#: g10/import.c:842
 #, 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:854
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "cl� %08lX: utilisateur non pris en compte: '"
 
-#: g10/import.c:877
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "cl� %08lX: sous-cl� non prise en compte\n"
@@ -1975,32 +1979,32 @@ msgstr "cl� %08lX: sous-cl� non prise en compte\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:902
+#: g10/import.c:919
 #, 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:911
+#: g10/import.c:928
 #, 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:919
+#: g10/import.c:936
 #, 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:1019
+#: g10/import.c:1036
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "cl� %08lX: nom d'utilisateur en double fusionn�\n"
 
-#: g10/import.c:1071
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "cl� %08lX: certificat de r�vocation ajout�\n"
 
-#: g10/import.c:1185 g10/import.c:1238
+#: g10/import.c:1202 g10/import.c:1255
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "cl� %08lX: notre copie n'a pas d'auto-signature\n"
@@ -2010,63 +2014,63 @@ msgstr "cl� %08lX: notre copie n'a pas d'auto-signature\n"
 msgid "%s: user not found\n"
 msgstr "%s: utilisateur non trouv�\n"
 
-#: g10/keyedit.c:155
+#: g10/keyedit.c:156
 msgid "[revocation]"
 msgstr "[r�vocation]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:157
 msgid "[self-signature]"
 msgstr "[auto-signature]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:221
 msgid "1 bad signature\n"
 msgstr "une mauvaise signature\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:223
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d mauvaises signatures\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:225
 msgid "1 signature not checked due to a missing key\n"
 msgstr "une signature non v�rifi�e � cause d'une cl� manquante\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signatures non v�rifi�es � cause de cl�s manquantes\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 msgid "1 signature not checked due to an error\n"
 msgstr "une signature non v�rifi�e � cause d'une erreur\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:231
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signatures non v�rifi�es � cause d'erreurs\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:233
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "un nom d'utilisateur sans auto-signature valide d�tect�\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:235
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d nom d'utilisateurs sans auto-signature valide d�tect�\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:317
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "D�j� sign� par la cl� %08lX\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:325
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Rien � signer avec la cl� %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2074,7 +2078,7 @@ msgstr ""
 "Etes-vous vraiment s�r(e) que vous voulez signer cette cl�\n"
 "avec la v�tre: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:343
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2082,39 +2086,39 @@ msgstr ""
 "La signature sera marqu�e comme non-exportable.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:348
 msgid "Really sign? "
 msgstr "Signer r�ellement ? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
+#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:136
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a �chou�: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:428
 msgid "This key is not protected.\n"
 msgstr "Cette cl� n'est pas prot�g�e.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:432
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Les parties secr�tes de la cl� principale ne sont pas disponibles.\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:436
 msgid "Key is protected.\n"
 msgstr "La cl� est prot�g�e.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossible d'�diter cette cl�: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:461
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr "Entrez le nouveau mot de passe pour cette cl� secr�te.\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:473
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2123,422 +2127,422 @@ msgstr ""
 "*mauvaise* id�e\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:476
 msgid "Do you really want to do this? "
 msgstr "Voulez-vous vraiment faire cela ? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:540
 msgid "moving a key signature to the correct place\n"
 msgstr "replacer la signature d'une cl� � l'endroit correct\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save"
 msgstr "enregistrer"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save and quit"
 msgstr "enregistrer et quitter"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "show this help"
 msgstr "afficher cette aide"
 
 # g10/keyedit.c:556 ???
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "show fingerprint"
 msgstr "afficher l'empreinte"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list"
 msgstr "lister"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list key and user IDs"
 msgstr "lister la cl� et les noms d'utilisateurs"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "select user ID N"
 msgstr "s�lectionner le nom d'utilisateur N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "key"
 msgstr "cl�"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "select secondary key N"
 msgstr "s�lectionner la cl� secondaire N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "check"
 msgstr "v�rifier"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "list signatures"
 msgstr "lister les signatures"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign"
 msgstr "signer"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign the key"
 msgstr "signer la cl�"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "lsign"
 msgstr "lsigner"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "sign the key locally"
 msgstr "signer la cl� localement"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "debug"
 msgstr "d�boguer"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "adduid"
 msgstr "aj.ut"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "add a user ID"
 msgstr "ajouter un utilisateur"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "deluid"
 msgstr "suppr.ut"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "delete user ID"
 msgstr "enlever un utilisateur"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "addkey"
 msgstr "aj.cl�"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "add a secondary key"
 msgstr "ajouter une cl� secondaire"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delkey"
 msgstr "suppr.cl�"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delete a secondary key"
 msgstr "enlever une cl� secondaire"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delsig"
 msgstr "suppr.sign"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delete signatures"
 msgstr "supprimer les signatures"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "change the expire date"
 msgstr "changer la date d'expiration"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle"
 msgstr "changer"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle between secret and public key listing"
 msgstr "passer de la liste des cl�s secr�tes aux cl�s priv�es et inversement"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "pref"
 msgstr "pr�f"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "list preferences"
 msgstr "lister les pr�f�rences"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
 msgid "passwd"
 msgstr "mot.pas"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
 msgid "change the passphrase"
 msgstr "changer le mot de passe"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
 msgid "trust"
 msgstr "confi."
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
 msgid "change the ownertrust"
 msgstr "changer la confiance"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
 msgid "revoke signatures"
 msgstr "r�voquer les signatures"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 msgid "revkey"
 msgstr "revcl�"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 msgid "revoke a secondary key"
 msgstr "r�voquer une cl� secondaire"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 msgid "disable"
 msgstr "d�sactiver"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 msgid "disable a key"
 msgstr "d�sactiver une cl�"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
 msgid "enable"
 msgstr "activer"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
 msgid "enable a key"
 msgstr "activer une cl�"
 
-#: g10/delkey.c:110 g10/keyedit.c:631
+#: g10/delkey.c:110 g10/keyedit.c:632
 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:669
+#: g10/keyedit.c:670
 msgid "Secret key is available.\n"
 msgstr "La cl� secr�te est disponible.\n"
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 msgid "Command> "
 msgstr "Commande> "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:729
 msgid "Need the secret key to do this.\n"
 msgstr "Il faut la cl� secr�te pour faire cela.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:733
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Utilisez la commande �toggle� d'abord.\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 msgid "Really sign all user IDs? "
 msgstr "Signer vraiment tous les utilisateurs ? "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Aide: S�lectionner les utilisateurs � signer\n"
 
-#: g10/keyedit.c:812 g10/keyedit.c:994
+#: g10/keyedit.c:813 g10/keyedit.c:995
 #, 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:823 g10/keyedit.c:844
+#: g10/keyedit.c:824 g10/keyedit.c:845
 msgid "You must select at least one user ID.\n"
 msgstr "Vous devez s�lectionner au moins un utilisateur.\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "You can't delete the last user ID!\n"
 msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:829
 msgid "Really remove all selected user IDs? "
 msgstr "Enlever r�ellement tous les utilisateurs s�lectionn�s ? "
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:830
 msgid "Really remove this user ID? "
 msgstr "Enlever r�ellement cet utilisateur ? "
 
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:866 g10/keyedit.c:888
 msgid "You must select at least one key.\n"
 msgstr "Vous devez s�lectionner au moins une cl�.\n"
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:870
 msgid "Do you really want to delete the selected keys? "
 msgstr "Voulez-vous vraiment supprimer les cl�s s�lectionn�es ? "
 
-#: g10/keyedit.c:870
+#: g10/keyedit.c:871
 msgid "Do you really want to delete this key? "
 msgstr "Voulez-vous vraiment supprimer cette cl� ? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 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:892
+#: g10/keyedit.c:893
 msgid "Do you really want to revoke this key? "
 msgstr "Voulez-vous vraiment r�voquer cette cl� ? "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:959
 msgid "Save changes? "
 msgstr "Enregistrer les changements? "
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:962
 msgid "Quit without saving? "
 msgstr "Quitter sans enregistrer? "
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:973
 #, c-format
 msgid "update failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:980
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:987
 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:1001
+#: g10/keyedit.c:1002
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez �help�)\n"
 
-#: g10/keyedit.c:1081 g10/keyedit.c:1107
+#: g10/keyedit.c:1082 g10/keyedit.c:1108
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1090
+#: g10/keyedit.c:1091
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1095
 msgid "This key has been disabled"
 msgstr "Cette cl� a �t� d�sactiv�e"
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1124
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "cl� %08lX: la sous-cl� a �t� r�voqu�e !\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1127
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr " nouvelles r�vocations de cl�s: %lu\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1129
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1371
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature invalide ? (o/N/q)"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1375
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1381
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d signature supprim�e.\n"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1396
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d signatures supprim�es\n"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a �t� supprim�.\n"
 
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1468
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les s�lections des cl�s secr�tes.\n"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1474
 msgid "Please select at most one secondary key.\n"
 msgstr "Vous devez s�lectionner au plus une cl� secondaire.\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1478
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Changer la date d'expiration d'une cl� secondaire.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1480
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la cl� principale.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1522
 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:1537
+#: g10/keyedit.c:1538
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1599
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:1644
+#: g10/keyedit.c:1645
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Pas de cl� secondaire avec l'index %d\n"
 
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:1743
 msgid "user ID: \""
 msgstr "nom d'utilisateur: �"
 
-#: g10/keyedit.c:1745
+#: g10/keyedit.c:1746
 #, c-format
 msgid ""
 "\"\n"
@@ -2547,34 +2551,34 @@ msgstr ""
 "�\n"
 "sign� avec votre cl� %08lX � %s\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1750
 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:1773
+#: g10/keyedit.c:1774
 msgid "You have signed these user IDs:\n"
 msgstr "Vous avez sign� ces noms d'utilisateurs:\n"
 
-#: g10/keyedit.c:1787 g10/keyedit.c:1822
+#: g10/keyedit.c:1788 g10/keyedit.c:1823
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   sign� par %08lX � %s\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1793
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   r�voqu� par %08lX � %s\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1813
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous �tes sur le point de r�voquer ces signatures:\n"
 
-#: g10/keyedit.c:1830
+#: g10/keyedit.c:1831
 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:1859
+#: g10/keyedit.c:1860
 msgid "no secret key\n"
 msgstr "pas de cl� secr�te\n"
 
@@ -2589,128 +2593,128 @@ msgid "revoked"
 msgstr "revcl�"
 
 #. of subkey
-#: g10/keylist.c:404 g10/mainproc.c:836
+#: g10/keylist.c:402 g10/mainproc.c:837
 #, c-format
 msgid " [expires: %s]"
 msgstr " [expire: %s]"
 
-#: g10/mainproc.c:270
+#: g10/mainproc.c:271
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la cl� publique est %08lX\n"
 
-#: g10/mainproc.c:315
+#: g10/mainproc.c:316
 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:367
+#: g10/mainproc.c:368
 #, 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:377
+#: g10/mainproc.c:378
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "chiffr� avec une cl� %s, %08lX\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:392
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "le d�chiffrement par cl� publique a �chou�: %s\n"
 
-#: g10/mainproc.c:431
+#: g10/mainproc.c:432
 msgid "decryption okay\n"
 msgstr "le d�chiffrement a r�ussi\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:437
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENTION: le message chiffr� a �t� manipul� !\n"
 
-#: g10/mainproc.c:441
+#: g10/mainproc.c:442
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "le d�chiffrement a �chou�: %s\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:461
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTE: l'exp�diteur a demand� �pour vos yeux seulement�\n"
 
-#: g10/mainproc.c:462
+#: g10/mainproc.c:463
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original: '%.*s'\n"
 
-#: g10/mainproc.c:617
+#: g10/mainproc.c:618
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "r�vocation autonome - utilisez �gpg --import� pour l'appliquer\n"
 
-#: g10/mainproc.c:704 g10/mainproc.c:713
+#: g10/mainproc.c:705 g10/mainproc.c:714
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENTION: des donn�es de notation invalides ont �t� d�tect�es\n"
 
-#: g10/mainproc.c:716
+#: g10/mainproc.c:717
 msgid "Notation: "
 msgstr "Notation: "
 
-#: g10/mainproc.c:725
+#: g10/mainproc.c:726
 msgid "Policy: "
 msgstr "Politique: "
 
-#: g10/mainproc.c:1235
+#: g10/mainproc.c:1177
 msgid "signature verification suppressed\n"
 msgstr "v�rification de signature supprim�e\n"
 
-#: g10/mainproc.c:1272
+#: g10/mainproc.c:1214
 #, 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:1307 g10/mainproc.c:1318
+#: g10/mainproc.c:1242 g10/mainproc.c:1250
 msgid "BAD signature from \""
 msgstr "MAUVAISE signature de \""
 
-#: g10/mainproc.c:1308 g10/mainproc.c:1319
+#: g10/mainproc.c:1243 g10/mainproc.c:1251
 msgid "Good signature from \""
 msgstr "Bonne signature de \""
 
-#: g10/mainproc.c:1310
+#: g10/mainproc.c:1266
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1366
+#: g10/mainproc.c:1316
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de v�rifier la signature: %s\n"
 
-#: g10/mainproc.c:1423 g10/mainproc.c:1438 g10/mainproc.c:1500
+#: g10/mainproc.c:1373 g10/mainproc.c:1388 g10/mainproc.c:1450
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "faire une signature d�tach�e"
 
-#: g10/mainproc.c:1449
+#: g10/mainproc.c:1399
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1454
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:1509
+#: g10/mainproc.c:1459
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:98
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossible d'emp�cher la g�n�ration de fichiers �core�: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:208
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Les algorithmes exp�rimentaux ne devraient pas �tre utilis�s !\n"
 
-#: g10/misc.c:237
+#: g10/misc.c:238
 #, fuzzy
 msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
 msgstr ""
@@ -2722,7 +2726,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:990
+#: g10/parse-packet.c:1010
 #, 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"
@@ -2735,7 +2739,7 @@ msgstr ""
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:170 g10/passphrase.c:248
+#: g10/hkp.c:147 g10/passphrase.c:248
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossible de se connecter � `%s': %s\n"
@@ -2868,36 +2872,36 @@ msgstr ""
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTE: la cl� secr�te %08lX a expir� le %s\n"
 
-#: g10/hkp.c:72
+#: g10/hkp.c:59
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr "requ�te de la cl� %08lX de %s...\n"
 
-#: g10/hkp.c:85
+#: g10/hkp.c:72
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "impossible d'obtenir les cl�s du serveur: %s\n"
 
-#: g10/hkp.c:109 g10/hkp.c:148
+#: g10/hkp.c:91 g10/hkp.c:125
 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:117
+#: g10/hkp.c:99
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s: l'identification de la cl� est invalide\n"
 
-#: g10/hkp.c:194
+#: g10/hkp.c:171
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "erreur pendant l'envoi de `%s': %s\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:183
 #, 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:209
+#: g10/hkp.c:186
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "l'envoi � `%s' a �chou�: le r�sultat est %u\n"
@@ -2911,11 +2915,11 @@ msgstr "les parties secr�tes ne sont pas disponibles\n"
 msgid "protection algorithm %d is not supported\n"
 msgstr "l'algorithme de protection %d n'est pas support�\n"
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:184
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Mot de passe invalide; r�essayez...\n"
 
-#: g10/seckey-cert.c:242
+#: g10/seckey-cert.c:240
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "ATTENTION: Cl� faible d�tect�e - changez encore le mot de passe.\n"
 
@@ -3191,11 +3195,6 @@ msgstr "cl� %08lX: non prot�g�e - ignor�e\n"
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "NOTE: la cl� secr�te %08lX n'est PAS prot�g�e.\n"
 
-#: g10/trustdb.c:577
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "cl� %08lX: cl� secr�te sans cl� publique - non prise en compte\n"
-
 #: g10/trustdb.c:584
 #, c-format
 msgid "key %08lX: secret and public key don't match\n"
@@ -3439,37 +3438,47 @@ msgstr "%s: impossible de cr�er le porte-cl�s: %s\n"
 msgid "%s: keyring created\n"
 msgstr "%s: porte-cl�s cr��\n"
 
-#: g10/ringedit.c:1551
+#: g10/ringedit.c:1555
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 "ATTENTION: 2 fichiers avec des informations confidentielles existent.\n"
 
-#: g10/ringedit.c:1552
+#: g10/ringedit.c:1556
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s est le fichier original\n"
 
-#: g10/ringedit.c:1553
+#: g10/ringedit.c:1557
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s est le nouveau\n"
 
-#: g10/ringedit.c:1554
+#: g10/ringedit.c:1558
 msgid "Please fix this possible security flaw\n"
 msgstr "R�parez ce probl�me de s�curit� possible\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
+#: 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 ""
 "la cl� n'est pas marqu�e comme non-s�re; on ne peut pas l'utiliser avec le\n"
 "pseudo-g�n�rateur de nombres al�atiores !\n"
 
-#: g10/skclist.c:113
+#: g10/skclist.c:138
+#, fuzzy, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "`%s' a �t� ignor�: %s\n"
+
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s' a �t� ignor�: %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:149
+#, fuzzy
+msgid "skipped: secret key already present\n"
+msgstr "%s: ignor�: cl� publique d�j� pr�sente\n"
+
+#: g10/skclist.c:160
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3572,11 +3581,11 @@ msgstr "Enlever cette cl� du porte-cl�s ? "
 msgid "This is a secret key! - really delete? "
 msgstr "C'est une cl� secr�te - faut-il vraiment l'effacer ? "
 
-#: g10/delkey.c:182
+#: g10/delkey.c:181
 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:184
+#: g10/delkey.c:183
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr "utiliser l'option �--delete-secret-key� pour l'effacer d'abord.\n"
 
@@ -3843,6 +3852,15 @@ msgstr "Pas d'aide disponible"
 msgid "No help available for `%s'"
 msgstr "Pas d'aide disponible pour `%s'"
 
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "les cl�s RSA ne peuvent �tre utilis�es dans cette version\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Pas de cl� pour l'utilisateur\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Pas d'utilisateur pour la cl�\n"
+
 #~ msgid "no secret key for decryption available\n"
 #~ msgstr "aucune cl� secr�te n'est disponible pour le d�chiffrement\n"
 
diff --git a/po/id.po b/po/id.po
index 611371727..d83df55ab 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU Privacy Guard 1.0.1\n"
-"POT-Creation-Date: 2001-02-07 16:46+0100\n"
+"POT-Creation-Date: 2001-03-13 13:40+0100\n"
 "PO-Revision-Date: 2000-02-06 18:04+07:00\n"
 "Last-Translator: Tedi Heriyanto <[email protected]>\n"
 "Language-Team: Indonesia <[email protected]>\n"
@@ -41,7 +41,7 @@ msgstr "tidak"
 msgid "nN"
 msgstr "tT"
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:308
 msgid "quit"
 msgstr "keluar"
 
@@ -246,6 +246,17 @@ msgstr "tidak dienkripsi"
 msgid "not processed"
 msgstr "%lu kunci diproses\n"
 
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+#, fuzzy
+msgid "unusable public key"
+msgstr "kunci publik yang buruk"
+
+#: util/errors.c:106
+#, fuzzy
+msgid "unusable secret key"
+msgstr "kunci rahasia yang buruk"
+
 #: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -256,63 +267,63 @@ msgstr "... kesalahan (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "anda menemukan kesalahan ...(%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
+#: cipher/random.c:309 g10/import.c:129 g10/keygen.c:1256
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:313
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:318
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:325
+#: cipher/random.c:323
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:331
+#: cipher/random.c:329
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:339
+#: cipher/random.c:337
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:375
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:397
+#: cipher/random.c:395
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:402
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:405
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:416
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:650
+#: cipher/random.c:648
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "PERINGATAN: menggunakan random number generator yang tidak aman!!\n"
 
-#: cipher/random.c:651
+#: cipher/random.c:649
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -337,7 +348,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:212
+#: g10/g10.c:213
 msgid ""
 "@Commands:\n"
 " "
@@ -345,140 +356,140 @@ msgstr ""
 "@Perintah:\n"
 "  "
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "|[file]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "store only"
 msgstr "hanya disimpan"
 
-#: g10/g10.c:220
+#: g10/g10.c:221
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/g10.c:221
+#: g10/g10.c:222
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/g10.c:223
+#: g10/g10.c:224
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/g10.c:229
+#: g10/g10.c:230
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
 msgid "remove key from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 #, fuzzy
 msgid "remove key from the secret keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/g10.c:238
+#: g10/g10.c:239
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/g10.c:239
+#: g10/g10.c:240
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
-#: g10/g10.c:243
+#: g10/g10.c:244
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/g10.c:245
+#: g10/g10.c:246
 msgid "list only the sequence of packets"
 msgstr "tampilkan hanya urutan paket"
 
-#: g10/g10.c:247
+#: g10/g10.c:248
 msgid "export the ownertrust values"
 msgstr "ekspor nilai ownertrust"
 
-#: g10/g10.c:249
+#: g10/g10.c:250
 msgid "import ownertrust values"
 msgstr "impor nilai ownertrust"
 
-#: g10/g10.c:251
+#: g10/g10.c:252
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMA]|periksa database trust"
 
-#: g10/g10.c:254
+#: g10/g10.c:255
 msgid "fix a corrupted trust database"
 msgstr "perbaiki database trust yang terkorupsi"
 
-#: g10/g10.c:255
+#: g10/g10.c:256
 msgid "De-Armor a file or stdin"
 msgstr "De-Armor file atau stdin"
 
-#: g10/g10.c:257
+#: g10/g10.c:258
 msgid "En-Armor a file or stdin"
 msgstr "En-Armor file atau stdin"
 
-#: g10/g10.c:259
+#: g10/g10.c:260
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/g10.c:263
+#: g10/g10.c:264
 msgid ""
 "@\n"
 "Options:\n"
@@ -488,162 +499,162 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: g10/g10.c:265
+#: g10/g10.c:266
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/g10.c:267
+#: g10/g10.c:268
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/g10.c:270
+#: g10/g10.c:271
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: g10/g10.c:272
+#: g10/g10.c:273
 msgid "use the default key as default recipient"
 msgstr "gunakan kunci baku sebagai penerima baku"
 
-#: g10/g10.c:276
+#: g10/g10.c:277
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "verbose"
 msgstr "detil"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "don't use the terminal at all"
 msgstr "jangan menggunakan terminal"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "force v3 signatures"
 msgstr "paksa signature v3"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "always use a MDC for encryption"
 msgstr "selalu gunakan MDC untuk enkripsi"
 
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "batch mode: never ask"
 msgstr "mode batch: tanpa tanya"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "assume yes on most questions"
 msgstr "asumsikan ya untuk seluruh pertanyaan"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "assume no on most questions"
 msgstr "asumsikan tidak untuk seluruh pertanyaan"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "add this keyring to the list of keyrings"
 msgstr "tambah keyring ini ke daftar keyring"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "add this secret keyring to the list"
 msgstr "tambah keyring rahasia ini ke daftar"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMA|set charset terminal ke NAMA"
 
-#: g10/g10.c:297
+#: g10/g10.c:298
 msgid "read options from file"
 msgstr "baca pilihan dari file"
 
-#: g10/g10.c:301
+#: g10/g10.c:302
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "emulate the mode described in RFC1991"
 msgstr "emulasikan mode seperti dalam RFC1991"
 
-#: g10/g10.c:309
+#: g10/g10.c:310
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "set pilihan paket, cipher, digest ke OpenPGP"
 
-#: g10/g10.c:310
+#: g10/g10.c:311
 msgid "|N|use passphrase mode N"
 msgstr "|N|gunakan passphrase mode N"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma digest NAMA utk passphrase"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMA|gunakan algoritma cipher NAMA"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "|N|use compress algorithm N"
 msgstr "|N|gunakan algoritma kompresi N"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "throw keyid field of encrypted packets"
 msgstr "buang field keyid paket terenkripsi"
 
-#: g10/g10.c:319
+#: g10/g10.c:320
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAMA=NILAI|gunakan notasi data ini"
 
-#: g10/g10.c:322
+#: g10/g10.c:323
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:325
+#: g10/g10.c:326
 msgid ""
 "@\n"
 "Examples:\n"
@@ -663,15 +674,15 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/g10.c:431
+#: g10/g10.c:432
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Silakan laporkan kesalahan ke <[email protected]>.\n"
 
-#: g10/g10.c:435
+#: g10/g10.c:436
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/g10.c:438
+#: g10/g10.c:439
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -681,7 +692,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/g10.c:445
+#: g10/g10.c:446
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -689,191 +700,191 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/g10.c:524
+#: g10/g10.c:525
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/g10.c:577
+#: g10/g10.c:578
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/g10.c:727
+#: g10/g10.c:728
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: g10/g10.c:731
+#: g10/g10.c:732
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: g10/g10.c:738
+#: g10/g10.c:739
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/g10.c:943
+#: g10/g10.c:944
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/g10.c:1014
+#: g10/g10.c:1015
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/g10.c:1018 g10/g10.c:1027
+#: g10/g10.c:1019 g10/g10.c:1028
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1021
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/g10.c:1023
+#: g10/g10.c:1024
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/g10.c:1043 g10/g10.c:1055
+#: g10/g10.c:1044 g10/g10.c:1056
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:1049 g10/g10.c:1061
+#: g10/g10.c:1050 g10/g10.c:1062
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:1065
+#: g10/g10.c:1066
 msgid "the given policy URL is invalid\n"
 msgstr "kebijakan URL yang diberikan tidak valid\n"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1069
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "algoritma kompresi harus di antara %d..%d\n"
 
-#: g10/g10.c:1070
+#: g10/g10.c:1071
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/g10.c:1072
+#: g10/g10.c:1073
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/g10.c:1074
+#: g10/g10.c:1075
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth harus di antara 1 hingga 255\n"
 
-#: g10/g10.c:1077
+#: g10/g10.c:1078
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/g10.c:1081
+#: g10/g10.c:1082
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
 
-#: g10/g10.c:1166
+#: g10/g10.c:1167
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/g10.c:1172
+#: g10/g10.c:1173
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1180
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/g10.c:1187
+#: g10/g10.c:1188
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/g10.c:1200
+#: g10/g10.c:1201
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/g10.c:1213
+#: g10/g10.c:1214
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:1227
+#: g10/g10.c:1228
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1245
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1261
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/g10.c:1268
+#: g10/g10.c:1269
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/g10.c:1284
+#: g10/g10.c:1285
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-user"
 
-#: g10/g10.c:1287
+#: g10/g10.c:1288
 msgid "--delete-key user-id"
 msgstr "--delete-key id-user"
 
-#: g10/g10.c:1295
+#: g10/g10.c:1296
 #, fuzzy
 msgid "--delete-secret-and-public-key user-id"
 msgstr "--delete-secret-key id-user"
 
-#: g10/encode.c:268 g10/g10.c:1332 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1333 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "tidak dapat membuka %s: %s\n"
 
-#: g10/g10.c:1347
+#: g10/g10.c:1348
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/g10.c:1413
+#: g10/g10.c:1414
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/g10.c:1421
+#: g10/g10.c:1422
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1493
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/g10.c:1579
+#: g10/g10.c:1580
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/g10.c:1583
+#: g10/g10.c:1584
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1586 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1587 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:1795
+#: g10/g10.c:1796
 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:1801
+#: g10/g10.c:1802
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -881,87 +892,87 @@ msgstr ""
 "nama notasi hanya terdiri dari huruf, digit, titik atau garis bawah dan "
 "diakhiri dengan sebuah '='\n"
 
-#: g10/g10.c:1807
+#: g10/g10.c:1808
 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:1815
+#: g10/g10.c:1816
 msgid "a notation value must not use any control characters\n"
 msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
-#: g10/armor.c:302
+#: g10/armor.c:304
 #, c-format
 msgid "armor: %s\n"
 msgstr "armor: %s\n"
 
-#: g10/armor.c:331
+#: g10/armor.c:333
 msgid "invalid armor header: "
 msgstr "header armor tidak valid: "
 
-#: g10/armor.c:338
+#: g10/armor.c:340
 msgid "armor header: "
 msgstr "header armor: "
 
-#: g10/armor.c:349
+#: g10/armor.c:351
 msgid "invalid clearsig header\n"
 msgstr "header clearsig tidak valid\n"
 
-#: g10/armor.c:401
+#: g10/armor.c:403
 msgid "nested clear text signatures\n"
 msgstr "signature teks bersarang\n"
 
-#: g10/armor.c:525
+#: g10/armor.c:527
 msgid "invalid dash escaped line: "
 msgstr "dash escaped line tidak valid: "
 
-#: g10/armor.c:537
+#: g10/armor.c:539
 msgid "unexpected armor:"
 msgstr "armor tidak terduga:"
 
-#: g10/armor.c:663
+#: g10/armor.c:665
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "karakter radix64 tidak valid %02x dilewati\n"
 
-#: g10/armor.c:706
+#: g10/armor.c:708
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematur (tanpa CRC)\n"
 
-#: g10/armor.c:740
+#: g10/armor.c:742
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematur (dalam CRC)\n"
 
-#: g10/armor.c:744
+#: g10/armor.c:746
 msgid "malformed CRC\n"
 msgstr "CRC tidak tepat\n"
 
-#: g10/armor.c:748
+#: g10/armor.c:750
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "kesalahan CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:765
+#: g10/armor.c:767
 msgid "premature eof (in Trailer)\n"
 msgstr "eof prematur (dalam Trailer)\n"
 
-#: g10/armor.c:769
+#: g10/armor.c:771
 msgid "error in trailer line\n"
 msgstr "kesalahan dalam garis trailer\n"
 
-#: g10/armor.c:915
+#: g10/armor.c:917
 msgid "For info see http://www.gnupg.org"
 msgstr ""
 
-#: g10/armor.c:1043
+#: g10/armor.c:1045
 msgid "no valid OpenPGP data found.\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/armor.c:1048
+#: g10/armor.c:1050
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armor tidak valid: baris melebihi %d karakter\n"
 
-#: g10/armor.c:1052
+#: g10/armor.c:1054
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -970,7 +981,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1189 g10/pkclist.c:53
+#: g10/keyedit.c:1190 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "            Fingerprint:"
 
@@ -1198,58 +1209,58 @@ msgstr ""
 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:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: dilewati: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:826 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: dilewati: kunci publik telah ada\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:853
 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:864
+#: g10/pkclist.c:863
 msgid "Enter the user ID: "
 msgstr "Masukkan ID user: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:875
 msgid "No such user ID.\n"
 msgstr "Tidak ada ID user tersebut.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:880
 msgid "skipped: public key already set as default recipient\n"
 msgstr "dilewati: kunci publik telah diset sebagai penerima baku\n"
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:903
 msgid "Public key is disabled.\n"
 msgstr "Kunci publik dimatikan.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:910
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "dilewati: kunci publik telah diset dengan --encrypt-to\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:941
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:974
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: kesalahan memeriksa kunci: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: dilewati: kunci publik dimatikan\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1017
 msgid "no valid addressees\n"
 msgstr "tidak ada alamat yang valid\n"
 
@@ -1524,7 +1535,7 @@ msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:955
+#: g10/keyedit.c:469 g10/keygen.c:955
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "passphrase tidak diulang dengan benar; coba lagi.\n"
 
@@ -1652,287 +1663,280 @@ msgstr "kunci %08lX: bukan kunci rfc2440 - dilewati\n"
 msgid "key %08lX: not protected - skipped\n"
 msgstr "kunci %08lX: bukan kunci rfc2440 - dilewati\n"
 
-#: g10/export.c:232
+#: g10/export.c:236
 msgid "WARNING: nothing exported\n"
 msgstr "PERINGATAN: tidak ada yang diekspor\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:208
 msgid "too many entries in pk cache - disabled\n"
 msgstr "terlalu banyak masukan dalam pk cache - ditiadakan\n"
 
-#: g10/getkey.c:350
+#: g10/getkey.c:443
 msgid "too many entries in unk cache - disabled\n"
 msgstr "terlalu banyak masukan di unk cache - ditiadakan\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
-msgid "RSA key cannot be used in this version\n"
-msgstr "Kunci RSA tidak dapat digunakan pada versi ini\n"
-
-#: g10/getkey.c:1310 g10/getkey.c:1349
-msgid "No key for user ID\n"
-msgstr "Tidak ada kunci untuk ID user\n"
-
-#: g10/getkey.c:1388 g10/getkey.c:1428
-msgid "No user ID for key\n"
-msgstr "Tidak ada ID user untuk kunci\n"
-
-#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
+#: g10/getkey.c:2143
 #, 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:2050
+#: g10/getkey.c:2185 g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
+
+#: g10/getkey.c:2473
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: user tidak ditemukan\n"
 
-#: g10/import.c:182
+#: g10/import.c:184
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "melewati blok tipe %d\n"
 
-#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu kunci telah diproses\n"
 
-#: g10/import.c:194
+#: g10/import.c:196
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/import.c:204
+#: g10/import.c:206
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Jumlah yang telah diproses: %lu\n"
 
-#: g10/import.c:206
+#: g10/import.c:208
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "          subkey baru: %lu\n"
 
-#: g10/import.c:209
+#: g10/import.c:211
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         tanpa ID user: %lu\n"
 
-#: g10/import.c:211
+#: g10/import.c:213
 #, c-format
 msgid "              imported: %lu"
 msgstr "             diimpor: %lu"
 
-#: g10/import.c:217
+#: g10/import.c:219
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "            tidak berubah: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:221
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         ID user baru: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:223
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "          subkey baru: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:225
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "       signature baru: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:227
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  pembatalan kunci baru: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:229
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     kunci rahasia dibaca: %lu\n"
 
-#: g10/import.c:229
+#: g10/import.c:231
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  kunci rahasia diimpor: %lu\n"
 
-#: g10/import.c:231
+#: g10/import.c:233
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " kunci rahasia tetap: %lu\n"
 
-#: g10/import.c:391 g10/import.c:600
+#: g10/import.c:408 g10/import.c:617
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/import.c:405
+#: g10/import.c:422
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "kunci %08lX: tidak ada ID user yang valid\n"
 
-#: g10/import.c:407
+#: g10/import.c:424
 msgid "this may be caused by a missing self-signature\n"
 msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
 
-#: g10/import.c:418 g10/import.c:667
+#: g10/import.c:435 g10/import.c:684
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
 
-#: g10/import.c:423
+#: g10/import.c:440
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "kunci %08lX: bukan kunci rfc2440 - dilewati\n"
 
-#: g10/import.c:431
+#: g10/import.c:448
 msgid "no default public keyring\n"
 msgstr "tidak ada keyring publik baku\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
+#: g10/import.c:452 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:615 g10/import.c:716
+#: 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:441 g10/import.c:499 g10/import.c:618 g10/import.c:719
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "kunci %08lX: kunci publik diimpor\n"
 
-#: g10/import.c:463
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
 
-#: g10/import.c:472 g10/import.c:675
+#: g10/import.c:489 g10/import.c:692
 #, 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:478 g10/import.c:681
+#: g10/import.c:495 g10/import.c:698
 #, 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:505
+#: g10/import.c:522
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "kunci %08lX: 1 user ID baru\n"
 
-#: g10/import.c:508
+#: g10/import.c:525
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "kunci %08lX: %d user ID baru\n"
 
-#: g10/import.c:511
+#: g10/import.c:528
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "kunci %08lX: 1 signature baru\n"
 
-#: g10/import.c:514
+#: g10/import.c:531
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "kunci %08lX: %d signature baru\n"
 
-#: g10/import.c:517
+#: g10/import.c:534
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "kunci %08lX: 1 subkey baru\n"
 
-#: g10/import.c:520
+#: g10/import.c:537
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "kunci %08lX: %d subkey baru\n"
 
-#: g10/import.c:530
+#: g10/import.c:547
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "kunci %08lX: tidak berubah\n"
 
-#: g10/import.c:593
+#: g10/import.c:610
 #, c-format
 msgid "secret key %08lX not imported (use %s to allow for it)\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:640
 #, 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:627
+#: g10/import.c:644
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "kunci %08lX: sudah ada di keyring rahasia\n"
 
-#: g10/import.c:632
+#: g10/import.c:649
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "kunci %08lX: kunci rahasia tidak ditemukan: %s\n"
 
-#: g10/import.c:661
+#: g10/import.c:678
 #, 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:692
+#: g10/import.c:709
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - ditolak\n"
 
-#: g10/import.c:724
+#: g10/import.c:741
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "kunci %08lX: sertifikat pembatalan diimpor\n"
 
-#: g10/import.c:766
+#: g10/import.c:783
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "kunci %08lX: tidak ada ID user untuk signature\n"
 
-#: g10/import.c:773 g10/import.c:797
+#: g10/import.c:790 g10/import.c:814
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
 
-#: g10/import.c:774
+#: g10/import.c:791
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "kunci %08lX: self-signature tidak valid\n"
 
-#: g10/import.c:789
+#: g10/import.c:806
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
 
-#: g10/import.c:798
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "kunci %08lX: subkey binding tidak valid\n"
 
-#: g10/import.c:825
+#: g10/import.c:842
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "kunci %08lX: menerima ID user yang tidak self-signed "
 
-#: g10/import.c:854
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "kunci %08lX: melewati ID user "
 
-#: g10/import.c:877
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "kunci %08lX: melewati subkey\n"
@@ -1941,32 +1945,32 @@ 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:902
+#: g10/import.c:919
 #, 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:911
+#: g10/import.c:928
 #, 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:919
+#: g10/import.c:936
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - dilewati\n"
 
-#: g10/import.c:1019
+#: g10/import.c:1036
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
 
-#: g10/import.c:1071
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "kunci %08lX: penambahan sertifikat pembatalan\n"
 
-#: g10/import.c:1185 g10/import.c:1238
+#: g10/import.c:1202 g10/import.c:1255
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "kunci %08lX: salinan kita tidak memiliki self-signature\n"
@@ -1976,63 +1980,63 @@ msgstr "kunci %08lX: salinan kita tidak memiliki self-signature\n"
 msgid "%s: user not found\n"
 msgstr "%s: user tidak ditemukan\n"
 
-#: g10/keyedit.c:155
+#: g10/keyedit.c:156
 msgid "[revocation]"
 msgstr "[pembatalan]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:157
 msgid "[self-signature]"
 msgstr "[self-signature]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:221
 msgid "1 bad signature\n"
 msgstr "1 signature yang buruk\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:223
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d signature yang buruk\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:225
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signature tidak diperiksa karena kesalahan\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:231
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signature tidak diperiksa karena ada kesalahan\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:233
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "terdeteksi 1 ID user tanpa self-signature yang valid\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:235
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "terdeteksi ID %d user tanpa self-signature yang valid\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:317
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Sudah ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:325
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2040,7 +2044,7 @@ msgstr ""
 "Apakah anda yakin untuk menandai kunci ini \n"
 "dengan kunci anda: "
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:343
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2048,34 +2052,34 @@ msgstr ""
 "Signature akan ditandai sebagai tidak dapat diekspor.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:348
 msgid "Really sign? "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
+#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:136
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:428
 msgid "This key is not protected.\n"
 msgstr "Kunci ini tidak diproteksi.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:432
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "kunci rahasia tidak ada"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:436
 msgid "Key is protected.\n"
 msgstr "Kunci diproteksi.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tidak dapat mengedit kunci ini: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:461
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2083,7 +2087,7 @@ msgstr ""
 "Masukkan passphrase baru untuk kunci rahasia ini.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:473
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2091,455 +2095,455 @@ msgstr ""
 "Anda tidak ingin passphrase - bukan ide yang baik!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:476
 msgid "Do you really want to do this? "
 msgstr "Apakah anda ingin melakukan hal ini? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:540
 msgid "moving a key signature to the correct place\n"
 msgstr "memindahkan signature kunci ke tempat yang tepat\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save"
 msgstr "simpan"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save and quit"
 msgstr "simpan dan berhenti"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "help"
 msgstr "bantuan"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "show fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list"
 msgstr "tampilkan"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list key and user IDs"
 msgstr "tampilkan kunci dan ID user"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "select user ID N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "key"
 msgstr "kunci"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "select secondary key N"
 msgstr "pilih kunci sekunder N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "check"
 msgstr "periksa"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "list signatures"
 msgstr "tampilkan signature"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign"
 msgstr "tandai"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign the key"
 msgstr "tandai kunci"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "sign the key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "add a user ID"
 msgstr "tambah sebuah ID user"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "delete user ID"
 msgstr "hapus ID user"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "add a secondary key"
 msgstr "tambah kunci sekunder"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delete a secondary key"
 msgstr "hapus kunci sekunder"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delete signatures"
 msgstr "hapus signature"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "change the expire date"
 msgstr "ubah tanggal kadaluarsa"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle between secret and public key listing"
 msgstr "ubah tampilan kunci rahasia dan publik"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "list preferences"
 msgstr "tampilkan preferensi"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
 msgid "change the passphrase"
 msgstr "ubah passphrase"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
 msgid "change the ownertrust"
 msgstr "ubah ownertrust"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
 msgid "revoke signatures"
 msgstr "batalkan signature"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 msgid "revoke a secondary key"
 msgstr "batalkan kunci sekunder"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 msgid "disable a key"
 msgstr "tiadakan kunci"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
 msgid "enable a key"
 msgstr "aktifkan kunci"
 
-#: g10/delkey.c:110 g10/keyedit.c:631
+#: g10/delkey.c:110 g10/keyedit.c:632
 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:669
+#: g10/keyedit.c:670
 msgid "Secret key is available.\n"
 msgstr "Kunci rahasia tersedia.\n"
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 msgid "Command> "
 msgstr "Perintah> "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:729
 msgid "Need the secret key to do this.\n"
 msgstr "Perlu kunci rahasia.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:733
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 msgid "Really sign all user IDs? "
 msgstr "Tandai ID seluruh user? "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:812 g10/keyedit.c:994
+#: g10/keyedit.c:813 g10/keyedit.c:995
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "gagal perbarui trustdb: %s\n"
 
-#: g10/keyedit.c:823 g10/keyedit.c:844
+#: g10/keyedit.c:824 g10/keyedit.c:845
 msgid "You must select at least one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "You can't delete the last user ID!\n"
 msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:829
 msgid "Really remove all selected user IDs? "
 msgstr "Hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:830
 msgid "Really remove this user ID? "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:866 g10/keyedit.c:888
 msgid "You must select at least one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:870
 msgid "Do you really want to delete the selected keys? "
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: g10/keyedit.c:870
+#: g10/keyedit.c:871
 msgid "Do you really want to delete this key? "
 msgstr "Anda ingin menghapus kunci ini? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Anda ingin membatalkan kunci terpilih ini? "
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:893
 msgid "Do you really want to revoke this key? "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:959
 msgid "Save changes? "
 msgstr "Simpan perubahan? "
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:962
 msgid "Quit without saving? "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:973
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:980
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:987
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1002
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
-#: g10/keyedit.c:1081 g10/keyedit.c:1107
+#: g10/keyedit.c:1082 g10/keyedit.c:1108
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1090
+#: g10/keyedit.c:1091
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1095
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1124
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "kunci %08lX: subkey telah dibatalkan!\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1127
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "  pembatalan kunci baru: %lu\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1129
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1371
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1375
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1381
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1396
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1468
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1474
 msgid "Please select at most one secondary key.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1478
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1480
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1522
 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:1537
+#: g10/keyedit.c:1538
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1599
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:1644
+#: g10/keyedit.c:1645
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Tidak ada kunci sekunder dengan index %d\n"
 
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:1743
 msgid "user ID: \""
 msgstr "ID user: "
 
-#: g10/keyedit.c:1745
+#: g10/keyedit.c:1746
 #, c-format
 msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 msgstr "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1750
 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:1773
+#: g10/keyedit.c:1774
 msgid "You have signed these user IDs:\n"
 msgstr "Anda telah menandai ID user ini:\n"
 
-#: g10/keyedit.c:1787 g10/keyedit.c:1822
+#: g10/keyedit.c:1788 g10/keyedit.c:1823
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   ditandai oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1793
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1813
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:1830
+#: g10/keyedit.c:1831
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1860
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
@@ -2554,128 +2558,128 @@ msgid "revoked"
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:404 g10/mainproc.c:836
+#: g10/keylist.c:402 g10/mainproc.c:837
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "Kunci berakhir pada %s\n"
 
-#: g10/mainproc.c:270
+#: g10/mainproc.c:271
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "kunci publik adalah %08lX\n"
 
-#: g10/mainproc.c:315
+#: g10/mainproc.c:316
 msgid "public key encrypted data: good DEK\n"
 msgstr "data terenkripsi dengan kunci publik: DEK baik\n"
 
-#: g10/mainproc.c:367
+#: g10/mainproc.c:368
 #, 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:377
+#: g10/mainproc.c:378
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:392
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "gagal dekripsi kunci publik: %s\n"
 
-#: g10/mainproc.c:431
+#: g10/mainproc.c:432
 msgid "decryption okay\n"
 msgstr "dekripsi lancar\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:437
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
 
-#: g10/mainproc.c:441
+#: g10/mainproc.c:442
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "gagal dekripsi: %s\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:461
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:462
+#: g10/mainproc.c:463
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nama file asli='%.*s'\n"
 
-#: g10/mainproc.c:617
+#: g10/mainproc.c:618
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:704 g10/mainproc.c:713
+#: g10/mainproc.c:705 g10/mainproc.c:714
 msgid "WARNING: invalid notation data found\n"
 msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
 
-#: g10/mainproc.c:716
+#: g10/mainproc.c:717
 msgid "Notation: "
 msgstr "Notasi: "
 
-#: g10/mainproc.c:725
+#: g10/mainproc.c:726
 msgid "Policy: "
 msgstr "Kebijakan: "
 
-#: g10/mainproc.c:1235
+#: g10/mainproc.c:1177
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak optimal\n"
 
-#: g10/mainproc.c:1272
+#: g10/mainproc.c:1214
 #, 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:1307 g10/mainproc.c:1318
+#: g10/mainproc.c:1242 g10/mainproc.c:1250
 msgid "BAD signature from \""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1308 g10/mainproc.c:1319
+#: g10/mainproc.c:1243 g10/mainproc.c:1251
 msgid "Good signature from \""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1310
+#: g10/mainproc.c:1266
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1366
+#: g10/mainproc.c:1316
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:1423 g10/mainproc.c:1438 g10/mainproc.c:1500
+#: g10/mainproc.c:1373 g10/mainproc.c:1388 g10/mainproc.c:1450
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "buat detached signature"
 
-#: g10/mainproc.c:1449
+#: g10/mainproc.c:1399
 #, fuzzy, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature tidak dikenal"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1454
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
 
-#: g10/mainproc.c:1509
+#: g10/mainproc.c:1459
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:98
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "tidak dapat meniadakan core dump: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:208
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Algoritma eksperimental sebaiknya tidak dipakai!\n"
 
-#: g10/misc.c:237
+#: g10/misc.c:238
 #, fuzzy
 msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
 msgstr ""
@@ -2686,7 +2690,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/parse-packet.c:990
+#: g10/parse-packet.c:1010
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
@@ -2699,7 +2703,7 @@ msgstr ""
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:170 g10/passphrase.c:248
+#: g10/hkp.c:147 g10/passphrase.c:248
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
@@ -2829,36 +2833,36 @@ msgstr "CATATAN: algoritma cipher %d tidak ditemukan dalam preferensi\n"
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "CATATAN: kunci signature berakhir %s\n"
 
-#: g10/hkp.c:72
+#: g10/hkp.c:59
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr ""
 
-#: g10/hkp.c:85
+#: g10/hkp.c:72
 #, fuzzy, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "impor kunci dari key server"
 
-#: g10/hkp.c:109 g10/hkp.c:148
+#: g10/hkp.c:91 g10/hkp.c:125
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/hkp.c:117
+#: g10/hkp.c:99
 #, fuzzy, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/hkp.c:194
+#: g10/hkp.c:171
 #, fuzzy, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:183
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:209
+#: g10/hkp.c:186
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
@@ -2873,11 +2877,11 @@ msgstr "kunci rahasia tidak ada"
 msgid "protection algorithm %d is not supported\n"
 msgstr "algoritma proteksi %d tidak didukung\n"
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:184
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Passphrase tidak valid; silakan coba lagi ...\n"
 
-#: g10/seckey-cert.c:242
+#: g10/seckey-cert.c:240
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "PERINGATAN: terdeteksi kunci lemah - silakan rubah passphrase lagi.\n"
 
@@ -3143,11 +3147,6 @@ msgstr "kunci %08lX: bukan kunci rfc2440 - dilewati\n"
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "CATATAN: kunci rahasia %08lX tidak diproteksi.\n"
 
-#: g10/trustdb.c:577
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
-
 #: g10/trustdb.c:584
 #, c-format
 msgid "key %08lX: secret and public key don't match\n"
@@ -3378,36 +3377,46 @@ msgstr "%s: tidak dapat membuat keyring: %s\n"
 msgid "%s: keyring created\n"
 msgstr "%s: keyring tercipta\n"
 
-#: g10/ringedit.c:1551
+#: g10/ringedit.c:1555
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "PERINGATAN: terdapat 2 file dengan informasi penting.\n"
 
-#: g10/ringedit.c:1552
+#: g10/ringedit.c:1556
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s adalah yang tidak berubah\n"
 
-#: g10/ringedit.c:1553
+#: g10/ringedit.c:1557
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s adalah yang baru\n"
 
-#: g10/ringedit.c:1554
+#: g10/ringedit.c:1558
 msgid "Please fix this possible security flaw\n"
 msgstr "Silakan perbaikan kemungkinan lubang keamanan\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
+#: 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 ""
 "kunci tidak dianggap sebagai tidak aman - tidak dapat digunakan dengan RNG "
 "palsu!\n"
 
-#: g10/skclist.c:113
+#: g10/skclist.c:138
+#, fuzzy, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "melewati `%s': %s\n"
+
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "melewati `%s': %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:149
+#, fuzzy
+msgid "skipped: secret key already present\n"
+msgstr "%s: dilewati: kunci publik telah ada\n"
+
+#: g10/skclist.c:160
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3506,11 +3515,11 @@ msgstr "Menghapus kunci ini dari keyring? "
 msgid "This is a secret key! - really delete? "
 msgstr "Ini adalah kunci rahasia! - Yakin dihapus? "
 
-#: g10/delkey.c:182
+#: g10/delkey.c:181
 msgid "there is a secret key for this public key!\n"
 msgstr "terdapat kunci rahasia untuk kunci publik ini!\n"
 
-#: g10/delkey.c:184
+#: g10/delkey.c:183
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n"
 
@@ -3758,6 +3767,15 @@ msgstr "Tidak tersedia bantuan"
 msgid "No help available for `%s'"
 msgstr "Tidak tersedia bantuan untuk `%s'"
 
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "Kunci RSA tidak dapat digunakan pada versi ini\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Tidak ada kunci untuk ID user\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Tidak ada ID user untuk kunci\n"
+
 #~ msgid "no secret key for decryption available\n"
 #~ msgstr "tidak tersedia kunci rahasia untuk dekripsi\n"
 
diff --git a/po/it.po b/po/it.po
index d84efbfef..ff7c7cd6d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.0h\n"
-"POT-Creation-Date: 2001-02-07 16:46+0100\n"
+"POT-Creation-Date: 2001-03-13 13:40+0100\n"
 "PO-Revision-Date: 1999-12-08 15:51+02:00\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -41,7 +41,7 @@ msgstr "no"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:308
 msgid "quit"
 msgstr "quit"
 
@@ -246,6 +246,17 @@ msgstr "non cifrato"
 msgid "not processed"
 msgstr "non esaminato"
 
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+#, fuzzy
+msgid "unusable public key"
+msgstr "chiave pubblica errata"
+
+#: util/errors.c:106
+#, fuzzy
+msgid "unusable secret key"
+msgstr "chiave segreta errata"
+
 #: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -256,64 +267,64 @@ msgstr "... questo � un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Hai trovato un bug... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
+#: cipher/random.c:309 g10/import.c:129 g10/keygen.c:1256
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:313
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:318
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:325
+#: cipher/random.c:323
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:331
+#: cipher/random.c:329
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:339
+#: cipher/random.c:337
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:375
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:397
+#: cipher/random.c:395
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:402
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:405
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:416
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:650
+#: cipher/random.c:648
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ATTENZIONE: si sta usando un generatore di numeri casuali non sicuro!!\n"
 
-#: cipher/random.c:651
+#: cipher/random.c:649
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -339,7 +350,7 @@ msgstr ""
 "altra cosa per dare all'OS la possibilit� di raccogliere altra entropia!\n"
 "(Servono altri %d byte)\n"
 
-#: g10/g10.c:212
+#: g10/g10.c:213
 msgid ""
 "@Commands:\n"
 " "
@@ -347,139 +358,139 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "store only"
 msgstr "immagazzina soltanto"
 
-#: g10/g10.c:220
+#: g10/g10.c:221
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/g10.c:221
+#: g10/g10.c:222
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:223
+#: g10/g10.c:224
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/g10.c:229
+#: g10/g10.c:230
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
 msgid "remove key from the public keyring"
 msgstr "rimuove una chiave dal portachiavi pubblico"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "remove key from the secret keyring"
 msgstr "rimuove una chiave dal portachiavi privato"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "sign a key locally"
 msgstr "firma localmente una chiave"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/g10.c:238
+#: g10/g10.c:239
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/g10.c:239
+#: g10/g10.c:240
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/g10.c:243
+#: g10/g10.c:244
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/g10.c:245
+#: g10/g10.c:246
 msgid "list only the sequence of packets"
 msgstr "elenca solo la sequenza dei pacchetti"
 
-#: g10/g10.c:247
+#: g10/g10.c:248
 msgid "export the ownertrust values"
 msgstr "esporta i valori di fiducia"
 
-#: g10/g10.c:249
+#: g10/g10.c:250
 msgid "import ownertrust values"
 msgstr "importa i valori di fiducia"
 
-#: g10/g10.c:251
+#: g10/g10.c:252
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMI]|controlla il database della fiducia"
 
-#: g10/g10.c:254
+#: g10/g10.c:255
 msgid "fix a corrupted trust database"
 msgstr "ripara un database della fiducia rovinato"
 
-#: g10/g10.c:255
+#: g10/g10.c:256
 msgid "De-Armor a file or stdin"
 msgstr "rimuovi l'armatura a un file o a stdin"
 
-#: g10/g10.c:257
+#: g10/g10.c:258
 msgid "En-Armor a file or stdin"
 msgstr "crea l'armatura a un file o a stdin"
 
-#: g10/g10.c:259
+#: g10/g10.c:260
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/g10.c:263
+#: g10/g10.c:264
 msgid ""
 "@\n"
 "Options:\n"
@@ -489,164 +500,164 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/g10.c:265
+#: g10/g10.c:266
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/g10.c:267
+#: g10/g10.c:268
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/g10.c:270
+#: g10/g10.c:271
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: g10/g10.c:272
+#: g10/g10.c:273
 msgid "use the default key as default recipient"
 msgstr "usa la chiave predefinita come destinatario predefinito"
 
-#: g10/g10.c:276
+#: g10/g10.c:277
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "verbose"
 msgstr "prolisso"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "don't use the terminal at all"
 msgstr "non usa per niente il terminale"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "force v3 signatures"
 msgstr "forza l'uso di firme v3"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "always use a MDC for encryption"
 msgstr "usa sempre un MDC per cifrare"
 
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "batch mode: never ask"
 msgstr "modo batch: non fa domande"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "assume yes on most questions"
 msgstr "assumi \"s�\" per quasi tutte le domande"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "assume no on most questions"
 msgstr "assumi \"no\" per quasi tutte le domande"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "add this keyring to the list of keyrings"
 msgstr "aggiungi questo portachiavi alla lista"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "add this secret keyring to the list"
 msgstr "aggiungi questo portachiavi segreto alla lista"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usa NOME come chiave segreta predefinita"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|cerca le chiavi in questo keyserver"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOME|imposta il set di caratteri del terminale NOME"
 
-#: g10/g10.c:297
+#: g10/g10.c:298
 msgid "read options from file"
 msgstr "leggi le opzioni dal file"
 
-#: g10/g10.c:301
+#: g10/g10.c:302
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato su questo FD"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "emulate the mode described in RFC1991"
 msgstr "emula il modo descritto in RFC 1991"
 
-#: g10/g10.c:309
+#: g10/g10.c:310
 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:310
+#: g10/g10.c:311
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa il modo N per la passphrase"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOME|usa l'algoritmo di message digest NOME per le passphrase"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di cifratura NOME"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di message digest NOME"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritmo di compressione N"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina il campo keyid dei pacchetti cifrati"
 
-#: g10/g10.c:319
+#: g10/g10.c:320
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALORE|usa questi dati per una nota"
 
-#: g10/g10.c:322
+#: g10/g10.c:323
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:325
+#: g10/g10.c:326
 msgid ""
 "@\n"
 "Examples:\n"
@@ -666,15 +677,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/g10.c:431
+#: g10/g10.c:432
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: g10/g10.c:435
+#: g10/g10.c:436
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/g10.c:438
+#: g10/g10.c:439
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -684,7 +695,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/g10.c:445
+#: g10/g10.c:446
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -692,193 +703,193 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/g10.c:524
+#: g10/g10.c:525
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/g10.c:577
+#: g10/g10.c:578
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/g10.c:727
+#: g10/g10.c:728
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/g10.c:731
+#: g10/g10.c:732
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/g10.c:738
+#: g10/g10.c:739
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/g10.c:943
+#: g10/g10.c:944
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/g10.c:1014
+#: g10/g10.c:1015
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/g10.c:1018 g10/g10.c:1027
+#: g10/g10.c:1019 g10/g10.c:1028
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1021
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/g10.c:1023
+#: g10/g10.c:1024
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/g10.c:1043 g10/g10.c:1055
+#: g10/g10.c:1044 g10/g10.c:1056
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/g10.c:1049 g10/g10.c:1061
+#: g10/g10.c:1050 g10/g10.c:1062
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:1065
+#: g10/g10.c:1066
 msgid "the given policy URL is invalid\n"
 msgstr "L'URL della policy indicato non � valido\n"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1069
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "l'algoritmo di compressione deve essere tra %d e %d\n"
 
-#: g10/g10.c:1070
+#: g10/g10.c:1071
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/g10.c:1072
+#: g10/g10.c:1073
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/g10.c:1074
+#: g10/g10.c:1075
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth deve essere tra 1 e 255\n"
 
-#: g10/g10.c:1077
+#: g10/g10.c:1078
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: l'uso del modo S2K semplice (0) � fortemente scoraggiato\n"
 
-#: g10/g10.c:1081
+#: g10/g10.c:1082
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
 
-#: g10/g10.c:1166
+#: g10/g10.c:1167
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/g10.c:1172
+#: g10/g10.c:1173
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1180
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:1187
+#: g10/g10.c:1188
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/g10.c:1200
+#: g10/g10.c:1201
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/g10.c:1213
+#: g10/g10.c:1214
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:1227
+#: g10/g10.c:1228
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1245
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1261
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:1268
+#: g10/g10.c:1269
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/g10.c:1284
+#: g10/g10.c:1285
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key user-id"
 
-#: g10/g10.c:1287
+#: g10/g10.c:1288
 msgid "--delete-key user-id"
 msgstr "--delete-key user-id"
 
-#: g10/g10.c:1295
+#: g10/g10.c:1296
 #, fuzzy
 msgid "--delete-secret-and-public-key user-id"
 msgstr "--delete-secret-key user-id"
 
-#: g10/encode.c:268 g10/g10.c:1332 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1333 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/g10.c:1347
+#: g10/g10.c:1348
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/g10.c:1413
+#: g10/g10.c:1414
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1421
+#: g10/g10.c:1422
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1493
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/g10.c:1579
+#: g10/g10.c:1580
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/g10.c:1583
+#: g10/g10.c:1584
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1586 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1587 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/g10.c:1795
+#: g10/g10.c:1796
 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:1801
+#: g10/g10.c:1802
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -886,87 +897,87 @@ 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:1807
+#: g10/g10.c:1808
 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:1815
+#: g10/g10.c:1816
 msgid "a notation value must not use any control characters\n"
 msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 
-#: g10/armor.c:302
+#: g10/armor.c:304
 #, c-format
 msgid "armor: %s\n"
 msgstr "armatura: %s\n"
 
-#: g10/armor.c:331
+#: g10/armor.c:333
 msgid "invalid armor header: "
 msgstr "header dell'armatura non valido: "
 
-#: g10/armor.c:338
+#: g10/armor.c:340
 msgid "armor header: "
 msgstr "header dell'armatura: "
 
-#: g10/armor.c:349
+#: g10/armor.c:351
 msgid "invalid clearsig header\n"
 msgstr "header della firma in chiaro non valido\n"
 
-#: g10/armor.c:401
+#: g10/armor.c:403
 msgid "nested clear text signatures\n"
 msgstr "firme in chiaro annidate\n"
 
-#: g10/armor.c:525
+#: g10/armor.c:527
 msgid "invalid dash escaped line: "
 msgstr "riga protetta con il trattino non valida: "
 
-#: g10/armor.c:537
+#: g10/armor.c:539
 msgid "unexpected armor:"
 msgstr "armatura inaspettata:"
 
-#: g10/armor.c:663
+#: g10/armor.c:665
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Carattere radix64 non valido %02x saltato\n"
 
-#: g10/armor.c:706
+#: g10/armor.c:708
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematura (nessun CRC)\n"
 
-#: g10/armor.c:740
+#: g10/armor.c:742
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematura (nel CRC)\n"
 
-#: g10/armor.c:744
+#: g10/armor.c:746
 msgid "malformed CRC\n"
 msgstr "CRC malformato\n"
 
-#: g10/armor.c:748
+#: g10/armor.c:750
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "errore nel CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:765
+#: g10/armor.c:767
 msgid "premature eof (in Trailer)\n"
 msgstr "eof prematura (nella coda)\n"
 
-#: g10/armor.c:769
+#: g10/armor.c:771
 msgid "error in trailer line\n"
 msgstr "errore nella riga della coda\n"
 
-#: g10/armor.c:915
+#: g10/armor.c:917
 msgid "For info see http://www.gnupg.org"
 msgstr ""
 
-#: g10/armor.c:1043
+#: g10/armor.c:1045
 msgid "no valid OpenPGP data found.\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/armor.c:1048
+#: g10/armor.c:1050
 #, 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:1052
+#: g10/armor.c:1054
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -975,7 +986,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1189 g10/pkclist.c:53
+#: g10/keyedit.c:1190 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "       Impronta digitale:"
 
@@ -1204,17 +1215,17 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Non � sicuro che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: saltata: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:826 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: saltato: chiave pubblica gi� presente\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:853
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1222,42 +1233,42 @@ msgstr ""
 "Non hai specificato un user ID. (puoi usare \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:863
 msgid "Enter the user ID: "
 msgstr "Inserisci l'user ID: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:875
 msgid "No such user ID.\n"
 msgstr "User ID inesistente.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:880
 msgid "skipped: public key already set as default recipient\n"
 msgstr "saltato: chiave pubblica gi� impostata come destinatario predefinito\n"
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:903
 msgid "Public key is disabled.\n"
 msgstr "La chiave pubblica � disabilitata.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:910
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "saltato: chiave pubblica gi� impostata con --encrypt-to\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:941
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:974
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: errore nel controllare la chiave: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: saltato: chiave pubblica disabilitata\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1017
 msgid "no valid addressees\n"
 msgstr "nessun indirizzo valido\n"
 
@@ -1536,7 +1547,7 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:955
+#: g10/keyedit.c:469 g10/keygen.c:955
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "passphrase non ripetuta correttamente; riprova.\n"
 
@@ -1666,287 +1677,280 @@ msgstr "chiave %08lX: chiave non rfc2440 - saltata\n"
 msgid "key %08lX: not protected - skipped\n"
 msgstr "chiave %08lX: chiave non rfc2440 - saltata\n"
 
-#: g10/export.c:232
+#: g10/export.c:236
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENZIONE: non � stato esportato nulla\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:208
 msgid "too many entries in pk cache - disabled\n"
 msgstr "troppe voci nella pk cache - disabilitata\n"
 
-#: g10/getkey.c:350
+#: g10/getkey.c:443
 msgid "too many entries in unk cache - disabled\n"
 msgstr "troppe voci nella unk cache - disabilitata\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
-msgid "RSA key cannot be used in this version\n"
-msgstr "In questa versione non possono essere usate chiavi RSA\n"
-
-#: g10/getkey.c:1310 g10/getkey.c:1349
-msgid "No key for user ID\n"
-msgstr "Non ci sono chiavi per questo user ID\n"
-
-#: g10/getkey.c:1388 g10/getkey.c:1428
-msgid "No user ID for key\n"
-msgstr "Non ci sono user ID per questa chiave\n"
-
-#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
+#: g10/getkey.c:2143
 #, 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:2050
+#: g10/getkey.c:2185 g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
+
+#: g10/getkey.c:2473
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: utente non trovato\n"
 
-#: g10/import.c:182
+#: g10/import.c:184
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "salto un blocco di tipo %d\n"
 
-#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "Per ora sono state esaminate %lu chiavi\n"
 
-#: g10/import.c:194
+#: g10/import.c:196
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/import.c:204
+#: g10/import.c:206
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Numero totale esaminato: %lu\n"
 
-#: g10/import.c:206
+#: g10/import.c:208
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       nuove subchiavi: %lu\n"
 
-#: g10/import.c:209
+#: g10/import.c:211
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         senza user ID: %lu\n"
 
-#: g10/import.c:211
+#: g10/import.c:213
 #, c-format
 msgid "              imported: %lu"
 msgstr "             importate: %lu"
 
-#: g10/import.c:217
+#: g10/import.c:219
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "        non modificate: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:221
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         nuovi user ID: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:223
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nuove subchiavi: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:225
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "           nuove firme: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:227
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "nuove revoche di chiavi: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:229
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "  chiavi segrete lette: %lu\n"
 
-#: g10/import.c:229
+#: g10/import.c:231
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chiavi segrete importate: %lu\n"
 
-#: g10/import.c:231
+#: g10/import.c:233
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chiavi segrete non cambiate: %lu\n"
 
-#: g10/import.c:391 g10/import.c:600
+#: g10/import.c:408 g10/import.c:617
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "chiave %08lX: nessun user ID\n"
 
-#: g10/import.c:405
+#: g10/import.c:422
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "chiave %08lX: nessun user ID valido\n"
 
-#: g10/import.c:407
+#: g10/import.c:424
 msgid "this may be caused by a missing self-signature\n"
 msgstr "questo pu� essere causato da una autofirma mancante\n"
 
-#: g10/import.c:418 g10/import.c:667
+#: g10/import.c:435 g10/import.c:684
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 
-#: g10/import.c:423
+#: g10/import.c:440
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "chiave %08lX: chiave non rfc2440 - saltata\n"
 
-#: g10/import.c:431
+#: g10/import.c:448
 msgid "no default public keyring\n"
 msgstr "nessun portachiavi pubblico predefinito\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
+#: g10/import.c:452 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:615 g10/import.c:716
+#: 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:441 g10/import.c:499 g10/import.c:618 g10/import.c:719
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "chiave %08lX: chiave pubblica importata\n"
 
-#: g10/import.c:463
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
 
-#: g10/import.c:472 g10/import.c:675
+#: g10/import.c:489 g10/import.c:692
 #, 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:478 g10/import.c:681
+#: g10/import.c:495 g10/import.c:698
 #, 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:505
+#: g10/import.c:522
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "chiave %08lX: 1 nuovo user ID\n"
 
-#: g10/import.c:508
+#: g10/import.c:525
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "chiave %08lX: %d nuovi user ID\n"
 
-#: g10/import.c:511
+#: g10/import.c:528
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "chiave %08lX: una nuova firma\n"
 
-#: g10/import.c:514
+#: g10/import.c:531
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "chiave %08lX: %d nuove firme\n"
 
-#: g10/import.c:517
+#: g10/import.c:534
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "chiave %08lX: una nuova subchiave\n"
 
-#: g10/import.c:520
+#: g10/import.c:537
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "chiave %08lX: %d nuove subchiavi\n"
 
-#: g10/import.c:530
+#: g10/import.c:547
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "chiave %08lX: non cambiata\n"
 
-#: g10/import.c:593
+#: g10/import.c:610
 #, c-format
 msgid "secret key %08lX not imported (use %s to allow for it)\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:640
 #, 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:627
+#: g10/import.c:644
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chiave %08lX: gi� nel portachiavi segreto\n"
 
-#: g10/import.c:632
+#: g10/import.c:649
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
 
-#: g10/import.c:661
+#: g10/import.c:678
 #, 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:692
+#: g10/import.c:709
 #, 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:724
+#: g10/import.c:741
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "chiave %08lX: certificato di revoca importato\n"
 
-#: g10/import.c:766
+#: g10/import.c:783
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "chiave %08lX: nessun user ID per la firma\n"
 
-#: g10/import.c:773 g10/import.c:797
+#: g10/import.c:790 g10/import.c:814
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
 
-#: g10/import.c:774
+#: g10/import.c:791
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "chiave %08lX: autofirma non valida\n"
 
-#: g10/import.c:789
+#: g10/import.c:806
 #, 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:798
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chiave %08lX: legame con la subchiave non valido:\n"
 
-#: g10/import.c:825
+#: g10/import.c:842
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "chiave %08lX: accettato l'user ID non autofirmato '"
 
-#: g10/import.c:854
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chiave %08lX: saltato l'user ID '"
 
-#: g10/import.c:877
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chiave %08lX: saltata la subchiave\n"
@@ -1955,32 +1959,32 @@ 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:902
+#: g10/import.c:919
 #, 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:911
+#: g10/import.c:928
 #, 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:919
+#: g10/import.c:936
 #, 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:1019
+#: g10/import.c:1036
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
 
-#: g10/import.c:1071
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chiave %08lX: certificato di revoca aggiunto\n"
 
-#: g10/import.c:1185 g10/import.c:1238
+#: g10/import.c:1202 g10/import.c:1255
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "chiave %08lX: la nostra copia non ha autofirma\n"
@@ -1990,63 +1994,63 @@ msgstr "chiave %08lX: la nostra copia non ha autofirma\n"
 msgid "%s: user not found\n"
 msgstr "%s: utente non trovato\n"
 
-#: g10/keyedit.c:155
+#: g10/keyedit.c:156
 msgid "[revocation]"
 msgstr "[revoca]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:157
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:221
 msgid "1 bad signature\n"
 msgstr "una firma non corretta\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:223
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firme non corrette\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:225
 msgid "1 signature not checked due to a missing key\n"
 msgstr "una firma non controllata per mancanza della chiave\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d firme non controllate per mancanza delle chiavi\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 msgid "1 signature not checked due to an error\n"
 msgstr "una firma non controllata a causa di un errore\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:231
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firme non controllate a causa di errori\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:233
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Trovato un user ID senza autofirma valida\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:235
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Trovati %d user ID senza autofirme valide\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:317
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Gi� firmato dalla chiave %08lX\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:325
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Niente da firmare con la chiave %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2054,7 +2058,7 @@ msgstr ""
 "Sei davvero sicuro di volere firmare questa chiave\n"
 "con la tua chiave: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:343
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2062,34 +2066,34 @@ msgstr ""
 "La firma sar� segnata come non esportabile.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:348
 msgid "Really sign? "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
+#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:136
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:428
 msgid "This key is not protected.\n"
 msgstr "Questa chiave non � protetta.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:432
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "la chiave segreta non � disponibile"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:436
 msgid "Key is protected.\n"
 msgstr "La chiave � protetta.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossibile modificare questa chiave: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:461
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2097,7 +2101,7 @@ msgstr ""
 "Inserisci la nuova passphrase per questa chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:473
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2105,421 +2109,421 @@ msgstr ""
 "Non vuoi una passphrase - questa � probabilmente una *cattiva* idea!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:476
 msgid "Do you really want to do this? "
 msgstr "Vuoi veramente farlo?"
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:540
 msgid "moving a key signature to the correct place\n"
 msgstr "spostamento della firma di una chiave nel posto corretto\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
 msgid "quit this menu"
 msgstr "abbandona questo men�"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save and quit"
 msgstr "salva ed esci"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "show fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list key and user IDs"
 msgstr "elenca le chiavi e gli user ID"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "select user ID N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "select secondary key N"
 msgstr "scegli la chiave secondaria N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "list signatures"
 msgstr "elenca le firme"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign the key"
 msgstr "firma la chiave"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "sign the key locally"
 msgstr "firma la chiave localmente"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "add a user ID"
 msgstr "aggiungi un user ID"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "delete user ID"
 msgstr "cancella un user ID"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "add a secondary key"
 msgstr "aggiungi una chiave secondaria"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delete a secondary key"
 msgstr "cancella una chiave secondaria"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delsig"
 msgstr "delsign"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delete signatures"
 msgstr "cancella le firme"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "change the expire date"
 msgstr "cambia la data di scadenza"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle between secret and public key listing"
 msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "list preferences"
 msgstr "elenca le impostazioni"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
 msgid "change the passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
 msgid "change the ownertrust"
 msgstr "cambia il valore di fiducia"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
 msgid "revoke signatures"
 msgstr "revoca firme"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 msgid "revoke a secondary key"
 msgstr "revoca una chiave secondaria"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 msgid "disable a key"
 msgstr "disabilita una chiave"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
 msgid "enable"
 msgstr "abilita"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
 msgid "enable a key"
 msgstr "abilita una chiave"
 
-#: g10/delkey.c:110 g10/keyedit.c:631
+#: g10/delkey.c:110 g10/keyedit.c:632
 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:669
+#: g10/keyedit.c:670
 msgid "Secret key is available.\n"
 msgstr "� disponibile una chiave segreta.\n"
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:729
 msgid "Need the secret key to do this.\n"
 msgstr "Per fare questo serve la chiave segreta.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:733
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 msgid "Really sign all user IDs? "
 msgstr "Firmo davvero tutti gli user ID? "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:812 g10/keyedit.c:994
+#: g10/keyedit.c:813 g10/keyedit.c:995
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "aggiornamento del trustdb fallito: %s\n"
 
-#: g10/keyedit.c:823 g10/keyedit.c:844
+#: g10/keyedit.c:824 g10/keyedit.c:845
 msgid "You must select at least one user ID.\n"
 msgstr "Devi selezionare almeno un user ID.\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "You can't delete the last user ID!\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:829
 msgid "Really remove all selected user IDs? "
 msgstr "Tolgo davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:830
 msgid "Really remove this user ID? "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:866 g10/keyedit.c:888
 msgid "You must select at least one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:870
 msgid "Do you really want to delete the selected keys? "
 msgstr "Vuoi davvero cancellare le chiavi selezionate? "
 
-#: g10/keyedit.c:870
+#: g10/keyedit.c:871
 msgid "Do you really want to delete this key? "
 msgstr "Vuoi davvero cancellare questa chiave? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Vuoi davvero revocare le chiavi selezionate? "
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:893
 msgid "Do you really want to revoke this key? "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:959
 msgid "Save changes? "
 msgstr "Salvo i cambiamenti? "
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:962
 msgid "Quit without saving? "
 msgstr "Esco senza salvare? "
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:973
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:980
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:987
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1002
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
-#: g10/keyedit.c:1081 g10/keyedit.c:1107
+#: g10/keyedit.c:1082 g10/keyedit.c:1108
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1090
+#: g10/keyedit.c:1091
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1095
 msgid "This key has been disabled"
 msgstr "Questa chiave � stata disabilitata"
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1124
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "chiave %08lX: la subchiave � stata revocata!\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1127
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "nuove revoche di chiavi: %lu\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1129
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1371
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1375
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1381
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1396
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "Nothing deleted.\n"
 msgstr "Non � stato cancellato nulla.\n"
 
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1468
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1474
 msgid "Please select at most one secondary key.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1478
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1480
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1522
 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:1537
+#: g10/keyedit.c:1538
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1599
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:1644
+#: g10/keyedit.c:1645
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nessuna chiave secondaria con l'indice %d\n"
 
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:1743
 msgid "user ID: \""
 msgstr "user ID: \""
 
-#: g10/keyedit.c:1745
+#: g10/keyedit.c:1746
 #, c-format
 msgid ""
 "\"\n"
@@ -2529,34 +2533,34 @@ msgstr ""
 "firmata con la tua chiave %08lX a %s\n"
 "\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1750
 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:1773
+#: g10/keyedit.c:1774
 msgid "You have signed these user IDs:\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:1787 g10/keyedit.c:1822
+#: g10/keyedit.c:1788 g10/keyedit.c:1823
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   firmata da %08lX il %s\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1793
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1813
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:1830
+#: g10/keyedit.c:1831
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Creare davvero i certificati di revoca? (s/N)"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1860
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
@@ -2571,128 +2575,128 @@ msgid "revoked"
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:404 g10/mainproc.c:836
+#: g10/keylist.c:402 g10/mainproc.c:837
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "La chiave scadr� il %s\n"
 
-#: g10/mainproc.c:270
+#: g10/mainproc.c:271
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la chiave pubblica � %08lX\n"
 
-#: g10/mainproc.c:315
+#: g10/mainproc.c:316
 msgid "public key encrypted data: good DEK\n"
 msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
 
-#: g10/mainproc.c:367
+#: g10/mainproc.c:368
 #, 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:377
+#: g10/mainproc.c:378
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "Cifrato con la chiave %s con ID %08lX\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:392
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:431
+#: g10/mainproc.c:432
 msgid "decryption okay\n"
 msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:437
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato � stato manipolato!\n"
 
-#: g10/mainproc.c:441
+#: g10/mainproc.c:442
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:461
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
 
-#: g10/mainproc.c:462
+#: g10/mainproc.c:463
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:617
+#: g10/mainproc.c:618
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
 
-#: g10/mainproc.c:704 g10/mainproc.c:713
+#: g10/mainproc.c:705 g10/mainproc.c:714
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
 
-#: g10/mainproc.c:716
+#: g10/mainproc.c:717
 msgid "Notation: "
 msgstr "Nota: "
 
-#: g10/mainproc.c:725
+#: g10/mainproc.c:726
 msgid "Policy: "
 msgstr "Policy: "
 
-#: g10/mainproc.c:1235
+#: g10/mainproc.c:1177
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
-#: g10/mainproc.c:1272
+#: g10/mainproc.c:1214
 #, 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:1307 g10/mainproc.c:1318
+#: g10/mainproc.c:1242 g10/mainproc.c:1250
 msgid "BAD signature from \""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:1308 g10/mainproc.c:1319
+#: g10/mainproc.c:1243 g10/mainproc.c:1251
 msgid "Good signature from \""
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1310
+#: g10/mainproc.c:1266
 msgid "                aka \""
 msgstr "    anche noto come \""
 
-#: g10/mainproc.c:1366
+#: g10/mainproc.c:1316
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:1423 g10/mainproc.c:1438 g10/mainproc.c:1500
+#: g10/mainproc.c:1373 g10/mainproc.c:1388 g10/mainproc.c:1450
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "fai una firma separata"
 
-#: g10/mainproc.c:1449
+#: g10/mainproc.c:1399
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1454
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/mainproc.c:1509
+#: g10/mainproc.c:1459
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:98
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossibile disabilitare i core dump: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:208
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Gli algoritmi sperimentali non dovrebbero essere usati!\n"
 
-#: g10/misc.c:237
+#: g10/misc.c:238
 #, fuzzy
 msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
 msgstr "questo algoritmo di cifratura � deprecato; usane uno pi� standard!\n"
@@ -2702,7 +2706,7 @@ msgstr "questo algoritmo di cifratura � deprecato; usane uno pi� standard!\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
 
-#: g10/parse-packet.c:990
+#: g10/parse-packet.c:1010
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
@@ -2715,7 +2719,7 @@ msgstr ""
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:170 g10/passphrase.c:248
+#: g10/hkp.c:147 g10/passphrase.c:248
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
@@ -2846,36 +2850,36 @@ msgstr ""
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: chiave per firmare scaduta il %s\n"
 
-#: g10/hkp.c:72
+#: g10/hkp.c:59
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr ""
 
-#: g10/hkp.c:85
+#: g10/hkp.c:72
 #, fuzzy, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "importa le chiavi da un key server"
 
-#: g10/hkp.c:109 g10/hkp.c:148
+#: g10/hkp.c:91 g10/hkp.c:125
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/hkp.c:117
+#: g10/hkp.c:99
 #, fuzzy, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/hkp.c:194
+#: g10/hkp.c:171
 #, fuzzy, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:183
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:209
+#: g10/hkp.c:186
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
@@ -2890,11 +2894,11 @@ msgstr "la chiave segreta non � disponibile"
 msgid "protection algorithm %d is not supported\n"
 msgstr "l'algoritmo di protezione %d non � gestito\n"
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:184
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Passphrase non valida; riprova...\n"
 
-#: g10/seckey-cert.c:242
+#: g10/seckey-cert.c:240
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "ATTENZIONE: Individuata una chiave debole - per favore cambia ancora la\n"
@@ -3165,11 +3169,6 @@ msgstr "chiave %08lX: chiave non rfc2440 - saltata\n"
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "NOTA: la chiave segreta %08lX NON � protetta.\n"
 
-#: g10/trustdb.c:577
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
-
 #: g10/trustdb.c:584
 #, c-format
 msgid "key %08lX: secret and public key don't match\n"
@@ -3405,36 +3404,46 @@ msgstr "%s: impossibile creare il portachiavi: %s\n"
 msgid "%s: keyring created\n"
 msgstr "%s: portachiavi creato\n"
 
-#: g10/ringedit.c:1551
+#: g10/ringedit.c:1555
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATTENZIONE: esistono due file con informazioni confidenziali.\n"
 
-#: g10/ringedit.c:1552
+#: g10/ringedit.c:1556
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � quello non modificato\n"
 
-#: g10/ringedit.c:1553
+#: g10/ringedit.c:1557
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � quello nuovo\n"
 
-#: g10/ringedit.c:1554
+#: g10/ringedit.c:1558
 msgid "Please fix this possible security flaw\n"
 msgstr "Per favore risolvete questo possibile problema di sicurezza\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
+#: 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 ""
 "la chiave non � indicata come insicura - impossibile usarla con il RNG "
 "finto!\n"
 
-#: g10/skclist.c:113
+#: g10/skclist.c:138
+#, fuzzy, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "saltata `%s': %s\n"
+
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "saltata `%s': %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:149
+#, fuzzy
+msgid "skipped: secret key already present\n"
+msgstr "%s: saltato: chiave pubblica gi� presente\n"
+
+#: g10/skclist.c:160
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3537,11 +3546,11 @@ msgstr "Vuoi cancellare questa chiave dal portachiavi? "
 msgid "This is a secret key! - really delete? "
 msgstr "� una chaive segreta! - Vuoi cancellarla davvero? "
 
-#: g10/delkey.c:182
+#: g10/delkey.c:181
 msgid "there is a secret key for this public key!\n"
 msgstr "c'� una chiave segreta per questa chiave pubblica!\n"
 
-#: g10/delkey.c:184
+#: g10/delkey.c:183
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr "prima usa l'opzione \"--delete-secret-key\" per cancellarla.\n"
 
@@ -3792,6 +3801,15 @@ msgstr "Non � disponibile un aiuto"
 msgid "No help available for `%s'"
 msgstr "Non � disponibile un aiuto per `%s'"
 
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "In questa versione non possono essere usate chiavi RSA\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Non ci sono chiavi per questo user ID\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Non ci sono user ID per questa chiave\n"
+
 #~ msgid "no secret key for decryption available\n"
 #~ msgstr "nessuna chiave disponibile per decifrare\n"
 
diff --git a/po/ja.po b/po/ja.po
index 5c146c827..e98a4cb9b 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-02-07 16:46+0100\n"
+"POT-Creation-Date: 2001-03-13 13:40+0100\n"
 "PO-Revision-Date: 2000-10-19 23:08+09:00\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -43,7 +43,7 @@ msgstr "no"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:308
 msgid "quit"
 msgstr "quit"
 
@@ -247,6 +247,17 @@ msgstr "�Ź沽����Ƥ��ޤ���"
 msgid "not processed"
 msgstr "̤����"
 
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+#, fuzzy
+msgid "unusable public key"
+msgstr "�������������Ǥ�"
+
+#: util/errors.c:106
+#, fuzzy
+msgid "unusable secret key"
+msgstr "��̩���������Ǥ�"
+
 #: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -257,63 +268,63 @@ msgstr "... �Х��Ǥ� (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "�Х��򸫤Ĥ����褦�Ǥ� ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
+#: cipher/random.c:309 g10/import.c:129 g10/keygen.c:1256
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s'�������ޤ���: %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:313
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "`%s'��Ĵ�٤뤳�Ȥ��Ǥ��ޤ���: %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:318
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' �����̤Υե�����ǤϤ���ޤ��� - ̵��\n"
 
-#: cipher/random.c:325
+#: cipher/random.c:323
 msgid "note: random_seed file is empty\n"
 msgstr "����: random_seed �ե�����϶��Ǥ�\n"
 
-#: cipher/random.c:331
+#: cipher/random.c:329
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr "�ٹ�: ̵���ʥ������� random_seed �ե����� - �Ȥ��ޤ���\n"
 
-#: cipher/random.c:339
+#: cipher/random.c:337
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "`%s'���ɤ�ޤ���: %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:375
 msgid "note: random_seed file not updated\n"
 msgstr "����: random_seed �ե�����ι����򤷤ޤ���\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:395
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "`%s'���Ǥ��ޤ���: %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:402
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "`%s'�˽񤱤ޤ���: %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:405
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "`%s'���Ĥ����ޤ���: %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:416
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr "�����ࡦ�ӥåȤ򤿤������׵ᤷ�᤮�Ǥ����³��� %d\n"
 
-#: cipher/random.c:650
+#: cipher/random.c:648
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "�ٹ�: ��Ф���������Ҥ��Ȥ��Ƥ��ޤ�!!\n"
 
-#: cipher/random.c:651
+#: cipher/random.c:649
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -338,7 +349,7 @@ msgstr ""
 "��ʬ��Ĺ��������������ޤ���OS����ä��𻨤������\n"
 "�Ǥ���褦���������Ƥ�������! (����%d�Х��Ȥ���ޤ�)\n"
 
-#: g10/g10.c:212
+#: g10/g10.c:213
 msgid ""
 "@Commands:\n"
 " "
@@ -346,141 +357,141 @@ msgstr ""
 "@���ޥ��:\n"
 " "
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "|[file]|make a signature"
 msgstr "|[�ե�����]|��̾�����"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "|[file]|make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "make a detached signature"
 msgstr "ʬΥ��̾�����"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "encrypt data"
 msgstr "�ǡ�����Ź沽"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "encryption only with symmetric cipher"
 msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "store only"
 msgstr "��¸�Τ�"
 
-#: g10/g10.c:220
+#: g10/g10.c:221
 msgid "decrypt data (default)"
 msgstr "�ǡ��������� (����)"
 
-#: g10/g10.c:221
+#: g10/g10.c:222
 msgid "verify a signature"
 msgstr "��̾�򸡾�"
 
-#: g10/g10.c:223
+#: g10/g10.c:224
 msgid "list keys"
 msgstr "�����"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "list keys and signatures"
 msgstr "���Ƚ�̾�ΰ���"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "check key signatures"
 msgstr "���ν�̾�򸡾�"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "list keys and fingerprints"
 msgstr "���Ȼ���ΰ���"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "list secret keys"
 msgstr "��̩���ΰ���"
 
-#: g10/g10.c:229
+#: g10/g10.c:230
 msgid "generate a new key pair"
 msgstr "��������������"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
 msgid "remove key from the public keyring"
 msgstr "�������ؤ��鸰����"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "remove key from the secret keyring"
 msgstr "��̩���ؤ��鸰����"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign a key"
 msgstr "���˽�̾"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "sign a key locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "sign or edit a key"
 msgstr "���ؤν�̾���Խ�"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "generate a revocation certificate"
 msgstr "�˴������������"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "export keys"
 msgstr "����񤭽Ф�"
 
-#: g10/g10.c:238
+#: g10/g10.c:239
 msgid "export keys to a key server"
 msgstr "�������С��˸���񤭽Ф�"
 
-#: g10/g10.c:239
+#: g10/g10.c:240
 msgid "import keys from a key server"
 msgstr "�������С����鸰���ɤ߹���"
 
-#: g10/g10.c:243
+#: g10/g10.c:244
 msgid "import/merge keys"
 msgstr "�����ɹ���/ʻ��"
 
-#: g10/g10.c:245
+#: g10/g10.c:246
 msgid "list only the sequence of packets"
 msgstr "�ѥ��å���Τߤΰ���"
 
-#: g10/g10.c:247
+#: g10/g10.c:248
 msgid "export the ownertrust values"
 msgstr "��ͭ�Ԥ��Ѥ����ͤ�񤭽Ф�"
 
-#: g10/g10.c:249
+#: g10/g10.c:250
 msgid "import ownertrust values"
 msgstr "��ͭ�Ԥ��Ѥ����ͤ��ɤ߹���"
 
-#: g10/g10.c:251
+#: g10/g10.c:252
 msgid "update the trust database"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "|[NAMES]|check the trust database"
 msgstr "|[̾��]|���ѥǡ����١���������å�"
 
-#: g10/g10.c:254
+#: g10/g10.c:255
 msgid "fix a corrupted trust database"
 msgstr "���줿���ѥǡ����١�������"
 
-#: g10/g10.c:255
+#: g10/g10.c:256
 msgid "De-Armor a file or stdin"
 msgstr ""
 "�ե�����ޤ���ɸ�����Ϥ�\n"
 "��������"
 
-#: g10/g10.c:257
+#: g10/g10.c:258
 msgid "En-Armor a file or stdin"
 msgstr "�ե�����ޤ���ɸ�����Ϥ�������"
 
-#: g10/g10.c:259
+#: g10/g10.c:260
 msgid "|algo [files]|print message digests"
 msgstr "|���르�ꥺ�� [�ե�����]|��å�������������"
 
-#: g10/g10.c:263
+#: g10/g10.c:264
 msgid ""
 "@\n"
 "Options:\n"
@@ -490,192 +501,192 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/g10.c:265
+#: g10/g10.c:266
 msgid "create ascii armored output"
 msgstr "ASCII���������������"
 
-#: g10/g10.c:267
+#: g10/g10.c:268
 msgid "|NAME|encrypt for NAME"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: g10/g10.c:270
+#: g10/g10.c:271
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 "|̾��|����μ����ԤȤ���\n"
 "��̾���פ����"
 
-#: g10/g10.c:272
+#: g10/g10.c:273
 msgid "use the default key as default recipient"
 msgstr "����μ����Ԥ˴���θ������"
 
-#: g10/g10.c:276
+#: g10/g10.c:277
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "��̾������ˤ��Υ桼����id\n"
 "�����"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|���̥�٥��N������\n"
 "(0���󰵽�)"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "use canonical text mode"
 msgstr "����ƥ����ȡ��⡼�ɤ����"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "use as output file"
 msgstr "���ϥե�����Ȥ��ƻ���"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "verbose"
 msgstr "��Ĺ"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "be somewhat more quiet"
 msgstr "����Ť�"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "don't use the terminal at all"
 msgstr "ü�����Ի���"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "force v3 signatures"
 msgstr "����Ū��v3��̾"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "always use a MDC for encryption"
 msgstr "�Ź沽�ˤϾ��MDC�����"
 
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "do not make any changes"
 msgstr "̵�ѹ�"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "batch mode: never ask"
 msgstr "�Хå����⡼��: ��ǧ��ά"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "assume yes on most questions"
 msgstr ""
 "�����Ƥ��μ����������yes\n"
 "�Ȥߤʤ�"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "assume no on most questions"
 msgstr ""
 "�����Ƥ��μ����������no\n"
 "�Ȥߤʤ�"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "add this keyring to the list of keyrings"
 msgstr "���ؤΰ����ˤ��θ��ؤ��ɲ�"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "add this secret keyring to the list"
 msgstr "�����ˤ�����̩���ؤ��ɲ�"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 "|̾��|�������̩���Ȥ���\n"
 "��̾���פ����"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|�ۥ���|���θ����ˤ��θ������С������"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|CHARSET̾|ü����charset���CHARSET̾��\n"
 "������"
 
-#: g10/g10.c:297
+#: g10/g10.c:298
 msgid "read options from file"
 msgstr ""
 "�ե����뤫�饪�ץ�����\n"
 "�ɤ߹���"
 
-#: g10/g10.c:301
+#: g10/g10.c:302
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
 "�񤭽Ф�"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "|KEYID|ulimately trust this key"
 msgstr "|��ID|���Ρָ��פ���Ū�˿��Ѥ���"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "|FILE|load extension module FILE"
 msgstr ""
 "|�ե�����|��ĥ�⥸�塼��Υե������\n"
 "�ɤ߹���"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "emulate the mode described in RFC1991"
 msgstr ""
 "RFC1991�˵��Ҥ��줿�⡼�ɤ�\n"
 "����"
 
-#: g10/g10.c:309
+#: g10/g10.c:310
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "�ѥ��åȤȰŹ�Ƚ�̾�Υ��ץ���\n"
 "�������OpenPGP��������"
 
-#: g10/g10.c:310
+#: g10/g10.c:311
 msgid "|N|use passphrase mode N"
 msgstr "|N|�ѥ��ե졼�����⡼��N�����"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|̾��|�ѥ��ե졼���ˡ�̾���פΥ��\n"
 "���������󥢥르�ꥺ������"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|̾��|�ѥ��ե졼���ˡ�̾���פΰŹ�\n"
 "���르�ꥺ������"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|NAME|use cipher algorithm NAME"
 msgstr ""
 "|̾��|��̾���פΰŹ楢�르�ꥺ���\n"
 "����"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "|NAME|use message digest algorithm NAME"
 msgstr ""
 "|̾��|��̾���פΥ�å���������\n"
 "���르�ꥺ������"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "|N|use compress algorithm N"
 msgstr ""
 "|̾��|��̾���פΰ��̥��르�ꥺ���\n"
 "����"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "�Ź�ѥ��åȤθ�ID�ե������\n"
 "������"
 
-#: g10/g10.c:319
+#: g10/g10.c:320
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|̾��=��|��������ǡ��������"
 
-#: g10/g10.c:322
+#: g10/g10.c:323
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -684,7 +695,7 @@ msgstr ""
 "(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
 "�ޥ˥奢�롦�ڡ���������������)\n"
 
-#: g10/g10.c:325
+#: g10/g10.c:326
 msgid ""
 "@\n"
 "Examples:\n"
@@ -704,15 +715,15 @@ msgstr ""
 " --list-keys [̾��]         ����ɽ��\n"
 " --fingerprint [̾��]       �����ɽ��\n"
 
-#: g10/g10.c:431
+#: g10/g10.c:432
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
 
-#: g10/g10.c:435
+#: g10/g10.c:436
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/g10.c:438
+#: g10/g10.c:439
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -722,7 +733,7 @@ msgstr ""
 "��̾�����ڡ��Ź沽������\n"
 "�����ư��ϡ����ϥǡ����˰�¸\n"
 
-#: g10/g10.c:445
+#: g10/g10.c:446
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -730,191 +741,191 @@ msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: g10/g10.c:524
+#: g10/g10.c:525
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/g10.c:577
+#: g10/g10.c:578
 msgid "conflicting commands\n"
 msgstr "���ޥ�ɤξ���\n"
 
-#: g10/g10.c:727
+#: g10/g10.c:728
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե�����`%s'������ޤ���\n"
 
-#: g10/g10.c:731
+#: g10/g10.c:732
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե�����`%s': %s\n"
 
-#: g10/g10.c:738
+#: g10/g10.c:739
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "`%s'���饪�ץ������ɤ߹��ߤޤ�\n"
 
-#: g10/g10.c:943
+#: g10/g10.c:944
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s��������ʸ������ǤϤ���ޤ���\n"
 
-#: g10/g10.c:1014
+#: g10/g10.c:1015
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/g10.c:1018 g10/g10.c:1027
+#: g10/g10.c:1019 g10/g10.c:1028
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s���Ѥ��ޤ���!\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1021
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ���Ѥ��뤳�ȤϤǤ��ޤ���!\n"
 
-#: g10/g10.c:1023
+#: g10/g10.c:1024
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ���Ѥ��Ƥ�̵��̣�Ǥ�!\n"
 
-#: g10/g10.c:1043 g10/g10.c:1055
+#: g10/g10.c:1044 g10/g10.c:1056
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ���̵���Ǥ�\n"
 
-#: g10/g10.c:1049 g10/g10.c:1061
+#: g10/g10.c:1050 g10/g10.c:1062
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ���̵���Ǥ�\n"
 
-#: g10/g10.c:1065
+#: g10/g10.c:1066
 msgid "the given policy URL is invalid\n"
 msgstr "��������줿�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1069
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "���̥��르�ꥺ���%d..%d���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1070
+#: g10/g10.c:1071
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:1072
+#: g10/g10.c:1073
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:1074
+#: g10/g10.c:1075
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1077
+#: g10/g10.c:1078
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/g10.c:1081
+#: g10/g10.c:1082
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1166
+#: g10/g10.c:1167
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:1172
+#: g10/g10.c:1173
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1180
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/g10.c:1187
+#: g10/g10.c:1188
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/g10.c:1200
+#: g10/g10.c:1201
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/g10.c:1213
+#: g10/g10.c:1214
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/g10.c:1227
+#: g10/g10.c:1228
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1245
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1261
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/g10.c:1268
+#: g10/g10.c:1269
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/g10.c:1284
+#: g10/g10.c:1285
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key �桼����id"
 
-#: g10/g10.c:1287
+#: g10/g10.c:1288
 msgid "--delete-key user-id"
 msgstr "--delete-key �桼����id"
 
-#: g10/g10.c:1295
+#: g10/g10.c:1296
 #, fuzzy
 msgid "--delete-secret-and-public-key user-id"
 msgstr "--delete-secret-key �桼����id"
 
-#: g10/encode.c:268 g10/g10.c:1332 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1333 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s�������ޤ���: %s\n"
 
-#: g10/g10.c:1347
+#: g10/g10.c:1348
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [�桼����id] [����]"
 
-#: g10/g10.c:1413
+#: g10/g10.c:1414
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:1421
+#: g10/g10.c:1422
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1493
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ��`%s'�Ǥ�\n"
 
-#: g10/g10.c:1579
+#: g10/g10.c:1580
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/g10.c:1583
+#: g10/g10.c:1584
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å������򥿥��פ��Ƥ������� ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1586 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1587 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s'�������ޤ���\n"
 
-#: g10/g10.c:1795
+#: g10/g10.c:1796
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "����̾����Ƭ��ʸ�����������������(_)�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1801
+#: g10/g10.c:1802
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -922,87 +933,87 @@ msgstr ""
 "����̾�ˤ�ʸ�����������ɥåȡ���������������Τߤ��Ѥ���\n"
 "'='�ǽ����ʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1807
+#: g10/g10.c:1808
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "����̾�ΥɥåȤ�¾��ʸ���ǰϤޤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1815
+#: g10/g10.c:1816
 msgid "a notation value must not use any control characters\n"
 msgstr "����̾���ͤ�����ʸ�����Ѥ��ƤϤ����ޤ���\n"
 
-#: g10/armor.c:302
+#: g10/armor.c:304
 #, c-format
 msgid "armor: %s\n"
 msgstr "����: %s\n"
 
-#: g10/armor.c:331
+#: g10/armor.c:333
 msgid "invalid armor header: "
 msgstr "̵���������إå���: "
 
-#: g10/armor.c:338
+#: g10/armor.c:340
 msgid "armor header: "
 msgstr "�����إå���: "
 
-#: g10/armor.c:349
+#: g10/armor.c:351
 msgid "invalid clearsig header\n"
 msgstr "̵���ʥ��ꥢ��̾�إå���\n"
 
-#: g10/armor.c:401
+#: g10/armor.c:403
 msgid "nested clear text signatures\n"
 msgstr "����ҤΥ��ꥢ��̾\n"
 
-#: g10/armor.c:525
+#: g10/armor.c:527
 msgid "invalid dash escaped line: "
 msgstr "̵���ʥ��å���ǥ��������פ��줿��: "
 
-#: g10/armor.c:537
+#: g10/armor.c:539
 msgid "unexpected armor:"
 msgstr "ͽ����������:"
 
-#: g10/armor.c:663
+#: g10/armor.c:665
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "̵����64��ʸ��%02x��ȤФ��ޤ�\n"
 
-#: g10/armor.c:706
+#: g10/armor.c:708
 msgid "premature eof (no CRC)\n"
 msgstr "�ե������������᤹���ޤ� (CRC������ޤ���)\n"
 
-#: g10/armor.c:740
+#: g10/armor.c:742
 msgid "premature eof (in CRC)\n"
 msgstr "�ե������������᤹���ޤ� (CRC����ˤ���ޤ�)\n"
 
-#: g10/armor.c:744
+#: g10/armor.c:746
 msgid "malformed CRC\n"
 msgstr "CRC�ν񼰤�����������ޤ���\n"
 
-#: g10/armor.c:748
+#: g10/armor.c:750
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "CRC���顼��%06lx - %06lx\n"
 
-#: g10/armor.c:765
+#: g10/armor.c:767
 msgid "premature eof (in Trailer)\n"
 msgstr "�ե������������᤹���ޤ� (����������ˤ���ޤ�)\n"
 
-#: g10/armor.c:769
+#: g10/armor.c:771
 msgid "error in trailer line\n"
 msgstr "�����ιԤ˥��顼������ޤ�\n"
 
-#: g10/armor.c:915
+#: g10/armor.c:917
 msgid "For info see http://www.gnupg.org"
 msgstr "KUHASIKU WA http://www.gnupg.org/ WO GORANKUDASAI"
 
-#: g10/armor.c:1043
+#: g10/armor.c:1045
 msgid "no valid OpenPGP data found.\n"
 msgstr "ͭ����OpenPGP�ǡ��������Ĥ���ޤ���\n"
 
-#: g10/armor.c:1048
+#: g10/armor.c:1050
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "̵��������: �Ԥ�Ĺ����%dʸ����Ķ���Ƥ��ޤ�\n"
 
-#: g10/armor.c:1052
+#: g10/armor.c:1054
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1011,7 +1022,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1189 g10/pkclist.c:53
+#: g10/keyedit.c:1190 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "                    ����:"
 
@@ -1236,17 +1247,17 @@ msgstr "�ٹ�: ���θ��Ͻ�ʬ�˿��ѤǤ����̾�Ǿ�������Ƥ��ޤ���!\n"
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "      ���ν�̾���ܿͤΤ�Τ��ɤ����ο��Ǥ��ޤ���\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: �����å�: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:826 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: �����å�: �������ϴ��ˤ���ޤ�\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:853
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1254,42 +1265,42 @@ msgstr ""
 "�桼����ID�����ꤵ��Ƥ��ޤ��� (��-r�פ��Ѥ��ޤ��礦) ��\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:863
 msgid "Enter the user ID: "
 msgstr "�桼����ID������: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:875
 msgid "No such user ID.\n"
 msgstr "���Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:880
 msgid "skipped: public key already set as default recipient\n"
 msgstr "�����å�: �������ϴ���μ����ԤȤ�������ѤߤǤ�\n"
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:903
 msgid "Public key is disabled.\n"
 msgstr "�������ϻ��ѶػߤǤ���\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:910
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "�����å�: �������ϴ��� --encrypt-to ������ѤߤǤ�\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:941
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "����μ�����`%s'�����Ĥ���ޤ���\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:974
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: ���θ��ڥ��顼: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: �����å�: �������ϻ��Ѷػ�\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1017
 msgid "no valid addressees\n"
 msgstr "ͭ���ʥ��ɥ쥹������ޤ���\n"
 
@@ -1566,7 +1577,7 @@ msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:955
+#: g10/keyedit.c:469 g10/keygen.c:955
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "�ѥ��ե졼�����ۤʤ�ޤ����⤦�������ꤷ�Ƥ���������\n"
 
@@ -1690,284 +1701,277 @@ msgstr "�� %08lX: rfc2440�θ��ǤϤ���ޤ��� - �����å�\n"
 msgid "key %08lX: not protected - skipped\n"
 msgstr "�� %08lX: �ݸ��Ƥ��ޤ��� - �����å�\n"
 
-#: g10/export.c:232
+#: g10/export.c:236
 msgid "WARNING: nothing exported\n"
 msgstr "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:208
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk����å���Υ���ȥ꡼��¿�����ޤ� - ���Ѷػ�\n"
 
-#: g10/getkey.c:350
+#: g10/getkey.c:443
 msgid "too many entries in unk cache - disabled\n"
 msgstr "unk����å���Υ���ȥ꡼��¿�����ޤ� - ���Ѷػ�\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
-msgid "RSA key cannot be used in this version\n"
-msgstr "���ΥС������Ǥ�RSA���ϻȤ��ޤ���\n"
-
-#: g10/getkey.c:1310 g10/getkey.c:1349
-msgid "No key for user ID\n"
-msgstr "�桼����ID�θ�������ޤ���\n"
-
-#: g10/getkey.c:1388 g10/getkey.c:1428
-msgid "No user ID for key\n"
-msgstr "���Υ桼����ID������ޤ���\n"
-
-#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
+#: g10/getkey.c:2143
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "����%08lX��縰%08lX�����Ѥ��ޤ�\n"
 
-#: g10/getkey.c:2050
+#: g10/getkey.c:2185 g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "��%08lX: �������Τʤ���̩���Ǥ��������å�\n"
+
+#: g10/getkey.c:2473
 msgid "[User id not found]"
 msgstr "[�桼����id�����Ĥ���ޤ���]"
 
-#: g10/import.c:182
+#: g10/import.c:184
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "������%d�Υ֥��å��򥹥��åפ��ޤ�\n"
 
-#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu���ޤǽ���\n"
 
-#: g10/import.c:194
+#: g10/import.c:196
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "`%s'���ɹ��ߥ��顼: %s\n"
 
-#: g10/import.c:204
+#: g10/import.c:206
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "         ��������: %lu\n"
 
-#: g10/import.c:206
+#: g10/import.c:208
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr " �����åפ�����������: %lu\n"
 
-#: g10/import.c:209
+#: g10/import.c:211
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "       �桼����ID�ʤ�: %lu\n"
 
-#: g10/import.c:211
+#: g10/import.c:213
 #, c-format
 msgid "              imported: %lu"
 msgstr "               �ɹ���: %lu"
 
-#: g10/import.c:217
+#: g10/import.c:219
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             �ѹ��ʤ�: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:221
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "     �������桼����ID: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:223
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           ����������: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:225
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "           ��������̾: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:227
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "       �����������˴�: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:229
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "       ��̩�����ɽФ�: %lu\n"
 
-#: g10/import.c:229
+#: g10/import.c:231
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "       ��̩�����ɹ���: %lu\n"
 
-#: g10/import.c:231
+#: g10/import.c:233
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "       ̵�ѹ�����̩��: %lu\n"
 
-#: g10/import.c:391 g10/import.c:600
+#: g10/import.c:408 g10/import.c:617
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "��%08lX: �桼����ID������ޤ���\n"
 
-#: g10/import.c:405
+#: g10/import.c:422
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "��%08lX: ���ѤǤ���桼����ID������ޤ���\n"
 
-#: g10/import.c:407
+#: g10/import.c:424
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���ʽ�̾�Τʤ������Ǥ��礦\n"
 
-#: g10/import.c:418 g10/import.c:667
+#: g10/import.c:435 g10/import.c:684
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "��%08lX: �����������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:423
+#: g10/import.c:440
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "�� %08lX: ���������Ǥ� - �����å�\n"
 
-#: g10/import.c:431
+#: g10/import.c:448
 msgid "no default public keyring\n"
 msgstr "����θ������ؤ�����ޤ���\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
+#: g10/import.c:452 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "`%s'�ؤν�Ф�\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:615 g10/import.c:716
+#: 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:441 g10/import.c:499 g10/import.c:618 g10/import.c:719
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "����`%s'�ν���ߥ��顼: %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "��%08lX: ���������ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:463
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "��%08lX: �������ʣ���ȹ礤�ޤ���\n"
 
-#: g10/import.c:472 g10/import.c:675
+#: g10/import.c:489 g10/import.c:692
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "��%08lX: ���θ��֥��å��˰��֤Ť��Ǥ��ޤ���: %s\n"
 
-#: g10/import.c:478 g10/import.c:681
+#: g10/import.c:495 g10/import.c:698
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "��%08lX: ���θ��֥��å����ɤ߹���ޤ���: %s\n"
 
-#: g10/import.c:505
+#: g10/import.c:522
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "��%08lX: �������桼����ID��1��\n"
 
-#: g10/import.c:508
+#: g10/import.c:525
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "��%08lX: �������桼����ID��%d��\n"
 
-#: g10/import.c:511
+#: g10/import.c:528
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "��%08lX: ��������̾��1��\n"
 
-#: g10/import.c:514
+#: g10/import.c:531
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "��%08lX: ��������̾��%d��\n"
 
-#: g10/import.c:517
+#: g10/import.c:534
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "��%08lX: ������������1��\n"
 
-#: g10/import.c:520
+#: g10/import.c:537
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "��%08lX: ������������%d��\n"
 
-#: g10/import.c:530
+#: g10/import.c:547
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "��%08lX: �ѹ��ʤ�\n"
 
-#: g10/import.c:593
+#: g10/import.c:610
 #, c-format
 msgid "secret key %08lX not imported (use %s to allow for it)\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:640
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "��%08lX: ��̩�����ɤ߹��ߤޤ���\n"
 
 #. we can't merge secret keys
-#: g10/import.c:627
+#: g10/import.c:644
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "��%08lX: ������̩���ؤˤ���ޤ�\n"
 
-#: g10/import.c:632
+#: g10/import.c:649
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "��%08lX: ��̩�������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:661
+#: g10/import.c:678
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr "��%08lX: ������������ޤ��� - �˴��������Ŭ�ѤǤ��ޤ���\n"
 
-#: g10/import.c:692
+#: g10/import.c:709
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "��%08lX: ̵�����˴�������: %s - ����\n"
 
-#: g10/import.c:724
+#: g10/import.c:741
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "��%08lX: �˴���������ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:766
+#: g10/import.c:783
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "��%08lX: ��̾���б�����桼����ID������ޤ���\n"
 
-#: g10/import.c:773 g10/import.c:797
+#: g10/import.c:790 g10/import.c:814
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "��%08lX: ���ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:774
+#: g10/import.c:791
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "��%08lX: ̵���ʼ��ʽ�̾�Ǥ�\n"
 
-#: g10/import.c:789
+#: g10/import.c:806
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "��%08lX: �����б���������������ޤ���\n"
 
-#: g10/import.c:798
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "��%08lX: ̵�����������б��Ǥ�\n"
 
-#: g10/import.c:825
+#: g10/import.c:842
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "��%08lX: ��������̤���ʽ�̾�Υ桼����ID '"
 
-#: g10/import.c:854
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "��%08lX: �����åפ����桼����ID '"
 
-#: g10/import.c:877
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "��%08lX: �����åפ�������\n"
@@ -1976,32 +1980,32 @@ msgstr "��%08lX: �����åפ�������\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:902
+#: g10/import.c:919
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "��%08lX: ��Ф��ԲĤʽ�̾ (���饹%02x) - �����å�\n"
 
-#: g10/import.c:911
+#: g10/import.c:928
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "��%08lX: �˴������񤬸��ä����ꤵ��Ƥ��ޤ� - �����å�\n"
 
-#: g10/import.c:919
+#: g10/import.c:936
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "��%08lX: ̵�����˴�������: %s - �����å�\n"
 
-#: g10/import.c:1019
+#: g10/import.c:1036
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "��%08lX: ��ʣ�����桼����ID�θ��� - ʻ��\n"
 
-#: g10/import.c:1071
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "��%08lX: �˴���������ɲ�\n"
 
-#: g10/import.c:1185 g10/import.c:1238
+#: g10/import.c:1202 g10/import.c:1255
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "��%08lX: �������ʣ���ˤϼ��ʽ�̾������ޤ���\n"
@@ -2011,69 +2015,69 @@ msgstr "��%08lX: �������ʣ���ˤϼ��ʽ�̾������ޤ���\n"
 msgid "%s: user not found\n"
 msgstr "%s: �桼���������Ĥ���ޤ���\n"
 
-#: g10/keyedit.c:155
+#: g10/keyedit.c:156
 msgid "[revocation]"
 msgstr "[�˴�]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:157
 msgid "[self-signature]"
 msgstr "[���ʽ�̾]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:221
 msgid "1 bad signature\n"
 msgstr "̵���ʽ�̾1��\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:223
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "̵���ʽ�̾%d��\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:225
 msgid "1 signature not checked due to a missing key\n"
 msgstr "�����ʤ�����1�Ĥν�̾�򸡾ڤ��ޤ���\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "�����ʤ�����%d�Ĥν�̾�򸡾ڤ��ޤ���\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 msgid "1 signature not checked due to an error\n"
 msgstr "���顼�Τ���1�Ĥν�̾�򸡾ڤ��ޤ���\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:231
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "���顼�Τ���%d�Ĥν�̾�򸡾ڤ��ޤ���\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:233
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��1�ĸ���\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:235
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��%d�ĸ���\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:317
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "��%08lX�Ǥ⤦��̾���Ƥ���ޤ�\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:325
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "��%08lX�ǽ�̾�����ΤϤ���ޤ���\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr "�����ˤ��θ��ˤ��ʤ��θ��ǽ�̾���Ƥ褤�Ǥ���: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:343
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2081,33 +2085,33 @@ msgstr ""
 "��̾�Ͻ�Ф��ԲĤ����ꤵ��ޤ���\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:348
 msgid "Really sign? "
 msgstr "�����˽�̾���ޤ���? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
+#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:136
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:428
 msgid "This key is not protected.\n"
 msgstr "���θ����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:432
 msgid "Secret parts of primary key are not available.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:436
 msgid "Key is protected.\n"
 msgstr "�����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "���θ����Խ��Ǥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:461
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2115,7 +2119,7 @@ msgstr ""
 "������̩���ο������ѥ��ե졼�������Ϥ��Ƥ���������\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:473
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2124,420 +2128,420 @@ msgstr ""
 "�����餯����Ϥ����ʹͤ��ǤϤ���ޤ���!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:476
 msgid "Do you really want to do this? "
 msgstr "�����˼¹Ԥ��ޤ���? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:540
 msgid "moving a key signature to the correct place\n"
 msgstr "���ν�̾�����������˰�ư���ޤ�\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
 msgid "quit this menu"
 msgstr "���Υ�˥塼��λ"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save and quit"
 msgstr "��¸���ƽ�λ"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "show this help"
 msgstr "���Υإ�פ򸫤�"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "show fingerprint"
 msgstr "����򸫤�"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list key and user IDs"
 msgstr "���ȥ桼����ID�ΰ���"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "select user ID N"
 msgstr "�桼����ID N������"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "select secondary key N"
 msgstr "����N������"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "list signatures"
 msgstr "��̾�ΰ���"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign the key"
 msgstr "���ؽ�̾"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "sign the key locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "add a user ID"
 msgstr "�桼����ID���ɲ�"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "delete user ID"
 msgstr "�桼����ID�κ��"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "add a secondary key"
 msgstr "�������ɲ�"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delete a secondary key"
 msgstr "������"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delete signatures"
 msgstr "��̾�κ��"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "change the expire date"
 msgstr "ͭ�����¤��ѹ�"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle between secret and public key listing"
 msgstr "��̩���ȸ������ΰ��������ؤ�"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "list preferences"
 msgstr "ͥ���̤ΰ���"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
 msgid "change the passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
 msgid "change the ownertrust"
 msgstr "��ͭ�Կ��Ѥ��ѹ�"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
 msgid "revoke signatures"
 msgstr "��̾���˴�"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 msgid "revoke a secondary key"
 msgstr "�������˴�"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 msgid "disable a key"
 msgstr "���λ��Ѥ�ػߤ���"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
 msgid "enable a key"
 msgstr "���λ��Ѥ���Ĥ���"
 
-#: g10/delkey.c:110 g10/keyedit.c:631
+#: g10/delkey.c:110 g10/keyedit.c:632
 msgid "can't do that in batchmode\n"
 msgstr "����ϥХå��⡼�ɤǤϤǤ��ޤ���\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:669
+#: g10/keyedit.c:670
 msgid "Secret key is available.\n"
 msgstr "��̩�������ѤǤ��ޤ���\n"
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 msgid "Command> "
 msgstr "���ޥ��> "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:729
 msgid "Need the secret key to do this.\n"
 msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:733
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�ޤ���toggle�ץ��ޥ�ɤ�ȤäƤ�������\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 msgid "Really sign all user IDs? "
 msgstr "���������桼����ID�˽�̾���ޤ���? "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
 
-#: g10/keyedit.c:812 g10/keyedit.c:994
+#: g10/keyedit.c:813 g10/keyedit.c:995
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "���ѥǡ����١����ι����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:823 g10/keyedit.c:844
+#: g10/keyedit.c:824 g10/keyedit.c:845
 msgid "You must select at least one user ID.\n"
 msgstr "�桼����ID�򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "You can't delete the last user ID!\n"
 msgstr "�Ǹ�Υ桼����ID�Ϻ���Ǥ��ޤ���!\n"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:829
 msgid "Really remove all selected user IDs? "
 msgstr "���򤷤����桼����ID�������˺�����ޤ���? "
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:830
 msgid "Really remove this user ID? "
 msgstr "���Υ桼����ID�������˺�����ޤ���? "
 
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:866 g10/keyedit.c:888
 msgid "You must select at least one key.\n"
 msgstr "���򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:870
 msgid "Do you really want to delete the selected keys? "
 msgstr "���򤷤����������˺�����ޤ���? "
 
-#: g10/keyedit.c:870
+#: g10/keyedit.c:871
 msgid "Do you really want to delete this key? "
 msgstr "���θ��������˺�����ޤ���? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "Do you really want to revoke the selected keys? "
 msgstr "���򤷤������������˴����ޤ���? "
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:893
 msgid "Do you really want to revoke this key? "
 msgstr "���θ����������˴����ޤ���? "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:959
 msgid "Save changes? "
 msgstr "�ѹ�����¸���ޤ���? "
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:962
 msgid "Quit without saving? "
 msgstr "��¸�����˽�λ���ޤ���? "
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:973
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:980
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "��̩���ι����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:987
 msgid "Key not changed so no update needed.\n"
 msgstr "����̵�ѹ��ʤΤǹ����Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1002
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵���ʥ��ޥ�� (��help�פ򻲾�)\n"
 
-#: g10/keyedit.c:1081 g10/keyedit.c:1107
+#: g10/keyedit.c:1082 g10/keyedit.c:1108
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  ����: %s ����: %s"
 
-#: g10/keyedit.c:1090
+#: g10/keyedit.c:1091
 #, c-format
 msgid " trust: %c/%c"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1095
 msgid "This key has been disabled"
 msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�"
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1124
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! �������˴��ѤߤǤ�: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1127
 msgid "rev- faked revocation found\n"
 msgstr "rev- �Ǥä��������˴���ȯ��\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1129
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? �˴���ǧ�㳲: %s\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 msgid "Delete this good signature? (y/N/q)"
 msgstr "������������̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1371
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1375
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "����̤�Τν�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1381
 msgid "Really delete this self-signature? (y/N)"
 msgstr "���μ��ʽ�̾�������˺�����ޤ���? (y/N)"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1396
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "Nothing deleted.\n"
 msgstr "���������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1468
 msgid "Please remove selections from the secret keys.\n"
 msgstr "��̩���������Ȥ��Ƥ���������\n"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1474
 msgid "Please select at most one secondary key.\n"
 msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1478
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "������ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1480
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1522
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1538
 msgid "No corresponding signature in secret ring\n"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1599
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:1644
+#: g10/keyedit.c:1645
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "%d�֤������Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:1743
 msgid "user ID: \""
 msgstr "�桼����ID: \""
 
-#: g10/keyedit.c:1745
+#: g10/keyedit.c:1746
 #, c-format
 msgid ""
 "\"\n"
@@ -2546,34 +2550,34 @@ msgstr ""
 "\"\n"
 "���ʤ��θ�%08lX��%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1750
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "���ν�̾�ˤ��������˴����������ޤ���? (y/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1774
 msgid "You have signed these user IDs:\n"
 msgstr "�����Υ桼����ID�˽�̾���ޤ���:\n"
 
-#: g10/keyedit.c:1787 g10/keyedit.c:1822
+#: g10/keyedit.c:1788 g10/keyedit.c:1823
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   %08lX��%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1793
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   %08lX��%s���˴�����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1813
 msgid "You are about to revoke these signatures:\n"
 msgstr "�����ν�̾���˴����褦�Ȥ��Ƥ��ޤ�:\n"
 
-#: g10/keyedit.c:1830
+#: g10/keyedit.c:1831
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "�˴�������������˺��ޤ���? (y/N)"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1860
 msgid "no secret key\n"
 msgstr "��̩��������ޤ���\n"
 
@@ -2586,128 +2590,128 @@ msgid "revoked"
 msgstr "�˴��Ѥ�"
 
 #. of subkey
-#: g10/keylist.c:404 g10/mainproc.c:836
+#: g10/keylist.c:402 g10/mainproc.c:837
 #, c-format
 msgid " [expires: %s]"
 msgstr " [ͭ������: %s]"
 
-#: g10/mainproc.c:270
+#: g10/mainproc.c:271
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "��������%08lX�Ǥ�\n"
 
-#: g10/mainproc.c:315
+#: g10/mainproc.c:316
 msgid "public key encrypted data: good DEK\n"
 msgstr "�������ǰŹ沽���줿�ǡ���: ������DEK�Ǥ�\n"
 
-#: g10/mainproc.c:367
+#: g10/mainproc.c:368
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "%u-�ӥå�%s��, ID %08lX�ǰŹ沽%s�ˤǤ��ޤ���\n"
 
-#: g10/mainproc.c:377
+#: g10/mainproc.c:378
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "%s��, ID %08lX�ǰŹ沽����ޤ���\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:392
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "������������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:431
+#: g10/mainproc.c:432
 msgid "decryption okay\n"
 msgstr "���������\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:437
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "�ٹ�: �Ź沽���줿��å������ϲ��⤵��Ƥ��ޤ�!\n"
 
-#: g10/mainproc.c:441
+#: g10/mainproc.c:442
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:461
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "����: �����Ԥϡ����ˤ���פ褦�˵��Ƥ��ޤ�\n"
 
-#: g10/mainproc.c:462
+#: g10/mainproc.c:463
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "���Υե�����̾='%.*s'\n"
 
-#: g10/mainproc.c:617
+#: g10/mainproc.c:618
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "��Ω�˴�����gpg --import�פ�Ȥä�Ŭ�Ѥ��Ƥ�������\n"
 
-#: g10/mainproc.c:704 g10/mainproc.c:713
+#: g10/mainproc.c:705 g10/mainproc.c:714
 msgid "WARNING: invalid notation data found\n"
 msgstr "�ٹ�: ̵��������ǡ���������ޤ�\n"
 
-#: g10/mainproc.c:716
+#: g10/mainproc.c:717
 msgid "Notation: "
 msgstr "����: "
 
-#: g10/mainproc.c:725
+#: g10/mainproc.c:726
 msgid "Policy: "
 msgstr "�ݥꥷ��: "
 
-#: g10/mainproc.c:1235
+#: g10/mainproc.c:1177
 msgid "signature verification suppressed\n"
 msgstr "��̾�θ��ڤ��ά\n"
 
-#: g10/mainproc.c:1272
+#: g10/mainproc.c:1214
 #, 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:1307 g10/mainproc.c:1318
+#: g10/mainproc.c:1242 g10/mainproc.c:1250
 msgid "BAD signature from \""
 msgstr "������ ��̾: \""
 
-#: g10/mainproc.c:1308 g10/mainproc.c:1319
+#: g10/mainproc.c:1243 g10/mainproc.c:1251
 msgid "Good signature from \""
 msgstr "��������̾: \""
 
-#: g10/mainproc.c:1310
+#: g10/mainproc.c:1266
 msgid "                aka \""
 msgstr "       ��̾ \""
 
-#: g10/mainproc.c:1366
+#: g10/mainproc.c:1316
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "��̾�򸡾ڤǤ��ޤ���: %s\n"
 
-#: g10/mainproc.c:1423 g10/mainproc.c:1438 g10/mainproc.c:1500
+#: g10/mainproc.c:1373 g10/mainproc.c:1388 g10/mainproc.c:1450
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "ʬΥ��̾�����"
 
-#: g10/mainproc.c:1449
+#: g10/mainproc.c:1399
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���饹0x%02x����Ω��̾\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1454
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�Ť����� (PGP 2.x) �ν�̾\n"
 
-#: g10/mainproc.c:1509
+#: g10/mainproc.c:1459
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() �����̵���ʥѥ��åȤ򸡽Ф��ޤ���\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:98
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "����������פ�̵���ˤǤ��ޤ���: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:208
 msgid "Experimental algorithms should not be used!\n"
 msgstr "�¸���Υ��르�ꥺ��ϻ��Ѥ��٤��ǤϤ���ޤ���!\n"
 
-#: g10/misc.c:237
+#: g10/misc.c:238
 #, fuzzy
 msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
 msgstr ""
@@ -2719,7 +2723,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "�������Υ��르�ꥺ��%d�ϻ��ѤǤ��ޤ���\n"
 
-#: g10/parse-packet.c:990
+#: g10/parse-packet.c:1010
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "������%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
@@ -2732,7 +2736,7 @@ msgstr ""
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:170 g10/passphrase.c:248
+#: g10/hkp.c:147 g10/passphrase.c:248
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "`%s'����³�Ǥ��ޤ���: %s\n"
@@ -2863,36 +2867,36 @@ msgstr "����: �Ź楢�르�ꥺ��%d��ͥ�������äƤ��ޤ���\n"
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "����: ��̩��%08lX��%s�Ǵ����ڤ�Ǥ�\n"
 
-#: g10/hkp.c:72
+#: g10/hkp.c:59
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr "��%08lX��%s���׵� ...\n"
 
-#: g10/hkp.c:85
+#: g10/hkp.c:72
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "�������С����鸰���ɤ߹���ޤ���: %s\n"
 
-#: g10/hkp.c:109 g10/hkp.c:148
+#: g10/hkp.c:91 g10/hkp.c:125
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "���Τθ������С��Ϥ���ޤ��� (--keyserver���ץ�����Ȥ��ޤ��礦)\n"
 
-#: g10/hkp.c:117
+#: g10/hkp.c:99
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s: ��������ID�Ǥ���ޤ���\n"
 
-#: g10/hkp.c:194
+#: g10/hkp.c:171
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "`%s'�ؤ��������顼: %s\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:183
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "`%s'�ؤ����������� (����=%u)\n"
 
-#: g10/hkp.c:209
+#: g10/hkp.c:186
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "`%s'�ؤ������˼��Ԥ��ޤ���: ����=%u\n"
@@ -2906,11 +2910,11 @@ msgstr "��̩��ʬ�������ޤ���\n"
 msgid "protection algorithm %d is not supported\n"
 msgstr "�ݸ�르�ꥺ��%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:184
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "̵���ʥѥ��ե졼���Ǥ��������Ϥ��Ƥ������� ...\n"
 
-#: g10/seckey-cert.c:242
+#: g10/seckey-cert.c:240
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "�ٹ�: �夤���򸡽Ф��ޤ������ѥ��ե졼�����ѹ����Ƥ���������\n"
 
@@ -3178,11 +3182,6 @@ msgstr "�� %08lX: ���Ѥ��븰�θ�����������ޤ��� - �����å�\n"
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "����: ��̩��%08lX���ݸ��Ƥ��� ����\n"
 
-#: g10/trustdb.c:577
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "��%08lX: �������Τʤ���̩���Ǥ��������å�\n"
-
 #: g10/trustdb.c:584
 #, c-format
 msgid "key %08lX: secret and public key don't match\n"
@@ -3415,36 +3414,46 @@ msgstr "%s: ���ؤ��Ǥ��ޤ���: %s\n"
 msgid "%s: keyring created\n"
 msgstr "%s: ���ؤ��Ǥ��ޤ���\n"
 
-#: g10/ringedit.c:1551
+#: g10/ringedit.c:1555
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "�ٹ�: ���Ѿ�����ä�2�ĤΥե����뤬¸�ߤ��ޤ���\n"
 
-#: g10/ringedit.c:1552
+#: g10/ringedit.c:1556
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s���ѹ��Τʤ����Ǥ�\n"
 
-#: g10/ringedit.c:1553
+#: g10/ringedit.c:1557
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s�Ͽ��������Ǥ�\n"
 
-#: g10/ringedit.c:1554
+#: g10/ringedit.c:1558
 msgid "Please fix this possible security flaw\n"
 msgstr "���ΰ�����η�٤������Ƥ�������\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
+#: 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 ""
 "��Ф��Ƥ⤤���ե饰�����ˤ����ꤵ��Ƥ��ޤ���\n"
 "��ʪ��������ҤȤϤ��ä���˻Ȥ��ޤ���!\n"
 
-#: g10/skclist.c:113
+#: g10/skclist.c:138
+#, fuzzy, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "`%s'�򥹥��å�: %s\n"
+
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s'�򥹥��å�: %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:149
+#, fuzzy
+msgid "skipped: secret key already present\n"
+msgstr "%s: �����å�: �������ϴ��ˤ���ޤ�\n"
+
+#: g10/skclist.c:160
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3543,11 +3552,11 @@ msgstr "���θ����ؤ��������ޤ���? "
 msgid "This is a secret key! - really delete? "
 msgstr "�������̩���Ǥ�! �����˺�����ޤ���? "
 
-#: g10/delkey.c:182
+#: g10/delkey.c:181
 msgid "there is a secret key for this public key!\n"
 msgstr "���θ������ˤ���������̩��������ޤ�!\n"
 
-#: g10/delkey.c:184
+#: g10/delkey.c:183
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr "�ޤ���--delete-secret-key�ץ��ץ����Ǥ���������Ƥ���������\n"
 
@@ -3806,5 +3815,14 @@ msgstr "�إ�פϤ���ޤ���"
 msgid "No help available for `%s'"
 msgstr "`%s'�Υإ�פϤ���ޤ���"
 
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "���ΥС������Ǥ�RSA���ϻȤ��ޤ���\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "�桼����ID�θ�������ޤ���\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "���Υ桼����ID������ޤ���\n"
+
 #~ msgid "no secret key for decryption available\n"
 #~ msgstr "�����ɬ�פ���̩���������ޤ���\n"
diff --git a/po/nl.po b/po/nl.po
index 16e8010bb..9691c4cce 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-02-07 16:46+0100\n"
+"POT-Creation-Date: 2001-03-13 13:40+0100\n"
 "PO-Revision-Date: 2000-02-20 21:30+01:00\n"
 "Last-Translator: Ivo Timmermans <[email protected]>\n"
 "Language-Team: Dutch <[email protected]>\n"
@@ -41,7 +41,7 @@ msgstr "nee"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:308
 msgid "quit"
 msgstr "einde"
 
@@ -245,6 +245,17 @@ msgstr "niet versleuteld"
 msgid "not processed"
 msgstr "niet behandeld"
 
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+#, fuzzy
+msgid "unusable public key"
+msgstr "foutieve publieke sleutel"
+
+#: util/errors.c:106
+#, fuzzy
+msgid "unusable secret key"
+msgstr "foutieve geheime sleutel"
+
 #: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -255,63 +266,63 @@ msgstr "... dit is een programmeerfout (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "u heeft een fout in het programma gevonden ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
+#: cipher/random.c:309 g10/import.c:129 g10/keygen.c:1256
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:313
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:318
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:325
+#: cipher/random.c:323
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:331
+#: cipher/random.c:329
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:339
+#: cipher/random.c:337
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:375
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:397
+#: cipher/random.c:395
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan %s niet aanmaken: %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:402
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:405
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:416
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:650
+#: cipher/random.c:648
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "LET OP: de willekeurige getallengenerator is niet veilig!!\n"
 
-#: cipher/random.c:651
+#: cipher/random.c:649
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -337,7 +348,7 @@ msgstr ""
 "om het besturingssysteem de kans te geven om meer entropie te\n"
 "verzamelen! (Nog %d bytes nodig)\n"
 
-#: g10/g10.c:212
+#: g10/g10.c:213
 msgid ""
 "@Commands:\n"
 " "
@@ -345,139 +356,139 @@ msgstr ""
 "@Opdrachten:\n"
 " "
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "|[file]|make a signature"
 msgstr "|[bestand]|maak een ondertekening"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "|[file]|make a clear text signature"
 msgstr "|[bestand]|maak een niet versleutelde ondertekening"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "make a detached signature"
 msgstr "maak een losstaande ondertekening"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "encrypt data"
 msgstr "versleutel gegevens"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "encryption only with symmetric cipher"
 msgstr "versleutel slechts met een symmetrische versleutelmethode"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "store only"
 msgstr "alleen bewaren"
 
-#: g10/g10.c:220
+#: g10/g10.c:221
 msgid "decrypt data (default)"
 msgstr "gegevens decoderen (standaard)"
 
-#: g10/g10.c:221
+#: g10/g10.c:222
 msgid "verify a signature"
 msgstr "ondertekening controleren"
 
-#: g10/g10.c:223
+#: g10/g10.c:224
 msgid "list keys"
 msgstr "lijst van sleutels genereren"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "list keys and signatures"
 msgstr "sleutels en ondertekeningen opnoemen"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "check key signatures"
 msgstr "sleutelverificaties controleren"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "list keys and fingerprints"
 msgstr "sleutels en vingerafdrukken opnoemen"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "list secret keys"
 msgstr "geheime sleutels opnoemen"
 
-#: g10/g10.c:229
+#: g10/g10.c:230
 msgid "generate a new key pair"
 msgstr "nieuw sleutelpaar genereren"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
 msgid "remove key from the public keyring"
 msgstr "sleutel weghalen uit de publieke sleutelbos"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "remove key from the secret keyring"
 msgstr "sleutel weghalen uit de geheime sleutelbos"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign a key"
 msgstr "onderteken een sleutel"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "sign a key locally"
 msgstr "onderteken een sleutel lokaal"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "sign or edit a key"
 msgstr "onderteken of bewerk een sleutel"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "generate a revocation certificate"
 msgstr "genereer een terugtrekkings-certificaat"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "export keys"
 msgstr "exporteer sleutels"
 
-#: g10/g10.c:238
+#: g10/g10.c:239
 msgid "export keys to a key server"
 msgstr "exporteer sleutels naar een sleutelserver"
 
-#: g10/g10.c:239
+#: g10/g10.c:240
 msgid "import keys from a key server"
 msgstr "importeer sleutels van een sleutelserver"
 
-#: g10/g10.c:243
+#: g10/g10.c:244
 msgid "import/merge keys"
 msgstr "sleutels importeren/samenvoegen"
 
-#: g10/g10.c:245
+#: g10/g10.c:246
 msgid "list only the sequence of packets"
 msgstr "noem alleen de volgorde van pakketten"
 
-#: g10/g10.c:247
+#: g10/g10.c:248
 msgid "export the ownertrust values"
 msgstr "exporteer het vertrouwen in de eigenaars"
 
-#: g10/g10.c:249
+#: g10/g10.c:250
 msgid "import ownertrust values"
 msgstr "importeer het vertrouwen in de eigenaars"
 
-#: g10/g10.c:251
+#: g10/g10.c:252
 msgid "update the trust database"
 msgstr "werk de vertrouwensdatabase bij"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMEN]|controleer de vertrouwensdatabase"
 
-#: g10/g10.c:254
+#: g10/g10.c:255
 msgid "fix a corrupted trust database"
 msgstr "repareer een beschadigde vertrouwensdatabase"
 
-#: g10/g10.c:255
+#: g10/g10.c:256
 msgid "De-Armor a file or stdin"
 msgstr "Verwijder de beveiliging op bestand of standaard invoer"
 
-#: g10/g10.c:257
+#: g10/g10.c:258
 msgid "En-Armor a file or stdin"
 msgstr "Voeg beveiliging toe aan bestad of standaard invoer"
 
-#: g10/g10.c:259
+#: g10/g10.c:260
 msgid "|algo [files]|print message digests"
 msgstr "|algo [bestanden]|geef controlegetal van berichten weer"
 
-#: g10/g10.c:263
+#: g10/g10.c:264
 msgid ""
 "@\n"
 "Options:\n"
@@ -487,163 +498,163 @@ msgstr ""
 "Opties:\n"
 " "
 
-#: g10/g10.c:265
+#: g10/g10.c:266
 msgid "create ascii armored output"
 msgstr "genereer beveiliging in ASCII"
 
-#: g10/g10.c:267
+#: g10/g10.c:268
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAAM|versleutel voor NAAM"
 
-#: g10/g10.c:270
+#: g10/g10.c:271
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAAM|gebruik NAAM als standaard ontvanger"
 
-#: g10/g10.c:272
+#: g10/g10.c:273
 msgid "use the default key as default recipient"
 msgstr "gebruik de standaard sleutel als standaard ontvanger"
 
-#: g10/g10.c:276
+#: g10/g10.c:277
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "gebruik deze gebruikersidentificatie om te ondertekenen of te decoderen"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|stel compressieniveau in op N (uitzetten met 0)"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "use canonical text mode"
 msgstr "gebruik de verkorte tekstmodus"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "use as output file"
 msgstr "gebruik als uitvoerbestand"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "verbose"
 msgstr "geef meer informatie"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "be somewhat more quiet"
 msgstr "wees iets stiller"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "don't use the terminal at all"
 msgstr "gebruik de terminal helemaal niet"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "force v3 signatures"
 msgstr "forcees v3 ondertekening"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "always use a MDC for encryption"
 msgstr "gebruik altijd een MDC voor versleuteling"
 
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "do not make any changes"
 msgstr "maak geen enkele verandering"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "batch mode: never ask"
 msgstr "doorlopende modus: vraag nooit"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "assume yes on most questions"
 msgstr "veronderstel ja als antwoord op de meeste vragen"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "assume no on most questions"
 msgstr "veronderstel nee als antwoord op de meeste vragen"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "add this keyring to the list of keyrings"
 msgstr "voeg deze sleutelbos toe aan de lijst van sleutelbossen"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "add this secret keyring to the list"
 msgstr "voeg deze geheime sleutelbos toe aan de lijst"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAAM|gebruik NAAM als standaard geheime sleutel"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVER|gebruik deze sleutelserver om sleutels op te zoeken"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAAM|zet tekenverzameling van terminal op NAAM"
 
-#: g10/g10.c:297
+#: g10/g10.c:298
 msgid "read options from file"
 msgstr "lees opties uit bestand"
 
-#: g10/g10.c:301
+#: g10/g10.c:302
 msgid "|FD|write status info to this FD"
 msgstr "|BB|schrijf status naar deze bestandsbeschrijver"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "|FILE|load extension module FILE"
 msgstr "|BESTAND|laad extensiemodule BESTAND"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "emulate the mode described in RFC1991"
 msgstr "doe als RFC1991 voorschrijft"
 
-#: g10/g10.c:309
+#: g10/g10.c:310
 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:310
+#: g10/g10.c:311
 msgid "|N|use passphrase mode N"
 msgstr "|N|gebruik sleuteltekst modus N"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM voor sleutelteksten"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAAM|gebruik versleutelalgoritme NAAM voor sleutelteksten"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAAM|gebruik versleutelalgoritme NAAM"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "|N|use compress algorithm N"
 msgstr "|N|gebruik compressiealgoritme N"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "throw keyid field of encrypted packets"
 msgstr "plaats geen sleutelidentificatieveld in versleutelde pakketten"
 
-#: g10/g10.c:319
+#: g10/g10.c:320
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAAM=WAARDE|gebruik deze notitiegegevens"
 
-#: g10/g10.c:322
+#: g10/g10.c:323
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:325
+#: g10/g10.c:326
 msgid ""
 "@\n"
 "Examples:\n"
@@ -663,17 +674,17 @@ msgstr ""
 " --list-keys [namen]         toon sleutels\n"
 " --fingerprints [namen]      toon vingerafdrukken\n"
 
-#: g10/g10.c:431
+#: g10/g10.c:432
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Meld fouten in het programma a.u.b. aan <[email protected]>;\n"
 "fouten in de vertaling aan <[email protected]>.\n"
 
-#: g10/g10.c:435
+#: g10/g10.c:436
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Gebruik: gpg [opties] [bestanden] (-h voor hulp)"
 
-#: g10/g10.c:438
+#: g10/g10.c:439
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -683,7 +694,7 @@ msgstr ""
 "onderteken, controleer, versleutel of decodeer de ingevoerde gegevens\n"
 "standaardactie hangt af van de gegevens\n"
 
-#: g10/g10.c:445
+#: g10/g10.c:446
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -691,193 +702,193 @@ msgstr ""
 "\n"
 "Ondersteunde algoritmes:\n"
 
-#: g10/g10.c:524
+#: g10/g10.c:525
 msgid "usage: gpg [options] "
 msgstr "gebruik: gpg [opties] "
 
-#: g10/g10.c:577
+#: g10/g10.c:578
 msgid "conflicting commands\n"
 msgstr "tegenstrijdige commando's\n"
 
-#: g10/g10.c:727
+#: g10/g10.c:728
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "LET OP: geen bestand `%s' met standaardopties\n"
 
-#: g10/g10.c:731
+#: g10/g10.c:732
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "optiebestand `%s': %s\n"
 
-#: g10/g10.c:738
+#: g10/g10.c:739
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "opties inlezen van `%s'\n"
 
-#: g10/g10.c:943
+#: g10/g10.c:944
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s is een onbekende tekenverzameling\n"
 
-#: g10/g10.c:1014
+#: g10/g10.c:1015
 msgid "WARNING: program may create a core file!\n"
 msgstr "LET OP: programma zou een geheugendump kunnen maken!\n"
 
-#: g10/g10.c:1018 g10/g10.c:1027
+#: g10/g10.c:1019 g10/g10.c:1028
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "LET OP: %s is niet voor gewoon gebruik!\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1021
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s is niet toegestaan met deze %s!\n"
 
-#: g10/g10.c:1023
+#: g10/g10.c:1024
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s heeft geen betekenis met %s!\n"
 
-#: g10/g10.c:1043 g10/g10.c:1055
+#: g10/g10.c:1044 g10/g10.c:1056
 msgid "selected cipher algorithm is invalid\n"
 msgstr "geselecteerd versleutelalgoritme is ongeldig\n"
 
-#: g10/g10.c:1049 g10/g10.c:1061
+#: g10/g10.c:1050 g10/g10.c:1062
 msgid "selected digest algorithm is invalid\n"
 msgstr "geselecteerd controle-algoritme is ongeldig\n"
 
-#: g10/g10.c:1065
+#: g10/g10.c:1066
 msgid "the given policy URL is invalid\n"
 msgstr "de gegeven beleids-URL is ongeldig\n"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1069
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "compressie-algoritme moet in het bereik %d..%d liggen\n"
 
-#: g10/g10.c:1070
+#: g10/g10.c:1071
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed(?) moet groter zijn dan 0\n"
 
-#: g10/g10.c:1072
+#: g10/g10.c:1073
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed(?) moet groter zijn dan 1\n"
 
-#: g10/g10.c:1074
+#: g10/g10.c:1075
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth moet tussen de 1 en de 255 (inclusief) liggen\n"
 
-#: g10/g10.c:1077
+#: g10/g10.c:1078
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "LET OP: simpele S2K mode (0) wordt met klem afgeraden\n"
 
-#: g10/g10.c:1081
+#: g10/g10.c:1082
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ongeldige S2K modus; moet 0, 1 of 3 zijn\n"
 
-#: g10/g10.c:1166
+#: g10/g10.c:1167
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "fout bij het initialiseren van de vertrouwensdatabase: %s\n"
 
-#: g10/g10.c:1172
+#: g10/g10.c:1173
 msgid "--store [filename]"
 msgstr "--store [bestandsnaam]"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1180
 msgid "--symmetric [filename]"
 msgstr "--symmetric [bestandsnaam]"
 
-#: g10/g10.c:1187
+#: g10/g10.c:1188
 msgid "--encrypt [filename]"
 msgstr "--encrypt [bestandsnaam]"
 
-#: g10/g10.c:1200
+#: g10/g10.c:1201
 msgid "--sign [filename]"
 msgstr "--sign [bestandsnaam]"
 
-#: g10/g10.c:1213
+#: g10/g10.c:1214
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [bestandsnaam]"
 
-#: g10/g10.c:1227
+#: g10/g10.c:1228
 msgid "--clearsign [filename]"
 msgstr "--clearsign [bestandsnaam]"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1245
 msgid "--decrypt [filename]"
 msgstr "--decrypt [bestandsnaam]"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 msgid "--sign-key user-id"
 msgstr "--sign-key gebruikersidentificatie"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1261
 msgid "--lsign-key user-id"
 msgstr "--lsign-key gebruikers-identificatie"
 
-#: g10/g10.c:1268
+#: g10/g10.c:1269
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key gebruikersidentificatie [opdrachten]"
 
-#: g10/g10.c:1284
+#: g10/g10.c:1285
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key gebruikersidentificatie"
 
-#: g10/g10.c:1287
+#: g10/g10.c:1288
 msgid "--delete-key user-id"
 msgstr "--delete-key gebruikersidentificatie"
 
-#: g10/g10.c:1295
+#: g10/g10.c:1296
 #, fuzzy
 msgid "--delete-secret-and-public-key user-id"
 msgstr "--delete-secret-key gebruikersidentificatie"
 
-#: g10/encode.c:268 g10/g10.c:1332 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1333 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan %s niet openen: %s\n"
 
-#: g10/g10.c:1347
+#: g10/g10.c:1348
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [gebruikersidentificatie] [sleutelbos]"
 
-#: g10/g10.c:1413
+#: g10/g10.c:1414
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "opheffen van beveiliging mislukt: %s\n"
 
-#: g10/g10.c:1421
+#: g10/g10.c:1422
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "beveiligen mislukt: %s\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1493
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ongeldig frommelalgoritme `%s'\n"
 
-#: g10/g10.c:1579
+#: g10/g10.c:1580
 msgid "[filename]"
 msgstr "[bestandsnaam]"
 
-#: g10/g10.c:1583
+#: g10/g10.c:1584
 msgid "Go ahead and type your message ...\n"
 msgstr "Gaat uw gang, type het bericht ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1586 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1587 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:1795
+#: g10/g10.c:1796
 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:1801
+#: g10/g10.c:1802
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -885,89 +896,89 @@ msgstr ""
 "een notitienaam mag alleen letters, cijfers, punten of underscores bevatten "
 "en eindig met een =\n"
 
-#: g10/g10.c:1807
+#: g10/g10.c:1808
 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:1815
+#: g10/g10.c:1816
 msgid "a notation value must not use any control characters\n"
 msgstr "een notitienaam mag geen controletekens bevatten\n"
 
-#: g10/armor.c:302
+#: g10/armor.c:304
 #, c-format
 msgid "armor: %s\n"
 msgstr "beveiliging: %s\n"
 
-#: g10/armor.c:331
+#: g10/armor.c:333
 msgid "invalid armor header: "
 msgstr "ongeldige beveiliginsinformatie: "
 
-#: g10/armor.c:338
+#: g10/armor.c:340
 msgid "armor header: "
 msgstr "beveiligingsinformatie"
 
-#: g10/armor.c:349
+#: g10/armor.c:351
 msgid "invalid clearsig header\n"
 msgstr "ongeldige informatie over leesbare ondertekening\n"
 
-#: g10/armor.c:401
+#: g10/armor.c:403
 msgid "nested clear text signatures\n"
 msgstr "geneste leesbare ondertekeningen\n"
 
-#: g10/armor.c:525
+#: g10/armor.c:527
 msgid "invalid dash escaped line: "
 msgstr "ongeldige regel met streepjes: "
 
-#: g10/armor.c:537
+#: g10/armor.c:539
 msgid "unexpected armor:"
 msgstr "onverwachte beveiliging:"
 
-#: g10/armor.c:663
+#: g10/armor.c:665
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "ongeldig wortel64 teken %02x overgeslagen\n"
 
-#: g10/armor.c:706
+#: g10/armor.c:708
 msgid "premature eof (no CRC)\n"
 msgstr "voortijdig einde (geen controlesom)\n"
 
-#: g10/armor.c:740
+#: g10/armor.c:742
 msgid "premature eof (in CRC)\n"
 msgstr "voortijdig einde (in controlesom)\n"
 
-#: g10/armor.c:744
+#: g10/armor.c:746
 msgid "malformed CRC\n"
 msgstr "verkeerde controlesom\n"
 
-#: g10/armor.c:748
+#: g10/armor.c:750
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "fout in controlesom; %06lx - %06lx\n"
 
 # fixme
-#: g10/armor.c:765
+#: g10/armor.c:767
 msgid "premature eof (in Trailer)\n"
 msgstr "voortijdig einde (in trailer)\n"
 
 # fixme
-#: g10/armor.c:769
+#: g10/armor.c:771
 msgid "error in trailer line\n"
 msgstr "fout in de trailer regel\n"
 
-#: g10/armor.c:915
+#: g10/armor.c:917
 msgid "For info see http://www.gnupg.org"
 msgstr ""
 
-#: g10/armor.c:1043
+#: g10/armor.c:1045
 msgid "no valid OpenPGP data found.\n"
 msgstr "geen geldige OpenPGP gegevens gevonden.\n"
 
-#: g10/armor.c:1048
+#: g10/armor.c:1050
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ongeldige beveiliging: regel langer dan %d tekens\n"
 
-#: g10/armor.c:1052
+#: g10/armor.c:1054
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -976,7 +987,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1189 g10/pkclist.c:53
+#: g10/keyedit.c:1190 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "            Vingerafdruk:"
 
@@ -1211,17 +1222,17 @@ msgstr ""
 "        Het is niet zeker dat deze ondertekening toebehoort aan de "
 "eigenaar.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: overgeslagen: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:826 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: overgeslagen: openbare sleutel is al aanwezig\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:853
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1229,45 +1240,45 @@ msgstr ""
 "Je gaf geen gebruikersidentificatie op. (je kunt \"-r\" gebruiken)\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:863
 msgid "Enter the user ID: "
 msgstr "Geef de gebruikersidentificatie: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:875
 msgid "No such user ID.\n"
 msgstr "Gebruiker bestaat niet.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:880
 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:904
+#: g10/pkclist.c:903
 msgid "Public key is disabled.\n"
 msgstr "Openbare sleutel is niet toegankelijk.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:910
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "overgeslagen: openbare sleutel is al ingesteld met --encrypt-to\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:941
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "onbekende standaard ontvanger `%s'\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:974
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: fout tijdens controleren van de sleutel: %s\n"
 
 # fixme
-#: g10/pkclist.c:980
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: overgeslagen: openbare sleutel is niet toegankelijk\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1017
 msgid "no valid addressees\n"
 msgstr "geen geldige adressen\n"
 
@@ -1547,7 +1558,7 @@ msgstr ""
 "Je hebt een sleuteltekst nodig om je geheime sleutel te bewaken.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:955
+#: g10/keyedit.c:469 g10/keygen.c:955
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "sleuteltekst is niet goed herhaald; probeer het opnieuw.\n"
 
@@ -1678,289 +1689,283 @@ msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
 msgid "key %08lX: not protected - skipped\n"
 msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
 
-#: g10/export.c:232
+#: g10/export.c:236
 msgid "WARNING: nothing exported\n"
 msgstr "LET OP: er is niets ge�xporteerd\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:208
 msgid "too many entries in pk cache - disabled\n"
 msgstr "te veel ingangen in de pk cache - uitgezet\n"
 
-#: g10/getkey.c:350
+#: g10/getkey.c:443
 msgid "too many entries in unk cache - disabled\n"
 msgstr "te veel ingangen in de unk cache - uitgezet\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
-msgid "RSA key cannot be used in this version\n"
-msgstr "RSA sleutel kan niet gebruikt worden in deze versie\n"
-
-#: g10/getkey.c:1310 g10/getkey.c:1349
-msgid "No key for user ID\n"
-msgstr "Geen sleutel voor gebruikersidentificatie\n"
-
-#: g10/getkey.c:1388 g10/getkey.c:1428
-msgid "No user ID for key\n"
-msgstr "Geen gebruikersidentificatie voor sleutel\n"
-
-#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
+#: g10/getkey.c:2143
 #, 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:2050
+#: g10/getkey.c:2185 g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr ""
+"sleutel %08lX: geheime sleutel zonder openbare sleutel - overgeslagen\n"
+
+#: g10/getkey.c:2473
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: gebruiker niet gevonden\n"
 
-#: g10/import.c:182
+#: g10/import.c:184
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok van type %d wordt overgeslagen\n"
 
-#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu sleutels zijn tot nu toe behandeld\n"
 
-#: g10/import.c:194
+#: g10/import.c:196
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fout bij lezen `%s': %s\n"
 
-#: g10/import.c:204
+#: g10/import.c:206
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totaal aantal behandeld: %lu\n"
 
-#: g10/import.c:206
+#: g10/import.c:208
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "nieuwe subsleutels: %lu\n"
 
-#: g10/import.c:209
+#: g10/import.c:211
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          zonder identificatie: %lu\n"
 
-#: g10/import.c:211
+#: g10/import.c:213
 #, c-format
 msgid "              imported: %lu"
 msgstr "ge�mporteerd: %lu"
 
-#: g10/import.c:217
+#: g10/import.c:219
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "onveranderd: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:221
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "nieuwe gebruikers: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:223
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "nieuwe subsleutels: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:225
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "nieuwe ondertekeningen: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:227
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "nieuwe sleutelterugtrekkingen: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:229
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "geheime sleutels gelezen: %lu\n"
 
-#: g10/import.c:229
+#: g10/import.c:231
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "geheime sleutels ge�mporteerd: %lu\n"
 
-#: g10/import.c:231
+#: g10/import.c:233
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "onveranderde geheime sleutels: %lu\n"
 
-#: g10/import.c:391 g10/import.c:600
+#: g10/import.c:408 g10/import.c:617
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "sleutel %08lX: geen gebruikersidentificatie\n"
 
-#: g10/import.c:405
+#: g10/import.c:422
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "sleutel %08lX: geen geldige gebruikersidentificaties\n"
 
-#: g10/import.c:407
+#: g10/import.c:424
 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:418 g10/import.c:667
+#: g10/import.c:435 g10/import.c:684
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "sleutel %08lX: openbare sleutel niet gevonden: %s\n"
 
-#: g10/import.c:423
+#: g10/import.c:440
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
 
-#: g10/import.c:431
+#: g10/import.c:448
 msgid "no default public keyring\n"
 msgstr "geen standaard openbare sleutelbos\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
+#: g10/import.c:452 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "schrijven naar `%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:615 g10/import.c:716
+#: 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:441 g10/import.c:499 g10/import.c:618 g10/import.c:719
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "sleutel %08lX: openbare sleutel ge�mporteerd\n"
 
-#: g10/import.c:463
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "sleutel %08lX: komt niet overeen met onze kopie\n"
 
-#: g10/import.c:472 g10/import.c:675
+#: g10/import.c:489 g10/import.c:692
 #, 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:478 g10/import.c:681
+#: g10/import.c:495 g10/import.c:698
 #, 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:505
+#: g10/import.c:522
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "sleutel %08lX: 1 nieuwe gebruiker\n"
 
-#: g10/import.c:508
+#: g10/import.c:525
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "sleutel %08lX: %d nieuwe gebruikers\n"
 
-#: g10/import.c:511
+#: g10/import.c:528
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "sleutel %08lX: 1 nieuwe ondertekening\n"
 
-#: g10/import.c:514
+#: g10/import.c:531
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "sleutel %08lX: %d nieuwe ondertekeningen\n"
 
-#: g10/import.c:517
+#: g10/import.c:534
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "sleutel %08lX: 1 nieuwe subsleutel\n"
 
-#: g10/import.c:520
+#: g10/import.c:537
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "sleutel %08lX: %d nieuwe subsleutels\n"
 
-#: g10/import.c:530
+#: g10/import.c:547
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "sleutel %08lX: niet veranderd\n"
 
-#: g10/import.c:593
+#: g10/import.c:610
 #, c-format
 msgid "secret key %08lX not imported (use %s to allow for it)\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:640
 #, 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:627
+#: g10/import.c:644
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "sleutel %08lX: reeds aanwezig in de geheime sleutelbos\n"
 
-#: g10/import.c:632
+#: g10/import.c:649
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "sleutel %08lX: geheime sleutel niet gevonden: %s\n"
 
-#: g10/import.c:661
+#: g10/import.c:678
 #, 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:692
+#: g10/import.c:709
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "sleutel %08lX: ongeldig terugtrekkingscertificaat: %s - afgewezen\n"
 
-#: g10/import.c:724
+#: g10/import.c:741
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "sleutel %08lX: terugtrekkingscertificaat ge�mporteerd\n"
 
-#: g10/import.c:766
+#: g10/import.c:783
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "sleutel %08lX: geen gebruikersidentificatie voor ondertekening\n"
 
-#: g10/import.c:773 g10/import.c:797
+#: g10/import.c:790 g10/import.c:814
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "sleutel %08lX: openbaar sleutel algoritme niet ondersteund\n"
 
-#: g10/import.c:774
+#: g10/import.c:791
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "sleutel %08lX: ongeldige eigen ondertekening\n"
 
-#: g10/import.c:789
+#: g10/import.c:806
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "sleutel %08lX: geen subsleutel voor sleutelbinding\n"
 
-#: g10/import.c:798
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "sleutel %08lX: ongeldige subsleutelbinding\n"
 
-#: g10/import.c:825
+#: g10/import.c:842
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr ""
 "sleutel %08lX: niet zelfondertekende gebruikersidentificatie geaccepteerd '"
 
-#: g10/import.c:854
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "sleutel %08lX: gebruikersidentificatie overgeslagen '"
 
-#: g10/import.c:877
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "sleutel %08lX: subsleutel overgeslagen\n"
@@ -1969,37 +1974,37 @@ 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:902
+#: g10/import.c:919
 #, 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:911
+#: g10/import.c:928
 #, 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:919
+#: g10/import.c:936
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "sleutel %08lX: ongeldig terugtrekkingscertificaat: %s - overgeslagen\n"
 
-#: g10/import.c:1019
+#: g10/import.c:1036
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr ""
 "sleutel %08lX: dubbele gebruikersidentificatie gevonden - samengevoegd\n"
 
-#: g10/import.c:1071
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "sleutel %08lX: terugtrekkingscertificaat toegevoegd\n"
 
-#: g10/import.c:1185 g10/import.c:1238
+#: g10/import.c:1202 g10/import.c:1255
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "sleutel %08lX: onze versie heeft geen zelfondertekening\n"
@@ -2009,46 +2014,46 @@ msgstr "sleutel %08lX: onze versie heeft geen zelfondertekening\n"
 msgid "%s: user not found\n"
 msgstr "%s: gebruiker niet gevonden\n"
 
-#: g10/keyedit.c:155
+#: g10/keyedit.c:156
 msgid "[revocation]"
 msgstr "[terugtrekking]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:157
 msgid "[self-signature]"
 msgstr "[zelfondertekening]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:221
 msgid "1 bad signature\n"
 msgstr "1 ongeldige ondertekening\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:223
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d ongeldige ondertekeningen\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:225
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 ondertekening niet gecontroleerd wegens een ontbrekende sleutel\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d ondertekeningen niet gecontroleerd wegens ontbrekende sleutels\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 msgid "1 signature not checked due to an error\n"
 msgstr "1 ondertekening niet gecontroleerd wegens een fout\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:231
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d ondertekeningen niet gecontroleerd wegens fouten\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:233
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 gebruikersidentificatie gevonden zonder geldige zelfondertekening\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:235
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
@@ -2056,17 +2061,17 @@ msgstr ""
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:317
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Reeds ondertekend met sleutel %08lx\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:325
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Niets te tekenen met sleutel %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2074,7 +2079,7 @@ msgstr ""
 "Bent u er echt zeker van dat u deze sleutel wilt tekenen\n"
 "met uw sleutel: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:343
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2082,34 +2087,34 @@ msgstr ""
 "Deze ondertekening zal gemarkeerd worden als niet exporteerbaar.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:348
 msgid "Really sign? "
 msgstr "Echt tekenen? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
+#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:136
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "ondertekening mislukt: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:428
 msgid "This key is not protected.\n"
 msgstr "Deze sleutel is niet beveiligd.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:432
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "geheime sleutel niet beschikbaar"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:436
 msgid "Key is protected.\n"
 msgstr "Sleutel is beveiligd.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan deze sleutel niet bewerken: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:461
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2117,7 +2122,7 @@ msgstr ""
 "Geef de sleuteltekst voor deze geheime sleutel.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:473
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2125,421 +2130,421 @@ msgstr ""
 "U wilt geen sleuteltekst - dit is waaschijnlijk een *slecht* idee!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:476
 msgid "Do you really want to do this? "
 msgstr "Wilt u dit echt? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:540
 msgid "moving a key signature to the correct place\n"
 msgstr "sleutelondertekening naar de juiste plaats schuiven\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
 msgid "quit this menu"
 msgstr "be�indig dit menu"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save"
 msgstr "bewaar"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save and quit"
 msgstr "opslaan en be�indigen"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "help"
 msgstr "hulp"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "show this help"
 msgstr "geef deze hulp"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "show fingerprint"
 msgstr "toon vingerafdruk"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list"
 msgstr "lijst"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list key and user IDs"
 msgstr "lijst van sleutel- en gebruikersidentificaties"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "uid"
 msgstr "gebruikersidentificatie"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "select user ID N"
 msgstr "selecteer gebruikersidentificatie N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "key"
 msgstr "sleutel"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "select secondary key N"
 msgstr "selecteer subsleutel N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "check"
 msgstr "controleer"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "list signatures"
 msgstr "toon ondertekeningen"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign"
 msgstr "onderteken"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign the key"
 msgstr "onderteken de sleutel"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "lsign"
 msgstr "lteken"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "sign the key locally"
 msgstr "teken de sleutel lokaal"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "add a user ID"
 msgstr "voeg een gebruikersidentificatie toe"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "delete user ID"
 msgstr "verwijder gebruikersidentificatie"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "add a secondary key"
 msgstr "voeg een secundaire sleutel toe"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delete a secondary key"
 msgstr "verwijder een secundaire sleutel"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delete signatures"
 msgstr "verwijder ondertekeningen"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "change the expire date"
 msgstr "verander de vervaldatum"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle"
 msgstr "wissel"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle between secret and public key listing"
 msgstr "wissel tussen geheime en openbare sleutels"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "list preferences"
 msgstr "toon voorkeuren"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
 msgid "change the passphrase"
 msgstr "verander de sleuteltekst"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
 msgid "change the ownertrust"
 msgstr "verander het vertrouwen in de eigenaar"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
 msgid "revoke signatures"
 msgstr "roep ondertekeningen terug"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 msgid "revoke a secondary key"
 msgstr "trek secundaire sleutel in"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 msgid "disable a key"
 msgstr "sta het gebruik van een sleutel niet toe"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
 msgid "enable a key"
 msgstr "sta gebruik van een sleutel toe"
 
-#: g10/delkey.c:110 g10/keyedit.c:631
+#: g10/delkey.c:110 g10/keyedit.c:632
 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:669
+#: g10/keyedit.c:670
 msgid "Secret key is available.\n"
 msgstr "Geheime sleutel is beschikbaar.\n"
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 msgid "Command> "
 msgstr "Commando> "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:729
 msgid "Need the secret key to do this.\n"
 msgstr "Ik heb de geheime sleutel nodig om dat te doen.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:733
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 msgid "Really sign all user IDs? "
 msgstr "Echt alle gebruikers tekenen? "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Hint: Selecteer de gebruikersidentificaties om te tekenen\n"
 
-#: g10/keyedit.c:812 g10/keyedit.c:994
+#: g10/keyedit.c:813 g10/keyedit.c:995
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "bijwerken van de vertrouwensdatabase ging niet goed: %s\n"
 
-#: g10/keyedit.c:823 g10/keyedit.c:844
+#: g10/keyedit.c:824 g10/keyedit.c:845
 msgid "You must select at least one user ID.\n"
 msgstr "U moet op zijn minst een gebruikersidentificatie opgeven.\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "You can't delete the last user ID!\n"
 msgstr "U kunt de laatste gebruiker niet verwijderen!\n"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:829
 msgid "Really remove all selected user IDs? "
 msgstr "Al deze gebruikers echt verwijderen? "
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:830
 msgid "Really remove this user ID? "
 msgstr "Deze gebruiker echt verwijderen? "
 
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:866 g10/keyedit.c:888
 msgid "You must select at least one key.\n"
 msgstr "U moet op zijn minst een sleutel selecteren.\n"
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:870
 msgid "Do you really want to delete the selected keys? "
 msgstr "Wilt u echt alle geselecteerde sleutels verwijderen? "
 
-#: g10/keyedit.c:870
+#: g10/keyedit.c:871
 msgid "Do you really want to delete this key? "
 msgstr "Wilt u deze sleutel echt verwijderen? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Wilt u echt alle geselecteerde sleutels intrekken? "
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:893
 msgid "Do you really want to revoke this key? "
 msgstr "Wilt u deze sleutel echt intrekken? "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:959
 msgid "Save changes? "
 msgstr "Veranderingen bewaren? "
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:962
 msgid "Quit without saving? "
 msgstr "Be�indigen zonder te bewaren? "
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:973
 #, c-format
 msgid "update failed: %s\n"
 msgstr "bijwerken ging niet: %s\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:980
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "bijwerken van de geheime sleutel mislukte: %s\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:987
 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:1001
+#: g10/keyedit.c:1002
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Foutief commando (probeer \"help\")\n"
 
-#: g10/keyedit.c:1081 g10/keyedit.c:1107
+#: g10/keyedit.c:1082 g10/keyedit.c:1108
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1090
+#: g10/keyedit.c:1091
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1095
 msgid "This key has been disabled"
 msgstr "Deze sleutel is niet beschikbaar"
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1124
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "sleutel %08lx: subsleutel is teruggeroepen!\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1127
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "nieuwe sleutelterugtrekkingen: %lu\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1129
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Verwijder deze goede ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1371
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Verwijder deze ongeldige ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1375
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Verwijder deze onbekende ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1381
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Deze zelfondertekening echt verwijderen? (j/N)"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d ondertekening verwijderd.\n"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1396
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d ondertekeningen verwijderd.\n"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "Nothing deleted.\n"
 msgstr "Niets verwijderd.\n"
 
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1468
 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:1473
+#: g10/keyedit.c:1474
 msgid "Please select at most one secondary key.\n"
 msgstr "Selecteer a.u.b. maximaal ��n secundaire sleutel.\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1478
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Vervaldatum voor secundaire sleutel instellen.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1480
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Vervaldatum voor primaire sleutel instellen.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1522
 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:1537
+#: g10/keyedit.c:1538
 msgid "No corresponding signature in secret ring\n"
 msgstr "Geen overeenkomende ondertekening in de geheime sleutelbos\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1599
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Geen gebruikersidentificatie met index %d\n"
 
-#: g10/keyedit.c:1644
+#: g10/keyedit.c:1645
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Geen secundaire sleutel met index %d\n"
 
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:1743
 msgid "user ID: \""
 msgstr "gebruikersidentificatie: \""
 
-#: g10/keyedit.c:1745
+#: g10/keyedit.c:1746
 #, c-format
 msgid ""
 "\"\n"
@@ -2548,34 +2553,34 @@ msgstr ""
 "\"\n"
 "tekende met uw sleutel %08lX op %s\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1750
 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:1773
+#: g10/keyedit.c:1774
 msgid "You have signed these user IDs:\n"
 msgstr "U heeft deze gebruikers ondertekend:\n"
 
-#: g10/keyedit.c:1787 g10/keyedit.c:1822
+#: g10/keyedit.c:1788 g10/keyedit.c:1823
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   getekend door %08lX op %s\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1793
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   ingetrokken door %08lX op %s\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1813
 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:1830
+#: g10/keyedit.c:1831
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Echt deze terugtrekkingscertificaten aanmaken? (j/N)"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1860
 msgid "no secret key\n"
 msgstr "geen geheime sleutel\n"
 
@@ -2590,129 +2595,129 @@ msgid "revoked"
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:404 g10/mainproc.c:836
+#: g10/keylist.c:402 g10/mainproc.c:837
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "Sleutel verloopt op %s\n"
 
-#: g10/mainproc.c:270
+#: g10/mainproc.c:271
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "openbare sleutel is %08lX\n"
 
-#: g10/mainproc.c:315
+#: g10/mainproc.c:316
 msgid "public key encrypted data: good DEK\n"
 msgstr "gegevens versleuteld met een openbare sleutel: goede DEK\n"
 
-#: g10/mainproc.c:367
+#: g10/mainproc.c:368
 #, 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:377
+#: g10/mainproc.c:378
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "versleuteld met %s sleutel, nummer %08lX\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:392
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "openbare sleutel-ontsleuteling ging niet: %s\n"
 
-#: g10/mainproc.c:431
+#: g10/mainproc.c:432
 msgid "decryption okay\n"
 msgstr "ontsleutelen ging goed\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:437
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "LET OP: het versleutelde bericht is veranderd!\n"
 
-#: g10/mainproc.c:441
+#: g10/mainproc.c:442
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ontsleuteling mislukte: %s\n"
 
 # Dit kan wel Engels blijven.. toch?
-#: g10/mainproc.c:460
+#: g10/mainproc.c:461
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "LET OP: afzender vroeg om \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:462
+#: g10/mainproc.c:463
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originele bestandsnaam='%.*s'\n"
 
-#: g10/mainproc.c:617
+#: g10/mainproc.c:618
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "alleenstaande intrekking - gebruik \"gpg --import\" om uit te voeren\n"
 
-#: g10/mainproc.c:704 g10/mainproc.c:713
+#: g10/mainproc.c:705 g10/mainproc.c:714
 msgid "WARNING: invalid notation data found\n"
 msgstr "LET OP: ongeldige aantekeningen gevonden\n"
 
-#: g10/mainproc.c:716
+#: g10/mainproc.c:717
 msgid "Notation: "
 msgstr "Aantekening: "
 
-#: g10/mainproc.c:725
+#: g10/mainproc.c:726
 msgid "Policy: "
 msgstr "Beleid: "
 
-#: g10/mainproc.c:1235
+#: g10/mainproc.c:1177
 msgid "signature verification suppressed\n"
 msgstr "controle van de ondertekening overgeslagen\n"
 
-#: g10/mainproc.c:1272
+#: g10/mainproc.c:1214
 #, 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:1307 g10/mainproc.c:1318
+#: g10/mainproc.c:1242 g10/mainproc.c:1250
 msgid "BAD signature from \""
 msgstr "FOUTE ondertekening van \""
 
-#: g10/mainproc.c:1308 g10/mainproc.c:1319
+#: g10/mainproc.c:1243 g10/mainproc.c:1251
 msgid "Good signature from \""
 msgstr "Correcte ondertekening van \""
 
-#: g10/mainproc.c:1310
+#: g10/mainproc.c:1266
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1366
+#: g10/mainproc.c:1316
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ondertekening niet controleren: %s\n"
 
-#: g10/mainproc.c:1423 g10/mainproc.c:1438 g10/mainproc.c:1500
+#: g10/mainproc.c:1373 g10/mainproc.c:1388 g10/mainproc.c:1450
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "maak een losstaande ondertekening"
 
-#: g10/mainproc.c:1449
+#: g10/mainproc.c:1399
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "losstaande ondertekening van type 0x%02x\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1454
 msgid "old style (PGP 2.x) signature\n"
 msgstr "oude stijl (PGP 2.x) ondertekening\n"
 
-#: g10/mainproc.c:1509
+#: g10/mainproc.c:1459
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ongeldig hoofdpakket gevonden in proc_tree()\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:98
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan geheugendumps niet uitzetten: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:208
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Experimentele algoritmes dienen niet gebruikt te worden!\n"
 
-#: g10/misc.c:237
+#: g10/misc.c:238
 #, fuzzy
 msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
 msgstr "dit versleutelalgoritme is verouderd; gebruik een meer algemene!\n"
@@ -2722,7 +2727,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:990
+#: g10/parse-packet.c:1010
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpakket type %d heeft kritische bit gezet\n"
@@ -2735,7 +2740,7 @@ msgstr ""
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:170 g10/passphrase.c:248
+#: g10/hkp.c:147 g10/passphrase.c:248
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan geen verbinding maken met `%s': %s\n"
@@ -2865,36 +2870,36 @@ msgstr "LET OP: versleutelalgoritme %d niet gevonden in de voorkeuren\n"
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "LET OP: sleutel voor ondertekening is vervallen op %s\n"
 
-#: g10/hkp.c:72
+#: g10/hkp.c:59
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr "opvragen van sleutel %08lX van %s ...\n"
 
-#: g10/hkp.c:85
+#: g10/hkp.c:72
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "kan de sleutel niet opvragen van de server: %s\n"
 
-#: g10/hkp.c:109 g10/hkp.c:148
+#: g10/hkp.c:91 g10/hkp.c:125
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "geen sleutelserver bekend (gebruik de optie --keyserver)\n"
 
-#: g10/hkp.c:117
+#: g10/hkp.c:99
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s: ongeldig sleutelnummer\n"
 
-#: g10/hkp.c:194
+#: g10/hkp.c:171
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "fout bij versturen naar `%s': %s\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:183
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "versturen naar `%s' gelukt (status=%u)\n"
 
-#: g10/hkp.c:209
+#: g10/hkp.c:186
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "fout bij versturen naar `%s': status=%u\n"
@@ -2909,11 +2914,11 @@ msgstr "geheime sleutel niet beschikbaar"
 msgid "protection algorithm %d is not supported\n"
 msgstr "beschermingsalgoritme %d wordt niet ondersteund\n"
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:184
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Foutieve sleuteltekst; probeer a.u.b. opnieuw ...\n"
 
-#: g10/seckey-cert.c:242
+#: g10/seckey-cert.c:240
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "LET OP: Kwetsbare sleutel gevonden - verander a.u.b. de sleuteltekst "
@@ -3185,12 +3190,6 @@ 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:577
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr ""
-"sleutel %08lX: geheime sleutel zonder openbare sleutel - overgeslagen\n"
-
 #: g10/trustdb.c:584
 #, c-format
 msgid "key %08lX: secret and public key don't match\n"
@@ -3428,36 +3427,46 @@ msgstr "%s: kan sleutelbos niet aanmaken: %s\n"
 msgid "%s: keyring created\n"
 msgstr "%s: sleutelbos aangemaakt\n"
 
-#: g10/ringedit.c:1551
+#: g10/ringedit.c:1555
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "LET OP: er zijn 2 bestanden met vertrouwelijke informatie.\n"
 
-#: g10/ringedit.c:1552
+#: g10/ringedit.c:1556
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s is de onveranderde\n"
 
-#: g10/ringedit.c:1553
+#: g10/ringedit.c:1557
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s is de nieuwe\n"
 
-#: g10/ringedit.c:1554
+#: g10/ringedit.c:1558
 msgid "Please fix this possible security flaw\n"
 msgstr "Dicht dit mogelijke beveiligingsgat\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
+#: 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 ""
 "sleutel is niet als onveilig gemarkeerd - kan hem niet gebruiken met "
 "nep-RNG!\n"
 
-#: g10/skclist.c:113
+#: g10/skclist.c:138
+#, fuzzy, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "`%s' overgeslagen: %s\n"
+
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s' overgeslagen: %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:149
+#, fuzzy
+msgid "skipped: secret key already present\n"
+msgstr "%s: overgeslagen: openbare sleutel is al aanwezig\n"
+
+#: g10/skclist.c:160
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3559,11 +3568,11 @@ msgstr "Deze sleutel van de sleutelbos verwijderen? "
 msgid "This is a secret key! - really delete? "
 msgstr "Dit is een geheime sleutel! - echt verwijderen? "
 
-#: g10/delkey.c:182
+#: g10/delkey.c:181
 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:184
+#: g10/delkey.c:183
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr ""
 "gebruik eerst de optie \"--delete-secret-key\" om hem te verwijderen.\n"
@@ -3818,6 +3827,15 @@ msgstr "Geen hulp beschikbaar"
 msgid "No help available for `%s'"
 msgstr "Geen hulp beschikbaar voor `%s'"
 
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "RSA sleutel kan niet gebruikt worden in deze versie\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Geen sleutel voor gebruikersidentificatie\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Geen gebruikersidentificatie voor sleutel\n"
+
 #~ msgid "no secret key for decryption available\n"
 #~ msgstr "geheime sleutel voor ontsleuteling is niet beschikbaar\n"
 
diff --git a/po/pl.po b/po/pl.po
index ccf9f843a..c6eb0e268 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-02-07 16:46+0100\n"
+"POT-Creation-Date: 2001-03-13 13:40+0100\n"
 "PO-Revision-Date: 2000-10-18 22:54+02:00\n"
 "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -51,7 +51,7 @@ msgstr "nie"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:308
 msgid "quit"
 msgstr "wyj�cie"
 
@@ -255,6 +255,17 @@ msgstr "nie zaszyfrowany"
 msgid "not processed"
 msgstr "nie zosta� przetworzony"
 
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+#, fuzzy
+msgid "unusable public key"
+msgstr "niepoprawny klucz publiczny"
+
+#: util/errors.c:106
+#, fuzzy
+msgid "unusable secret key"
+msgstr "niepoprawny klucz prywatny"
+
 #: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -265,66 +276,66 @@ msgstr "... to jest b��d w programie (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "znalaz�e�(a�) b��d w programie ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
+#: cipher/random.c:309 g10/import.c:129 g10/keygen.c:1256
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� %s: %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:313
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "nie mo�na sprawdzi� %s: %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:318
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' nie jest zwyk�ym plikiem - zostaje pomini�ty\n"
 
-#: cipher/random.c:325
+#: cipher/random.c:323
 msgid "note: random_seed file is empty\n"
 msgstr "uwaga: plik random_seed jest pusty\n"
 
-#: cipher/random.c:331
+#: cipher/random.c:329
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 "ostrze�enie: plik random_seed ma niew�a�ciwy rozmiar - nie zostanie u�yty\n"
 
-#: cipher/random.c:339
+#: cipher/random.c:337
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "nie mo�na odczyta� %s: %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:375
 msgid "note: random_seed file not updated\n"
 msgstr "uwaga: plik random_seed nie jest uaktualniony\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:395
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nie mo�na stworzy� %s: %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:402
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "nie mo�na zapisa� %s: %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:405
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "nie mo�na zamkn�� %s: %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:416
 #, 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:650
+#: cipher/random.c:648
 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:651
+#: cipher/random.c:649
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -350,7 +361,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:212
+#: g10/g10.c:213
 msgid ""
 "@Commands:\n"
 " "
@@ -358,139 +369,139 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu na czytelnym dokumencie"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "make a detached signature"
 msgstr "z�o�enie podpisu oddzielonego od dokumentu"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "store only"
 msgstr "tylko zapis"
 
-#: g10/g10.c:220
+#: g10/g10.c:221
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lnie)"
 
-#: g10/g10.c:221
+#: g10/g10.c:222
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/g10.c:223
+#: g10/g10.c:224
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpis�w"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "check key signatures"
 msgstr "sprawdzenie podpis�w kluczy"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "list secret keys"
 msgstr "lista kluczy tajnych"
 
-#: g10/g10.c:229
+#: g10/g10.c:230
 msgid "generate a new key pair"
 msgstr "generacja nowej pary klucza"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
 msgid "remove key from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "remove key from the secret keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy tajnych"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign a key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "sign a key locally"
 msgstr "z�o�enie lokalnego podpisu na kluczu"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "generate a revocation certificate"
 msgstr "generacja certyfikatu uniewa�nienia klucza"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/g10.c:238
+#: g10/g10.c:239
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/g10.c:239
+#: g10/g10.c:240
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/g10.c:243
+#: g10/g10.c:244
 msgid "import/merge keys"
 msgstr "import/do��czenie kluczy"
 
-#: g10/g10.c:245
+#: g10/g10.c:246
 msgid "list only the sequence of packets"
 msgstr "wypisane sekwencji pakiet�w"
 
-#: g10/g10.c:247
+#: g10/g10.c:248
 msgid "export the ownertrust values"
 msgstr "eksport warto�ci zaufania"
 
-#: g10/g10.c:249
+#: g10/g10.c:250
 msgid "import ownertrust values"
 msgstr "wczytanie warto��i zaufania"
 
-#: g10/g10.c:251
+#: g10/g10.c:252
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAZWY]|sprawdzenie bazy zaufania"
 
-#: g10/g10.c:254
+#: g10/g10.c:255
 msgid "fix a corrupted trust database"
 msgstr "naprawa uszkodzonej bazy zaufania"
 
-#: g10/g10.c:255
+#: g10/g10.c:256
 msgid "De-Armor a file or stdin"
 msgstr "zdj�cie opakowania ASCII pliku lub potoku"
 
-#: g10/g10.c:257
+#: g10/g10.c:258
 msgid "En-Armor a file or stdin"
 msgstr "opakowanie ASCII pliku lub potoku"
 
-#: g10/g10.c:259
+#: g10/g10.c:260
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/g10.c:263
+#: g10/g10.c:264
 msgid ""
 "@\n"
 "Options:\n"
@@ -500,156 +511,156 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/g10.c:265
+#: g10/g10.c:266
 msgid "create ascii armored output"
 msgstr "plik wynikowy w opakowaniu ASCII"
 
-#: g10/g10.c:267
+#: g10/g10.c:268
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/g10.c:270
+#: g10/g10.c:271
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego adresata"
 
-#: g10/g10.c:272
+#: g10/g10.c:273
 msgid "use the default key as default recipient"
 msgstr "domy�lny klucz jest domy�lnym adresatem"
 
-#: g10/g10.c:276
+#: g10/g10.c:277
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - brak)"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "use as output file"
 msgstr "plik wyj�ciowy"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "verbose"
 msgstr "z informacjami dodatkowymi"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "be somewhat more quiet"
 msgstr "mniej komunikat�ww"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "don't use the terminal at all"
 msgstr "bez odwo�a� do terminala"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "force v3 signatures"
 msgstr "wymuszenie trzeciej wersji formatu podpis�w"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "always use a MDC for encryption"
 msgstr "do szyfrowania b�dzie u�ywany MDC"
 
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: �adnych pyta�"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "assume yes on most questions"
 msgstr "automatyczna odpowied� tak na wi�kszo�� pyta�"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "assume no on most questions"
 msgstr "automatyczna odpowied� nie na wi�kszo�� pyta�"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "add this keyring to the list of keyrings"
 msgstr "doda� zbi�r kluczy do listy u�ywanych"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "add this secret keyring to the list"
 msgstr "doda� zbi�r kluczy tajnych do listy"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego klucza tajnego"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|serwer kluczy w kt�rym b�d� poszukiwane"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAZWA|zestaw znak�w terminala NAZWA"
 
-#: g10/g10.c:297
+#: g10/g10.c:298
 msgid "read options from file"
 msgstr "wczytanie opcji z pliku"
 
-#: g10/g10.c:301
+#: g10/g10.c:302
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapisa� opis stanu do FD"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "|KEYID|ulimately trust this key"
 msgstr "|KLUCZ|ca�kowite zaufanie dla tego klucza"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "|FILE|load extension module FILE"
 msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "emulate the mode described in RFC1991"
 msgstr "emulacja trybu opisanego w RFC1991"
 
-#: g10/g10.c:309
+#: g10/g10.c:310
 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:310
+#: g10/g10.c:311
 msgid "|N|use passphrase mode N"
 msgstr "|N|N-ty tryb wprowadzania wyra�enia przej�ciowego"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|ALG|algorytm obliczania skr�t�w wiadomo�ci ALG"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|ALG|algorytmu szyfruj�cy ALG dla has�a"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|algorytm szyfruj�cy NAZWA"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|algorytm obliczania skr�t�w wiadomo�ci NAZWA"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "|N|use compress algorithm N"
 msgstr "|N|algorytm kompresji N"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "throw keyid field of encrypted packets"
 msgstr "usuni�cie identyfikator�w kluczy z pakiet�w"
 
-#: g10/g10.c:319
+#: g10/g10.c:320
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAZWA=WARTO��|adnotacje"
 
-#: g10/g10.c:322
+#: g10/g10.c:323
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -657,7 +668,7 @@ msgstr ""
 "@\n"
 "(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
 
-#: g10/g10.c:325
+#: g10/g10.c:326
 msgid ""
 "@\n"
 "Examples:\n"
@@ -678,15 +689,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/g10.c:431
+#: g10/g10.c:432
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: g10/g10.c:435
+#: g10/g10.c:436
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/g10.c:438
+#: g10/g10.c:439
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -696,7 +707,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/g10.c:445
+#: g10/g10.c:446
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -704,191 +715,191 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/g10.c:524
+#: g10/g10.c:525
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/g10.c:577
+#: g10/g10.c:578
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/g10.c:727
+#: g10/g10.c:728
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji '%s'\n"
 
-#: g10/g10.c:731
+#: g10/g10.c:732
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji '%s': %s\n"
 
-#: g10/g10.c:738
+#: g10/g10.c:739
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z '%s'\n"
 
-#: g10/g10.c:943
+#: g10/g10.c:944
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/g10.c:1014
+#: g10/g10.c:1015
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/g10.c:1018 g10/g10.c:1027
+#: g10/g10.c:1019 g10/g10.c:1028
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1021
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/g10.c:1023
+#: g10/g10.c:1024
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu z %s!\n"
 
-#: g10/g10.c:1043 g10/g10.c:1055
+#: g10/g10.c:1044 g10/g10.c:1056
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/g10.c:1049 g10/g10.c:1061
+#: g10/g10.c:1050 g10/g10.c:1062
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm geenracji skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/g10.c:1065
+#: g10/g10.c:1066
 msgid "the given policy URL is invalid\n"
 msgstr "podany URL regulaminu jest niepoprawny\n"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1069
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "ustawienie algortytmu kompresji musi pochodzi� z zakresu %d..%d\n"
 
-#: g10/g10.c:1070
+#: g10/g10.c:1071
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/g10.c:1072
+#: g10/g10.c:1073
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/g10.c:1074
+#: g10/g10.c:1075
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "warto�� max-cert-depth musi mie�ci� si� w zakresie od 1 do 255\n"
 
-#: g10/g10.c:1077
+#: g10/g10.c:1078
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/g10.c:1081
+#: g10/g10.c:1082
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "niepoprawny tryb S2K; musi mie� warto�� 0, 1 lub 3\n"
 
-#: g10/g10.c:1166
+#: g10/g10.c:1167
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1172
+#: g10/g10.c:1173
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1180
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:1187
+#: g10/g10.c:1188
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/g10.c:1200
+#: g10/g10.c:1201
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/g10.c:1213
+#: g10/g10.c:1214
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:1227
+#: g10/g10.c:1228
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/g10.c:1244
+#: g10/g10.c:1245
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1261
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/g10.c:1268
+#: g10/g10.c:1269
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/g10.c:1284
+#: g10/g10.c:1285
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key nazwa u�ytkownika"
 
-#: g10/g10.c:1287
+#: g10/g10.c:1288
 msgid "--delete-key user-id"
 msgstr "--delete-key nazwa u�ytkownika"
 
-#: g10/g10.c:1295
+#: g10/g10.c:1296
 #, fuzzy
 msgid "--delete-secret-and-public-key user-id"
 msgstr "--delete-secret-key nazwa u�ytkownika"
 
-#: g10/encode.c:268 g10/g10.c:1332 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1333 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "nie mo�na otworzy� %s: %s\n"
 
-#: g10/g10.c:1347
+#: g10/g10.c:1348
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
 
-#: g10/g10.c:1413
+#: g10/g10.c:1414
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1421
+#: g10/g10.c:1422
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1493
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu '%s'\n"
 
-#: g10/g10.c:1579
+#: g10/g10.c:1580
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/g10.c:1583
+#: g10/g10.c:1584
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1586 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1587 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:1795
+#: g10/g10.c:1796
 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:1801
+#: g10/g10.c:1802
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -896,87 +907,87 @@ msgstr ""
 "nazwa adnotacji mo�e zawiera� tylko litery, cyfry, kropki,\n"
 "podkre�lenia, i musi ko�czy� si� '='\n"
 
-#: g10/g10.c:1807
+#: g10/g10.c:1808
 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:1815
+#: g10/g10.c:1816
 msgid "a notation value must not use any control characters\n"
 msgstr "warto�� adnotacji nie mo�e zawiera� znak�w steruj�cych\n"
 
-#: g10/armor.c:302
+#: g10/armor.c:304
 #, c-format
 msgid "armor: %s\n"
 msgstr "opakowanie: %s\n"
 
-#: g10/armor.c:331
+#: g10/armor.c:333
 msgid "invalid armor header: "
 msgstr "niepoprawny nag��wek opakowania: "
 
-#: g10/armor.c:338
+#: g10/armor.c:340
 msgid "armor header: "
 msgstr "nag��wek opakowania: "
 
-#: g10/armor.c:349
+#: g10/armor.c:351
 msgid "invalid clearsig header\n"
 msgstr "niew�a�ciwy nag��wek czytelnego podpisanego dokumentu\n"
 
-#: g10/armor.c:401
+#: g10/armor.c:403
 msgid "nested clear text signatures\n"
 msgstr "zagnie�d�one podpisy na czytelnym dokumencie\n"
 
-#: g10/armor.c:525
+#: g10/armor.c:527
 msgid "invalid dash escaped line: "
 msgstr "niepoprawne oznaczenie linii minusami: "
 
-#: g10/armor.c:537
+#: g10/armor.c:539
 msgid "unexpected armor:"
 msgstr "nieoczekiwane opakowanie:"
 
-#: g10/armor.c:663
+#: g10/armor.c:665
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "niew�a�ciwy znak formatu radix64 %02x zosta� pomini�ty\n"
 
-#: g10/armor.c:706
+#: g10/armor.c:708
 msgid "premature eof (no CRC)\n"
 msgstr "przewczesny koniec pliku (brak CRC)\n"
 
-#: g10/armor.c:740
+#: g10/armor.c:742
 msgid "premature eof (in CRC)\n"
 msgstr "przedwczesny koniec pliku (w CRC)\n"
 
-#: g10/armor.c:744
+#: g10/armor.c:746
 msgid "malformed CRC\n"
 msgstr "b��d formatu CRC\n"
 
-#: g10/armor.c:748
+#: g10/armor.c:750
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "B��d sumy CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:765
+#: g10/armor.c:767
 msgid "premature eof (in Trailer)\n"
 msgstr "przedwczesny koniec pliku (w linii ko�cz�cej)\n"
 
-#: g10/armor.c:769
+#: g10/armor.c:771
 msgid "error in trailer line\n"
 msgstr "b��d w linii ko�cz�cej\n"
 
-#: g10/armor.c:915
+#: g10/armor.c:917
 msgid "For info see http://www.gnupg.org"
 msgstr "Dalsze informacje znajduj� si� na http://www.gnupg.org/"
 
-#: g10/armor.c:1043
+#: g10/armor.c:1045
 msgid "no valid OpenPGP data found.\n"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: g10/armor.c:1048
+#: g10/armor.c:1050
 #, 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:1052
+#: g10/armor.c:1054
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -985,7 +996,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1189 g10/pkclist.c:53
+#: g10/keyedit.c:1190 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "                  Odcisk:"
 
@@ -1216,17 +1227,17 @@ msgstr ""
 "             Nie ma pewno�ci �e ten podpis zosta� z�o�nony przez "
 "w�a�ciciela.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: pomini�ty: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:826 g10/pkclist.c:993
 #, 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:854
+#: g10/pkclist.c:853
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1234,42 +1245,42 @@ msgstr ""
 "Nie poda�e� identyfikatora u�ytkownika (user ID). \n"
 "Mo�na to zrobi� za pomoc� opcji \"-r\".\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:863
 msgid "Enter the user ID: "
 msgstr "Wprowad� identyfikator u�ytkownika (user ID): "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:875
 msgid "No such user ID.\n"
 msgstr "Brak takiego identyfikatora u�ytkownika.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:880
 msgid "skipped: public key already set as default recipient\n"
 msgstr "pomini�ty: klucz publiczny ju� jest domy�lnym adresatem\n"
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:903
 msgid "Public key is disabled.\n"
 msgstr "Klucz publiczny wy��czony z uzycia.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:910
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "pomini�ty: klucz publiczny ju� wybrany w --encrypt-to\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:941
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "nieznany domy�lny adresat '%s'\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:974
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: b��d podczas sprawdzania klucza: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:979
 #, 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:1018
+#: g10/pkclist.c:1017
 msgid "no valid addressees\n"
 msgstr "brak poprawnych adres�w\n"
 
@@ -1552,7 +1563,7 @@ msgid ""
 msgstr ""
 "Musisz poda� wyra�enie przej�ciowe (has�o) aby ochroni� sw�j klucz tajny.\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:955
+#: g10/keyedit.c:469 g10/keygen.c:955
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr ""
 "Powt�rzone wyra�enie przej�ciowe nie zgadza si� z podanym w pierwszej "
@@ -1686,287 +1697,280 @@ msgstr "klucz %08lX: nie jest w formacie RFC 2440 - pomini�ty\n"
 msgid "key %08lX: not protected - skipped\n"
 msgstr "klucz %08lX: nie jest chroniony - pomini�ty\n"
 
-#: g10/export.c:232
+#: g10/export.c:236
 msgid "WARNING: nothing exported\n"
 msgstr "OSTRZE�ENIE: nic nie zosta�o wyeksportowane!\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:208
 msgid "too many entries in pk cache - disabled\n"
 msgstr "zbyt wiele wpis�w w buforze kluczy publicznych - wy��czony\n"
 
-#: g10/getkey.c:350
+#: g10/getkey.c:443
 msgid "too many entries in unk cache - disabled\n"
 msgstr "zbyt wiele wpis�w w buforze nieznanych kluczy - wy��czony\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
-msgid "RSA key cannot be used in this version\n"
-msgstr "W tej wersji nie mo�na u�ywa� kluczy RSA\n"
-
-#: g10/getkey.c:1310 g10/getkey.c:1349
-msgid "No key for user ID\n"
-msgstr "Brak klucza z takim identyfikatorem u�ytkownika.\n"
-
-#: g10/getkey.c:1388 g10/getkey.c:1428
-msgid "No user ID for key\n"
-msgstr "Brak identyfikatora u�ytkownika dla klucza.\n"
-
-#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
+#: g10/getkey.c:2143
 #, 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:2050
+#: g10/getkey.c:2185 g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pomini�ty\n"
+
+#: g10/getkey.c:2473
 msgid "[User id not found]"
 msgstr "[brak identyfikatora u�ytkownika]"
 
-#: g10/import.c:182
+#: g10/import.c:184
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d zostaje pomini�ty\n"
 
-#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu kluczy przetworzonych do tej chwili\n"
 
-#: g10/import.c:194
+#: g10/import.c:196
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "b��d odczytu '%s': %s\n"
 
-#: g10/import.c:204
+#: g10/import.c:206
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Og�em przetworzonych kluczy: %lu\n"
 
-#: g10/import.c:206
+#: g10/import.c:208
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "   pomini�tych nowych kluczy: %lu\n"
 
-#: g10/import.c:209
+#: g10/import.c:211
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez identyfikatora: %lu\n"
 
-#: g10/import.c:211
+#: g10/import.c:213
 #, c-format
 msgid "              imported: %lu"
 msgstr "         do��czono do zbioru: %lu"
 
-#: g10/import.c:217
+#: g10/import.c:219
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   bez zmian: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:221
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nowych identyfikator�w: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:223
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "            nowych podkluczy: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:225
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "             nowych podpis�w: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:227
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   nowych uniewa�nie� kluczy: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:229
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   tajnych kluczy wczytanych: %lu\n"
 
-#: g10/import.c:229
+#: g10/import.c:231
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "     tajnych kluczy dodanych: %lu\n"
 
-#: g10/import.c:231
+#: g10/import.c:233
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    tajnych kluczy bez zmian: %lu\n"
 
-#: g10/import.c:391 g10/import.c:600
+#: g10/import.c:408 g10/import.c:617
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
 
-#: g10/import.c:405
+#: g10/import.c:422
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "klucz %08lX: brak poprawnych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:407
+#: g10/import.c:424
 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:418 g10/import.c:667
+#: g10/import.c:435 g10/import.c:684
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "klucz %08lX: brak klucza publicznego: %s\n"
 
-#: g10/import.c:423
+#: g10/import.c:440
 #, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "klucz %08lX: nowy klucz - pomini�ty\n"
 
-#: g10/import.c:431
+#: g10/import.c:448
 msgid "no default public keyring\n"
 msgstr "brak domy�lnego zbioru kluczy publicznych\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
+#: g10/import.c:452 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:615 g10/import.c:716
+#: 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:441 g10/import.c:499 g10/import.c:618 g10/import.c:719
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "klucz %08lX: klucz publiczny wczytano do zbioru\n"
 
-#: g10/import.c:463
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "klucz %08lX: nie zgadza si� z lokalnie posiadan� kopi�\n"
 
-#: g10/import.c:472 g10/import.c:675
+#: g10/import.c:489 g10/import.c:692
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "klucz %08lX: brak oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:478 g10/import.c:681
+#: g10/import.c:495 g10/import.c:698
 #, 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:505
+#: g10/import.c:522
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "klucz %08lX: 1 nowy identyfikator u�ytkownika\n"
 
-#: g10/import.c:508
+#: g10/import.c:525
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "klucz %08lX: %d nowych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:511
+#: g10/import.c:528
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "klucz %08lX: 1 nowy podpis\n"
 
-#: g10/import.c:514
+#: g10/import.c:531
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "klucz %08lX: %d nowych podpis�w\n"
 
-#: g10/import.c:517
+#: g10/import.c:534
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "klucz %08lX: 1 nowy podklucz\n"
 
-#: g10/import.c:520
+#: g10/import.c:537
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "klucz %08lX: %d nowych podkluczy\n"
 
-#: g10/import.c:530
+#: g10/import.c:547
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "klucz %08lX: bez zmian\n"
 
-#: g10/import.c:593
+#: g10/import.c:610
 #, c-format
 msgid "secret key %08lX not imported (use %s to allow for it)\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:640
 #, 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:627
+#: g10/import.c:644
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "Klucz %08lX: ten klucz ju� znajduje si� w zbiorze\n"
 
-#: g10/import.c:632
+#: g10/import.c:649
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "klucz %08lX: brak klucza tajnego: %s\n"
 
-#: g10/import.c:661
+#: g10/import.c:678
 #, 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:692
+#: g10/import.c:709
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "klucz %08lX: niepoprawny certyfikat uniewa�nienia: %s - odrzucony\n"
 
-#: g10/import.c:724
+#: g10/import.c:741
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "klucz %08lX: wczytany certyfikat uniewa�nienia\n"
 
-#: g10/import.c:766
+#: g10/import.c:783
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika do podpisu\n"
 
-#: g10/import.c:773 g10/import.c:797
+#: g10/import.c:790 g10/import.c:814
 #, 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:774
+#: g10/import.c:791
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "klucz %08lX: niepoprawny podpis w�a�ciciela klucza\n"
 
-#: g10/import.c:789
+#: g10/import.c:806
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "klucz %08lX: brak podklucza do dowi�zania\n"
 
-#: g10/import.c:798
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "klucz %08lX: niepoprawne dowi�zanie podklucza\n"
 
-#: g10/import.c:825
+#: g10/import.c:842
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "klucz %08lX: przyj�to identyfikator nie podpisany nim samym '"
 
-#: g10/import.c:854
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "klucz %08lX: pomini�to identyfikator u�ytkownika '"
 
-#: g10/import.c:877
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "klucz %08lX: podklucz pomini�ty\n"
@@ -1975,34 +1979,34 @@ msgstr "klucz %08lX: podklucz pomini�ty\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:902
+#: g10/import.c:919
 #, 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:911
+#: g10/import.c:928
 #, 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:919
+#: g10/import.c:936
 #, 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:1019
+#: g10/import.c:1036
 #, 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:1071
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "klucz %08lX: dodany certyfikat uniewa�nienia\n"
 
-#: g10/import.c:1185 g10/import.c:1238
+#: g10/import.c:1202 g10/import.c:1255
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "klucz %08lX: dost�pna kopia nie jest podpisana ni� sam�\n"
@@ -2012,46 +2016,46 @@ msgstr "klucz %08lX: dost�pna kopia nie jest podpisana ni� sam�\n"
 msgid "%s: user not found\n"
 msgstr "%s: nie znaleziono u�ytkownika\n"
 
-#: g10/keyedit.c:155
+#: g10/keyedit.c:156
 msgid "[revocation]"
 msgstr "[uniewa�nienie]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:157
 msgid "[self-signature]"
 msgstr "[podpis klucza nim samym]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:221
 msgid "1 bad signature\n"
 msgstr "1 niepoprawny podpis\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:223
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d niepoprawnych podpis�w\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:225
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis nie zosta� sprawdzony z powodu braku klucza\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d podpis�w nie zosta�o sprawdzonych z powodu braku kluczy\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis nie zosta� sprawdzony z powodu b��du\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:231
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpis�w nie sprawdzonych z powodu b��d�w\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:233
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "wykryto 1 identyfikator u�ytkownika bez podpisu w�a�ciciela klucza\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:235
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
@@ -2059,17 +2063,17 @@ msgstr ""
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:317
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Ju� podpisano kluczem %08lX.\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:325
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nie ma nic do podpisania kluczem %08lX.\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2077,7 +2081,7 @@ msgstr ""
 "Czy jeste� naprawd� pewien �e chcesz podpisa� ten klucz \n"
 "swoim kluczem: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:343
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2085,33 +2089,33 @@ msgstr ""
 "Podpis zostanie oznaczony jako nieeksportowalny.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:348
 msgid "Really sign? "
 msgstr "Na pewno podpisa�? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
+#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:136
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:428
 msgid "This key is not protected.\n"
 msgstr "Ten klucz nie jest chroniony.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:432
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:436
 msgid "Key is protected.\n"
 msgstr "Klucz jest chroniony.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tego klucza nie mo�na edytowa�: %s.\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:461
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2119,7 +2123,7 @@ msgstr ""
 "Wprowad� nowe wyra�enie przej�ciowe (has�o) dla tego klucza tajnego.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:473
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2127,421 +2131,421 @@ msgstr ""
 "Nie chcesz poda� wyra�enia przej�ciowego (has�a) - to *z�y* pomys�!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:476
 msgid "Do you really want to do this? "
 msgstr "Czy na pewno chcesz to zrobi�? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:540
 msgid "moving a key signature to the correct place\n"
 msgstr "przenosz� podpis klucza na w�a�ciwe miejsce\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
 msgid "quit this menu"
 msgstr "wyj�cie z tego menu"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "q"
 msgstr "w"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save"
 msgstr "zapis"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save and quit"
 msgstr "zapis zmian i wyj�cie"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "help"
 msgstr "pomoc"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "fpr"
 msgstr "odc"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "show fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list"
 msgstr "lista"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list key and user IDs"
 msgstr "lista kluczy i identyfikator�w u�ytkownik�w"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "uid"
 msgstr "id"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "select user ID N"
 msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "key"
 msgstr "klucz"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "select secondary key N"
 msgstr "wyb�r podklucza N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "check"
 msgstr "lista"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "list signatures"
 msgstr "lista podpis�w"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "c"
 msgstr "l"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign"
 msgstr "podpis"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign the key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "s"
 msgstr "p"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "lsign"
 msgstr "lpodpis"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "sign the key locally"
 msgstr "z�o�enie lokalnego podpisu na kluczu"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "debug"
 msgstr "�ledzenia"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "adduid"
 msgstr "dodid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "add a user ID"
 msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "deluid"
 msgstr "usid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "delete user ID"
 msgstr "usuni�cie identyfikatora u�ytkownika z klucza"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "addkey"
 msgstr "dodkl"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "add a secondary key"
 msgstr "dodanie podklucza"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delkey"
 msgstr "uskl"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delete a secondary key"
 msgstr "usuni�cie podklucza"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delsig"
 msgstr "uspod"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delete signatures"
 msgstr "usuni�cie podpis�w"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "expire"
 msgstr "data"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "change the expire date"
 msgstr "zmiana daty wa�no�ci klucza"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle"
 msgstr "prze�"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle between secret and public key listing"
 msgstr "prze��czenie pomi�dzy list� kluczy publicznych i tajnych"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "t"
 msgstr "p"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "pref"
 msgstr "opcje"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "list preferences"
 msgstr "lista opcji"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
 msgid "passwd"
 msgstr "has�o"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
 msgid "change the passphrase"
 msgstr "zmiana wyra�enia przej�ciowego (has�a)"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
 msgid "trust"
 msgstr "zaufanie"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
 msgid "change the ownertrust"
 msgstr "zmiana zaufania w�a�ciciela"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
 msgid "revsig"
 msgstr "unpod"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
 msgid "revoke signatures"
 msgstr "uniewa�nienie podpisu"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 msgid "revkey"
 msgstr "unpkl"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 msgid "revoke a secondary key"
 msgstr "uniewa�nienie podklucza"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 msgid "disable"
 msgstr "wy�kl"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 msgid "disable a key"
 msgstr "wy��czy� klucz z u�ycia"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
 msgid "enable"
 msgstr "w�kl"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
 msgid "enable a key"
 msgstr "w��czy� klucz do u�ycia"
 
-#: g10/delkey.c:110 g10/keyedit.c:631
+#: g10/delkey.c:110 g10/keyedit.c:632
 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:669
+#: g10/keyedit.c:670
 msgid "Secret key is available.\n"
 msgstr "Dost�pny jest klucz tajny.\n"
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 msgid "Command> "
 msgstr "Polecenie> "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:729
 msgid "Need the secret key to do this.\n"
 msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:733
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Najpierw trzeba u�y� polecenia \"prze�\".\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 msgid "Really sign all user IDs? "
 msgstr "Podpisa� wszystkie identyfikatory u�ytkownika na tym kluczu? "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Podpowied�: wybierz identyfikatory u�ytkownika do podpisania.\n"
 
-#: g10/keyedit.c:812 g10/keyedit.c:994
+#: g10/keyedit.c:813 g10/keyedit.c:995
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "naniesienie poprawek bazy zaufania nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:823 g10/keyedit.c:844
+#: g10/keyedit.c:824 g10/keyedit.c:845
 msgid "You must select at least one user ID.\n"
 msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "You can't delete the last user ID!\n"
 msgstr "Nie mo�esz usun�� ostatniego identyfikatora u�ytkownika!\n"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:829
 msgid "Really remove all selected user IDs? "
 msgstr "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:830
 msgid "Really remove this user ID? "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:866 g10/keyedit.c:888
 msgid "You must select at least one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:870
 msgid "Do you really want to delete the selected keys? "
 msgstr "Czy na pewno chcesz usun�� wybrane klucze? "
 
-#: g10/keyedit.c:870
+#: g10/keyedit.c:871
 msgid "Do you really want to delete this key? "
 msgstr "Czy na pewno chcesz usun�� ten klucz? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Czy na pewno chcesz uniewa�ni� wybrane klucze? "
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:893
 msgid "Do you really want to revoke this key? "
 msgstr "Czy na pewno chcesz uniewa�ni� ten klucz? "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:959
 msgid "Save changes? "
 msgstr "Zapisa� zmiany? "
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:962
 msgid "Quit without saving? "
 msgstr "Wyj�� bez zapisania zmian? "
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:973
 #, c-format
 msgid "update failed: %s\n"
 msgstr "naniesienie poprawek nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:980
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "naniesienie poprawek na kluczu tajnym nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:987
 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:1001
+#: g10/keyedit.c:1002
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawna komenda  (spr�buj \"help\")\n"
 
-#: g10/keyedit.c:1081 g10/keyedit.c:1107
+#: g10/keyedit.c:1082 g10/keyedit.c:1108
 #, 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:1090
+#: g10/keyedit.c:1091
 #, c-format
 msgid " trust: %c/%c"
 msgstr "zaufanie: %c/%c"
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1095
 msgid "This key has been disabled"
 msgstr "Ten klucz zosta� wy��czony z u�ytku"
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1124
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "podklucz zosta� uniewa�niony: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1127
 msgid "rev- faked revocation found\n"
 msgstr "fa�szywy certyfikat uniewa�nienia\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1129
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "problem przy sprawdzaniu uniewa�nienia: %s\n"
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usun�� ten poprawny podpis? (t/N/w)"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1371
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usun�� ten niepoprawny podpis? (t/N/w)"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1375
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usun�� ten nieznany podpis? (t/N/w)"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1381
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usun�� ten podpis klucza nim samym? (t/N)"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d podpis usuni�ty.\n"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1396
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d podpis�w usuni�tych.\n"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta�o usuni�te.\n"
 
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1468
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Prosz� usun�� znacznik wyboru z kluczy tajnych.\n"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1474
 msgid "Please select at most one secondary key.\n"
 msgstr "Prosz� wybra� najwy�ej jeden podklucz.\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1478
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Zmiana daty wa�no�ci podklucza.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1480
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1522
 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:1537
+#: g10/keyedit.c:1538
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy tajnych\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1599
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:1644
+#: g10/keyedit.c:1645
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Brak podklucza o indeksie %d\n"
 
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:1743
 msgid "user ID: \""
 msgstr "Identyfikator u�ytkownika: "
 
-#: g10/keyedit.c:1745
+#: g10/keyedit.c:1746
 #, c-format
 msgid ""
 "\"\n"
@@ -2550,34 +2554,34 @@ msgstr ""
 "\"\n"
 "podpisano Twoim kluczem %08lX w %s\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1750
 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:1773
+#: g10/keyedit.c:1774
 msgid "You have signed these user IDs:\n"
 msgstr "Te identyfikatory u�ytkownik�w s� podpisane przez Ciebie:\n"
 
-#: g10/keyedit.c:1787 g10/keyedit.c:1822
+#: g10/keyedit.c:1788 g10/keyedit.c:1823
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "podpisany przez %08lX w %s\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1793
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "uniewa�niony przez %08lX w %s\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1813
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
 
-#: g10/keyedit.c:1830
+#: g10/keyedit.c:1831
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N)"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1860
 msgid "no secret key\n"
 msgstr "brak klucza prywatnego\n"
 
@@ -2590,79 +2594,79 @@ msgid "revoked"
 msgstr "uniewa�niony"
 
 #. of subkey
-#: g10/keylist.c:404 g10/mainproc.c:836
+#: g10/keylist.c:402 g10/mainproc.c:837
 #, c-format
 msgid " [expires: %s]"
 msgstr "[wygasa :%s]"
 
-#: g10/mainproc.c:270
+#: g10/mainproc.c:271
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "klucz publiczny %08lX\n"
 
-#: g10/mainproc.c:315
+#: g10/mainproc.c:316
 msgid "public key encrypted data: good DEK\n"
 msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
 
-#: g10/mainproc.c:367
+#: g10/mainproc.c:368
 #, 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:377
+#: g10/mainproc.c:378
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "zaszyfrowane kluczem %s, o identyfikatorze %08lX\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:392
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "b��d odszyfrowywania kluczem publicznym: %s\n"
 
-#: g10/mainproc.c:431
+#: g10/mainproc.c:432
 msgid "decryption okay\n"
 msgstr "odszyfrowane poprawnie\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:437
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "OSTRZE�ENIE: zaszyfrowana wiadomo�� by�a manipulowana!\n"
 
-#: g10/mainproc.c:441
+#: g10/mainproc.c:442
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:461
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "UWAGA: nadawca zaznaczy� �e wiadomo�� nie powinna by� zapisywana\n"
 
-#: g10/mainproc.c:462
+#: g10/mainproc.c:463
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:617
+#: g10/mainproc.c:618
 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:704 g10/mainproc.c:713
+#: g10/mainproc.c:705 g10/mainproc.c:714
 msgid "WARNING: invalid notation data found\n"
 msgstr "OSTRZE�ENIE: niepoprawne dane w adnotacji\n"
 
-#: g10/mainproc.c:716
+#: g10/mainproc.c:717
 msgid "Notation: "
 msgstr "Adnotacja:"
 
-#: g10/mainproc.c:725
+#: g10/mainproc.c:726
 msgid "Policy: "
 msgstr "Regulamin:"
 
-#: g10/mainproc.c:1235
+#: g10/mainproc.c:1177
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
 
-#: g10/mainproc.c:1272
+#: g10/mainproc.c:1214
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
@@ -2670,51 +2674,51 @@ msgstr ""
 "z u�yciem klucza o identyfikatorze %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1307 g10/mainproc.c:1318
+#: g10/mainproc.c:1242 g10/mainproc.c:1250
 msgid "BAD signature from \""
 msgstr "NIEPOPRAWNY podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1308 g10/mainproc.c:1319
+#: g10/mainproc.c:1243 g10/mainproc.c:1251
 msgid "Good signature from \""
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1310
+#: g10/mainproc.c:1266
 msgid "                aka \""
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1366
+#: g10/mainproc.c:1316
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie mog� sprawdzi� podpisu: %s\n"
 
-#: g10/mainproc.c:1423 g10/mainproc.c:1438 g10/mainproc.c:1500
+#: g10/mainproc.c:1373 g10/mainproc.c:1388 g10/mainproc.c:1450
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "z�o�enie podpisu oddzielonego od dokumentu"
 
-#: g10/mainproc.c:1449
+#: g10/mainproc.c:1399
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "osobny podpis klasy 0x%02x\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1454
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:1509
+#: g10/mainproc.c:1459
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:98
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nie mo�na wy��czy� zrzut�w pami�ci: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:208
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Nie nale�y u�ywa� algorytm�w do�wiadczalnych!\n"
 
-#: g10/misc.c:237
+#: g10/misc.c:238
 #, fuzzy
 msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
 msgstr ""
@@ -2725,7 +2729,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:990
+#: g10/parse-packet.c:1010
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
@@ -2738,7 +2742,7 @@ msgstr ""
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:170 g10/passphrase.c:248
+#: g10/hkp.c:147 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"
@@ -2869,36 +2873,36 @@ msgstr "UWAGA: brak algorytmu szyfruj�cego %d w ustawieniach\n"
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "UWAGA: wa�no�� klucza tajnego %08lX wygas�a %s\n"
 
-#: g10/hkp.c:72
+#: g10/hkp.c:59
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr "zapytanie o klucz %08lX w %s ...\n"
 
-#: g10/hkp.c:85
+#: g10/hkp.c:72
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "nie mo�na pobra� klucza z serwera: %s\n"
 
-#: g10/hkp.c:109 g10/hkp.c:148
+#: g10/hkp.c:91 g10/hkp.c:125
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "brak znanyk serwer�w kluczy (u�yj opcji --keyserver)\n"
 
-#: g10/hkp.c:117
+#: g10/hkp.c:99
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s: nie jest poprawnym identyfikatorem klucza\n"
 
-#: g10/hkp.c:194
+#: g10/hkp.c:171
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "b��d przy wysy�aniu do '%s': %s\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:183
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "wysy�anie do '%s' powiod�o si� (status=%u)\n"
 
-#: g10/hkp.c:209
+#: g10/hkp.c:186
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "wysy�anie do '%s' nie powiod�o si� (status=%u)\n"
@@ -2912,12 +2916,12 @@ msgstr "tajne cz�ci klucza s� niedost�pne\n"
 msgid "protection algorithm %d is not supported\n"
 msgstr "algorytm ochrony %d nie jest obs�ugiwany\n"
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:184
 msgid "Invalid passphrase; please try again ...\n"
 msgstr ""
 "Niepoprawne wyra�enie przej�ciowe (has�o); prosz� spr�bowa� ponownie ...\n"
 
-#: g10/seckey-cert.c:242
+#: g10/seckey-cert.c:240
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "OSTRZE�ENIE: Wykryto klucz s�aby algorytmu - nale�y ponownie zmieni� \n"
@@ -3190,11 +3194,6 @@ msgstr ""
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "UWAGA: klucz tajny %08lX NIE jest chroniony.\n"
 
-#: g10/trustdb.c:577
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pomini�ty\n"
-
 #: g10/trustdb.c:584
 #, c-format
 msgid "key %08lX: secret and public key don't match\n"
@@ -3431,36 +3430,46 @@ msgstr "%s: stworzenie zbioru kluczy jest niemo�liwe: %s\n"
 msgid "%s: keyring created\n"
 msgstr "%s: zbi�r kluczy utworzony\n"
 
-#: g10/ringedit.c:1551
+#: g10/ringedit.c:1555
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "OSTRZE�ENIE: Istniej� dwa pliki z poufnymi informacjami.\n"
 
-#: g10/ringedit.c:1552
+#: g10/ringedit.c:1556
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s pozosta� bez zmian\n"
 
-#: g10/ringedit.c:1553
+#: g10/ringedit.c:1557
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s zosta� utworzony\n"
 
-#: g10/ringedit.c:1554
+#: g10/ringedit.c:1558
 msgid "Please fix this possible security flaw\n"
 msgstr "Prosz� usun�� to naruszenie zasad bezpiecze�stwa\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
+#: 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 ""
 "klucz nie jest oznaczony jako niepewny - nie mo�na go u�y� z atrap� \n"
 "generatora liczb losowych!\n"
 
-#: g10/skclist.c:113
+#: g10/skclist.c:138
+#, fuzzy, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "pomini�ty '%s': %s\n"
+
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "pomini�ty '%s': %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:149
+#, fuzzy
+msgid "skipped: secret key already present\n"
+msgstr "%s: pomini�ty: klucz publiczny ju� znajduje si� w bazie\n"
+
+#: g10/skclist.c:160
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3560,11 +3569,11 @@ msgstr "Usun�� ten klucz ze zbioru? "
 msgid "This is a secret key! - really delete? "
 msgstr "To jest klucz tajny! - czy na pewno go usun��? "
 
-#: g10/delkey.c:182
+#: g10/delkey.c:181
 msgid "there is a secret key for this public key!\n"
 msgstr "jest klucz tajny do tego klucza publicznego!\n"
 
-#: g10/delkey.c:184
+#: g10/delkey.c:183
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr "aby go usun�� nalezy najpierw u�y� opcji \"--delete-secret-key\".\n"
 
@@ -3831,6 +3840,15 @@ msgstr "Pomoc niedost�pna"
 msgid "No help available for `%s'"
 msgstr "Brak pomocy o '%s'"
 
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "W tej wersji nie mo�na u�ywa� kluczy RSA\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Brak klucza z takim identyfikatorem u�ytkownika.\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Brak identyfikatora u�ytkownika dla klucza.\n"
+
 #~ msgid "no secret key for decryption available\n"
 #~ msgstr "odszyfrowuj�cy klucz tajny do jest niedost�pny\n"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4baa0925b..53c9500cc 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2001-02-07 16:46+0100\n"
+"POT-Creation-Date: 2001-03-13 13:40+0100\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-20 23:46:36-0200\n"
 "From: Thiago Jung Bauermann <[email protected]>\n"
@@ -46,7 +46,7 @@ msgid "nN"
 msgstr "nN"
 
 # INICIO MENU
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:308
 msgid "quit"
 msgstr "sair"
 
@@ -251,6 +251,17 @@ msgstr "n�o criptografado"
 msgid "not processed"
 msgstr "n�o processado(s)"
 
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+#, fuzzy
+msgid "unusable public key"
+msgstr "chave p�blica incorreta"
+
+#: util/errors.c:106
+#, fuzzy
+msgid "unusable secret key"
+msgstr "chave secreta incorreta"
+
 #: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -261,63 +272,63 @@ msgstr "... isto � um bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "voc� encontrou um bug ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
+#: cipher/random.c:309 g10/import.c:129 g10/keygen.c:1256
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:313
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:318
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:325
+#: cipher/random.c:323
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:331
+#: cipher/random.c:329
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:339
+#: cipher/random.c:337
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:375
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:397
+#: cipher/random.c:395
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:402
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:405
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:416
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:650
+#: cipher/random.c:648
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: usando gerador de n�meros aleat�rios inseguro!\n"
 
-#: cipher/random.c:651
+#: cipher/random.c:649
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -343,7 +354,7 @@ msgstr ""
 "para que o sistema possa coletar mais entropia!\n"
 "(S�o necess�rios mais %d bytes)\n"
 
-#: g10/g10.c:212
+#: g10/g10.c:213
 msgid ""
 "@Commands:\n"
 " "
@@ -351,144 +362,144 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "sim�trica"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/g10.c:220
+#: g10/g10.c:221
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padr�o)"
 
-#: g10/g10.c:221
+#: g10/g10.c:222
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:223
+#: g10/g10.c:224
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:229
+#: g10/g10.c:230
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
 msgid "remove key from the public keyring"
 msgstr "remover a chave do chaveiro p�blico"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "remove key from the secret keyring"
 msgstr "remover a chave do chaveiro secreto"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:238
+#: g10/g10.c:239
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:239
+#: g10/g10.c:240
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:243
+#: g10/g10.c:244
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:245
+#: g10/g10.c:246
 msgid "list only the sequence of packets"
 msgstr "listar apenas as seq��ncias de pacotes"
 
 # ownertrust ???
-#: g10/g10.c:247
+#: g10/g10.c:248
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confian�a"
 
-#: g10/g10.c:249
+#: g10/g10.c:250
 msgid "import ownertrust values"
 msgstr "importar os valores de confian�a"
 
-#: g10/g10.c:251
+#: g10/g10.c:252
 msgid "update the trust database"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMES]|verificar o banco de dados de confiabilidade"
 
-#: g10/g10.c:254
+#: g10/g10.c:255
 msgid "fix a corrupted trust database"
 msgstr ""
 "consertar um banco de dados de confiabilidade\n"
 "danificado"
 
-#: g10/g10.c:255
+#: g10/g10.c:256
 msgid "De-Armor a file or stdin"
 msgstr "retirar a armadura de um arquivo ou de \"stdin\""
 
-#: g10/g10.c:257
+#: g10/g10.c:258
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um arquivo ou \"stdin\""
 
-#: g10/g10.c:259
+#: g10/g10.c:260
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:263
+#: g10/g10.c:264
 msgid ""
 "@\n"
 "Options:\n"
@@ -498,179 +509,179 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/g10.c:265
+#: g10/g10.c:266
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/g10.c:267
+#: g10/g10.c:268
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/g10.c:270
+#: g10/g10.c:271
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: g10/g10.c:272
+#: g10/g10.c:273
 msgid "use the default key as default recipient"
 msgstr "usar a chave padr�o como destinat�rio padr�o"
 
-#: g10/g10.c:276
+#: g10/g10.c:277
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usu�rio para\n"
 "assinar ou descriptografar"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desabilita)"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "use as output file"
 msgstr "usar como arquivo de sa�da"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para criptografar"
 
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "batch mode: never ask"
 msgstr "modo n�o-interativo: nunca perguntar"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "add this keyring to the list of keyrings"
 msgstr "adicionar este chaveiro � lista de chaveiros"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "add this secret keyring to the list"
 msgstr "adicionar este chaveiro secreto � lista"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta padr�o"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/g10.c:297
+#: g10/g10.c:298
 msgid "read options from file"
 msgstr "ler op��es do arquivo"
 
-#: g10/g10.c:301
+#: g10/g10.c:302
 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:306
+#: g10/g10.c:307
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "|FILE|load extension module FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/g10.c:309
+#: g10/g10.c:310
 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:310
+#: g10/g10.c:311
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar frase secreta modo N"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 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:314
+#: g10/g10.c:315
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "eliminar o campo keyid dos pacotes\n"
 "criptografados"
 
-#: g10/g10.c:319
+#: g10/g10.c:320
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALOR|usar estes dados de nota��o"
 
-#: g10/g10.c:322
+#: g10/g10.c:323
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:325
+#: g10/g10.c:326
 msgid ""
 "@\n"
 "Examples:\n"
@@ -690,15 +701,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:431
+#: g10/g10.c:432
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:435
+#: g10/g10.c:436
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/g10.c:438
+#: g10/g10.c:439
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -708,7 +719,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/g10.c:445
+#: g10/g10.c:446
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -716,194 +727,194 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:524
+#: g10/g10.c:525
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:577
+#: g10/g10.c:578
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/g10.c:727
+#: g10/g10.c:728
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/g10.c:731
+#: g10/g10.c:732
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: g10/g10.c:738
+#: g10/g10.c:739
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/g10.c:943
+#: g10/g10.c:944
 #, 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:1014
+#: g10/g10.c:1015
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/g10.c:1018 g10/g10.c:1027
+#: g10/g10.c:1019 g10/g10.c:1028
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1021
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:1023
+#: g10/g10.c:1024
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:1043 g10/g10.c:1055
+#: g10/g10.c:1044 g10/g10.c:1056
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1049 g10/g10.c:1061
+#: g10/g10.c:1050 g10/g10.c:1062
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1065
+#: g10/g10.c:1066
 msgid "the given policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1069
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "o algoritmo de compress�o deve estar na faixa %d..%d\n"
 
-#: g10/g10.c:1070
+#: g10/g10.c:1071
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:1072
+#: g10/g10.c:1073
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:1074
+#: g10/g10.c:1075
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/g10.c:1077
+#: g10/g10.c:1078
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/g10.c:1081
+#: g10/g10.c:1082
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:1166
+#: g10/g10.c:1167
 #, 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:1172
+#: g10/g10.c:1173
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1180
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:1187
+#: g10/g10.c:1188
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1200
+#: g10/g10.c:1201
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/g10.c:1213
+#: g10/g10.c:1214
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1227
+#: g10/g10.c:1228
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1245
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1261
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/g10.c:1268
+#: g10/g10.c:1269
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/g10.c:1284
+#: g10/g10.c:1285
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-usu�rio"
 
-#: g10/g10.c:1287
+#: g10/g10.c:1288
 msgid "--delete-key user-id"
 msgstr "--delete-key id-usu�rio"
 
-#: g10/g10.c:1295
+#: g10/g10.c:1296
 #, fuzzy
 msgid "--delete-secret-and-public-key user-id"
 msgstr "--delete-secret-key id-usu�rio"
 
-#: g10/encode.c:268 g10/g10.c:1332 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1333 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/g10.c:1347
+#: g10/g10.c:1348
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usu�rio] [chaveiro]"
 
-#: g10/g10.c:1413
+#: g10/g10.c:1414
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1421
+#: g10/g10.c:1422
 #, 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:1492
+#: g10/g10.c:1493
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/g10.c:1579
+#: g10/g10.c:1580
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/g10.c:1583
+#: g10/g10.c:1584
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1586 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1587 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:1795
+#: g10/g10.c:1796
 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:1801
+#: g10/g10.c:1802
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -911,88 +922,88 @@ msgstr ""
 "um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:1807
+#: g10/g10.c:1808
 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:1815
+#: g10/g10.c:1816
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
-#: g10/armor.c:302
+#: g10/armor.c:304
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:331
+#: g10/armor.c:333
 msgid "invalid armor header: "
 msgstr "cabe�alho de armadura inv�lido: "
 
-#: g10/armor.c:338
+#: g10/armor.c:340
 msgid "armor header: "
 msgstr "cabe�alho de armadura: "
 
-#: g10/armor.c:349
+#: g10/armor.c:351
 msgid "invalid clearsig header\n"
 msgstr "cabe�alho de assinatura em texto puro inv�lido\n"
 
-#: g10/armor.c:401
+#: g10/armor.c:403
 msgid "nested clear text signatures\n"
 msgstr "assinaturas em texto puro aninhadas\n"
 
-#: g10/armor.c:525
+#: g10/armor.c:527
 msgid "invalid dash escaped line: "
 msgstr "linha com h�fen inv�lida: "
 
-#: g10/armor.c:537
+#: g10/armor.c:539
 msgid "unexpected armor:"
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:663
+#: g10/armor.c:665
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caractere radix64 inv�lido %02x ignorado\n"
 
-#: g10/armor.c:706
+#: g10/armor.c:708
 msgid "premature eof (no CRC)\n"
 msgstr "fim de arquivo prematuro (sem CRC)\n"
 
-#: g10/armor.c:740
+#: g10/armor.c:742
 msgid "premature eof (in CRC)\n"
 msgstr "fim de arquivo prematuro (no CRC)\n"
 
-#: g10/armor.c:744
+#: g10/armor.c:746
 msgid "malformed CRC\n"
 msgstr "CRC malformado\n"
 
-#: g10/armor.c:748
+#: g10/armor.c:750
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:765
+#: g10/armor.c:767
 msgid "premature eof (in Trailer)\n"
 msgstr "fim de arquivo prematuro (no \"Trailer\")\n"
 
-#: g10/armor.c:769
+#: g10/armor.c:771
 msgid "error in trailer line\n"
 msgstr "erro na linha \"trailer\"\n"
 
-#: g10/armor.c:915
+#: g10/armor.c:917
 msgid "For info see http://www.gnupg.org"
 msgstr ""
 
-#: g10/armor.c:1043
+#: g10/armor.c:1045
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/armor.c:1048
+#: g10/armor.c:1050
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inv�lida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1052
+#: g10/armor.c:1054
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1001,7 +1012,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1189 g10/pkclist.c:53
+#: g10/keyedit.c:1190 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "       Impress�o digital:"
 
@@ -1230,17 +1241,17 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "       N�o se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:826 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:853
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1248,42 +1259,42 @@ msgstr ""
 "Voc� n�o especificou um identificador de usu�rio. (pode-se usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:863
 msgid "Enter the user ID: "
 msgstr "Digite o identificador de usu�rio: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:875
 msgid "No such user ID.\n"
 msgstr "Identificador de usu�rio inexistente.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:880
 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:904
+#: g10/pkclist.c:903
 msgid "Public key is disabled.\n"
 msgstr "A chave p�blica est� desativada.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:910
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "ignorado: chave p�blica j� marcada com --encrypt-to\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:941
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:974
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: erro na verifica��o da chave: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave p�blica est� desativada\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1017
 msgid "no valid addressees\n"
 msgstr "nenhum endere�o v�lido\n"
 
@@ -1563,7 +1574,7 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:955
+#: g10/keyedit.c:469 g10/keygen.c:955
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
@@ -1692,287 +1703,280 @@ msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 msgid "key %08lX: not protected - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:232
+#: g10/export.c:236
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:208
 msgid "too many entries in pk cache - disabled\n"
 msgstr "entradas demais no cache pk - desativado\n"
 
-#: g10/getkey.c:350
+#: g10/getkey.c:443
 msgid "too many entries in unk cache - disabled\n"
 msgstr "entradas demais no cache unk - desativado\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
-msgid "RSA key cannot be used in this version\n"
-msgstr "chave RSA n�o pode ser usada nesta vers�o\n"
-
-#: g10/getkey.c:1310 g10/getkey.c:1349
-msgid "No key for user ID\n"
-msgstr "Nenhuma chave para identificador de usu�rio\n"
-
-#: g10/getkey.c:1388 g10/getkey.c:1428
-msgid "No user ID for key\n"
-msgstr "Nenhum identificador de usu�rio para chave\n"
-
-#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
+#: g10/getkey.c:2143
 #, 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:2050
+#: g10/getkey.c:2185 g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
+
+#: g10/getkey.c:2473
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: usu�rio n�o encontrado\n"
 
-#: g10/import.c:182
+#: g10/import.c:184
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu chaves processadas at� agora\n"
 
-#: g10/import.c:194
+#: g10/import.c:196
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/import.c:204
+#: g10/import.c:206
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total processado: %lu\n"
 
-#: g10/import.c:206
+#: g10/import.c:208
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:209
+#: g10/import.c:211
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de usu�rios: %lu\n"
 
-#: g10/import.c:211
+#: g10/import.c:213
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:217
+#: g10/import.c:219
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             n�o modificados: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:221
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de usu�rios: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:223
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:225
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:227
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:229
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:229
+#: g10/import.c:231
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:231
+#: g10/import.c:233
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:391 g10/import.c:600
+#: g10/import.c:408 g10/import.c:617
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "chave %08lX: sem ID de usu�rio\n"
 
-#: g10/import.c:405
+#: g10/import.c:422
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de usu�rios v�lidos\n"
 
-#: g10/import.c:407
+#: g10/import.c:424
 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:418 g10/import.c:667
+#: g10/import.c:435 g10/import.c:684
 #, 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:423
+#: g10/import.c:440
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/import.c:431
+#: g10/import.c:448
 msgid "no default public keyring\n"
 msgstr "sem chaveiro p�blico padr�o\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
+#: g10/import.c:452 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:615 g10/import.c:716
+#: 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:441 g10/import.c:499 g10/import.c:618 g10/import.c:719
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "chave %08lX: chave p�blica importada\n"
 
-#: g10/import.c:463
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
 
-#: g10/import.c:472 g10/import.c:675
+#: g10/import.c:489 g10/import.c:692
 #, 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:478 g10/import.c:681
+#: g10/import.c:495 g10/import.c:698
 #, 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:505
+#: g10/import.c:522
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "chave %8lX: 1 novo ID de usu�rio\n"
 
-#: g10/import.c:508
+#: g10/import.c:525
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "chave %08lX: %d novos IDs de usu�rios\n"
 
-#: g10/import.c:511
+#: g10/import.c:528
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "chave %08lX: 1 nova assinatura\n"
 
-#: g10/import.c:514
+#: g10/import.c:531
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:517
+#: g10/import.c:534
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:520
+#: g10/import.c:537
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "chave %08lX: %d novas subchaves\n"
 
-#: g10/import.c:530
+#: g10/import.c:547
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "chave %08lX: n�o modificada\n"
 
-#: g10/import.c:593
+#: g10/import.c:610
 #, c-format
 msgid "secret key %08lX not imported (use %s to allow for it)\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:640
 #, 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:627
+#: g10/import.c:644
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no chaveiro secreto\n"
 
-#: g10/import.c:632
+#: g10/import.c:649
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
 
-#: g10/import.c:661
+#: g10/import.c:678
 #, 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:692
+#: g10/import.c:709
 #, 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:724
+#: g10/import.c:741
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revoga��o importado\n"
 
-#: g10/import.c:766
+#: g10/import.c:783
 #, 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:773 g10/import.c:797
+#: g10/import.c:790 g10/import.c:814
 #, 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:774
+#: g10/import.c:791
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/import.c:789
+#: g10/import.c:806
 #, 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:798
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:825
+#: g10/import.c:842
 #, 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:854
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chave %08lX: ignorado ID de usu�rio '"
 
-#: g10/import.c:877
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
@@ -1981,32 +1985,32 @@ 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:902
+#: g10/import.c:919
 #, 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:911
+#: g10/import.c:928
 #, 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:919
+#: g10/import.c:936
 #, 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:1019
+#: g10/import.c:1036
 #, 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:1071
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/import.c:1185 g10/import.c:1238
+#: g10/import.c:1202 g10/import.c:1255
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "chave %08lX: nossa c�pia n�o tem auto-assinatura\n"
@@ -2016,63 +2020,63 @@ msgstr "chave %08lX: nossa c�pia n�o tem auto-assinatura\n"
 msgid "%s: user not found\n"
 msgstr "%s: usu�rio n�o encontrado\n"
 
-#: g10/keyedit.c:155
+#: g10/keyedit.c:156
 msgid "[revocation]"
 msgstr "[revoga��o]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:157
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:221
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorreta\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:223
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorretas\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:225
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 assinatura n�o verificada por falta de chave\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d assinaturas n�o verificadas por falta de chaves\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura n�o verificada devido a um erro\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:231
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas n�o verificadas devido a erros\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:233
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 ID de usu�rio sem auto-assinatura v�lida detectado\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:235
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d IDs de usu�rios sem auto-assinaturas v�lidas detectados\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:317
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:325
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2080,7 +2084,7 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "sua chave: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:343
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2088,34 +2092,34 @@ msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:348
 msgid "Really sign? "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
+#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:136
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:428
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:432
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:436
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:461
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2123,7 +2127,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:473
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2131,422 +2135,422 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:476
 msgid "Do you really want to do this? "
 msgstr "Voc� realmente quer fazer isso? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:540
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a assinatura da chave para o local correto\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "show fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de usu�rios"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "select user ID N"
 msgstr "seleciona ID de usu�rio N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "select secondary key N"
 msgstr "seleciona chave secund�ria N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "list signatures"
 msgstr "lista assinaturas"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign the key"
 msgstr "assina a chave"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "sign the key locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "add a user ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "delete user ID"
 msgstr "remove ID de usu�rio"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "add a secondary key"
 msgstr "adiciona nova chave secund�ria"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delete a secondary key"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delete signatures"
 msgstr "remove assinaturas"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "change the expire date"
 msgstr "muda a data de validade"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle between secret and public key listing"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "list preferences"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
 msgid "revoke signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 msgid "revoke a secondary key"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 msgid "disable a key"
 msgstr "desativa uma chave"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
 msgid "enable a key"
 msgstr "ativa uma chave"
 
-#: g10/delkey.c:110 g10/keyedit.c:631
+#: g10/delkey.c:110 g10/keyedit.c:632
 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:669
+#: g10/keyedit.c:670
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:729
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:733
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 msgid "Really sign all user IDs? "
 msgstr "Realmente assinar todos os IDs de usu�rio? "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de usu�rio para assinar\n"
 
-#: g10/keyedit.c:812 g10/keyedit.c:994
+#: g10/keyedit.c:813 g10/keyedit.c:995
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "atualiza��o do banco de dados de confiabilidade falhou: %s\n"
 
-#: g10/keyedit.c:823 g10/keyedit.c:844
+#: g10/keyedit.c:824 g10/keyedit.c:845
 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:825
+#: g10/keyedit.c:826
 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:828
+#: g10/keyedit.c:829
 msgid "Really remove all selected user IDs? "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:830
 msgid "Really remove this user ID? "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:866 g10/keyedit.c:888
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:870
 msgid "Do you really want to delete the selected keys? "
 msgstr "Voc� realmente quer remover as chaves selecionadas? "
 
-#: g10/keyedit.c:870
+#: g10/keyedit.c:871
 msgid "Do you really want to delete this key? "
 msgstr "Voc� realmente quer remover esta chave? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Voc� realmente quer revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:893
 msgid "Do you really want to revoke this key? "
 msgstr "Voc� realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:959
 msgid "Save changes? "
 msgstr "Salvar altera��es? "
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:962
 msgid "Quit without saving? "
 msgstr "Sair sem salvar? "
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:973
 #, c-format
 msgid "update failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:980
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:987
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma atualiza��o � necess�ria.\n"
 
 # help ou ajuda ???
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1002
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/keyedit.c:1081 g10/keyedit.c:1107
+#: g10/keyedit.c:1082 g10/keyedit.c:1108
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1090
+#: g10/keyedit.c:1091
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1095
 msgid "This key has been disabled"
 msgstr "Esta chave foi desativada"
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1124
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "chave %08lX: a subchave foi revogada!\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1127
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1129
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deletar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1371
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deletar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1375
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1381
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1396
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1468
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as sele��es das chaves secretas.\n"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1474
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1478
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Modificando a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1480
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1522
 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:1537
+#: g10/keyedit.c:1538
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1599
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:1644
+#: g10/keyedit.c:1645
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secund�ria com �ndice %d\n"
 
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:1743
 msgid "user ID: \""
 msgstr "ID de usu�rio: \""
 
-#: g10/keyedit.c:1745
+#: g10/keyedit.c:1746
 #, c-format
 msgid ""
 "\"\n"
@@ -2555,34 +2559,34 @@ msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1750
 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:1773
+#: g10/keyedit.c:1774
 msgid "You have signed these user IDs:\n"
 msgstr "Voc� assinou estes IDs de usu�rio:\n"
 
-#: g10/keyedit.c:1787 g10/keyedit.c:1822
+#: g10/keyedit.c:1788 g10/keyedit.c:1823
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1793
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1813
 msgid "You are about to revoke these signatures:\n"
 msgstr "Voc� est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:1830
+#: g10/keyedit.c:1831
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1860
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
@@ -2597,128 +2601,128 @@ msgid "revoked"
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:404 g10/mainproc.c:836
+#: g10/keylist.c:402 g10/mainproc.c:837
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "A chave expira em %s\n"
 
-#: g10/mainproc.c:270
+#: g10/mainproc.c:271
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:315
+#: g10/mainproc.c:316
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados criptografados com chave p�blica: DEK v�lido\n"
 
-#: g10/mainproc.c:367
+#: g10/mainproc.c:368
 #, 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:377
+#: g10/mainproc.c:378
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "criptografado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:392
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descriptografia de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:431
+#: g10/mainproc.c:432
 msgid "decryption okay\n"
 msgstr "descriptografia correta\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:437
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem criptografada foi manipulada!\n"
 
-#: g10/mainproc.c:441
+#: g10/mainproc.c:442
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:461
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:462
+#: g10/mainproc.c:463
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome de arquivo original='%.*s'\n"
 
-#: g10/mainproc.c:617
+#: g10/mainproc.c:618
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoga��o isolada - use \"gpg --import\" para aplic�-la\n"
 
-#: g10/mainproc.c:704 g10/mainproc.c:713
+#: g10/mainproc.c:705 g10/mainproc.c:714
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 
-#: g10/mainproc.c:716
+#: g10/mainproc.c:717
 msgid "Notation: "
 msgstr "Nota��o: "
 
-#: g10/mainproc.c:725
+#: g10/mainproc.c:726
 msgid "Policy: "
 msgstr "Pol�tica: "
 
-#: g10/mainproc.c:1235
+#: g10/mainproc.c:1177
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1272
+#: g10/mainproc.c:1214
 #, 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:1307 g10/mainproc.c:1318
+#: g10/mainproc.c:1242 g10/mainproc.c:1250
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRETA de \""
 
-#: g10/mainproc.c:1308 g10/mainproc.c:1319
+#: g10/mainproc.c:1243 g10/mainproc.c:1251
 msgid "Good signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1310
+#: g10/mainproc.c:1266
 msgid "                aka \""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1366
+#: g10/mainproc.c:1316
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1423 g10/mainproc.c:1438 g10/mainproc.c:1500
+#: g10/mainproc.c:1373 g10/mainproc.c:1388 g10/mainproc.c:1450
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1449
+#: g10/mainproc.c:1399
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura isolada da classe 0x%02x\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1454
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1509
+#: g10/mainproc.c:1459
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:98
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "imposs�vel desativar core dumps: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:208
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Algoritmos experimentais n�o devem ser usados!\n"
 
-#: g10/misc.c:237
+#: g10/misc.c:238
 #, fuzzy
 msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
 msgstr ""
@@ -2730,7 +2734,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:990
+#: g10/parse-packet.c:1010
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
@@ -2743,7 +2747,7 @@ msgstr ""
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:170 g10/passphrase.c:248
+#: g10/hkp.c:147 g10/passphrase.c:248
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -2873,36 +2877,36 @@ msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: chave de assinatura expirou %s\n"
 
-#: g10/hkp.c:72
+#: g10/hkp.c:59
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr ""
 
-#: g10/hkp.c:85
+#: g10/hkp.c:72
 #, fuzzy, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/hkp.c:109 g10/hkp.c:148
+#: g10/hkp.c:91 g10/hkp.c:125
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/hkp.c:117
+#: g10/hkp.c:99
 #, 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:194
+#: g10/hkp.c:171
 #, fuzzy, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:183
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:209
+#: g10/hkp.c:186
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
@@ -2917,11 +2921,11 @@ msgstr "chave secreta n�o dispon�vel"
 msgid "protection algorithm %d is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:184
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Frase secreta inv�lida; por favor tente novamente ...\n"
 
-#: g10/seckey-cert.c:242
+#: g10/seckey-cert.c:240
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Chave fraca detectada - por favor mude a frase secreta novamente.\n"
@@ -3191,11 +3195,6 @@ msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "NOTA: a chave secreta %08lX N�O est� protegida.\n"
 
-#: g10/trustdb.c:577
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
-
 #: g10/trustdb.c:584
 #, c-format
 msgid "key %08lX: secret and public key don't match\n"
@@ -3431,36 +3430,46 @@ msgstr "%s: imposs�vel criar chaveiro: %s\n"
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro criado\n"
 
-#: g10/ringedit.c:1551
+#: g10/ringedit.c:1555
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existem 2 arquivos com informa��es confidenciais.\n"
 
-#: g10/ringedit.c:1552
+#: g10/ringedit.c:1556
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o n�o modificado\n"
 
-#: g10/ringedit.c:1553
+#: g10/ringedit.c:1557
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/ringedit.c:1554
+#: g10/ringedit.c:1558
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte este poss�vel furo de seguran�a\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
+#: 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 ""
 "a chave n�o est� marcada como insegura - imposs�vel us�-la com o pseudo "
 "RNG!\n"
 
-#: g10/skclist.c:113
+#: g10/skclist.c:138
+#, fuzzy, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "ignorado `%s': %s\n"
+
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:149
+#, fuzzy
+msgid "skipped: secret key already present\n"
+msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
+
+#: g10/skclist.c:160
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3565,11 +3574,11 @@ msgstr "Deletar esta chave do chaveiro? "
 msgid "This is a secret key! - really delete? "
 msgstr "Esta � uma chave secreta! - realmente deletar? "
 
-#: g10/delkey.c:182
+#: g10/delkey.c:181
 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:184
+#: g10/delkey.c:183
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr "use a op��o \"--delete-secret-key\" para delet�-la antes.\n"
 
@@ -3816,6 +3825,15 @@ msgstr "Nenhuma ajuda dispon�vel"
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
 
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "chave RSA n�o pode ser usada nesta vers�o\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Nenhuma chave para identificador de usu�rio\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Nenhum identificador de usu�rio para chave\n"
+
 #~ msgid "no secret key for decryption available\n"
 #~ msgstr "nenhuma chave secreta para descriptografia dispon�vel\n"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 5ffcb82ad..054e9a290 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
-"POT-Creation-Date: 2001-02-07 16:46+0100\n"
+"POT-Creation-Date: 2001-03-13 13:40+0100\n"
 "PO-Revision-Date: 1999-09-09 20:28+0000\n"
 "Last-Translator: Pedro Morais <[email protected]>\n"
 "Language-Team: pt\n"
@@ -44,7 +44,7 @@ msgid "nN"
 msgstr "nN"
 
 # INICIO MENU
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:308
 msgid "quit"
 msgstr "sair"
 
@@ -248,6 +248,17 @@ msgstr "n�o encriptado"
 msgid "not processed"
 msgstr "n�o processado"
 
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+#, fuzzy
+msgid "unusable public key"
+msgstr "chave p�blica incorrecta"
+
+#: util/errors.c:106
+#, fuzzy
+msgid "unusable secret key"
+msgstr "chave secreta incorrecta"
+
 #: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -258,63 +269,63 @@ msgstr "... isto � um bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "voc� encontrou um bug ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
+#: cipher/random.c:309 g10/import.c:129 g10/keygen.c:1256
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:313
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:318
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:325
+#: cipher/random.c:323
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:331
+#: cipher/random.c:329
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:339
+#: cipher/random.c:337
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:375
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:397
+#: cipher/random.c:395
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:402
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:405
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:416
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:650
+#: cipher/random.c:648
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: a utilizar gerador de n�meros aleat�rios inseguro!\n"
 
-#: cipher/random.c:651
+#: cipher/random.c:649
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -339,7 +350,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:212
+#: g10/g10.c:213
 msgid ""
 "@Commands:\n"
 " "
@@ -347,140 +358,140 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "encrypt data"
 msgstr "encriptar dados"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "encryption only with symmetric cipher"
 msgstr "encriptar apenas com cifra sim�trica"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/g10.c:220
+#: g10/g10.c:221
 msgid "decrypt data (default)"
 msgstr "desencriptar dados (ac��o por omiss�o)"
 
-#: g10/g10.c:221
+#: g10/g10.c:222
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:223
+#: g10/g10.c:224
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:229
+#: g10/g10.c:230
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
 msgid "remove key from the public keyring"
 msgstr "remover a chave do porta-chaves p�blico"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "remove key from the secret keyring"
 msgstr "remover a chave do porta-chaves secreto"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:238
+#: g10/g10.c:239
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:239
+#: g10/g10.c:240
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:243
+#: g10/g10.c:244
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:245
+#: g10/g10.c:246
 msgid "list only the sequence of packets"
 msgstr "listar apenas as sequ�ncias de pacotes"
 
 # ownertrust ???
-#: g10/g10.c:247
+#: g10/g10.c:248
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confian�a"
 
-#: g10/g10.c:249
+#: g10/g10.c:250
 msgid "import ownertrust values"
 msgstr "importar os valores de confian�a"
 
-#: g10/g10.c:251
+#: g10/g10.c:252
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confian�a"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMES]|verificar a base de dados de confian�a"
 
-#: g10/g10.c:254
+#: g10/g10.c:255
 msgid "fix a corrupted trust database"
 msgstr "consertar uma base de dados de confian�a"
 
-#: g10/g10.c:255
+#: g10/g10.c:256
 msgid "De-Armor a file or stdin"
 msgstr "retirar armadura de um ficheiro ou do \"stdin\""
 
-#: g10/g10.c:257
+#: g10/g10.c:258
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um ficheiro ou \"stdin\""
 
-#: g10/g10.c:259
+#: g10/g10.c:260
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:263
+#: g10/g10.c:264
 msgid ""
 "@\n"
 "Options:\n"
@@ -490,179 +501,179 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/g10.c:265
+#: g10/g10.c:266
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/g10.c:267
+#: g10/g10.c:268
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|encriptar para NOME"
 
-#: g10/g10.c:270
+#: g10/g10.c:271
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: g10/g10.c:272
+#: g10/g10.c:273
 msgid "use the default key as default recipient"
 msgstr "usar a chave padr�o como destinat�rio padr�o"
 
-#: g10/g10.c:276
+#: g10/g10.c:277
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou desencriptar"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desactiva)"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "use as output file"
 msgstr "usar como ficheiro de sa�da"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para encriptar"
 
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "batch mode: never ask"
 msgstr "modo n�o-interactivo: nunca perguntar"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "add this keyring to the list of keyrings"
 msgstr ""
 "adicionar este porta-chaves\n"
 "� lista de porta-chaves"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "add this secret keyring to the list"
 msgstr "adicionar este porta-chaves secreto � lista"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta por omiss�o"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/g10.c:297
+#: g10/g10.c:298
 msgid "read options from file"
 msgstr "ler op��es do ficheiro"
 
-#: g10/g10.c:301
+#: g10/g10.c:302
 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:306
+#: g10/g10.c:307
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/g10.c:309
+#: g10/g10.c:310
 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:310
+#: g10/g10.c:311
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar mode de frase secreta N"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 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:314
+#: g10/g10.c:315
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "throw keyid field of encrypted packets"
 msgstr "eliminar campo keyid dos pacotes encriptados"
 
-#: g10/g10.c:319
+#: g10/g10.c:320
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALOR|usar estes dados de nota��o"
 
-#: g10/g10.c:322
+#: g10/g10.c:323
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:325
+#: g10/g10.c:326
 msgid ""
 "@\n"
 "Examples:\n"
@@ -682,15 +693,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:431
+#: g10/g10.c:432
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:435
+#: g10/g10.c:436
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/g10.c:438
+#: g10/g10.c:439
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -700,7 +711,7 @@ msgstr ""
 "assina, verifica, encripta ou desencripta\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/g10.c:445
+#: g10/g10.c:446
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -708,194 +719,194 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:524
+#: g10/g10.c:525
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:577
+#: g10/g10.c:578
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/g10.c:727
+#: g10/g10.c:728
 #, 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:731
+#: g10/g10.c:732
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: g10/g10.c:738
+#: g10/g10.c:739
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/g10.c:943
+#: g10/g10.c:944
 #, 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:1014
+#: g10/g10.c:1015
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/g10.c:1018 g10/g10.c:1027
+#: g10/g10.c:1019 g10/g10.c:1028
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1021
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:1023
+#: g10/g10.c:1024
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:1043 g10/g10.c:1055
+#: g10/g10.c:1044 g10/g10.c:1056
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1049 g10/g10.c:1061
+#: g10/g10.c:1050 g10/g10.c:1062
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1065
+#: g10/g10.c:1066
 msgid "the given policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1069
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "o algoritmo de compress�o deve estar na faixa %d..%d\n"
 
-#: g10/g10.c:1070
+#: g10/g10.c:1071
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:1072
+#: g10/g10.c:1073
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:1074
+#: g10/g10.c:1075
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/g10.c:1077
+#: g10/g10.c:1078
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/g10.c:1081
+#: g10/g10.c:1082
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:1166
+#: g10/g10.c:1167
 #, 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:1172
+#: g10/g10.c:1173
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1180
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:1187
+#: g10/g10.c:1188
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1200
+#: g10/g10.c:1201
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/g10.c:1213
+#: g10/g10.c:1214
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1227
+#: g10/g10.c:1228
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1245
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1261
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/g10.c:1268
+#: g10/g10.c:1269
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/g10.c:1284
+#: g10/g10.c:1285
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-utilizador"
 
-#: g10/g10.c:1287
+#: g10/g10.c:1288
 msgid "--delete-key user-id"
 msgstr "--delete-key id-utilizador"
 
-#: g10/g10.c:1295
+#: g10/g10.c:1296
 #, fuzzy
 msgid "--delete-secret-and-public-key user-id"
 msgstr "--delete-secret-key id-utilizador"
 
-#: g10/encode.c:268 g10/g10.c:1332 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1333 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/g10.c:1347
+#: g10/g10.c:1348
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/g10.c:1413
+#: g10/g10.c:1414
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1421
+#: g10/g10.c:1422
 #, 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:1492
+#: g10/g10.c:1493
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/g10.c:1579
+#: g10/g10.c:1580
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/g10.c:1583
+#: g10/g10.c:1584
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1586 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1587 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:1795
+#: g10/g10.c:1796
 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:1801
+#: g10/g10.c:1802
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -903,88 +914,88 @@ msgstr ""
 "um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:1807
+#: g10/g10.c:1808
 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:1815
+#: g10/g10.c:1816
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
-#: g10/armor.c:302
+#: g10/armor.c:304
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:331
+#: g10/armor.c:333
 msgid "invalid armor header: "
 msgstr "cabe�alho de armadura inv�lido: "
 
-#: g10/armor.c:338
+#: g10/armor.c:340
 msgid "armor header: "
 msgstr "cabe�alho de armadura: "
 
-#: g10/armor.c:349
+#: g10/armor.c:351
 msgid "invalid clearsig header\n"
 msgstr "cabe�alho de assinatura em texto puro inv�lido\n"
 
-#: g10/armor.c:401
+#: g10/armor.c:403
 msgid "nested clear text signatures\n"
 msgstr "assinaturas em texto puro aninhadas\n"
 
-#: g10/armor.c:525
+#: g10/armor.c:527
 msgid "invalid dash escaped line: "
 msgstr "linha com h�fen inv�lida: "
 
-#: g10/armor.c:537
+#: g10/armor.c:539
 msgid "unexpected armor:"
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:663
+#: g10/armor.c:665
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracter radix64 inv�lido %02x ignorado\n"
 
-#: g10/armor.c:706
+#: g10/armor.c:708
 msgid "premature eof (no CRC)\n"
 msgstr "fim de ficheiro prematuro (sem CRC)\n"
 
-#: g10/armor.c:740
+#: g10/armor.c:742
 msgid "premature eof (in CRC)\n"
 msgstr "fim de ficheiro prematuro (no CRC)\n"
 
-#: g10/armor.c:744
+#: g10/armor.c:746
 msgid "malformed CRC\n"
 msgstr "CRC malformado\n"
 
-#: g10/armor.c:748
+#: g10/armor.c:750
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:765
+#: g10/armor.c:767
 msgid "premature eof (in Trailer)\n"
 msgstr "fim de ficheiro prematuro (no \"Trailer\")\n"
 
-#: g10/armor.c:769
+#: g10/armor.c:771
 msgid "error in trailer line\n"
 msgstr "erro na linha \"trailer\"\n"
 
-#: g10/armor.c:915
+#: g10/armor.c:917
 msgid "For info see http://www.gnupg.org"
 msgstr ""
 
-#: g10/armor.c:1043
+#: g10/armor.c:1045
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/armor.c:1048
+#: g10/armor.c:1050
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inv�lida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1052
+#: g10/armor.c:1054
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -993,7 +1004,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1189 g10/pkclist.c:53
+#: g10/keyedit.c:1190 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "       Impress�o digital:"
 
@@ -1223,17 +1234,17 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         N�o se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:826 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:853
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1241,42 +1252,42 @@ msgstr ""
 "Voc� n�o especificou um identificador de utilizador. (pode-se usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:863
 msgid "Enter the user ID: "
 msgstr "Digite o identificador de utilizador: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:875
 msgid "No such user ID.\n"
 msgstr "Identificador de utilizador inexistente.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:880
 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:904
+#: g10/pkclist.c:903
 msgid "Public key is disabled.\n"
 msgstr "A chave p�blica est� desativada.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:910
 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:942
+#: g10/pkclist.c:941
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:974
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: erro na verifica��o da chave: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave p�blica est� desactivada\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1017
 msgid "no valid addressees\n"
 msgstr "nenhum endere�o v�lido\n"
 
@@ -1557,7 +1568,7 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:955
+#: g10/keyedit.c:469 g10/keygen.c:955
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
@@ -1686,287 +1697,280 @@ msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 msgid "key %08lX: not protected - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:232
+#: g10/export.c:236
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:208
 msgid "too many entries in pk cache - disabled\n"
 msgstr "entradas demais no cache pk - desactivado\n"
 
-#: g10/getkey.c:350
+#: g10/getkey.c:443
 msgid "too many entries in unk cache - disabled\n"
 msgstr "entradas demais no cache unk - desactivado\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
-msgid "RSA key cannot be used in this version\n"
-msgstr "chave RSA n�o pode ser usada nesta vers�o\n"
-
-#: g10/getkey.c:1310 g10/getkey.c:1349
-msgid "No key for user ID\n"
-msgstr "Nenhuma chave para identificador de utilizador\n"
-
-#: g10/getkey.c:1388 g10/getkey.c:1428
-msgid "No user ID for key\n"
-msgstr "Nenhum identificador de utilizador para chave\n"
-
-#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
+#: g10/getkey.c:2143
 #, 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:2050
+#: g10/getkey.c:2185 g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
+
+#: g10/getkey.c:2473
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: utilizador n�o encontrado\n"
 
-#: g10/import.c:182
+#: g10/import.c:184
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu chaves processadas at� agora\n"
 
-#: g10/import.c:194
+#: g10/import.c:196
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/import.c:204
+#: g10/import.c:206
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total processado: %lu\n"
 
-#: g10/import.c:206
+#: g10/import.c:208
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:209
+#: g10/import.c:211
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de utilizadores: %lu\n"
 
-#: g10/import.c:211
+#: g10/import.c:213
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:217
+#: g10/import.c:219
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             n�o modificados: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:221
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de utilizadores: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:223
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:225
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:227
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:229
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:229
+#: g10/import.c:231
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:231
+#: g10/import.c:233
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:391 g10/import.c:600
+#: g10/import.c:408 g10/import.c:617
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/import.c:405
+#: g10/import.c:422
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de utilizadores v�lidos\n"
 
-#: g10/import.c:407
+#: g10/import.c:424
 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:418 g10/import.c:667
+#: g10/import.c:435 g10/import.c:684
 #, 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:423
+#: g10/import.c:440
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/import.c:431
+#: g10/import.c:448
 msgid "no default public keyring\n"
 msgstr "sem porta-chaves p�blico padr�o\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
+#: g10/import.c:452 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:615 g10/import.c:716
+#: 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:441 g10/import.c:499 g10/import.c:618 g10/import.c:719
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "chave %08lX: chave p�blica importada\n"
 
-#: g10/import.c:463
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
 
-#: g10/import.c:472 g10/import.c:675
+#: g10/import.c:489 g10/import.c:692
 #, 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:478 g10/import.c:681
+#: g10/import.c:495 g10/import.c:698
 #, 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:505
+#: g10/import.c:522
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "chave %8lX: 1 novo ID de utilizador\n"
 
-#: g10/import.c:508
+#: g10/import.c:525
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "chave %08lX: %d novos IDs de utilizadores\n"
 
-#: g10/import.c:511
+#: g10/import.c:528
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "chave %08lX: 1 nova assinatura\n"
 
-#: g10/import.c:514
+#: g10/import.c:531
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:517
+#: g10/import.c:534
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:520
+#: g10/import.c:537
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "chave %08lX: %d novas subchaves\n"
 
-#: g10/import.c:530
+#: g10/import.c:547
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "chave %08lX: n�o modificada\n"
 
-#: g10/import.c:593
+#: g10/import.c:610
 #, c-format
 msgid "secret key %08lX not imported (use %s to allow for it)\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:640
 #, 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:627
+#: g10/import.c:644
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no porta-chaves secreto\n"
 
-#: g10/import.c:632
+#: g10/import.c:649
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
 
-#: g10/import.c:661
+#: g10/import.c:678
 #, 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:692
+#: g10/import.c:709
 #, 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:724
+#: g10/import.c:741
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revoga��o importado\n"
 
-#: g10/import.c:766
+#: g10/import.c:783
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de utilizador para assinatura\n"
 
-#: g10/import.c:773 g10/import.c:797
+#: g10/import.c:790 g10/import.c:814
 #, 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:774
+#: g10/import.c:791
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/import.c:789
+#: g10/import.c:806
 #, 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:798
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:825
+#: g10/import.c:842
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '"
 
-#: g10/import.c:854
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chave %08lX: ignorado ID de utilizador '"
 
-#: g10/import.c:877
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
@@ -1975,32 +1979,32 @@ 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:902
+#: g10/import.c:919
 #, 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:911
+#: g10/import.c:928
 #, 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:919
+#: g10/import.c:936
 #, 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:1019
+#: g10/import.c:1036
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
 
-#: g10/import.c:1071
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/import.c:1185 g10/import.c:1238
+#: g10/import.c:1202 g10/import.c:1255
 #, 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"
@@ -2010,63 +2014,63 @@ msgstr "chave %08lX: a nossa c�pia n�o tem auto-assinatura\n"
 msgid "%s: user not found\n"
 msgstr "%s: utilizador n�o encontrado\n"
 
-#: g10/keyedit.c:155
+#: g10/keyedit.c:156
 msgid "[revocation]"
 msgstr "[revoga��o]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:157
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:221
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorrecta\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:223
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorrectas\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:225
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 assinatura n�o verificada por falta de chave\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d assinaturas n�o verificadas por falta de chaves\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura n�o verificada devido a um erro\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:231
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas n�o verificadas devido a erros\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:233
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 ID de utilizador sem auto-assinatura v�lida detectado\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:235
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d IDs de utilizadores sem auto-assinaturas v�lidas detectados\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:317
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:325
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2074,7 +2078,7 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "a sua chave: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:343
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2082,34 +2086,34 @@ msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:348
 msgid "Really sign? "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
+#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:136
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:428
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:432
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:436
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:461
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2117,7 +2121,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:473
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2125,422 +2129,422 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:476
 msgid "Do you really want to do this? "
 msgstr "Voc� quer realmente fazer isso? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:540
 msgid "moving a key signature to the correct place\n"
 msgstr "a mover a assinatura da chave para o local correcto\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "show fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de utilizadores"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "select user ID N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "select secondary key N"
 msgstr "seleciona chave secund�ria N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "list signatures"
 msgstr "lista assinaturas"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign the key"
 msgstr "assina a chave"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "sign the key locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "add a user ID"
 msgstr "adiciona um novo ID de utilizador"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "delete user ID"
 msgstr "remove ID de utilizador"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "add a secondary key"
 msgstr "adiciona nova chave secund�ria"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delete a secondary key"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delete signatures"
 msgstr "remove assinaturas"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "change the expire date"
 msgstr "muda a data de validade"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle between secret and public key listing"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "list preferences"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
 msgid "revoke signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 msgid "revoke a secondary key"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 msgid "disable a key"
 msgstr "desactiva uma chave"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
 msgid "enable a key"
 msgstr "activa uma chave"
 
-#: g10/delkey.c:110 g10/keyedit.c:631
+#: g10/delkey.c:110 g10/keyedit.c:632
 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:669
+#: g10/keyedit.c:670
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:729
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:733
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 msgid "Really sign all user IDs? "
 msgstr "Realmente assinar todos os IDs de utilizador? "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:812 g10/keyedit.c:994
+#: g10/keyedit.c:813 g10/keyedit.c:995
 #, 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:823 g10/keyedit.c:844
+#: g10/keyedit.c:824 g10/keyedit.c:845
 msgid "You must select at least one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de utilizador.\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 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:828
+#: g10/keyedit.c:829
 msgid "Really remove all selected user IDs? "
 msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:830
 msgid "Really remove this user ID? "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:866 g10/keyedit.c:888
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:870
 msgid "Do you really want to delete the selected keys? "
 msgstr "Voc� quer realmente remover as chaves selecionadas? "
 
-#: g10/keyedit.c:870
+#: g10/keyedit.c:871
 msgid "Do you really want to delete this key? "
 msgstr "Voc� quer realmente remover esta chave? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Voc� quer realmente revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:893
 msgid "Do you really want to revoke this key? "
 msgstr "Voc� quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:959
 msgid "Save changes? "
 msgstr "Gravar altera��es? "
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:962
 msgid "Quit without saving? "
 msgstr "Sair sem gravar? "
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:973
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:980
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:987
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma actualiza��o � necess�ria.\n"
 
 # help ou ajuda ???
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1002
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/keyedit.c:1081 g10/keyedit.c:1107
+#: g10/keyedit.c:1082 g10/keyedit.c:1108
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1090
+#: g10/keyedit.c:1091
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1095
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1124
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "chave %08lX: a subchave foi revogada!\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1127
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1129
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1371
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1375
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1381
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1396
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1468
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as selec��es das chaves secretas.\n"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1474
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor seleccione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1478
 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:1479
+#: g10/keyedit.c:1480
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1522
 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:1537
+#: g10/keyedit.c:1538
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1599
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:1644
+#: g10/keyedit.c:1645
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secund�ria com �ndice %d\n"
 
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:1743
 msgid "user ID: \""
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:1745
+#: g10/keyedit.c:1746
 #, c-format
 msgid ""
 "\"\n"
@@ -2549,34 +2553,34 @@ msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1750
 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:1773
+#: g10/keyedit.c:1774
 msgid "You have signed these user IDs:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:1787 g10/keyedit.c:1822
+#: g10/keyedit.c:1788 g10/keyedit.c:1823
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1793
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1813
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:1830
+#: g10/keyedit.c:1831
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1860
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
@@ -2591,128 +2595,128 @@ msgid "revoked"
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:404 g10/mainproc.c:836
+#: g10/keylist.c:402 g10/mainproc.c:837
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "A chave expira em %s\n"
 
-#: g10/mainproc.c:270
+#: g10/mainproc.c:271
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:315
+#: g10/mainproc.c:316
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados encriptados com chave p�blica: DEK v�lido\n"
 
-#: g10/mainproc.c:367
+#: g10/mainproc.c:368
 #, 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:377
+#: g10/mainproc.c:378
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "encriptado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:392
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "desencripta��o de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:431
+#: g10/mainproc.c:432
 msgid "decryption okay\n"
 msgstr "desencripta��o correcta\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:437
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem encriptada foi manipulada!\n"
 
-#: g10/mainproc.c:441
+#: g10/mainproc.c:442
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "desencripta��o falhou: %s\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:461
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:462
+#: g10/mainproc.c:463
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro original='%.*s'\n"
 
-#: g10/mainproc.c:617
+#: g10/mainproc.c:618
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca��o solit�ria - utilize \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:704 g10/mainproc.c:713
+#: g10/mainproc.c:705 g10/mainproc.c:714
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 
-#: g10/mainproc.c:716
+#: g10/mainproc.c:717
 msgid "Notation: "
 msgstr "Nota��o: "
 
-#: g10/mainproc.c:725
+#: g10/mainproc.c:726
 msgid "Policy: "
 msgstr "Pol�tica: "
 
-#: g10/mainproc.c:1235
+#: g10/mainproc.c:1177
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1272
+#: g10/mainproc.c:1214
 #, 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:1307 g10/mainproc.c:1318
+#: g10/mainproc.c:1242 g10/mainproc.c:1250
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1308 g10/mainproc.c:1319
+#: g10/mainproc.c:1243 g10/mainproc.c:1251
 msgid "Good signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1310
+#: g10/mainproc.c:1266
 msgid "                aka \""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1366
+#: g10/mainproc.c:1316
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1423 g10/mainproc.c:1438 g10/mainproc.c:1500
+#: g10/mainproc.c:1373 g10/mainproc.c:1388 g10/mainproc.c:1450
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1449
+#: g10/mainproc.c:1399
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1454
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1509
+#: g10/mainproc.c:1459
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:98
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "imposs�vel desactivar core dumps: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:208
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Algoritmos experimentais n�o devem ser usados!\n"
 
-#: g10/misc.c:237
+#: g10/misc.c:238
 #, fuzzy
 msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
 msgstr ""
@@ -2724,7 +2728,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:990
+#: g10/parse-packet.c:1010
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
@@ -2737,7 +2741,7 @@ msgstr ""
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:170 g10/passphrase.c:248
+#: g10/hkp.c:147 g10/passphrase.c:248
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -2866,36 +2870,36 @@ msgstr "NOTA: algoritmo de cifragem %d n�o encontrado nas prefer�ncias\n"
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: chave de assinatura expirou %s\n"
 
-#: g10/hkp.c:72
+#: g10/hkp.c:59
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr ""
 
-#: g10/hkp.c:85
+#: g10/hkp.c:72
 #, fuzzy, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "importar chaves de um servidor"
 
-#: g10/hkp.c:109 g10/hkp.c:148
+#: g10/hkp.c:91 g10/hkp.c:125
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/hkp.c:117
+#: g10/hkp.c:99
 #, fuzzy, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/hkp.c:194
+#: g10/hkp.c:171
 #, fuzzy, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:183
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:209
+#: g10/hkp.c:186
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
@@ -2910,11 +2914,11 @@ msgstr "chave secreta n�o dispon�vel"
 msgid "protection algorithm %d is not supported\n"
 msgstr "algoritmo de protec��o %d n�o � suportado\n"
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:184
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Frase secreta inv�lida; por favor tente novamente ...\n"
 
-#: g10/seckey-cert.c:242
+#: g10/seckey-cert.c:240
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Chave fraca detectada - por favor mude a frase secreta novamente.\n"
@@ -3183,11 +3187,6 @@ msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "NOTA: a chave secreta %08lX N�O est� protegida.\n"
 
-#: g10/trustdb.c:577
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
-
 #: g10/trustdb.c:584
 #, c-format
 msgid "key %08lX: secret and public key don't match\n"
@@ -3423,35 +3422,45 @@ msgstr "%s: imposs�vel criar porta-chaves: %s\n"
 msgid "%s: keyring created\n"
 msgstr "%s: porta-chaves criado\n"
 
-#: g10/ringedit.c:1551
+#: g10/ringedit.c:1555
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existem 2 ficheiros com informa��es confidenciais.\n"
 
-#: g10/ringedit.c:1552
+#: g10/ringedit.c:1556
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o n�o modificado\n"
 
-#: g10/ringedit.c:1553
+#: g10/ringedit.c:1557
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/ringedit.c:1554
+#: g10/ringedit.c:1558
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte esta poss�vel falha de seguran�a\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
+#: 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 ""
 "a chave n�o est� marcada insegura - imposs�vel us�-la com o RNG falso!\n"
 
-#: g10/skclist.c:113
+#: g10/skclist.c:138
+#, fuzzy, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "ignorado `%s': %s\n"
+
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:149
+#, fuzzy
+msgid "skipped: secret key already present\n"
+msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
+
+#: g10/skclist.c:160
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3552,11 +3561,11 @@ msgstr "Remover esta chave do porta-chaves?"
 msgid "This is a secret key! - really delete? "
 msgstr "Esta chave � secreta! - apagar de qualquer modo? "
 
-#: g10/delkey.c:182
+#: g10/delkey.c:181
 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:184
+#: g10/delkey.c:183
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr "utilize a op��o \"--delete-secret-key\" para a apagar primeiro.\n"
 
@@ -3802,6 +3811,15 @@ msgstr "Nenhuma ajuda dispon�vel"
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
 
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "chave RSA n�o pode ser usada nesta vers�o\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Nenhuma chave para identificador de utilizador\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Nenhum identificador de utilizador para chave\n"
+
 #~ msgid "no secret key for decryption available\n"
 #~ msgstr "nenhuma chave secreta para desencripta��o dispon�vel\n"
 
diff --git a/po/ru.po b/po/ru.po
index bccaa795a..8970faf44 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@
 # QingLong <qinglong@Bolizm> (couldn't send an email to let you know)
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2001-02-07 16:46+0100\n"
+"POT-Creation-Date: 2001-03-13 13:40+0100\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-01-26 22:08:36+0100\n"
 "From: Gregory Steuck <[email protected]>\n"
@@ -52,7 +52,7 @@ msgstr ""
 msgid "nN"
 msgstr ""
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:308
 msgid "quit"
 msgstr "�����"
 
@@ -303,6 +303,17 @@ msgstr "����������� ������"
 msgid "not processed"
 msgstr "�� ��������������"
 
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+#, fuzzy
+msgid "unusable public key"
+msgstr "������ �������� ����"
+
+#: util/errors.c:106
+#, fuzzy
+msgid "unusable secret key"
+msgstr "������ ��������� ����"
+
 #: util/logger.c:224
 #, fuzzy, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -313,64 +324,64 @@ msgstr "��-�� ... ������ � ��������� (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "�� ����� ������ � ��������� ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
+#: cipher/random.c:309 g10/import.c:129 g10/keygen.c:1256
 #, fuzzy, c-format
 msgid "can't open `%s': %s\n"
 msgstr "���������� ������� ���� `%s': %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:313
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "���������� ������� ���� `%s': %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:318
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:325
+#: cipher/random.c:323
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:331
+#: cipher/random.c:329
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:339
+#: cipher/random.c:337
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "���������� ������� ���� `%s': %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:375
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:397
+#: cipher/random.c:395
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:402
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "���������� ������� ���� `%s': %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:405
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "���������� ������� ���� `%s': %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:416
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:650
+#: cipher/random.c:648
 #, fuzzy
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "��������: ������������ ���������� ��������� ��������� �����!\n"
 
-#: cipher/random.c:651
+#: cipher/random.c:649
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -395,7 +406,7 @@ msgstr ""
 "������������ ��������� ������. ����������, ��������� ���-������, �����\n"
 "�� ����� ������� �������������� ��������� �����! (����� ��� %d ����)\n"
 
-#: g10/g10.c:212
+#: g10/g10.c:213
 msgid ""
 "@Commands:\n"
 " "
@@ -403,147 +414,147 @@ msgstr ""
 "@�������:\n"
 " "
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 #, fuzzy
 msgid "|[file]|make a signature"
 msgstr "|[����]|������� �������"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 #, fuzzy
 msgid "|[file]|make a clear text signature"
 msgstr "|[����]|������� ��������� �������"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "make a detached signature"
 msgstr "������� ��������� �������"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "encrypt data"
 msgstr "����������� ������"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "encryption only with symmetric cipher"
 msgstr "����������� ������������ ����������"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "store only"
 msgstr "������ ���������"
 
-#: g10/g10.c:220
+#: g10/g10.c:221
 msgid "decrypt data (default)"
 msgstr "������������ ������ (�� ���������)"
 
-#: g10/g10.c:221
+#: g10/g10.c:222
 msgid "verify a signature"
 msgstr "��������� �������"
 
-#: g10/g10.c:223
+#: g10/g10.c:224
 msgid "list keys"
 msgstr "������ ������"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "list keys and signatures"
 msgstr "������ ������ � ��������"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "check key signatures"
 msgstr "��������� ������� �� �����"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "list keys and fingerprints"
 msgstr "������ ������ � �� \"����������� �������\""
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "list secret keys"
 msgstr "������ ��������� ������"
 
-#: g10/g10.c:229
+#: g10/g10.c:230
 msgid "generate a new key pair"
 msgstr "������������� ����� ���� ������ (�������� � ���������)"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
 msgid "remove key from the public keyring"
 msgstr "������� ���� �� ������"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 #, fuzzy
 msgid "remove key from the secret keyring"
 msgstr "������� ���� �� ������"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 #, fuzzy
 msgid "sign a key"
 msgstr "��������� ����"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 #, fuzzy
 msgid "sign a key locally"
 msgstr "��������� ����"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "sign or edit a key"
 msgstr "��������� ��� ������������� ����"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "generate a revocation certificate"
 msgstr "������������� ���������� ����������"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "export keys"
 msgstr "�������������� �����"
 
-#: g10/g10.c:238
+#: g10/g10.c:239
 msgid "export keys to a key server"
 msgstr ""
 
-#: g10/g10.c:239
+#: g10/g10.c:240
 msgid "import keys from a key server"
 msgstr ""
 
-#: g10/g10.c:243
+#: g10/g10.c:244
 msgid "import/merge keys"
 msgstr "�������������/�������� �����"
 
-#: g10/g10.c:245
+#: g10/g10.c:246
 msgid "list only the sequence of packets"
 msgstr "���������� ������ ������������������ �������"
 
-#: g10/g10.c:247
+#: g10/g10.c:248
 #, fuzzy
 msgid "export the ownertrust values"
 msgstr "�������������� ��������� �������\n"
 
-#: g10/g10.c:249
+#: g10/g10.c:250
 #, fuzzy
 msgid "import ownertrust values"
 msgstr "������������� ��������� �������\n"
 
-#: g10/g10.c:251
+#: g10/g10.c:252
 #, fuzzy
 msgid "update the trust database"
 msgstr "|[�����]|��������� ���� ������ �������"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "|[NAMES]|check the trust database"
 msgstr "|[�����]|��������� ���� ������ �������"
 
-#: g10/g10.c:254
+#: g10/g10.c:255
 msgid "fix a corrupted trust database"
 msgstr "��������� ����������� ���� ������ �������"
 
-#: g10/g10.c:255
+#: g10/g10.c:256
 msgid "De-Armor a file or stdin"
 msgstr "������������ stdin ��� ���� �� ASCII-�������������"
 
-#: g10/g10.c:257
+#: g10/g10.c:258
 msgid "En-Armor a file or stdin"
 msgstr "������������ stdin ��� ���� � ASCII-�������������"
 
-#: g10/g10.c:259
+#: g10/g10.c:260
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|���������� �������� ���������"
 
-#: g10/g10.c:263
+#: g10/g10.c:264
 msgid ""
 "@\n"
 "Options:\n"
@@ -553,172 +564,172 @@ msgstr ""
 "���������:\n"
 " "
 
-#: g10/g10.c:265
+#: g10/g10.c:266
 msgid "create ascii armored output"
 msgstr "����� � ASCII-�������������"
 
-#: g10/g10.c:267
+#: g10/g10.c:268
 #, fuzzy
 msgid "|NAME|encrypt for NAME"
 msgstr "|���|������������ ������������ ���������� ���"
 
-#: g10/g10.c:270
+#: g10/g10.c:271
 #, fuzzy
 msgid "|NAME|use NAME as default recipient"
 msgstr "|���|������������ ��� � �������� ���������� ����� �� ���������"
 
-#: g10/g10.c:272
+#: g10/g10.c:273
 msgid "use the default key as default recipient"
 msgstr ""
 
-#: g10/g10.c:276
+#: g10/g10.c:277
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "������������ ��������� ������������� ������������ ��� ������� ��� �����������"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|���������� ������� ������ (0 - �� �������)"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "use canonical text mode"
 msgstr "������������ ������������ ��������� �����"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "use as output file"
 msgstr "������������ � �������� ��������� �����"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "verbose"
 msgstr "������������"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "be somewhat more quiet"
 msgstr ""
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "��������� ������� �� �����"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 #, fuzzy
 msgid "always use a MDC for encryption"
 msgstr "������������ ��������� ������������� ������������ ��� ����������"
 
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "do not make any changes"
 msgstr "Keine wirklichen �nderungen durchf�hren"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "batch mode: never ask"
 msgstr "�������� �����: ������ �� ����������"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "assume yes on most questions"
 msgstr "�������� \"��\" �� ����������� ��������"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "assume no on most questions"
 msgstr "�������� \"���\" �� ����������� ��������"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "add this keyring to the list of keyrings"
 msgstr "�������� ��� ������ � ������ ������ ������"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "add this secret keyring to the list"
 msgstr "�������� ��� ��������� ������ � ������ ������ ������"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|NAME|use NAME as default secret key"
 msgstr "|���|������������ ��� � �������� ���������� ����� �� ���������"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|���|������������ ������������ ���������� ���"
 
-#: g10/g10.c:297
+#: g10/g10.c:298
 msgid "read options from file"
 msgstr "������ ��������� �� �����"
 
-#: g10/g10.c:301
+#: g10/g10.c:302
 msgid "|FD|write status info to this FD"
 msgstr "|FD| ���������� ���������� � ��������� � ���������� (FD)"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 #, fuzzy
 msgid "|FILE|load extension module FILE"
 msgstr "|����|��������� ���� � ������������ ��������"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "emulate the mode described in RFC1991"
 msgstr "����������� ����� ��������� � RFC1991"
 
-#: g10/g10.c:309
+#: g10/g10.c:310
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:310
+#: g10/g10.c:311
 #, fuzzy
 msgid "|N|use passphrase mode N"
 msgstr "|N|������������ �������� ����� ������ N\n"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|���|������������ ���-�������� ��� ��� �������� ����"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|���|������������ ������������ ���������� ��� ��� �������� ����"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|���|������������ ������������ ���������� ���"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|���|������������ ���-�������� ���"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "|N|use compress algorithm N"
 msgstr "|N|������������ �������� ������ N"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "throw keyid field of encrypted packets"
 msgstr "����������� ���� keyid � ������������� �������"
 
-#: g10/g10.c:319
+#: g10/g10.c:320
 msgid "|NAME=VALUE|use this notation data"
 msgstr ""
 
-#: g10/g10.c:322
+#: g10/g10.c:323
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:325
+#: g10/g10.c:326
 #, fuzzy
 msgid ""
 "@\n"
@@ -739,17 +750,17 @@ msgstr ""
 " --list-keys [names]        �������� ������ ������\n"
 " --fingerprint [names]      �������� \"��������� �������\" ������\n"
 
-#: g10/g10.c:431
+#: g10/g10.c:432
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "����������, ����������� ��������� �� ������� �� ������ "
 "<[email protected]>.\n"
 
-#: g10/g10.c:435
+#: g10/g10.c:436
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�������������: gpg [���������] [�����] (-h ��� ������)"
 
-#: g10/g10.c:438
+#: g10/g10.c:439
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -759,7 +770,7 @@ msgstr ""
 "�����������, ��������� �������, ������� ��� ��������������\n"
 "����� ������ ������� �� ������� ������\n"
 
-#: g10/g10.c:445
+#: g10/g10.c:446
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -767,294 +778,294 @@ msgstr ""
 "\n"
 "�������������� ���������:\n"
 
-#: g10/g10.c:524
+#: g10/g10.c:525
 msgid "usage: gpg [options] "
 msgstr "�������������: gpg [���������] "
 
-#: g10/g10.c:577
+#: g10/g10.c:578
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Kommandos\n"
 
-#: g10/g10.c:727
+#: g10/g10.c:728
 #, fuzzy, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "���������: ���� ���������� �� ��������� `%s' �����������\n"
 
-#: g10/g10.c:731
+#: g10/g10.c:732
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���� ���������� `%s': %s\n"
 
-#: g10/g10.c:738
+#: g10/g10.c:739
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� ��������� �� `%s'\n"
 
-#: g10/g10.c:943
+#: g10/g10.c:944
 #, fuzzy, c-format
 msgid "%s is not a valid character set\n"
 msgstr "������������ ������ � �����������.\n"
 
-#: g10/g10.c:1014
+#: g10/g10.c:1015
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:1018 g10/g10.c:1027
+#: g10/g10.c:1019 g10/g10.c:1028
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/g10.c:1020
+#: g10/g10.c:1021
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr ""
 
-#: g10/g10.c:1023
+#: g10/g10.c:1024
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr ""
 
-#: g10/g10.c:1043 g10/g10.c:1055
+#: g10/g10.c:1044 g10/g10.c:1056
 msgid "selected cipher algorithm is invalid\n"
 msgstr "������ ������������ �������� ����������\n"
 
-#: g10/g10.c:1049 g10/g10.c:1061
+#: g10/g10.c:1050 g10/g10.c:1062
 msgid "selected digest algorithm is invalid\n"
 msgstr "������ ������������ ��������-��������\n"
 
-#: g10/g10.c:1065
+#: g10/g10.c:1066
 msgid "the given policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:1068
+#: g10/g10.c:1069
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "�������� �������� ����� ����� �������� �� %d �� %d\n"
 
-#: g10/g10.c:1070
+#: g10/g10.c:1071
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ ���� ������ 0\n"
 
-#: g10/g10.c:1072
+#: g10/g10.c:1073
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ ���� ������ 1\n"
 
-#: g10/g10.c:1074
+#: g10/g10.c:1075
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:1077
+#: g10/g10.c:1078
 #, fuzzy
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "���������: ������� S2K ����� (0) ����� �� �������������\n"
 
-#: g10/g10.c:1081
+#: g10/g10.c:1082
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "������������ ����� S2K: ������ ���� 0, 1 ��� 3\n"
 
-#: g10/g10.c:1166
+#: g10/g10.c:1167
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "������ ������������� ���� ������ �������: %s\n"
 
-#: g10/g10.c:1172
+#: g10/g10.c:1173
 msgid "--store [filename]"
 msgstr "--store [��� �����]"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1180
 msgid "--symmetric [filename]"
 msgstr "--symmetric [��� �����]"
 
-#: g10/g10.c:1187
+#: g10/g10.c:1188
 msgid "--encrypt [filename]"
 msgstr "--encrypt [��� �����]"
 
-#: g10/g10.c:1200
+#: g10/g10.c:1201
 msgid "--sign [filename]"
 msgstr "--sign [��� �����]"
 
-#: g10/g10.c:1213
+#: g10/g10.c:1214
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [��� �����]"
 
-#: g10/g10.c:1227
+#: g10/g10.c:1228
 msgid "--clearsign [filename]"
 msgstr "--clearsign [��� �����]"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1245
 msgid "--decrypt [filename]"
 msgstr "--decrypt [��� �����]"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 msgid "--sign-key user-id"
 msgstr ""
 
-#: g10/g10.c:1260
+#: g10/g10.c:1261
 #, fuzzy
 msgid "--lsign-key user-id"
 msgstr "--delete-key ���-������������"
 
-#: g10/g10.c:1268
+#: g10/g10.c:1269
 #, fuzzy
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key ���-������������"
 
-#: g10/g10.c:1284
+#: g10/g10.c:1285
 #, fuzzy
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key ���-������������"
 
-#: g10/g10.c:1287
+#: g10/g10.c:1288
 #, fuzzy
 msgid "--delete-key user-id"
 msgstr "--delete-key ���-������������"
 
-#: g10/g10.c:1295
+#: g10/g10.c:1296
 #, fuzzy
 msgid "--delete-secret-and-public-key user-id"
 msgstr "--delete-secret-key ���-������������"
 
-#: g10/encode.c:268 g10/g10.c:1332 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1333 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "���������� ������� ���� `%s': %s\n"
 
-#: g10/g10.c:1347
+#: g10/g10.c:1348
 #, fuzzy
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [������������� ������������] [������ ������]"
 
-#: g10/g10.c:1413
+#: g10/g10.c:1414
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "������ �������������: %s\n"
 
-#: g10/g10.c:1421
+#: g10/g10.c:1422
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "������ �����������: %s\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1493
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "������������ ���-�������� `%s'\n"
 
-#: g10/g10.c:1579
+#: g10/g10.c:1580
 msgid "[filename]"
 msgstr "[��� �����]"
 
-#: g10/g10.c:1583
+#: g10/g10.c:1584
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/decrypt.c:59 g10/g10.c:1586 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1587 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "���������� ������� ���� `%s'\n"
 
-#: g10/g10.c:1795
+#: g10/g10.c:1796
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 
-#: g10/g10.c:1801
+#: g10/g10.c:1802
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1807
+#: g10/g10.c:1808
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1815
+#: g10/g10.c:1816
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
-#: g10/armor.c:302
+#: g10/armor.c:304
 #, fuzzy, c-format
 msgid "armor: %s\n"
 msgstr "���������: %s\n"
 
-#: g10/armor.c:331
+#: g10/armor.c:333
 msgid "invalid armor header: "
 msgstr ""
 
-#: g10/armor.c:338
+#: g10/armor.c:340
 msgid "armor header: "
 msgstr ""
 
-#: g10/armor.c:349
+#: g10/armor.c:351
 #, fuzzy
 msgid "invalid clearsig header\n"
 msgstr "������������ ������ ��������� �������\n"
 
-#: g10/armor.c:401
+#: g10/armor.c:403
 #, fuzzy
 msgid "nested clear text signatures\n"
 msgstr "|[����]|������� ��������� �������"
 
-#: g10/armor.c:525
+#: g10/armor.c:527
 msgid "invalid dash escaped line: "
 msgstr "������������ ������ ������������ � �������: "
 
-#: g10/armor.c:537
+#: g10/armor.c:539
 #, fuzzy
 msgid "unexpected armor:"
 msgstr "����������� ������"
 
-#: g10/armor.c:663
+#: g10/armor.c:665
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "������������ ��� ��������� radix64 ������ %02x ��������\n"
 
-#: g10/armor.c:706
+#: g10/armor.c:708
 msgid "premature eof (no CRC)\n"
 msgstr "����������� ����� ����� (��� CRC)\n"
 
-#: g10/armor.c:740
+#: g10/armor.c:742
 msgid "premature eof (in CRC)\n"
 msgstr "����������� ����� ����� (� CRC)\n"
 
-#: g10/armor.c:744
+#: g10/armor.c:746
 msgid "malformed CRC\n"
 msgstr "������������ ����� CRC\n"
 
-#: g10/armor.c:748
+#: g10/armor.c:750
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "������ CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:765
+#: g10/armor.c:767
 msgid "premature eof (in Trailer)\n"
 msgstr "����������� ����� ����� (� ������)\n"
 
-#: g10/armor.c:769
+#: g10/armor.c:771
 msgid "error in trailer line\n"
 msgstr "������ � ����������� ������\n"
 
-#: g10/armor.c:915
+#: g10/armor.c:917
 msgid "For info see http://www.gnupg.org"
 msgstr ""
 
-#: g10/armor.c:1043
+#: g10/armor.c:1045
 #, fuzzy
 msgid "no valid OpenPGP data found.\n"
 msgstr "�� ������� ���������� RFC1991 ��� OpenPGP ������.\n"
 
-#: g10/armor.c:1048
+#: g10/armor.c:1050
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr ""
 
-#: g10/armor.c:1052
+#: g10/armor.c:1054
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1189 g10/pkclist.c:53
+#: g10/keyedit.c:1190 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr ""
 
@@ -1283,17 +1294,17 @@ msgstr "��������: ���� ���� �� ������� ���������� ����������� ���������!\n"
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "          ��� �����������, ��� ������� ����������� ���������.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ��������: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:826 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr ""
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:853
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1302,43 +1313,43 @@ msgstr ""
 "\"-r\").\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:863
 msgid "Enter the user ID: "
 msgstr "������� ������������� ������������: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:875
 msgid "No such user ID.\n"
 msgstr "��� ������ �������������� ������������.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:880
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:903
 #, fuzzy
 msgid "Public key is disabled.\n"
 msgstr "�������� ���� �� ������"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:910
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr ""
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:941
 #, fuzzy, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "���������: ���� ���������� �� ��������� `%s' �����������\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:974
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: ������ ��� �������� �����: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr ""
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1017
 msgid "no valid addressees\n"
 msgstr "��� ���������� �������\n"
 
@@ -1618,7 +1629,7 @@ msgstr ""
 "��� ������ ������ ����� ����� �������� �����.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:955
+#: g10/keyedit.c:469 g10/keygen.c:955
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "�������� ����� �� ���� ��������������, ���������� �����.\n"
 
@@ -1753,290 +1764,281 @@ msgstr "��������� ���� %08lX: �� ����� ���������������� ��������� �����.\n"
 msgid "key %08lX: not protected - skipped\n"
 msgstr "��������� ���� %08lX: �� ����� ���������������� ��������� �����.\n"
 
-#: g10/export.c:232
+#: g10/export.c:236
 #, fuzzy
 msgid "WARNING: nothing exported\n"
 msgstr "��������: ������������ ���� � �������� ��� �������!\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:208
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:350
+#: g10/getkey.c:443
 msgid "too many entries in unk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
-msgid "RSA key cannot be used in this version\n"
-msgstr ""
-
-#: g10/getkey.c:1310 g10/getkey.c:1349
-#, fuzzy
-msgid "No key for user ID\n"
-msgstr "���� %08lX: ��� �������������� ������������\n"
-
-#: g10/getkey.c:1388 g10/getkey.c:1428
-#, fuzzy
-msgid "No user ID for key\n"
-msgstr "������ ��������� ����"
-
-#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
+#: g10/getkey.c:2143
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "������������ �������������� ���� %09lX ������ ��������� %08lX%\n"
 
-#: g10/getkey.c:2050
+#: g10/getkey.c:2185 g10/trustdb.c:577
+#, fuzzy, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "��������� ���� %08lX: �� ����� ���������������� ��������� �����.\n"
+
+#: g10/getkey.c:2473
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: ������������ �� ������\n"
 
-#: g10/import.c:182
+#: g10/import.c:184
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "���������� ���� ���� %d\n"
 
-#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr ""
 
-#: g10/import.c:194
+#: g10/import.c:196
 #, fuzzy, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/import.c:204
+#: g10/import.c:206
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr ""
 
-#: g10/import.c:206
+#: g10/import.c:208
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "���� %08lX: %d ����� ��������\n"
 
-#: g10/import.c:209
+#: g10/import.c:211
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:211
+#: g10/import.c:213
 #, c-format
 msgid "              imported: %lu"
 msgstr ""
 
-#: g10/import.c:217
+#: g10/import.c:219
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:219
+#: g10/import.c:221
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:221
+#: g10/import.c:223
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr ""
 
-#: g10/import.c:223
+#: g10/import.c:225
 #, fuzzy, c-format
 msgid "        new signatures: %lu\n"
 msgstr "���� %08lX: %d ����� ��������\n"
 
-#: g10/import.c:225
+#: g10/import.c:227
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr ""
 
-#: g10/import.c:227
+#: g10/import.c:229
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr ""
 
-#: g10/import.c:229
+#: g10/import.c:231
 #, fuzzy, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "���� %08lX: ��������� ���� ������������\n"
 
-#: g10/import.c:231
+#: g10/import.c:233
 #, fuzzy, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "����������� ������������ ��������� ����"
 
-#: g10/import.c:391 g10/import.c:600
+#: g10/import.c:408 g10/import.c:617
 #, fuzzy, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "���� %08lX: ��� �������������� ������������\n"
 
-#: g10/import.c:405
+#: g10/import.c:422
 #, fuzzy, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "���� %08lX: ��� ���������� ��������������� �������������\n"
 
-#: g10/import.c:407
+#: g10/import.c:424
 msgid "this may be caused by a missing self-signature\n"
 msgstr "��� ����� ���� ������� ����������� ����-�������\n"
 
-#: g10/import.c:418 g10/import.c:667
+#: g10/import.c:435 g10/import.c:684
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "���� %08lX: �������� ���� �� ������: %s\n"
 
-#: g10/import.c:423
+#: g10/import.c:440
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "��������� ���� %08lX: �� ����� ���������������� ��������� �����.\n"
 
-#: g10/import.c:431
+#: g10/import.c:448
 msgid "no default public keyring\n"
 msgstr "��� ������ �������� ������ �� ���������\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
+#: g10/import.c:452 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "������������ � `%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:615 g10/import.c:716
+#: g10/import.c:455 g10/import.c:513 g10/import.c:632 g10/import.c:733
 #, fuzzy, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "���������� ������������� ������ �������� ������: %s\n"
 
-#: g10/import.c:441 g10/import.c:499 g10/import.c:618 g10/import.c:719
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
 #, fuzzy, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "���� %08lX: �������� ���� ������������\n"
 
-#: g10/import.c:463
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "���� %08lX: �� ��������� � ����� ������\n"
 
-#: g10/import.c:472 g10/import.c:675
+#: g10/import.c:489 g10/import.c:692
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "���� %08lX: ���������� ���������� original keyblock: %s\n"
 
-#: g10/import.c:478 g10/import.c:681
+#: g10/import.c:495 g10/import.c:698
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "���� %08lX: ���������� ��������� original keyblock: %s\n"
 
-#: g10/import.c:505
+#: g10/import.c:522
 #, fuzzy, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "���� %08lX: 1 ����� ������������� ������������\n"
 
-#: g10/import.c:508
+#: g10/import.c:525
 #, fuzzy, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "���� %08lX: %d ����� ��������������� �������������\n"
 
-#: g10/import.c:511
+#: g10/import.c:528
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "���� %08lX: 1 ����� �������\n"
 
-#: g10/import.c:514
+#: g10/import.c:531
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "���� %08lX: %d ����� ��������\n"
 
-#: g10/import.c:517
+#: g10/import.c:534
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "���� %08lX: 1 ����� ���-����\n"
 
-#: g10/import.c:520
+#: g10/import.c:537
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "���� %08lX: %d ����� ���-������\n"
 
-#: g10/import.c:530
+#: g10/import.c:547
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "���� %08lX: �� �������\n"
 
-#: g10/import.c:593
+#: g10/import.c:610
 #, c-format
 msgid "secret key %08lX not imported (use %s to allow for it)\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:640
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "���� %08lX: ��������� ���� ������������\n"
 
 #. we can't merge secret keys
-#: g10/import.c:627
+#: g10/import.c:644
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "���� %08lX: ��� �� ������ ��������� ������\n"
 
-#: g10/import.c:632
+#: g10/import.c:649
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "���� %08lX: ��������� ���� �� ������: %s\n"
 
-#: g10/import.c:661
+#: g10/import.c:678
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "���� %08lX: ��� ��������� ����� - ���������� ��������� ���������� "
 "����������\n"
 
-#: g10/import.c:692
+#: g10/import.c:709
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "���� %08lX: ������������ ���������� ����������: %s - ���������\n"
 
-#: g10/import.c:724
+#: g10/import.c:741
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "���� %08lX: ���������� ���������� ������������\n"
 
-#: g10/import.c:766
+#: g10/import.c:783
 #, fuzzy, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "���� %08lX: ��� �������������� ������������ ��� �������\n"
 
-#: g10/import.c:773 g10/import.c:797
+#: g10/import.c:790 g10/import.c:814
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "���� %08lX: ���������������� �������� ��������� �����\n"
 
-#: g10/import.c:774
+#: g10/import.c:791
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "���� %08lX: ������������ ����-�������\n"
 
-#: g10/import.c:789
+#: g10/import.c:806
 #, fuzzy, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "���� %08lX: ��� �������������� ������������\n"
 
-#: g10/import.c:798
+#: g10/import.c:815
 #, fuzzy, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "���� %08lX: ��� ���������� ��������������� �������������\n"
 
-#: g10/import.c:825
+#: g10/import.c:842
 #, fuzzy, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "���� %08lX: �������� ������������� ������������ '"
 
-#: g10/import.c:854
+#: g10/import.c:871
 #, fuzzy, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "���� %08lX: �������� ������������� ������������ '"
 
-#: g10/import.c:877
+#: g10/import.c:894
 #, fuzzy, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "���� %08lX: 1 ����� ���-����\n"
@@ -2045,32 +2047,32 @@ msgstr "���� %08lX: 1 ����� ���-����\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:902
+#: g10/import.c:919
 #, fuzzy, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "���� %08lX: ���������� ���������� � ������������ ����� - ��������\n"
 
-#: g10/import.c:911
+#: g10/import.c:928
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "���� %08lX: ���������� ���������� � ������������ ����� - ��������\n"
 
-#: g10/import.c:919
+#: g10/import.c:936
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "���� %08lX: ������������ ���������� ����������: %s - ��������\n"
 
-#: g10/import.c:1019
+#: g10/import.c:1036
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1071
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "���� %08lX: ���������� ���������� ��������\n"
 
-#: g10/import.c:1185 g10/import.c:1238
+#: g10/import.c:1202 g10/import.c:1255
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "���� %08lX: ���� ����� �� ����� ����-�������\n"
@@ -2080,51 +2082,51 @@ msgstr "���� %08lX: ���� ����� �� ����� ����-�������\n"
 msgid "%s: user not found\n"
 msgstr "%s: ������������ �� ������\n"
 
-#: g10/keyedit.c:155
+#: g10/keyedit.c:156
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:157
 #, fuzzy
 msgid "[self-signature]"
 msgstr "[����-�������]\n"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:221
 #, fuzzy
 msgid "1 bad signature\n"
 msgstr "1 ������ �������\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:223
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d ������ ��������\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:225
 #, fuzzy
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 ������� �� ��������� ��-�� ���������� �����\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 #, fuzzy, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%s �������� �� ��������� ��-�� ���������� ������\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 #, fuzzy
 msgid "1 signature not checked due to an error\n"
 msgstr "1 ������� �� ��������� ��-�� ������\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:231
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%s �������� �� ��������� ��-�� ������\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:233
 #, fuzzy
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "��������� 1 ������������� ������������ ��� ���������� ����-�������\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:235
 #, fuzzy, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
@@ -2132,57 +2134,57 @@ msgstr ""
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:317
 #, fuzzy, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "��� ��������� ������ %08lX.\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:325
 #, fuzzy, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "������ ����������� ������ %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
 #, fuzzy
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr "�� ������������� �������, ��� ������ ��������� ���� ���� �����:\n"
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:343
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:348
 msgid "Really sign? "
 msgstr "������������� ���������? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
+#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:136
 #, fuzzy, c-format
 msgid "signing failed: %s\n"
 msgstr "������ ������������: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:428
 msgid "This key is not protected.\n"
 msgstr "���� ���� �� �������.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:432
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "��������� ���� �� ����������"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:436
 msgid "Key is protected.\n"
 msgstr "���� ���� �������.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "���������� ������������� ���� ����: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:461
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2190,7 +2192,7 @@ msgstr ""
 "������� ����� �������� ����� ��� ����� ���������� �����.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:473
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2198,499 +2200,499 @@ msgstr ""
 "�� �� ������ �������� ����� - ��� ������ ����� *������* ����!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:476
 msgid "Do you really want to do this? "
 msgstr "�� ������������� ����� ������? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:540
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
 msgid "quit this menu"
 msgstr "����� �� ����"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "q"
 msgstr ""
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save"
 msgstr "��������"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save and quit"
 msgstr "�������� � �����"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "help"
 msgstr "������"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "show this help"
 msgstr "�������� ������"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "fpr"
 msgstr ""
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 #, fuzzy
 msgid "show fingerprint"
 msgstr "�������� \"��������� ������\""
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 #, fuzzy
 msgid "list"
 msgstr "������"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 #, fuzzy
 msgid "list key and user IDs"
 msgstr "������ ������ � ��������������� �������������"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "l"
 msgstr ""
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "uid"
 msgstr ""
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, fuzzy
 msgid "select user ID N"
 msgstr "������� ������������� ������������ N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "key"
 msgstr "����"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "select secondary key N"
 msgstr "������� �������������� ���� N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "check"
 msgstr "��������"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 #, fuzzy
 msgid "list signatures"
 msgstr "������ ������ � �� ��������"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "c"
 msgstr ""
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign"
 msgstr "���������"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 #, fuzzy
 msgid "sign the key"
 msgstr "��������� ����"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "s"
 msgstr ""
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 #, fuzzy
 msgid "lsign"
 msgstr "���������"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 #, fuzzy
 msgid "sign the key locally"
 msgstr "��������� ����"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "debug"
 msgstr "�������"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "adduid"
 msgstr ""
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 #, fuzzy
 msgid "add a user ID"
 msgstr "�������� ������������� ������������"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "deluid"
 msgstr ""
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 #, fuzzy
 msgid "delete user ID"
 msgstr "������� ������������� ������������"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "addkey"
 msgstr ""
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 #, fuzzy
 msgid "add a secondary key"
 msgstr "�������� �������������� ����"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delkey"
 msgstr ""
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delete a secondary key"
 msgstr "������� �������������� ����"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 #, fuzzy
 msgid "delsig"
 msgstr "���������"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 #, fuzzy
 msgid "delete signatures"
 msgstr "������ ������ � �� ��������"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "expire"
 msgstr ""
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 #, fuzzy
 msgid "change the expire date"
 msgstr "�������� �������� �����"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle"
 msgstr ""
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle between secret and public key listing"
 msgstr "����������� ����� ������� ��������� � �������� ������"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "t"
 msgstr ""
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "pref"
 msgstr ""
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "list preferences"
 msgstr ""
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
 msgid "passwd"
 msgstr ""
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
 #, fuzzy
 msgid "change the passphrase"
 msgstr "�������� �������� �����"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
 msgid "trust"
 msgstr ""
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
 msgid "change the ownertrust"
 msgstr "�������� ��������� �������"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
 #, fuzzy
 msgid "revsig"
 msgstr "���������"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
 #, fuzzy
 msgid "revoke signatures"
 msgstr "��������� ������� �� �����"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 #, fuzzy
 msgid "revkey"
 msgstr "����"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 #, fuzzy
 msgid "revoke a secondary key"
 msgstr "������� �������������� ����"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 msgid "disable"
 msgstr ""
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 #, fuzzy
 msgid "disable a key"
 msgstr "������ ����"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
 msgid "enable"
 msgstr ""
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
 #, fuzzy
 msgid "enable a key"
 msgstr "������ ����"
 
-#: g10/delkey.c:110 g10/keyedit.c:631
+#: g10/delkey.c:110 g10/keyedit.c:632
 msgid "can't do that in batchmode\n"
 msgstr "���������� ������� ��� � �������� ������.\n"
 
 #. check that they match
 #. fixme: check that they both match
-#: g10/keyedit.c:669
+#: g10/keyedit.c:670
 #, fuzzy
 msgid "Secret key is available.\n"
 msgstr "������� ��������� ����.\n"
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 #, fuzzy
 msgid "Command> "
 msgstr "�������> "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:729
 #, fuzzy
 msgid "Need the secret key to do this.\n"
 msgstr "����� ��� �������, ����� ��������� ����.\n"
 
-#: g10/keyedit.c:732
+#: g10/keyedit.c:733
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 #, fuzzy
 msgid "Really sign all user IDs? "
 msgstr "������������� ��������� ��� �������������� ������������? "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 #, fuzzy
 msgid "Hint: Select the user IDs to sign\n"
 msgstr ""
 "���������: �������� �������������� ������������ ������� ������ ���������\n"
 
-#: g10/keyedit.c:812 g10/keyedit.c:994
+#: g10/keyedit.c:813 g10/keyedit.c:995
 #, fuzzy, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "���������� ���� ������ ������� �� �������: %s\n"
 
-#: g10/keyedit.c:823 g10/keyedit.c:844
+#: g10/keyedit.c:824 g10/keyedit.c:845
 #, fuzzy
 msgid "You must select at least one user ID.\n"
 msgstr "�� ������ ������� ���� �� ���� ������������� ������������.\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 #, fuzzy
 msgid "You can't delete the last user ID!\n"
 msgstr "�� �� ������ ������� ��������� ������������� ������������!\n"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:829
 #, fuzzy
 msgid "Really remove all selected user IDs? "
 msgstr "������������� ������� ��� ��������� �������������� ������������? "
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:830
 #, fuzzy
 msgid "Really remove this user ID? "
 msgstr "������������� ������� ���� ������������� ������������? "
 
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:866 g10/keyedit.c:888
 msgid "You must select at least one key.\n"
 msgstr "�� ������ ������� ���� �� ���� ����.\n"
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:870
 #, fuzzy
 msgid "Do you really want to delete the selected keys? "
 msgstr "�� ������������� ������ ������� ��������� �����? "
 
-#: g10/keyedit.c:870
+#: g10/keyedit.c:871
 #, fuzzy
 msgid "Do you really want to delete this key? "
 msgstr "�� ������������� ������ ������� ���� ����? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? "
 msgstr "�� ������������� ������ ������� ��������� �����? "
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:893
 #, fuzzy
 msgid "Do you really want to revoke this key? "
 msgstr "�� ������������� ������ ������� ���� ����? "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:959
 msgid "Save changes? "
 msgstr "��������� ���������? "
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:962
 msgid "Quit without saving? "
 msgstr "����� ��� ����������? "
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:973
 #, fuzzy, c-format
 msgid "update failed: %s\n"
 msgstr "���������� �� �������: %s\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:980
 #, fuzzy, c-format
 msgid "update secret failed: %s\n"
 msgstr "���������� ������� �� �������: %s\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:987
 msgid "Key not changed so no update needed.\n"
 msgstr "���� �� ���������, ���������� �� �����.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1002
 msgid "Invalid command  (try \"help\")\n"
 msgstr "������������ ������� (���������� \"help\")\n"
 
-#: g10/keyedit.c:1081 g10/keyedit.c:1107
+#: g10/keyedit.c:1082 g10/keyedit.c:1108
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1090
+#: g10/keyedit.c:1091
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1095
 #, fuzzy
 msgid "This key has been disabled"
 msgstr "���������: ���� �������� ����� ��� �����!\n"
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1124
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "build_sigrecs: ���� ist widerrufen\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1127
 msgid "rev- faked revocation found\n"
 msgstr ""
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1129
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1371
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1375
 #, fuzzy
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "������������� ���������� ����������"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1381
 #, fuzzy
 msgid "Really delete this self-signature? (y/N)"
 msgstr "������������� ���������� ����������"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1395
 #, fuzzy, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d ������ ��������\n"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1396
 #, fuzzy, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d ������ ��������\n"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 #, fuzzy
 msgid "Nothing deleted.\n"
 msgstr "��������: ������������ ���� � �������� ��� �������!\n"
 
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1468
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1474
 #, fuzzy
 msgid "Please select at most one secondary key.\n"
 msgstr "�� ������ ������� ���� �� ���� ����.\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1478
 msgid "Changing expiration time for a secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1480
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1522
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:1537
+#: g10/keyedit.c:1538
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1599
 #, fuzzy, c-format
 msgid "No user ID with index %d\n"
 msgstr "��� �������������� ������������ � �������� %d\n"
 
-#: g10/keyedit.c:1644
+#: g10/keyedit.c:1645
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "��� ��������������� ����� � �������� %d\n"
 
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:1743
 #, fuzzy
 msgid "user ID: \""
 msgstr "������� ������������� ������������: "
 
-#: g10/keyedit.c:1745
+#: g10/keyedit.c:1746
 #, fuzzy, c-format
 msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 msgstr "������ ����������� ������ %08lX\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1750
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "������������� ���������� ����������"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1773
+#: g10/keyedit.c:1774
 #, fuzzy
 msgid "You have signed these user IDs:\n"
 msgstr "�� �� ������ ������� ��������� ������������� ������������!\n"
 
-#: g10/keyedit.c:1787 g10/keyedit.c:1822
+#: g10/keyedit.c:1788 g10/keyedit.c:1823
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "������ ����������� ������ %08lX\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1793
 #, fuzzy, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "������ ����������� ������ %08lX\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1813
 #, fuzzy
 msgid "You are about to revoke these signatures:\n"
 msgstr "M�chten Sie einige der ung�ltigen Signaturen entfernen? "
 
-#: g10/keyedit.c:1830
+#: g10/keyedit.c:1831
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "������������� ���������� ����������"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1860
 #, fuzzy
 msgid "no secret key\n"
 msgstr "������ ��������� ����"
@@ -2706,132 +2708,132 @@ msgid "revoked"
 msgstr "����"
 
 #. of subkey
-#: g10/keylist.c:404 g10/mainproc.c:836
+#: g10/keylist.c:402 g10/mainproc.c:837
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "���� ��������� �� %s\n"
 
-#: g10/mainproc.c:270
+#: g10/mainproc.c:271
 #, fuzzy, c-format
 msgid "public key is %08lX\n"
 msgstr "�������� ���� �� ������"
 
-#: g10/mainproc.c:315
+#: g10/mainproc.c:316
 #, fuzzy
 msgid "public key encrypted data: good DEK\n"
 msgstr "����������� �������� ������ �� ������� %s\n"
 
-#: g10/mainproc.c:367
+#: g10/mainproc.c:368
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "(%u-��� %s ����, ID %08lX, ������ %s)\n"
 
-#: g10/mainproc.c:377
+#: g10/mainproc.c:378
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "������� ������� %.*s, ��������� %s ���� %08lX\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:392
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "����������� �������� ������ �� ������� %s\n"
 
-#: g10/mainproc.c:431
+#: g10/mainproc.c:432
 #, fuzzy
 msgid "decryption okay\n"
 msgstr "����������� �� �������: %s\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:437
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:441
+#: g10/mainproc.c:442
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "����������� �� �������: %s\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:461
 #, fuzzy
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "���������: ����������� �������� \"������-���-�����-����\"\n"
 
-#: g10/mainproc.c:462
+#: g10/mainproc.c:463
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:617
+#: g10/mainproc.c:618
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:704 g10/mainproc.c:713
+#: g10/mainproc.c:705 g10/mainproc.c:714
 #, fuzzy
 msgid "WARNING: invalid notation data found\n"
 msgstr "�� ������� ���������� RFC1991 ��� OpenPGP ������.\n"
 
-#: g10/mainproc.c:716
+#: g10/mainproc.c:717
 msgid "Notation: "
 msgstr ""
 
-#: g10/mainproc.c:725
+#: g10/mainproc.c:726
 msgid "Policy: "
 msgstr ""
 
-#: g10/mainproc.c:1235
+#: g10/mainproc.c:1177
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1272
+#: g10/mainproc.c:1214
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "������� ������� %.*s, ��������� %s ���� %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1307 g10/mainproc.c:1318
+#: g10/mainproc.c:1242 g10/mainproc.c:1250
 msgid "BAD signature from \""
 msgstr "������ ������� �� \""
 
-#: g10/mainproc.c:1308 g10/mainproc.c:1319
+#: g10/mainproc.c:1243 g10/mainproc.c:1251
 msgid "Good signature from \""
 msgstr "������� ������� �� \""
 
-#: g10/mainproc.c:1310
+#: g10/mainproc.c:1266
 msgid "                aka \""
 msgstr ""
 
-#: g10/mainproc.c:1366
+#: g10/mainproc.c:1316
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "���������� ��������� �������: %s\n"
 
-#: g10/mainproc.c:1423 g10/mainproc.c:1438 g10/mainproc.c:1500
+#: g10/mainproc.c:1373 g10/mainproc.c:1388 g10/mainproc.c:1450
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "������� ��������� �������"
 
-#: g10/mainproc.c:1449
+#: g10/mainproc.c:1399
 #, fuzzy, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "������� ������������ ����"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1454
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:1509
+#: g10/mainproc.c:1459
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:97
+#: g10/misc.c:98
 #, fuzzy, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "���������� ������� ���� `%s': %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:208
 msgid "Experimental algorithms should not be used!\n"
 msgstr ""
 
-#: g10/misc.c:237
+#: g10/misc.c:238
 msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
 msgstr ""
 
@@ -2840,7 +2842,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "���������� ������������� ������ �������� ������: %s\n"
 
-#: g10/parse-packet.c:990
+#: g10/parse-packet.c:1010
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -2853,7 +2855,7 @@ msgstr ""
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:170 g10/passphrase.c:248
+#: g10/hkp.c:147 g10/passphrase.c:248
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "���������� ������� ���� `%s': %s\n"
@@ -3003,36 +3005,36 @@ msgstr "���������: ������������ �������� %d �� ������ � �������������\n"
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "��������������: ���� ������� ������� %s\n"
 
-#: g10/hkp.c:72
+#: g10/hkp.c:59
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr ""
 
-#: g10/hkp.c:85
+#: g10/hkp.c:72
 #, fuzzy, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "���������� �������� � ������ ������: %s\n"
 
-#: g10/hkp.c:109 g10/hkp.c:148
+#: g10/hkp.c:91 g10/hkp.c:125
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/hkp.c:117
+#: g10/hkp.c:99
 #, fuzzy, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "������������ ������ � �����������.\n"
 
-#: g10/hkp.c:194
+#: g10/hkp.c:171
 #, fuzzy, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:183
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr ""
 
-#: g10/hkp.c:209
+#: g10/hkp.c:186
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
@@ -3047,11 +3049,11 @@ msgstr "��������� ���� �� ����������"
 msgid "protection algorithm %d is not supported\n"
 msgstr "�������� ������ %d �� ��������������\n"
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:184
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "������������ �������� �����, ���������� ����� ...\n"
 
-#: g10/seckey-cert.c:242
+#: g10/seckey-cert.c:240
 #, fuzzy
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "��������������: ��������� ������ ���� - ������� �������� �����.\n"
@@ -3319,11 +3321,6 @@ msgstr "��������� ���� %08lX: �� ����� ���������������� ��������� �����.\n"
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "���� ���� �� �������.\n"
 
-#: g10/trustdb.c:577
-#, fuzzy, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "��������� ���� %08lX: �� ����� ���������������� ��������� �����.\n"
-
 #: g10/trustdb.c:584
 #, c-format
 msgid "key %08lX: secret and public key don't match\n"
@@ -3564,34 +3561,43 @@ msgstr "%s: ���������� �������: %s\n"
 msgid "%s: keyring created\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/ringedit.c:1551
+#: g10/ringedit.c:1555
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/ringedit.c:1552
+#: g10/ringedit.c:1556
 #, fuzzy, c-format
 msgid "%s is the unchanged one\n"
 msgstr "����������� ������������ ��������� ����"
 
-#: g10/ringedit.c:1553
+#: g10/ringedit.c:1557
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/ringedit.c:1554
+#: g10/ringedit.c:1558
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
-#: g10/skclist.c:88 g10/skclist.c:125
+#: 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 ""
 
-#: g10/skclist.c:113
+#: g10/skclist.c:138
+#, fuzzy, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "%s: ��������: %s\n"
+
+#: g10/skclist.c:145 g10/skclist.c:153
 #, fuzzy, c-format
 msgid "skipped `%s': %s\n"
 msgstr "%s: ��������: %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:149
+msgid "skipped: secret key already present\n"
+msgstr ""
+
+#: g10/skclist.c:160
 #, fuzzy, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3693,11 +3699,11 @@ msgstr "Diesen ���� aus dem ����ring l�schen? "
 msgid "This is a secret key! - really delete? "
 msgstr "Dies ist ein privater ����! - Wirklich l�schen? "
 
-#: g10/delkey.c:182
+#: g10/delkey.c:181
 msgid "there is a secret key for this public key!\n"
 msgstr "Es gibt einen privaten ���� zu diesem �ffentlichen ����!\n"
 
-#: g10/delkey.c:184
+#: g10/delkey.c:183
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
 msgstr ""
 "Benutzen Sie das Kommando \"--delete-secret-key\", um ihn vorab zu "
@@ -3902,6 +3908,14 @@ msgid "No help available for `%s'"
 msgstr "������ ��� `%s' �����������."
 
 #, fuzzy
+#~ msgid "No key for user ID\n"
+#~ msgstr "���� %08lX: ��� �������������� ������������\n"
+
+#, fuzzy
+#~ msgid "No user ID for key\n"
+#~ msgstr "������ ��������� ����"
+
+#, fuzzy
 #~ msgid "no secret key for decryption available\n"
 #~ msgstr "��������� ���� �� ����������"
 
diff --git a/po/sv.po b/po/sv.po
index 86b7b17d9..c37515fd9 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-02-07 16:46+0100\n"
+"POT-Creation-Date: 2001-03-13 13:40+0100\n"
 "PO-Revision-Date: 2000-04-23 16:43+02:00\n"
 "Last-Translator: Daniel Resare <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -49,7 +49,7 @@ msgstr "nej"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:581 util/miscutil.c:308
 msgid "quit"
 msgstr "avsluta"
 
@@ -258,6 +258,17 @@ msgstr "ej krypterad"
 msgid "not processed"
 msgstr "inte behandlade"
 
+#. the key cannot be used for a specific usage
+#: util/errors.c:105
+#, fuzzy
+msgid "unusable public key"
+msgstr "felaktig publik nyckel"
+
+#: util/errors.c:106
+#, fuzzy
+msgid "unusable secret key"
+msgstr "felaktig hemlig nyckel"
+
 #: util/logger.c:224
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -268,63 +279,63 @@ msgstr "... detta �r en bugg (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du har hittat en bugg ... (%s:%d)\\n\n"
 
-#: cipher/random.c:311 g10/import.c:128 g10/keygen.c:1256
+#: cipher/random.c:309 g10/import.c:129 g10/keygen.c:1256
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte �ppna \"%s\": %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:313
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan inte ta status p� \"%s\": %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:318
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "\"%s\" �r inte �n vanlig fil - ignorerad\n"
 
-#: cipher/random.c:325
+#: cipher/random.c:323
 msgid "note: random_seed file is empty\n"
 msgstr "notera: filen random_seed �r tom\n"
 
-#: cipher/random.c:331
+#: cipher/random.c:329
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr "varning: random_seed har en felaktig storlek och anv�nds d�rf�r inte\n"
 
-#: cipher/random.c:339
+#: cipher/random.c:337
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan inte l�sa \"%s\": %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:375
 msgid "note: random_seed file not updated\n"
 msgstr "notera: random_seed uppdaterades inte\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:395
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:402
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan inte skriva till \"%s\": %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:405
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan inte st�nga \"%s\": %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:416
 #, 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:650
+#: cipher/random.c:648
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VARNING: anv�nder en os�ker slumptalsgenerator!!\n"
 
-#: cipher/random.c:651
+#: cipher/random.c:649
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -351,7 +362,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:212
+#: g10/g10.c:213
 msgid ""
 "@Commands:\n"
 " "
@@ -359,139 +370,139 @@ msgstr ""
 "@Kommandon:\n"
 " "
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "|[file]|make a signature"
 msgstr "|[fil]|skapa en signatur"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|skapa en klartext-signatur"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "make a detached signature"
 msgstr "skapa en signatur i en separat fil"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "encryption only with symmetric cipher"
 msgstr "endast kryptering med symmetriskt chiffer"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "store only"
 msgstr "endast lagring"
 
-#: g10/g10.c:220
+#: g10/g10.c:221
 msgid "decrypt data (default)"
 msgstr "dekryptera data (normall�ge)"
 
-#: g10/g10.c:221
+#: g10/g10.c:222
 msgid "verify a signature"
 msgstr "verifiera en signatur"
 
-#: g10/g10.c:223
+#: g10/g10.c:224
 msgid "list keys"
 msgstr "r�kna upp nycklar"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "list keys and signatures"
 msgstr "r�kna upp nycklar och signaturer"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "check key signatures"
 msgstr "verifiera nyckelsignaturer"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "list keys and fingerprints"
 msgstr "r�kna upp nycklar och fingeravtryck"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "list secret keys"
 msgstr "r�kna upp hemliga nycklar"
 
-#: g10/g10.c:229
+#: g10/g10.c:230
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
 msgid "remove key from the public keyring"
 msgstr "ta bort en nyckel fr�n den publika nyckelringen"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "remove key from the secret keyring"
 msgstr "ta bort en nyckel fr�n den hemliga nyckelringen"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "generate a revocation certificate"
 msgstr "generera ett �terkallelesecertifikat"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/g10.c:238
+#: g10/g10.c:239
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/g10.c:239
+#: g10/g10.c:240
 msgid "import keys from a key server"
 msgstr "importera nycklar fr�n en nyckelserver"
 
-#: g10/g10.c:243
+#: g10/g10.c:244
 msgid "import/merge keys"
 msgstr "importera/sl� ihop nycklar"
 
-#: g10/g10.c:245
+#: g10/g10.c:246
 msgid "list only the sequence of packets"
 msgstr "skriv endast ut paketsekvensen"
 
-#: g10/g10.c:247
+#: g10/g10.c:248
 msgid "export the ownertrust values"
 msgstr "exportera de v�rden som representerar �gartillit"
 
-#: g10/g10.c:249
+#: g10/g10.c:250
 msgid "import ownertrust values"
 msgstr "importera v�rden som representerar �gartillit"
 
-#: g10/g10.c:251
+#: g10/g10.c:252
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMN]|kontrollera tillitsdatabasen"
 
-#: g10/g10.c:254
+#: g10/g10.c:255
 msgid "fix a corrupted trust database"
 msgstr "reparera en korrupt tillitsdatabas"
 
-#: g10/g10.c:255
+#: g10/g10.c:256
 msgid "De-Armor a file or stdin"
 msgstr "Skala av en fil eller standard in"
 
-#: g10/g10.c:257
+#: g10/g10.c:258
 msgid "En-Armor a file or stdin"
 msgstr "Skapa ett skal f�r en fil eller standard in"
 
-#: g10/g10.c:259
+#: g10/g10.c:260
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skriv ut kontrollsummor"
 
-#: g10/g10.c:263
+#: g10/g10.c:264
 msgid ""
 "@\n"
 "Options:\n"
@@ -501,156 +512,156 @@ msgstr ""
 "Flaggor:\n"
 " "
 
-#: g10/g10.c:265
+#: g10/g10.c:266
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/g10.c:267
+#: g10/g10.c:268
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMN|kryptera f�r NAMN"
 
-#: g10/g10.c:270
+#: g10/g10.c:271
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMN|anv�nd NAMN som standardv�rdet f�r mottagare"
 
-#: g10/g10.c:272
+#: g10/g10.c:273
 msgid "use the default key as default recipient"
 msgstr "anv�nd standardnyckeln som standardmottagare"
 
-#: g10/g10.c:276
+#: g10/g10.c:277
 msgid "use this user-id to sign or decrypt"
 msgstr "anv�nd denna anv�ndaridentitet f�r att signera eller dekryptera"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 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:279
+#: g10/g10.c:280
 msgid "use canonical text mode"
 msgstr "anv�nd \"ursprunglig text\"-l�get"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "use as output file"
 msgstr "anv�nd som fil f�r utdata"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "verbose"
 msgstr "utf�rlig"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "be somewhat more quiet"
 msgstr "var n�got tystare"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "don't use the terminal at all"
 msgstr "anv�nd inte terminalen alls"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "force v3 signatures"
 msgstr "anv�nd v3-signaturer"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "always use a MDC for encryption"
 msgstr "anv�nd alltid en MDC f�r kryptering"
 
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "do not make any changes"
 msgstr "g�r inga �ndringar"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "batch mode: never ask"
 msgstr "batch-l�ge: fr�ga aldrig"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "assume yes on most questions"
 msgstr "anta att svaret �r ja p� de flesta fr�gor"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "assume no on most questions"
 msgstr "anta att svaret �r nej p� de flesta fr�gor"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "add this keyring to the list of keyrings"
 msgstr "l�gg till denna nyckelring till listan av nyckelringar"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "add this secret keyring to the list"
 msgstr "l�gg till denna hemliga nyckelring till listan"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMN|anv�nd NAMN som f�rvald hemlig nyckel"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|V�RD|anv�nd denna nyckelserver f�r att sl� upp nycklar"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMN|s�tt teckentabellen f�r terminalen till NAMN"
 
-#: g10/g10.c:297
+#: g10/g10.c:298
 msgid "read options from file"
 msgstr "l�s flaggor fr�n fil"
 
-#: g10/g10.c:301
+#: g10/g10.c:302
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "|FILE|load extension module FILE"
 msgstr "|FIL|ladda till�ggsmodul FIL"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "emulate the mode described in RFC1991"
 msgstr "imitera l�get som beskrivs i RFC1991"
 
-#: g10/g10.c:309
+#: g10/g10.c:310
 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:310
+#: g10/g10.c:311
 msgid "|N|use passphrase mode N"
 msgstr "|N|anv�nd l�senordsl�get N"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAMN|anv�nd kontrollsummealgoritmen NAMN f�r l�senordsfraser"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAMN|anv�nd chifferalgoritmen NAMN f�r l�senordsfraser"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMN|anv�nd chifferalgoritmen NAMN"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMN|anv�nd kontrollsummealgoritmen NAMN"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "|N|use compress algorithm N"
 msgstr "|N|anv�nd komprimeringsalgoritmen N"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "throw keyid field of encrypted packets"
 msgstr "sl�ng bort nyckelidentitetsf�ltet fr�n krypterade paket"
 
-#: g10/g10.c:319
+#: g10/g10.c:320
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAMN=V�RDE|anv�nd detta s�tt f�r att beskriva data"
 
-#: g10/g10.c:322
+#: g10/g10.c:323
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -658,7 +669,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan f�r en komplett lista p� alla kommandon och flaggor)\n"
 
-#: g10/g10.c:325
+#: g10/g10.c:326
 msgid ""
 "@\n"
 "Examples:\n"
@@ -678,17 +689,17 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/g10.c:431
+#: g10/g10.c:432
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Rapportera g�rna fel till <[email protected]>.\n"
 "Rapportera g�rna fel eller synpunkter p� �vers�ttningen till <[email protected]>.\n"
 
-#: g10/g10.c:435
+#: g10/g10.c:436
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Anv�ndning: gpg [flaggor] [filer] (-h f�r hj�lp)"
 
-#: g10/g10.c:438
+#: g10/g10.c:439
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -698,7 +709,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "vilken operation som utf�rs beror p� programmets indata\n"
 
-#: g10/g10.c:445
+#: g10/g10.c:446
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -706,66 +717,66 @@ msgstr ""
 "\n"
 "St�dda algoritmer:\n"
 
-#: g10/g10.c:524
+#: g10/g10.c:525
 msgid "usage: gpg [options] "
 msgstr "anv�ndning: gpg [flaggor] "
 
-#: g10/g10.c:577
+#: g10/g10.c:578
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
-#: g10/g10.c:727
+#: g10/g10.c:728
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTERA: inst�llningsfilen \"%s\" saknas\n"
 
-#: g10/g10.c:731
+#: g10/g10.c:732
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inst�llningsfil \"%s\": %s\n"
 
-#: g10/g10.c:738
+#: g10/g10.c:739
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser flaggor fr�n \"%s\"\n"
 
-#: g10/g10.c:943
+#: g10/g10.c:944
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s �r ingen giltig teckentabell\n"
 
-#: g10/g10.c:1014
+#: g10/g10.c:1015
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
 
-#: g10/g10.c:1018 g10/g10.c:1027
+#: g10/g10.c:1019 g10/g10.c:1028
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTERA: %s �r inte f�r normal anv�ndning!\n"
 
-#: g10/g10.c:1020
+#: g10/g10.c:1021
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �r inte till�ten tillsammans med %s!\n"
 
-#: g10/g10.c:1023
+#: g10/g10.c:1024
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "det �r ingen po�ng att anv�nda %s tillsammans med %s!\n"
 
-#: g10/g10.c:1043 g10/g10.c:1055
+#: g10/g10.c:1044 g10/g10.c:1056
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen �r ogiltig\n"
 
-#: g10/g10.c:1049 g10/g10.c:1061
+#: g10/g10.c:1050 g10/g10.c:1062
 msgid "selected digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen �r ogiltig\n"
 
-#: g10/g10.c:1065
+#: g10/g10.c:1066
 msgid "the given policy URL is invalid\n"
 msgstr "angiven URL �r ogiltig\n"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1069
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "kompressionsalgoritmen m�ste vara i intervallet %d..%d\n"
@@ -776,132 +787,132 @@ msgstr "kompressionsalgoritmen m�ste vara i intervallet %d..%d\n"
 # �r �nd� litet. Eventuellt borde meddelandena inte alls
 # �vers�ttas f�r att g�ra eventuell fels�kning l�ttare
 # f�r internationella fels�kare
-#: g10/g10.c:1070
+#: g10/g10.c:1071
 msgid "completes-needed must be greater than 0\n"
 msgstr "variabeln \"completes-needed\" m�ste ha ett v�rde som �r st�rre �n 0\n"
 
-#: g10/g10.c:1072
+#: g10/g10.c:1073
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" m�ste vara st�rre �n 1\n"
 
-#: g10/g10.c:1074
+#: g10/g10.c:1075
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "variabeln \"max-cert-depth\" m�ste ha ett v�rde mellan 1 och 255\n"
 
-#: g10/g10.c:1077
+#: g10/g10.c:1078
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTERA: enkelt S2K-l�ge (0) rekommenderas inte\n"
 
-#: g10/g10.c:1081
+#: g10/g10.c:1082
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ogiltigt S2K-l�ge; m�ste vara 0, 1 eller 3\n"
 
-#: g10/g10.c:1166
+#: g10/g10.c:1167
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/g10.c:1172
+#: g10/g10.c:1173
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1180
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/g10.c:1187
+#: g10/g10.c:1188
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/g10.c:1200
+#: g10/g10.c:1201
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/g10.c:1213
+#: g10/g10.c:1214
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:1227
+#: g10/g10.c:1228
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1245
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 msgid "--sign-key user-id"
 msgstr "--sign-key anv�ndaridentitet"
 
-#: g10/g10.c:1260
+#: g10/g10.c:1261
 msgid "--lsign-key user-id"
 msgstr "--lsign-key anv�ndaridentitet"
 
-#: g10/g10.c:1268
+#: g10/g10.c:1269
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key anv�ndaridentitet [kommandon]"
 
-#: g10/g10.c:1284
+#: g10/g10.c:1285
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key anv�ndaridentitet"
 
-#: g10/g10.c:1287
+#: g10/g10.c:1288
 msgid "--delete-key user-id"
 msgstr "--delete-key anv�ndaridentitet"
 
-#: g10/g10.c:1295
+#: g10/g10.c:1296
 #, fuzzy
 msgid "--delete-secret-and-public-key user-id"
 msgstr "--delete-secret-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:1332 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1333 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan inte �ppna %s: %s\n"
 
-#: g10/g10.c:1347
+#: g10/g10.c:1348
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [anv�ndaridentitet] [nyckelring]"
 
-#: g10/g10.c:1413
+#: g10/g10.c:1414
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort skalet: %s\n"
 
-#: g10/g10.c:1421
+#: g10/g10.c:1422
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa skal: %s\n"
 
-#: g10/g10.c:1492
+#: g10/g10.c:1493
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "felaktig hash-algoritm \"%s\"\n"
 
-#: g10/g10.c:1579
+#: g10/g10.c:1580
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/g10.c:1583
+#: g10/g10.c:1584
 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:1586 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1587 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:1795
+#: g10/g10.c:1796
 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:1801
+#: g10/g10.c:1802
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -909,87 +920,87 @@ msgstr ""
 "ett notationsnamn kan bara inneh�lla bokst�ver, siffror, punkter eller\n"
 "understrykningstecken och sluta med ett likhetstecken\n"
 
-#: g10/g10.c:1807
+#: g10/g10.c:1808
 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:1815
+#: g10/g10.c:1816
 msgid "a notation value must not use any control characters\n"
 msgstr "ett notationsv�rde f�r inte ineh�lla n�gra kontrolltecken\n"
 
-#: g10/armor.c:302
+#: g10/armor.c:304
 #, c-format
 msgid "armor: %s\n"
 msgstr "skal: %s\n"
 
-#: g10/armor.c:331
+#: g10/armor.c:333
 msgid "invalid armor header: "
 msgstr "felaktig rubrikrad i skalet: "
 
-#: g10/armor.c:338
+#: g10/armor.c:340
 msgid "armor header: "
 msgstr "rad i skalet: "
 
-#: g10/armor.c:349
+#: g10/armor.c:351
 msgid "invalid clearsig header\n"
 msgstr "felaktig rubrikrad i klartextsignatur\n"
 
-#: g10/armor.c:401
+#: g10/armor.c:403
 msgid "nested clear text signatures\n"
 msgstr "flera klartextsignaturer g�r in i varandra\n"
 
-#: g10/armor.c:525
+#: g10/armor.c:527
 msgid "invalid dash escaped line: "
 msgstr "felaktig bindestreck-kodad rad: "
 
-#: g10/armor.c:537
+#: g10/armor.c:539
 msgid "unexpected armor:"
 msgstr "ov�ntat skal:"
 
-#: g10/armor.c:663
+#: g10/armor.c:665
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "ogiltigt radix64-tecken %02x hoppades �ver\n"
 
-#: g10/armor.c:706
+#: g10/armor.c:708
 msgid "premature eof (no CRC)\n"
 msgstr "f�r tidigt filslut (ingen CRC-summa)\n"
 
-#: g10/armor.c:740
+#: g10/armor.c:742
 msgid "premature eof (in CRC)\n"
 msgstr "f�r tidigt filslut (i CRC-summan)\n"
 
-#: g10/armor.c:744
+#: g10/armor.c:746
 msgid "malformed CRC\n"
 msgstr "felformaterad CRC-summa\n"
 
-#: g10/armor.c:748
+#: g10/armor.c:750
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "CRC-fel; %06lx - %06lx\n"
 
-#: g10/armor.c:765
+#: g10/armor.c:767
 msgid "premature eof (in Trailer)\n"
 msgstr "f�r tidigt filslut (i den avslutande raden)\n"
 
-#: g10/armor.c:769
+#: g10/armor.c:771
 msgid "error in trailer line\n"
 msgstr "fel i avslutande rad\n"
 
-#: g10/armor.c:915
+#: g10/armor.c:917
 msgid "For info see http://www.gnupg.org"
 msgstr "F�r information se http://www.gnupg.org/"
 
-#: g10/armor.c:1043
+#: g10/armor.c:1045
 msgid "no valid OpenPGP data found.\n"
 msgstr "hittade ingen giltig OpenPGP-data.\n"
 
-#: g10/armor.c:1048
+#: g10/armor.c:1050
 #, 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:1052
+#: g10/armor.c:1054
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -999,7 +1010,7 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1189 g10/pkclist.c:53
+#: g10/keyedit.c:1190 g10/pkclist.c:53
 msgid "             Fingerprint:"
 msgstr "           Fingeravtryck:"
 
@@ -1234,59 +1245,59 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Det �r inte s�kert att signaturen tillh�r �garen.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:819 g10/pkclist.c:840 g10/pkclist.c:966 g10/pkclist.c:1011
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: %s �verhoppad\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:826 g10/pkclist.c:993
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: hoppade �ver: publik nyckel finns redan\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:853
 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:864
+#: g10/pkclist.c:863
 msgid "Enter the user ID: "
 msgstr "Ange anv�ndaridentiteten: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:875
 msgid "No such user ID.\n"
 msgstr "Hittade inte anv�ndaridentiteten.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:880
 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:904
+#: g10/pkclist.c:903
 msgid "Public key is disabled.\n"
 msgstr "Den publika nyckeln �r deaktiverad\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:910
 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:942
+#: g10/pkclist.c:941
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "den f�rvalda mottagaren \"%s\" �r ok�nd\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:974
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: fel vid kontroll av nyckeln: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:979
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: hoppade �ver: den publika nyckeln �r deaktiverad\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1017
 msgid "no valid addressees\n"
 msgstr "inga giltiga adresser\n"
 
@@ -1566,7 +1577,7 @@ msgstr ""
 "Du beh�ver en l�senordsfras f�r att skydda din hemliga nyckel\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:955
+#: g10/keyedit.c:469 g10/keygen.c:955
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "l�senordsfrasen upprepades ej korrekt; f�rs�k igen.\n"
 
@@ -1696,288 +1707,281 @@ msgstr "nyckeln %08lX f�ljer inte standarden RFC2440 - �verhoppad\n"
 msgid "key %08lX: not protected - skipped\n"
 msgstr "nyckeln %08lX �r inte skyddad - �verhoppad\n"
 
-#: g10/export.c:232
+#: g10/export.c:236
 msgid "WARNING: nothing exported\n"
 msgstr "VARNING: exporterade ingenting\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:208
 msgid "too many entries in pk cache - disabled\n"
 msgstr "f�r m�nga poster i pk-cachen - inaktiverad\n"
 
-#: g10/getkey.c:350
+#: g10/getkey.c:443
 msgid "too many entries in unk cache - disabled\n"
 msgstr "f�r m�nga poster i unk-cachen - inaktiverad\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
-msgid "RSA key cannot be used in this version\n"
-msgstr "det g�r inte att anv�nda RSA-nycklar i denna version\n"
-
-#: g10/getkey.c:1310 g10/getkey.c:1349
-msgid "No key for user ID\n"
-msgstr "Ingen nyckel f�r anv�ndaridentiteten\n"
-
-#: g10/getkey.c:1388 g10/getkey.c:1428
-msgid "No user ID for key\n"
-msgstr "Inget anv�ndarid f�r nyckel\n"
-
-#: g10/getkey.c:1628 g10/getkey.c:1675 g10/getkey.c:1731
+#: g10/getkey.c:2143
 #, 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:2050
+#: g10/getkey.c:2185 g10/trustdb.c:577
+#, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "nyckel %08lX: hemlig nyckel utan publik nyckel - hoppade �ver\n"
+
+#: g10/getkey.c:2473
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: hittade inte anv�ndaren\n"
 
-#: g10/import.c:182
+#: g10/import.c:184
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "hoppar �ver block av typen %d\n"
 
-#: g10/import.c:189 g10/trustdb.c:1806 g10/trustdb.c:1847
+#: g10/import.c:191 g10/trustdb.c:1806 g10/trustdb.c:1847
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "har behandlat %lu nycklar hittills\n"
 
-#: g10/import.c:194
+#: g10/import.c:196
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fel vid l�sning av \"%s\": %s\n"
 
-#: g10/import.c:204
+#: g10/import.c:206
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "  Totalt antal behandlade enheter: %lu\n"
 
-#: g10/import.c:206
+#: g10/import.c:208
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "                 nya undernycklar: %lu\n"
 
-#: g10/import.c:209
+#: g10/import.c:211
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         utan anv�ndaridentiteter: %lu\n"
 
-#: g10/import.c:211
+#: g10/import.c:213
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      importerade: %lu"
 
-#: g10/import.c:217
+#: g10/import.c:219
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                      of�r�ndrade: %lu\n"
 
-#: g10/import.c:219
+#: g10/import.c:221
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          nya anv�ndaridentiteter: %lu\n"
 
-#: g10/import.c:221
+#: g10/import.c:223
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "                 nya undernycklar: %lu\n"
 
-#: g10/import.c:223
+#: g10/import.c:225
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                   nya signaturer: %lu\n"
 
-#: g10/import.c:225
+#: g10/import.c:227
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "     nya �terkallelser av nycklar: %lu\n"
 
-#: g10/import.c:227
+#: g10/import.c:229
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      antal l�sta hemliga nycklar: %lu\n"
 
-#: g10/import.c:229
+#: g10/import.c:231
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "antal importerade hemliga nycklar: %lu\n"
 
-#: g10/import.c:231
+#: g10/import.c:233
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "antal of�r�ndrade hemliga nycklar: %lu\n"
 
-#: g10/import.c:391 g10/import.c:600
+#: g10/import.c:408 g10/import.c:617
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "nyckel %08lX: ingen anv�ndaridentitet\n"
 
-#: g10/import.c:405
+#: g10/import.c:422
 #, c-format
 msgid "key %08lX: no valid user IDs\n"
 msgstr "nyckel %08lX: inga giltiga anv�ndaridentiteter\n"
 
-#: g10/import.c:407
+#: g10/import.c:424
 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:418 g10/import.c:667
+#: g10/import.c:435 g10/import.c:684
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "nyckel %08lX: hittade ingen publik nyckel: %s\n"
 
-#: g10/import.c:423
+#: g10/import.c:440
 #, fuzzy, c-format
 msgid "key %08lX: new key - skipped\n"
 msgstr "nyckeln %08lX f�ljer inte standarden RFC2440 - �verhoppad\n"
 
-#: g10/import.c:431
+#: g10/import.c:448
 msgid "no default public keyring\n"
 msgstr "ingen f�rvald publik nyckel\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
+#: g10/import.c:452 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver till \"%s\"\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:615 g10/import.c:716
+#: 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:441 g10/import.c:499 g10/import.c:618 g10/import.c:719
+#: g10/import.c:458 g10/import.c:516 g10/import.c:635 g10/import.c:736
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "nyckel %08lX: importerade publik nyckel\n"
 
-#: g10/import.c:463
+#: g10/import.c:480
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "nyckel %08lX: matchar inte v�r lokala kopia\n"
 
-#: g10/import.c:472 g10/import.c:675
+#: g10/import.c:489 g10/import.c:692
 #, 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:478 g10/import.c:681
+#: g10/import.c:495 g10/import.c:698
 #, 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:505
+#: g10/import.c:522
 #, c-format
 msgid "key %08lX: 1 new user ID\n"
 msgstr "nyckel %08lX: 1 ny anv�ndaridentitet\n"
 
-#: g10/import.c:508
+#: g10/import.c:525
 #, c-format
 msgid "key %08lX: %d new user IDs\n"
 msgstr "nyckel %08lX: %d nya anv�ndaridentiteter\n"
 
-#: g10/import.c:511
+#: g10/import.c:528
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "nyckel %08lX: 1 ny signatur\n"
 
-#: g10/import.c:514
+#: g10/import.c:531
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "nyckel %08lX: %d nya signaturer\n"
 
-#: g10/import.c:517
+#: g10/import.c:534
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "nyckel %08lX: 1 ny undernyckel\n"
 
-#: g10/import.c:520
+#: g10/import.c:537
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "nyckel %08lX: %d nya undernycklar\n"
 
-#: g10/import.c:530
+#: g10/import.c:547
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "nyckel %08lX: inte f�r�ndrad\n"
 
-#: g10/import.c:593
+#: g10/import.c:610
 #, c-format
 msgid "secret key %08lX not imported (use %s to allow for it)\n"
 msgstr ""
 
-#: g10/import.c:623
+#: g10/import.c:640
 #, 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:627
+#: g10/import.c:644
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "nyckel %08lX: finns redan i den hemliga nyckelringen\n"
 
-#: g10/import.c:632
+#: g10/import.c:649
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "nyckel %08lX: hittade inte den hemliga nyckeln: %s\n"
 
-#: g10/import.c:661
+#: g10/import.c:678
 #, 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:692
+#: g10/import.c:709
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "nyckel %08lX: ogiltigt �terkallelsecertifikat: %s - avvisat\n"
 
-#: g10/import.c:724
+#: g10/import.c:741
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "nyckel %08lX: �terkallelsecertifikat importerat\n"
 
-#: g10/import.c:766
+#: g10/import.c:783
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "nyckel %08lX: ingen anv�ndaridentitet f�r signaturen\n"
 
-#: g10/import.c:773 g10/import.c:797
+#: g10/import.c:790 g10/import.c:814
 #, 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:774
+#: g10/import.c:791
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "nyckel %08lX: ogiltig sj�lvsignatur\n"
 
-#: g10/import.c:789
+#: g10/import.c:806
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "nyckel %08lX: ingen undernyckel f�r nyckelbindning\n"
 
-#: g10/import.c:798
+#: g10/import.c:815
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "nyckel %08lX: ogiltig undernyckelbindning\n"
 
 # vad inneb�r fnutten i slutet?
-#: g10/import.c:825
+#: g10/import.c:842
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "nyckel %08lX: accepterade icke sj�lvsignerad anv�ndaridentitet '"
 
-#: g10/import.c:854
+#: g10/import.c:871
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "nyckel %08lX: hoppade �ver anv�ndaridentitet '"
 
-#: g10/import.c:877
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "nyckel %08lX: hoppade �ver undernyckel\n"
@@ -1986,32 +1990,32 @@ msgstr "nyckel %08lX: hoppade �ver undernyckel\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:902
+#: g10/import.c:919
 #, 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:911
+#: g10/import.c:928
 #, 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:919
+#: g10/import.c:936
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "nyckel %08lX: felaktigt �terkallelsecertifikat: %s - hoppade �ver\n"
 
-#: g10/import.c:1019
+#: g10/import.c:1036
 #, 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:1071
+#: g10/import.c:1088
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "nyckel %08lX: lade till �terkallelsecertifikat\n"
 
-#: g10/import.c:1185 g10/import.c:1238
+#: g10/import.c:1202 g10/import.c:1255
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "nyckel %08lX: v�r kopia har ingen sj�lvsignatur\n"
@@ -2021,63 +2025,63 @@ msgstr "nyckel %08lX: v�r kopia har ingen sj�lvsignatur\n"
 msgid "%s: user not found\n"
 msgstr "%s: hittade inte anv�ndaren\n"
 
-#: g10/keyedit.c:155
+#: g10/keyedit.c:156
 msgid "[revocation]"
 msgstr "[�terkallelse]"
 
-#: g10/keyedit.c:156
+#: g10/keyedit.c:157
 msgid "[self-signature]"
 msgstr "[sj�lvsignatur]"
 
-#: g10/keyedit.c:220
+#: g10/keyedit.c:221
 msgid "1 bad signature\n"
 msgstr "1 felaktig signatur\n"
 
-#: g10/keyedit.c:222
+#: g10/keyedit.c:223
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d felaktiga signaturer\n"
 
-#: g10/keyedit.c:224
+#: g10/keyedit.c:225
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatur verifierades inte eftersom nyckeln saknades\n"
 
-#: g10/keyedit.c:226
+#: g10/keyedit.c:227
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signaturer verifierades inte eftersom nycklar saknades\n"
 
-#: g10/keyedit.c:228
+#: g10/keyedit.c:229
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatur verifierades inte eftersom ett fel uppstod\n"
 
-#: g10/keyedit.c:230
+#: g10/keyedit.c:231
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signaturer verifierades inte eftersom fel uppstod\n"
 
-#: g10/keyedit.c:232
+#: g10/keyedit.c:233
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 anv�ndaridentitet utan giltig sj�lvsignatur hittades\n"
 
-#: g10/keyedit.c:234
+#: g10/keyedit.c:235
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d anv�ndaridentiteter utan giltig sj�lvsignatur hittades\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:316
+#: g10/keyedit.c:317
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Redan signerad av nyckeln %08lX\n"
 
-#: g10/keyedit.c:324
+#: g10/keyedit.c:325
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Det finns inget att signera med nyckeln %08lX\n"
 
-#: g10/keyedit.c:333
+#: g10/keyedit.c:334
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2085,7 +2089,7 @@ msgstr ""
 "�r du verkligen s�ker p� att du vill signera denna nyckel\n"
 "med din nyckel: \""
 
-#: g10/keyedit.c:342
+#: g10/keyedit.c:343
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -2093,33 +2097,33 @@ msgstr ""
 "Signaturen kommer att markeras som icke exporterbar.\n"
 "\n"
 
-#: g10/keyedit.c:347
+#: g10/keyedit.c:348
 msgid "Really sign? "
 msgstr "Vill du verkligen signera? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1871 g10/keyedit.c:1933 g10/sign.c:136
+#: g10/keyedit.c:374 g10/keyedit.c:1872 g10/keyedit.c:1934 g10/sign.c:136
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
 
-#: g10/keyedit.c:427
+#: g10/keyedit.c:428
 msgid "This key is not protected.\n"
 msgstr "Denna nyckel �r inte skyddad.\n"
 
-#: g10/keyedit.c:431
+#: g10/keyedit.c:432
 msgid "Secret parts of primary key are not available.\n"
 msgstr "De hemliga delarna av den prim�ra nyckeln �r inte tillg�ngliga.\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:436
 msgid "Key is protected.\n"
 msgstr "Nyckeln �r skyddad.\n"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:456
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan inte redigera denna nyckel: %s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:461
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2127,7 +2131,7 @@ msgstr ""
 "Skriv in den nya l�senordsfrasen f�r denna hemliga nyckel.\n"
 "\n"
 
-#: g10/keyedit.c:472
+#: g10/keyedit.c:473
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2135,424 +2139,424 @@ msgstr ""
 "Du vill inte ha n�gon l�senordsfras - detta �r sannolikt en d�lig id�!\n"
 "\n"
 
-#: g10/keyedit.c:475
+#: g10/keyedit.c:476
 msgid "Do you really want to do this? "
 msgstr "Vill du verkligen g�ra detta? "
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:540
 msgid "moving a key signature to the correct place\n"
 msgstr "flyttar en nyckelsignatur till den r�tta platsen\n"
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:581
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
-#: g10/keyedit.c:581
+#: g10/keyedit.c:582
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:582
+#: g10/keyedit.c:583
 msgid "save and quit"
 msgstr "spara och avsluta"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:583
+#: g10/keyedit.c:584
 msgid "show this help"
 msgstr "visa denna hj�lp"
 
 # skall dessa �vers�ttas?
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:585
+#: g10/keyedit.c:586
 msgid "show fingerprint"
 msgstr "visa fingeravtryck"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:586
+#: g10/keyedit.c:587
 msgid "list key and user IDs"
 msgstr "r�kna upp nycklar och anv�ndaridentiteter"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:588
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 msgid "select user ID N"
 msgstr "v�lj anv�ndaridentitet N"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:589
+#: g10/keyedit.c:590
 msgid "select secondary key N"
 msgstr "v�lj sekund�r nyckel N"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:590
+#: g10/keyedit.c:591
 msgid "list signatures"
 msgstr "r�kna upp signaturer"
 
-#: g10/keyedit.c:591
+#: g10/keyedit.c:592
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:592
+#: g10/keyedit.c:593
 msgid "sign the key"
 msgstr "signera nyckeln"
 
-#: g10/keyedit.c:593
+#: g10/keyedit.c:594
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:594
+#: g10/keyedit.c:595
 msgid "sign the key locally"
 msgstr "signera nyckeln lokalt"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:596
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:596
+#: g10/keyedit.c:597
 msgid "add a user ID"
 msgstr "l�gg till en anv�ndaridentitet"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:597
+#: g10/keyedit.c:598
 msgid "delete user ID"
 msgstr "ta bort en anv�ndaridentitet"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:599
 msgid "add a secondary key"
 msgstr "l�gg till en sekund�r nyckel"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:599
+#: g10/keyedit.c:600
 msgid "delete a secondary key"
 msgstr "ta bort en sekund�r nyckel"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:600
+#: g10/keyedit.c:601
 msgid "delete signatures"
 msgstr "ta bort signaturer"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:601
+#: g10/keyedit.c:602
 msgid "change the expire date"
 msgstr "�ndra utg�ngsdatum"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:602
+#: g10/keyedit.c:603
 msgid "toggle between secret and public key listing"
 msgstr "hoppa mellan utskrift av hemliga och publika nycklar"
 
-#: g10/keyedit.c:604
+#: g10/keyedit.c:605
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:605
+#: g10/keyedit.c:606
 msgid "list preferences"
 msgstr "skriv ut inst�llningar"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:606
+#: g10/keyedit.c:607
 msgid "change the passphrase"
 msgstr "�ndra l�senordsfrasen"
 
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
 msgid "trust"
 msgstr "trust"
 
 # originalet borde ha ett value
-#: g10/keyedit.c:607
+#: g10/keyedit.c:608
 msgid "change the ownertrust"
 msgstr "�ndra �gartillitsv�rdet"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:608
+#: g10/keyedit.c:609
 msgid "revoke signatures"
 msgstr "�terkalla signaturer"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:609
+#: g10/keyedit.c:610
 msgid "revoke a secondary key"
 msgstr "�terkalla en sekund�r nyckel"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:610
+#: g10/keyedit.c:611
 msgid "disable a key"
 msgstr "deaktivera en nyckel"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:611
+#: g10/keyedit.c:612
 msgid "enable a key"
 msgstr "aktivera en nyckel"
 
-#: g10/delkey.c:110 g10/keyedit.c:631
+#: g10/delkey.c:110 g10/keyedit.c:632
 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:669
+#: g10/keyedit.c:670
 msgid "Secret key is available.\n"
 msgstr "Den hemliga nyckeln finns tillg�nglig.\n"
 
-#: g10/keyedit.c:698
+#: g10/keyedit.c:699
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/keyedit.c:728
+#: g10/keyedit.c:729
 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:732
+#: g10/keyedit.c:733
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Anv�nd kommandot \"toggle\" f�rst.\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 msgid "Really sign all user IDs? "
 msgstr "Vill du verkligen signera alla anv�ndaridentiteter? "
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:781
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: V�lj det anv�ndarid du vill signera\n"
 
-#: g10/keyedit.c:812 g10/keyedit.c:994
+#: g10/keyedit.c:813 g10/keyedit.c:995
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "uppdateringen av tillitsdatabasen misslyckades: %s\n"
 
-#: g10/keyedit.c:823 g10/keyedit.c:844
+#: g10/keyedit.c:824 g10/keyedit.c:845
 msgid "You must select at least one user ID.\n"
 msgstr "Du m�ste v�lja �tminstone en anv�ndaridentitet.\n"
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:826
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan inte ta bort den sista anv�ndaridentiteten!\n"
 
-#: g10/keyedit.c:828
+#: g10/keyedit.c:829
 msgid "Really remove all selected user IDs? "
 msgstr "Vill du verkligen ta bort alla valda anv�ndaridentiteter? "
 
-#: g10/keyedit.c:829
+#: g10/keyedit.c:830
 msgid "Really remove this user ID? "
 msgstr "Vill du verkligen ta bort denna anv�ndaridentitet? "
 
-#: g10/keyedit.c:865 g10/keyedit.c:887
+#: g10/keyedit.c:866 g10/keyedit.c:888
 msgid "You must select at least one key.\n"
 msgstr "Du m�ste v�lja �tminstone en nyckel.\n"
 
-#: g10/keyedit.c:869
+#: g10/keyedit.c:870
 msgid "Do you really want to delete the selected keys? "
 msgstr "Vill du verkligen ta bort valda nycklar? "
 
-#: g10/keyedit.c:870
+#: g10/keyedit.c:871
 msgid "Do you really want to delete this key? "
 msgstr "Vill du verkligen ta bort denna nyckel? "
 
-#: g10/keyedit.c:891
+#: g10/keyedit.c:892
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Vill du verkligen �terkalla de valda nycklarna? "
 
-#: g10/keyedit.c:892
+#: g10/keyedit.c:893
 msgid "Do you really want to revoke this key? "
 msgstr "Vill du verkligen �terkalla denna nyckel? "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:959
 msgid "Save changes? "
 msgstr "Spara �ndringarna? "
 
-#: g10/keyedit.c:961
+#: g10/keyedit.c:962
 msgid "Quit without saving? "
 msgstr "Avsluta utan att spara? "
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:973
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
 
-#: g10/keyedit.c:979
+#: g10/keyedit.c:980
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 
-#: g10/keyedit.c:986
+#: g10/keyedit.c:987
 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:1001
+#: g10/keyedit.c:1002
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ogiltigt kommando (f�rs�k med \"help\")\n"
 
-#: g10/keyedit.c:1081 g10/keyedit.c:1107
+#: g10/keyedit.c:1082 g10/keyedit.c:1108
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1090
+#: g10/keyedit.c:1091
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1094
+#: g10/keyedit.c:1095
 msgid "This key has been disabled"
 msgstr "Denna nyckel har deaktiverats"
 
-#: g10/keyedit.c:1123
+#: g10/keyedit.c:1124
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "nyckeln %08lX: en undernyckel har �terkallats!\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1127
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "     nya �terkallelser av nycklar: %lu\n"
 
-#: g10/keyedit.c:1128
+#: g10/keyedit.c:1129
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1366
+#: g10/keyedit.c:1367
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1371
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1375
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna ok�nda signatur? (j/N/a)"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1381
 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:1394
+#: g10/keyedit.c:1395
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1396
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Raderade %d signaturer.\n"
 
-#: g10/keyedit.c:1398
+#: g10/keyedit.c:1399
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:1467
+#: g10/keyedit.c:1468
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Tag bort markeringar fr�n de hemliga nycklarna.\n"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1474
 msgid "Please select at most one secondary key.\n"
 msgstr "V�lj som mest en sekund�r nyckel.\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1478
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "�ndrar giltighetstid f�r en sekund�r nyckel.\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1480
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�ndrar giltighetstid f�r den prim�ra nyckeln.\n"
 
-#: g10/keyedit.c:1521
+#: g10/keyedit.c:1522
 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:1537
+#: g10/keyedit.c:1538
 msgid "No corresponding signature in secret ring\n"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
-#: g10/keyedit.c:1598
+#: g10/keyedit.c:1599
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen anv�ndaridentitet med index %d\n"
 
-#: g10/keyedit.c:1644
+#: g10/keyedit.c:1645
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ingen sekund�r nyckel med index %d\n"
 
-#: g10/keyedit.c:1742
+#: g10/keyedit.c:1743
 msgid "user ID: \""
 msgstr "anv�ndaridentitet: \""
 
-#: g10/keyedit.c:1745
+#: g10/keyedit.c:1746
 #, c-format
 msgid ""
 "\"\n"
@@ -2561,34 +2565,34 @@ msgstr ""
 "\"\n"
 "signerad med din nyckel %08lX %s\n"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1750
 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:1773
+#: g10/keyedit.c:1774
 msgid "You have signed these user IDs:\n"
 msgstr "Du har signerat f�ljande anv�ndaridentiteter:\n"
 
-#: g10/keyedit.c:1787 g10/keyedit.c:1822
+#: g10/keyedit.c:1788 g10/keyedit.c:1823
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   signerad av %08lX %s\n"
 
-#: g10/keyedit.c:1792
+#: g10/keyedit.c:1793
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   �terkallad av %08lX %s\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1813
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du st�r i begrepp att �terkalla dessa signaturer:\n"
 
-#: g10/keyedit.c:1830
+#: g10/keyedit.c:1831
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Vill du verkligen skapa �terkallelsecertifikaten? (j/N)"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1860
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
@@ -2603,12 +2607,12 @@ msgid "revoked"
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:404 g10/mainproc.c:836
+#: g10/keylist.c:402 g10/mainproc.c:837
 #, c-format
 msgid " [expires: %s]"
 msgstr "[g�r ut: %s]"
 
-#: g10/mainproc.c:270
+#: g10/mainproc.c:271
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "den publika nyckeln �r %08lX\n"
@@ -2620,122 +2624,122 @@ msgstr "den publika nyckeln �r %08lX\n"
 # r�tt publik nyckel att kryptera datat med. Jag tycker
 # inte att svenska �vers�ttningen �r mycket obskyrare �n engelska
 # originalet iallafall.
-#: g10/mainproc.c:315
+#: g10/mainproc.c:316
 msgid "public key encrypted data: good DEK\n"
 msgstr "data krypterad med publik nyckel: korrekt krypteringsnyckel\n"
 
-#: g10/mainproc.c:367
+#: g10/mainproc.c:368
 #, 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:377
+#: g10/mainproc.c:378
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "krypterad med %s-nyckel, ID %08lX\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:392
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "dekryptering med publik nyckel misslyckades: %s\n"
 
-#: g10/mainproc.c:431
+#: g10/mainproc.c:432
 msgid "decryption okay\n"
 msgstr "dekrypteringen lyckades\n"
 
-#: g10/mainproc.c:436
+#: g10/mainproc.c:437
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VARNING: det krypterade meddelandet har �ndrats!\n"
 
-#: g10/mainproc.c:441
+#: g10/mainproc.c:442
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:461
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTERA: avs�ndaren efterfr�gade \"endast-f�r-dina-�gon\"\n"
 
-#: g10/mainproc.c:462
+#: g10/mainproc.c:463
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "ursprungligt filnamn=\"%.*s\"\n"
 
-#: g10/mainproc.c:617
+#: g10/mainproc.c:618
 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:704 g10/mainproc.c:713
+#: g10/mainproc.c:705 g10/mainproc.c:714
 msgid "WARNING: invalid notation data found\n"
 msgstr "VARNING: ogiltig notationsdata hittades\n"
 
-#: g10/mainproc.c:716
+#: g10/mainproc.c:717
 msgid "Notation: "
 msgstr "Notation: "
 
 # finns det n�gon bra svensk �vers�ttning av policy?
-#: g10/mainproc.c:725
+#: g10/mainproc.c:726
 msgid "Policy: "
 msgstr "Policy: "
 
-#: g10/mainproc.c:1235
+#: g10/mainproc.c:1177
 msgid "signature verification suppressed\n"
 msgstr "signaturen verifierades inte\n"
 
-#: g10/mainproc.c:1272
+#: g10/mainproc.c:1214
 #, 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:1307 g10/mainproc.c:1318
+#: g10/mainproc.c:1242 g10/mainproc.c:1250
 msgid "BAD signature from \""
 msgstr "FELAKTIG signatur fr�n \""
 
-#: g10/mainproc.c:1308 g10/mainproc.c:1319
+#: g10/mainproc.c:1243 g10/mainproc.c:1251
 msgid "Good signature from \""
 msgstr "Korrekt signatur fr�n \""
 
-#: g10/mainproc.c:1310
+#: g10/mainproc.c:1266
 msgid "                aka \""
 msgstr "      �ven k�nd som \""
 
-#: g10/mainproc.c:1366
+#: g10/mainproc.c:1316
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte verifiera signaturen: %s\n"
 
-#: g10/mainproc.c:1423 g10/mainproc.c:1438 g10/mainproc.c:1500
+#: g10/mainproc.c:1373 g10/mainproc.c:1388 g10/mainproc.c:1450
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "skapa en signatur i en separat fil"
 
-#: g10/mainproc.c:1449
+#: g10/mainproc.c:1399
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "frist�ende signatur av klassen 0x%02x\n"
 
-#: g10/mainproc.c:1504
+#: g10/mainproc.c:1454
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
 
-#: g10/mainproc.c:1509
+#: g10/mainproc.c:1459
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "felaktigt rotpaket hittades i proc_tree()\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:98
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan inte deaktivera minnesutskrifter: %s\n"
 
-#: g10/misc.c:207
+#: g10/misc.c:208
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Experimentella algoritmer b�r inte anv�ndas!\n"
 
 # XXX
-#: g10/misc.c:237
+#: g10/misc.c:238
 #, fuzzy
 msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
 msgstr ""
@@ -2746,7 +2750,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:990
+#: g10/parse-packet.c:1010
 #, 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"
@@ -2759,7 +2763,7 @@ msgstr ""
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/hkp.c:170 g10/passphrase.c:248
+#: g10/hkp.c:147 g10/passphrase.c:248
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan inte ansluta till \"%s\": %s\n"
@@ -2888,36 +2892,36 @@ msgstr "NOTERA: chifferalgoritmen %d finns inte i inst�llningarna\n"
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTERA: den hemliga nyckeln %08lX gick ut %s\n"
 
-#: g10/hkp.c:72
+#: g10/hkp.c:59
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
 msgstr "fr�ga efter nyckeln %08lX fr�n %s ...\n"
 
-#: g10/hkp.c:85
+#: g10/hkp.c:72
 #, c-format
 msgid "can't get key from keyserver: %s\n"
 msgstr "kan inte h�mta nyckeln fr�n en nyckelserver: %s\n"
 
-#: g10/hkp.c:109 g10/hkp.c:148
+#: g10/hkp.c:91 g10/hkp.c:125
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "k�nner inte till n�gon nyckelserver (anv�nd flaggan --keyserver)\n"
 
-#: g10/hkp.c:117
+#: g10/hkp.c:99
 #, c-format
 msgid "%s: not a valid key ID\n"
 msgstr "%s: ogiltig nyckelidentitet\n"
 
-#: g10/hkp.c:194
+#: g10/hkp.c:171
 #, c-format
 msgid "error sending to `%s': %s\n"
 msgstr "fel vid s�ndning till \"%s\": %s\n"
 
-#: g10/hkp.c:206
+#: g10/hkp.c:183
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
 msgstr "lyckades s�nda till \"%s\" (status=%u)\n"
 
-#: g10/hkp.c:209
+#: g10/hkp.c:186
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
 msgstr "misslyckades s�nda till \"%s\": status=%u\n"
@@ -2931,12 +2935,12 @@ msgstr "de hemliga nyckeldelarna �r inte tillg�nliga\n"
 msgid "protection algorithm %d is not supported\n"
 msgstr "skyddsalgoritmen %d st�ds inte\n"
 
-#: g10/seckey-cert.c:186
+#: g10/seckey-cert.c:184
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Ogiltig l�senordsfras, f�rs�k igen ...\n"
 
 # �r det nyckeln som �r svag, konstigt
-#: g10/seckey-cert.c:242
+#: g10/seckey-cert.c:240
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "VARNING: Uppt�ckte en svag nyckel - byt l�senordsfras igen.\n"
 
@@ -3208,11 +3212,6 @@ msgstr "nyckeln %08lX �r inte skyddad - �verhoppad\n"
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "NOTERA: den hemliga nyckeln %08lX �r INTE skyddad.\n"
 
-#: g10/trustdb.c:577
-#, c-format
-msgid "key %08lX: secret key without public key - skipped\n"
-msgstr "nyckel %08lX: hemlig nyckel utan publik nyckel - hoppade �ver\n"
-
 #: g10/trustdb.c:584
 #, c-format
 msgid "key %08lX: secret and public key don't match\n"
@@ -3452,36 +3451,46 @@ msgid "%s: keyring created\n"
 msgstr "%s: nyckelring skapad\n"
 
 # m�rkligt felmeddelande, kolla upp
-#: g10/ringedit.c:1551
+#: g10/ringedit.c:1555
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VARNING: det finns 2 filer med konfidentiell information.\n"
 
-#: g10/ringedit.c:1552
+#: g10/ringedit.c:1556
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s �r den of�r�ndrade\n"
 
-#: g10/ringedit.c:1553
+#: g10/ringedit.c:1557
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s �r den nya\n"
 
-#: g10/ringedit.c:1554
+#: g10/ringedit.c:1558
 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:88 g10/skclist.c:125
+#: 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 ""
 "nyckeln �r inte markerad os�ker - g�r inte att anv�nda med fejkad RNG!\n"
 
-#: g10/skclist.c:113
+#: g10/skclist.c:138
+#, fuzzy, c-format
+msgid "skipped `%s': duplicated\n"
+msgstr "hoppade �ver \"%s\": %s\n"
+
+#: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "hoppade �ver \"%s\": %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:149
+#, fuzzy
+msgid "skipped: secret key already present\n"
+msgstr "%s: hoppade �ver: publik nyckel finns redan\n"
+
+#: g10/skclist.c:160
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3583,11 +3592,11 @@ msgstr "Vill du ta bort denna nyckel fr�n nyckelringen? "
 msgid "This is a secret key! - really delete? "
 msgstr "Detta �r en hemlig nyckel! - vill du verkligen ta bort den? "
 
-#: g10/delkey.c:182
+#: g10/delkey.c:181
 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:184
+#: g10/delkey.c:183
 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"
 
@@ -3859,6 +3868,15 @@ msgstr "Det finns ingen hj�lp tillg�nglig"
 msgid "No help available for `%s'"
 msgstr "Det finns ingen hj�lp tillg�nglig f�r \"%s\""
 
+#~ msgid "RSA key cannot be used in this version\n"
+#~ msgstr "det g�r inte att anv�nda RSA-nycklar i denna version\n"
+
+#~ msgid "No key for user ID\n"
+#~ msgstr "Ingen nyckel f�r anv�ndaridentiteten\n"
+
+#~ msgid "No user ID for key\n"
+#~ msgstr "Inget anv�ndarid f�r nyckel\n"
+
 #~ msgid "no secret key for decryption available\n"
 #~ msgstr "det finns ingen hemlig nyckel tillg�nglig f�r dekryptering\n"
 
diff --git a/util/ChangeLog b/util/ChangeLog
index 422159306..ff85c9235 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,3 +1,14 @@
+2001-03-13  Werner Koch  <[email protected]>
+
+	* iobuf.c (iobuf_sockopen): New.
+	(sock_filter) [__MINGW32__]: New.
+	(iobuf_ioctl): New.
+	(file_filter): Implemented keep_open mode.
+	* http.c (http_open, http_wait_response): Replaced iobuf_fdopen by
+	iobuf_sockopen and use an iobuf_ioctl to avoid the dup().
+	(deinit_sockets, init_sockets) [__MINGW32__]: New.
+	(connect_server, write_server): Add code to work with W32 sockets.
+
 2001-03-12  Werner Koch  <[email protected]>
 
 	* strgutil.c (check_trailing_chars,check_trailing_ws): New.
diff --git a/util/http.c b/util/http.c
index d3bc44fe3..269e9238d 100644
--- a/util/http.c
+++ b/util/http.c
@@ -26,16 +26,18 @@
 #include <ctype.h>
 #include <errno.h>
 
-#ifndef HAVE_DOSISH_SYSTEM
-
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <time.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
+#ifdef __MINGW32__
+ #include <windows.h>
+#else
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/time.h>
+ #include <time.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <netdb.h>
+#endif
 
 #include "util.h"
 #include "iobuf.h"
@@ -43,6 +45,12 @@
 
 #include "http.h"
 
+#ifdef __MINGW32__
+#define sock_close(a)  closesocket(a)
+#else
+#define sock_close(a)  close(a)
+#endif
+
 #define MAX_LINELEN 20000  /* max. length of a HTTP line */
 #define VALID_URI_CHARS "abcdefghijklmnopqrstuvwxyz"   \
 			"ABCDEFGHIJKLMNOPQRSTUVWXYZ"   \
@@ -67,6 +75,38 @@ static int parse_response( HTTP_HD hd );
 static int connect_server( const char *server, ushort port );
 static int write_server( int sock, const char *data, size_t length );
 
+#ifdef __MINGW32__
+static void
+deinit_sockets (void)
+{
+    WSACleanup();
+}
+
+static void
+init_sockets (void)
+{
+    static int initialized;
+    static WSADATA wsdata;
+
+    if (initialized)
+        return;
+
+    if( WSAStartup( 0x0101, &wsdata ) ) {
+        log_error ("error initializing socket library: ec=%d\n", 
+                    (int)WSAGetLastError () );
+        return;
+    }
+    if( wsdata.wVersion < 0x0001 ) {
+        log_error ("socket library version is %x.%x - but 1.1 needed\n",
+                   LOBYTE(wsdata.wVersion), HIBYTE(wsdata.wVersion));
+        WSACleanup();
+        return;
+    }
+    atexit ( deinit_sockets );
+    initialized = 1;
+}
+#endif /*__MINGW32__*/
+
 
 int
 http_open( HTTP_HD hd, HTTP_REQ_TYPE reqtype, const char *url,
@@ -88,7 +128,7 @@ http_open( HTTP_HD hd, HTTP_REQ_TYPE reqtype, const char *url,
     if( !rc ) {
 	rc = send_request( hd );
 	if( !rc ) {
-	    hd->fp_write = iobuf_fdopen( hd->sock , "w" );
+	    hd->fp_write = iobuf_sockopen( hd->sock , "w" );
 	    if( hd->fp_write )
 		return 0;
 	    rc = G10ERR_GENERAL;
@@ -96,7 +136,7 @@ http_open( HTTP_HD hd, HTTP_REQ_TYPE reqtype, const char *url,
     }
 
     if( !hd->fp_read && !hd->fp_write && hd->sock != -1 )
-	close( hd->sock );
+	sock_close( hd->sock );
     iobuf_close( hd->fp_read );
     iobuf_close( hd->fp_write);
     release_parsed_uri( hd->uri );
@@ -124,15 +164,18 @@ http_wait_response( HTTP_HD hd, unsigned int *ret_status )
     http_start_data( hd ); /* make sure that we are in the data */
     iobuf_flush( hd->fp_write );
 
-    hd->sock = dup( hd->sock );
+  #if 0
+    hd->sock = dup( hd->sock ); 
     if( hd->sock == -1 )
 	return G10ERR_GENERAL;
-    iobuf_close( hd->fp_write );
+  #endif
+    iobuf_ioctl (hd->fp_write, 1, 1, NULL); /* keep the socket open */
+    iobuf_close (hd->fp_write);
     hd->fp_write = NULL;
     shutdown( hd->sock, 1 );
     hd->in_data = 0;
 
-    hd->fp_read = iobuf_fdopen( hd->sock , "r" );
+    hd->fp_read = iobuf_sockopen( hd->sock , "r" );
     if( !hd->fp_read )
 	return G10ERR_GENERAL;
 
@@ -169,7 +212,7 @@ http_close( HTTP_HD hd )
     if( !hd || !hd->initialized )
 	return;
     if( !hd->fp_read && !hd->fp_write && hd->sock != -1 )
-	close( hd->sock );
+	sock_close( hd->sock );
     iobuf_close( hd->fp_read );
     iobuf_close( hd->fp_write );
     release_parsed_uri( hd->uri );
@@ -606,13 +649,13 @@ start_server()
 
     if( bind( fd, (struct sockaddr *)&mya, sizeof(mya)) ) {
 	log_error("bind to port 11371 failed: %s\n", strerror(errno) );
-	close( fd );
+	sock_close( fd );
 	return -1;
     }
 
     if( listen( fd, 5 ) ) {
 	log_error("listen failed: %s\n", strerror(errno) );
-	close( fd );
+	sock_close( fd );
 	return -1;
     }
 
@@ -645,7 +688,7 @@ start_server()
 	    fclose(fp);
 	    exit(0);
 	}
-	close( client );
+	sock_close( client );
     }
 
 
@@ -658,9 +701,51 @@ start_server()
 static int
 connect_server( const char *server, ushort port )
 {
+    int sd;
+#ifdef __MINGW32__
+    struct hostent *hp;
+    struct sockaddr_in ad;
+    unsigned long l;
+    
+    init_sockets ();
+
+    memset (&ad, 0, sizeof(ad));
+    ad.sin_family = AF_INET;
+    ad.sin_port = htons(port);
+
+    if( (l = inet_addr (server)) != SOCKET_ERROR ) {
+        memcpy (&ad.sin_addr, &l, sizeof(l));
+    }
+    else if( (hp = gethostbyname (server)) ) {
+        if( hp->h_addrtype != AF_INET ) {
+            log_error ("%s: unknown address family\n", server);
+            return -1;
+        }
+        if ( hp->h_length != 4 ) {
+            log_error ("%s: illegal address length\n", server);
+            return -1;
+        }
+        memcpy (&ad.sin_addr, hp->h_addr, hp->h_length);
+    }
+    else {
+        log_error ("%s: host not found: ec=%d\n",
+                   server, (int)WSAGetLastError ());
+        return -1;
+    }
+
+    if ((sd = socket(AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) {
+        log_error ("error creating socket: ex=%d\n", 
+                   (int)WSAGetLastError ());
+        return -1;
+    }
+
+    if( connect (sd, (struct sockaddr *)&ad, sizeof (ad) ) ) {
+        sock_close (sd);
+        return -1;
+    }
+#else
     struct sockaddr_in addr;
     struct hostent *host;
-    int sd;
 
     addr.sin_family = AF_INET;
     addr.sin_port = htons(port);
@@ -675,10 +760,10 @@ connect_server( const char *server, ushort port )
 	return -1;
 
     if( connect( sd, (struct sockaddr *)&addr, sizeof addr) == -1 ) {
-	close(sd);
+	sock_close(sd);
 	return -1;
     }
-
+#endif
     return sd;
 }
 
@@ -686,11 +771,19 @@ connect_server( const char *server, ushort port )
 static int
 write_server( int sock, const char *data, size_t length )
 {
-    int nleft, nwritten;
+    int nleft;
 
     nleft = length;
     while( nleft > 0 ) {
-	nwritten = write( sock, data, nleft );
+      #ifdef __MINGW32__  
+        unsigned long nwritten;
+
+        if ( !WriteFile ( sock, data, nleft, &nwritten, NULL)) {
+	    log_info ("write failed: ec=%d\n", (int)GetLastError ());
+	    return G10ERR_NETWORK;
+        }
+      #else
+	int nwritten = write( sock, data, nleft );
 	if( nwritten == -1 ) {
 	    if( errno == EINTR )
 		continue;
@@ -705,6 +798,7 @@ write_server( int sock, const char *data, size_t length )
 	    log_info("write failed: %s\n", strerror(errno));
 	    return G10ERR_NETWORK;
 	}
+      #endif
 	nleft -=nwritten;
 	data += nwritten;
     }
@@ -712,8 +806,6 @@ write_server( int sock, const char *data, size_t length )
     return 0;
 }
 
-#endif /* HAVE_DOSISH_SYSTEM */
-
 /**** Test code ****/
 #ifdef TEST
 
diff --git a/util/iobuf.c b/util/iobuf.c
index ce4f93645..67e44de9f 100644
--- a/util/iobuf.c
+++ b/util/iobuf.c
@@ -53,6 +53,7 @@
  #define FILEP_OR_FD_FOR_STDOUT  (stdout)
  typedef struct {
      FILE *fp;	   /* open file handle */
+     int keep_open;
      int  print_only_name; /* flags indicating that fname is not a real file*/
      char fname[1]; /* name of the file */
  } file_filter_ctx_t ;
@@ -74,6 +75,7 @@
  #endif
  typedef struct {
      FILEP_OR_FD  fp;	   /* open file handle */
+     int keep_open;
      int eof_seen;
      int  print_only_name; /* flags indicating that fname is not a real file*/
      char fname[1]; /* name of the file */
@@ -88,6 +90,15 @@
  static CLOSE_CACHE close_cache;
 #endif
 
+#ifdef __MINGW32__
+typedef struct {
+    int sock;
+    int keep_open;
+    int eof_seen;
+    int  print_only_name; /* flags indicating that fname is not a real file*/
+    char fname[1]; /* name of the file */
+} sock_filter_ctx_t ;
+#endif /*__MINGW32__*/
 
 /* The first partial length header block must be of size 512
  * to make it easier (and efficienter) we use a min. block size of 512
@@ -216,6 +227,7 @@ fd_cache_close (const char *fname, FILEP_OR_FD fp)
     for (cc=close_cache; cc; cc = cc->next ) {
         if ( cc->fp == INVALID_FP && !strcmp (cc->fname, fname) ) {
             cc->fp = fp;
+            return;
         }
     }
     /* add a new one */
@@ -333,6 +345,7 @@ file_filter(void *opaque, int control, IOBUF chain, byte *buf, size_t *ret_len)
 	*ret_len = nbytes;
     }
     else if( control == IOBUFCTRL_INIT ) {
+        a->keep_open = 0;
     }
     else if( control == IOBUFCTRL_DESC ) {
 	*(char**)buf = "file_filter";
@@ -341,7 +354,8 @@ file_filter(void *opaque, int control, IOBUF chain, byte *buf, size_t *ret_len)
 	if( f != stdin && f != stdout ) {
 	    if( DBG_IOBUF )
 		log_debug("%s: close fd %d\n", a->fname, fileno(f) );
-	    fclose(f);
+            if (!a->keep_open)
+                fclose(f);
 	}
 	f = NULL;
 	m_free(a); /* we can free our context now */
@@ -443,6 +457,7 @@ file_filter(void *opaque, int control, IOBUF chain, byte *buf, size_t *ret_len)
     }
     else if ( control == IOBUFCTRL_INIT ) {
         a->eof_seen = 0;
+        a->keep_open = 0;
     }
     else if ( control == IOBUFCTRL_DESC ) {
 	*(char**)buf = "file_filter(fd)";
@@ -452,13 +467,15 @@ file_filter(void *opaque, int control, IOBUF chain, byte *buf, size_t *ret_len)
         if ( f != FILEP_OR_FD_FOR_STDIN && f != FILEP_OR_FD_FOR_STDOUT ) {
 	    if( DBG_IOBUF )
 		log_debug("%s: close handle %p\n", a->fname, f );
-            fd_cache_close (a->fname, f);
+            if (!a->keep_open)
+                fd_cache_close (a->fname, f);
         }
       #else
 	if ( (int)f != 0 && (int)f != 1 ) {
 	    if( DBG_IOBUF )
 		log_debug("%s: close fd %d\n", a->fname, f );
-            fd_cache_close (a->fname, f);
+            if (!a->keep_open)
+                fd_cache_close (a->fname, f);
 	}
 	f = INVALID_FP;
       #endif
@@ -468,6 +485,78 @@ file_filter(void *opaque, int control, IOBUF chain, byte *buf, size_t *ret_len)
     return rc;
 }
 
+#ifdef __MINGW32__
+/* Becuase sockets are an special object under Lose32 we have to
+ * use a special filter */
+static int
+sock_filter (void *opaque, int control, IOBUF chain, byte *buf, size_t *ret_len)
+{
+    sock_filter_ctx_t *a = opaque;
+    size_t size = *ret_len;
+    size_t nbytes = 0;
+    int rc = 0;
+
+    if( control == IOBUFCTRL_UNDERFLOW ) {
+	assert( size ); /* need a buffer */
+	if ( a->eof_seen) {
+	    rc = -1;		
+	    *ret_len = 0;	
+	}
+	else {
+            int nread;
+
+            nread = recv ( a->sock, buf, size, 0 );
+            if ( nread == SOCKET_ERROR ) {
+                int ec = (int)WSAGetLastError ();
+                log_error("socket read error: ec=%d\n", ec);
+                rc = G10ERR_READ_FILE;
+            }
+            else if ( !nread ) {
+                a->eof_seen = 1;
+                rc = -1;
+            }
+            else {
+                nbytes = nread;
+            }
+	    *ret_len = nbytes;
+	}
+    }
+    else if( control == IOBUFCTRL_FLUSH ) {
+	if( size ) {
+            byte *p = buf;
+            int n;
+
+            nbytes = size;
+            do {
+                n = send (a->sock, p, nbytes, 0);
+                if ( n == SOCKET_ERROR ) {
+                    int ec = (int)WSAGetLastError ();
+                    log_error("socket write error: ec=%d\n", ec);
+                    rc = G10ERR_WRITE_FILE;
+                    break;
+                }
+                p += n;
+                nbytes -= n;
+            } while ( nbytes );
+            nbytes = p - buf;
+	}
+	*ret_len = nbytes;
+    }
+    else if ( control == IOBUFCTRL_INIT ) {
+        a->eof_seen = 0;
+        a->keep_open = 0;
+    }
+    else if ( control == IOBUFCTRL_DESC ) {
+	*(char**)buf = "sock_filter";
+    }
+    else if ( control == IOBUFCTRL_FREE ) {
+        if (!a->keep_open)
+            closesocket (a->sock);
+	m_free (a); /* we can free our context now */
+    }
+    return rc;
+}
+#endif /*__MINGW32__*/
 
 /****************
  * This is used to implement the block write mode.
@@ -790,9 +879,8 @@ iobuf_alloc(int use, size_t bufsize)
     return a;
 }
 
-
 int
-iobuf_close( IOBUF a )
+iobuf_close ( IOBUF a )
 {
     IOBUF a2;
     size_t dummy_len=0;
@@ -996,6 +1084,32 @@ iobuf_fdopen( int fd, const char *mode )
     return a;
 }
 
+
+IOBUF
+iobuf_sockopen ( int fd, const char *mode )
+{
+#ifdef __MINGW32__
+    IOBUF a;
+    sock_filter_ctx_t *scx;
+    size_t len;
+
+    a = iobuf_alloc( strchr( mode, 'w')? 2:1, 8192 );
+    scx = m_alloc( sizeof *scx + 25 );
+    scx->sock = fd;
+    scx->print_only_name = 1;
+    sprintf(scx->fname, "[sock %d]", fd );
+    a->filter = sock_filter;
+    a->filter_ov = scx;
+    sock_filter( scx, IOBUFCTRL_DESC, NULL, (byte*)&a->desc, &len );
+    sock_filter( scx, IOBUFCTRL_INIT, NULL, NULL, &len );
+    if( DBG_IOBUF )
+	log_debug("iobuf-%d.%d: sockopen `%s'\n", a->no, a->subno, scx->fname);
+    return a;
+#else
+    return iobuf_fdopen (fd, mode);
+#endif
+}
+
 /****************
  * create an iobuf for writing to a file; the file will be created.
  */
@@ -1133,6 +1247,35 @@ iobuf_fopen( const char *fname, const char *mode )
     return a;
 }
 
+int
+iobuf_ioctl ( IOBUF a, int cmd, int intval, void *ptrval )
+{
+    if ( cmd == 1 ) {  /* keep system filepointer/descriptor open */
+        for( ; a; a = a->chain )
+            if( !a->chain && a->filter == file_filter ) {
+                file_filter_ctx_t *b = a->filter_ov;
+                b->keep_open = intval;
+                return 0;
+            }
+          #ifdef __MINGW32__
+            else if( !a->chain && a->filter == sock_filter ) {
+                sock_filter_ctx_t *b = a->filter_ov;
+                b->keep_open = intval;
+                return 0;
+            }
+          #endif
+    }
+    else if ( cmd == 2 ) {  /* invalidate cache */
+        if ( !a && !intval && ptrval ) {
+          #ifndef FILE_FILTER_USES_STDIO
+            fd_cache_invalidate (ptrval);
+          #endif
+            return 0;
+        }
+    }
+
+    return -1;
+}
 
 
 /****************