Backported getkey.c from 1.1

29 files changed, 3650 insertions, 2987 deletions

diff --git a/THANKS b/THANKS
index 510168239..8b8111b46 100644
--- a/THANKS
+++ b/THANKS
@@ -142,6 +142,7 @@ Ted Cabeen		   [email protected]
 Thiago Jung Bauermann	   [email protected]
 Thomas Roessler 	   [email protected]
 Tim Mooney		   [email protected]
+Timo Schulz                [email protected]
 Tom Spindler		   [email protected]
 Tom Zerucha		   [email protected]
 Tomas Fasth		   [email protected]
diff --git a/TODO b/TODO
index c76a34286..3c01ffa12 100644
--- a/TODO
+++ b/TODO
@@ -34,10 +34,6 @@
 
   * g10/trustdb.c (make_sig_records): fix the fixme.
 
-  * at least an option to prefer DSA keys over RSA when selecting the key to
-    use.  Depending on creation time would be nice too.  I think this is
-    already done for the subkeys - check it.
-
   * No TCP support yet for W32? arggg - should go into a separate program
     anyway.
 
@@ -45,6 +41,9 @@
 
   * Fix the bug in the mips assembler code
 
+  * Add a way to show the fingerprint of an key signator's keys
+
+
 Scheduled for 1.1
 -----------------
   * David C Niemi pointed out that the code for --no-default-keyring does not
@@ -54,10 +53,6 @@ Scheduled for 1.1
   * export by user-IDs does only export the first matching name which leads
     to a problem in cases where there are 2 keys with identically user-IDs.
 
-  * Rework the whole key selection stuff: Compile a list of valid
-    candidates for a keyblock first and the select one from it.
-    The current code is too ugly (getkey.c).
-
   * With option -i prompt before adding a key to the keyring and show some
     info what we are about to add.
 
@@ -69,18 +64,12 @@ Scheduled for 1.1
 
   * Skip RO keyrings when importing a key.
 
-  * Use the newest encryption key if only the main key has been given.
-    [already in the gpg 1.1 codebase]
-
   * replace the keyserver stuff either by a call to a specialized
     utility and SOCKSify this utility.
 
   * Check the beginning of file to detect already compressed files (gzip,
     bzip2, xdelta and some picture formats)
 
-  * Delay the read of the passphrase-fd after a NEED_PASSPHRASE.  But this
-    may break some scripts.
-
   * Get new assembler stuff from gmp 3.1
 
 
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 386c916f9..0850f4a65 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,6 +1,32 @@
+2001-02-08  Werner Koch  <[email protected]>
+
+	* parse-packet.c (parse_encrypted): Fixed listing of pktlen for
+	MDC packets.
+
+	* getkey.c: Backported the version of this file from gpg 1.1. this
+	involved some changes in other files too.
+	* parse-packet.c (parse_key): Clear req_usage.
+	* skclist.c (build_sk_list): Use req_usage to pass the usage
+	information to the lookup function.
+	* pkclist.c (build_pk_list): Ditto.
+	* free-packet.c (copy_public_parts_to_secret_key): New.
+	* keydb.h: Add IS_* macros to check the sig_class.
+	* misc.c (openpgp_cipher_test_algo): New.
+	(openpgp_pk_test_algo): New.
+	(openpgp_pk_algo_usage): New.
+	(openpgp_md_test_algo): New.
+	* packet.h: Add a few fields to PKT_{public,secret}_key and
+	PKT_user_id.
+	* seckey-cert.c (do_check): Use the new main_keyid field.
+
+2001-02-04  Werner Koch  <[email protected]>
+
+	* encr-data.c (decrypt_data): Catch error when we had problems to
+	parse the encrypted packet. By Timo.
+
 2001-01-29  Werner Koch  <[email protected]>
 
-	* g10.c (main): --batch dioes now set nogreeting.
+	* g10.c (main): --batch does now set nogreeting.
 
 	* delkey.c (do_delete_key): Fixed delete-both functionality.
 
diff --git a/g10/encr-data.c b/g10/encr-data.c
index 5e1fdabed..87766e7aa 100644
--- a/g10/encr-data.c
+++ b/g10/encr-data.c
@@ -93,6 +93,10 @@ decrypt_data( void *procctx, PKT_encrypted *ed, DEK *dek )
 	log_error("key setup failed: %s\n", g10_errstr(rc) );
 	goto leave;
     }
+    if (!ed->buf) {
+        log_error(_("problem handling encrypted packet\n"));
+        goto leave;
+    }
 
     cipher_setiv( dfx.cipher_hd, NULL, 0 );
 
diff --git a/g10/free-packet.c b/g10/free-packet.c
index 3082be686..dad04b7d5 100644
--- a/g10/free-packet.c
+++ b/g10/free-packet.c
@@ -140,6 +140,29 @@ copy_public_key( PKT_public_key *d, PKT_public_key *s )
    return copy_public_key_new_namehash( d, s, NULL );
 }
 
+/****************
+ * Replace all common parts of a sk by the one from the public key.
+ * This is a hack and a better solution will be to just store the real secret
+ * parts somewhere and don't duplicate all the other stuff.
+ */
+void
+copy_public_parts_to_secret_key( PKT_public_key *pk, PKT_secret_key *sk )
+{
+    sk->expiredate  = pk->expiredate;     
+    sk->pubkey_algo = pk->pubkey_algo;    
+    sk->pubkey_usage= pk->pubkey_usage;
+    sk->created     = pk->created;        
+    sk->req_usage   = pk->req_usage;
+    sk->req_algo    = pk->req_algo;
+    sk->has_expired = pk->has_expired;    
+    sk->is_revoked  = pk->is_revoked;     
+    sk->is_valid    = pk->is_valid;    
+    sk->main_keyid[0]= pk->main_keyid[0];
+    sk->main_keyid[1]= pk->main_keyid[1];
+    sk->keyid[0]    = pk->keyid[0];
+    sk->keyid[1]    = pk->keyid[1];
+}
+
 PKT_signature *
 copy_signature( PKT_signature *d, PKT_signature *s )
 {
diff --git a/g10/getkey.c b/g10/getkey.c
index 434b8a917..28bb7f84d 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -34,9 +34,12 @@
 #include "trustdb.h"
 #include "i18n.h"
 
+
+#if 0
 #define MAX_UNK_CACHE_ENTRIES 1000   /* we use a linked list - so I guess
 				      * this is a reasonable limit */
 #define MAX_PK_CACHE_ENTRIES	50
+#endif
 #define MAX_UID_CACHE_ENTRIES	50
 
 /* A map of the all characters valid used for word_match()
@@ -97,18 +100,17 @@ struct getkey_ctx_s {
     /* make an array or a linked list from dome fields */
     int primary;
     KBNODE keyblock;
-    KBPOS kbpos;
+    KBPOS  kbpos;
+    KBNODE found_key; /* pointer into some keyblock */
     int last_rc;
+    int req_usage;
+    int req_algo;
     ulong count;
     int not_allocated;
     int nitems;
     getkey_item_t items[1];
 };
 
-
-
-
-
 #if 0
 static struct {
     int any;
@@ -118,13 +120,13 @@ static struct {
 } lkup_stats[21];
 #endif
 
+typedef struct keyid_list {
+    struct keyid_list *next;
+    u32 keyid[2];
+} *keyid_list_t;
 
 
 #if MAX_UNK_CACHE_ENTRIES
-  typedef struct keyid_list {
-      struct keyid_list *next;
-      u32 keyid[2];
-  } *keyid_list_t;
   static keyid_list_t unknown_keyids;
   static int unk_cache_entries;   /* number of entries in unknown keys cache */
   static int unk_cache_disabled;
@@ -146,7 +148,7 @@ static struct {
 #endif
 typedef struct user_id_db {
     struct user_id_db *next;
-    u32 keyid[2];
+    keyid_list_t keyids;
     int len;
     char name[1];
 } *user_id_db_t;
@@ -156,9 +158,7 @@ static int uid_cache_entries;	/* number of entries in uid cache */
 
 
 static char* prepare_word_match( const byte *name );
-static int lookup_pk( GETKEY_CTX ctx, PKT_public_key *pk, KBNODE *ret_kb );
-static int lookup_sk( GETKEY_CTX ctx, PKT_secret_key *sk, KBNODE *ret_kb );
-static u32 subkeys_expiretime( KBNODE node, u32 *mainkid );
+static int lookup( GETKEY_CTX ctx, KBNODE *ret_kb, int secmode );
 
 
 #if 0
@@ -190,7 +190,7 @@ cache_public_key( PKT_public_key *pk )
 	return;
 
     if( is_ELGAMAL(pk->pubkey_algo)
-	|| pk->pubkey_algo == PUBKEY_ALGO_DSA
+	|| pk->pubkey_algo == GCRY_PK_DSA
 	|| is_RSA(pk->pubkey_algo) ) {
 	keyid_from_pk( pk, keyid );
     }
@@ -222,33 +222,96 @@ cache_public_key( PKT_public_key *pk )
 }
 
 
+/*
+ * Return the user ID from the given keyblock.
+ * We use the primary uid flag which has been set by the merge_selfsigs
+ * function.  The returned value is only valid as long as then given
+ * keyblock is not changed
+ */
+static const char *
+get_primary_uid ( KBNODE keyblock, size_t *uidlen )
+{
+    KBNODE k;
+
+    for (k=keyblock; k; k=k->next ) {
+        if ( k->pkt->pkttype == PKT_USER_ID
+             && k->pkt->pkt.user_id->is_primary ) {
+            *uidlen = k->pkt->pkt.user_id->len;
+            return k->pkt->pkt.user_id->name;
+        }
+    } 
+    *uidlen = 12;
+    return "[No user ID]";
+}
+
+
+static void
+release_keyid_list ( keyid_list_t k )
+{
+    while (  k ) {
+        keyid_list_t k2 = k->next;
+        m_free (k);
+        k = k2;
+    }
+}
+
 /****************
  * Store the association of keyid and userid
+ * Feed only public keys to this function.
  */
-void
-cache_user_id( PKT_user_id *uid, u32 *keyid )
+static void
+cache_user_id( KBNODE keyblock )
 {
     user_id_db_t r;
+    const char *uid;
+    size_t uidlen;
+    keyid_list_t keyids = NULL;
+    KBNODE k;
 
-    for(r=user_id_db; r; r = r->next )
-	if( r->keyid[0] == keyid[0] && r->keyid[1] == keyid[1] ) {
-	    if( DBG_CACHE )
-	       log_debug("cache_user_id: already in cache\n");
-	    return;
-	}
+    for (k=keyblock; k; k = k->next ) {
+        if ( k->pkt->pkttype == PKT_PUBLIC_KEY
+             || k->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
+            keyid_list_t a = m_alloc_clear ( sizeof *a );
+            /* Hmmm: For a long list of keyids it might be an advantage
+             * to append the keys */
+            keyid_from_pk( k->pkt->pkt.public_key, a->keyid );
+            /* first check for duplicates */
+            for(r=user_id_db; r; r = r->next ) {
+                keyid_list_t b = r->keyids;
+                for ( b = r->keyids; b; b = b->next ) {
+                    if( b->keyid[0] == a->keyid[0]
+                        && b->keyid[1] == a->keyid[1] ) {
+                        if( DBG_CACHE )
+                            log_debug("cache_user_id: already in cache\n");
+                        release_keyid_list ( keyids );
+                        m_free ( a );
+                        return;
+                    }
+                }
+            }
+            /* now put it into the cache */
+            a->next = keyids;
+            keyids = a;
+        }
+    }
+    if ( !keyids )
+        BUG (); /* No key no fun */
+
+
+    uid = get_primary_uid ( keyblock, &uidlen );
 
     if( uid_cache_entries >= MAX_UID_CACHE_ENTRIES ) {
 	/* fixme: use another algorithm to free some cache slots */
 	r = user_id_db;
 	user_id_db = r->next;
+        release_keyid_list ( r->keyids );
 	m_free(r);
 	uid_cache_entries--;
     }
-    r = m_alloc( sizeof *r + uid->len-1 );
-    r->keyid[0] = keyid[0];
-    r->keyid[1] = keyid[1];
-    r->len = uid->len;
-    memcpy(r->name, uid->name, r->len);
+    r = m_alloc( sizeof *r + uidlen-1 );
+    r->keyids = keyids;
+    r->len = uidlen;
+    memcpy(r->name, uid, r->len);
     r->next = user_id_db;
     user_id_db = r;
     uid_cache_entries++;
@@ -287,6 +350,31 @@ getkey_disable_caches()
 }
 
 
+static void
+pk_from_block ( GETKEY_CTX ctx,
+                PKT_public_key *pk, KBNODE keyblock, const char *namehash )
+{
+    KBNODE a = ctx->found_key ? ctx->found_key : keyblock;
+
+    assert ( a->pkt->pkttype == PKT_PUBLIC_KEY
+             ||  a->pkt->pkttype == PKT_PUBLIC_SUBKEY );
+     
+    copy_public_key_new_namehash( pk, a->pkt->pkt.public_key, namehash);
+}
+
+static void
+sk_from_block ( GETKEY_CTX ctx,
+                PKT_secret_key *sk, KBNODE keyblock )
+{
+    KBNODE a = ctx->found_key ? ctx->found_key : keyblock;
+
+    assert ( a->pkt->pkttype == PKT_SECRET_KEY
+             ||  a->pkt->pkttype == PKT_SECRET_SUBKEY );
+     
+    copy_secret_key( sk, a->pkt->pkt.secret_key);
+}
+
+
 /****************
  * Get a public key and store it into the allocated pk
  * can be called with PK set to NULL to just read it into some
@@ -328,14 +416,21 @@ get_pubkey( PKT_public_key *pk, u32 *keyid )
 
     /* do a lookup */
     {	struct getkey_ctx_s ctx;
+        KBNODE kb = NULL;
 	memset( &ctx, 0, sizeof ctx );
 	ctx.not_allocated = 1;
 	ctx.nitems = 1;
 	ctx.items[0].mode = 11;
 	ctx.items[0].keyid[0] = keyid[0];
 	ctx.items[0].keyid[1] = keyid[1];
-	rc = lookup_pk( &ctx, pk, NULL );
+        ctx.req_algo  = pk->req_algo;
+        ctx.req_usage = pk->req_usage;
+	rc = lookup( &ctx, &kb, 0 );
+        if ( !rc ) {
+            pk_from_block ( &ctx, pk, kb, NULL );
+        }
 	get_pubkey_end( &ctx );
+        release_kbnode ( kb );
     }
     if( !rc )
 	goto leave;
@@ -373,7 +468,6 @@ get_pubkey( PKT_public_key *pk, u32 *keyid )
 KBNODE
 get_pubkeyblock( u32 *keyid )
 {
-    PKT_public_key *pk = m_alloc_clear( sizeof *pk );
     struct getkey_ctx_s ctx;
     int rc = 0;
     KBNODE keyblock = NULL;
@@ -384,8 +478,7 @@ get_pubkeyblock( u32 *keyid )
     ctx.items[0].mode = 11;
     ctx.items[0].keyid[0] = keyid[0];
     ctx.items[0].keyid[1] = keyid[1];
-    rc = lookup_pk( &ctx, pk, &keyblock );
-    free_public_key(pk);
+    rc = lookup( &ctx, &keyblock, 0 );
     get_pubkey_end( &ctx );
 
     return rc ? NULL : keyblock;
@@ -402,6 +495,7 @@ get_seckey( PKT_secret_key *sk, u32 *keyid )
 {
     int rc;
     struct getkey_ctx_s ctx;
+    KBNODE kb = NULL;
 
     memset( &ctx, 0, sizeof ctx );
     ctx.not_allocated = 1;
@@ -409,8 +503,15 @@ get_seckey( PKT_secret_key *sk, u32 *keyid )
     ctx.items[0].mode = 11;
     ctx.items[0].keyid[0] = keyid[0];
     ctx.items[0].keyid[1] = keyid[1];
-    rc = lookup_sk( &ctx, sk, NULL );
+    ctx.req_algo  = sk->req_algo;
+    ctx.req_usage = sk->req_usage;
+    rc = lookup( &ctx, &kb, 1 );
+    if ( !rc ) {
+        sk_from_block ( &ctx, sk, kb );
+    }
     get_seckey_end( &ctx );
+    release_kbnode ( kb );
+
     if( !rc ) {
 	/* check the secret key (this may prompt for a passprase to
 	 * unlock the secret key
@@ -423,30 +524,6 @@ get_seckey( PKT_secret_key *sk, u32 *keyid )
 
 
 /****************
- * Get the primary secret key and store it into sk
- * Note: This function does not unprotect the key!
- */
-int
-get_primary_seckey( PKT_secret_key *sk, u32 *keyid )
-{
-    struct getkey_ctx_s ctx;
-    int rc;
-
-    memset( &ctx, 0, sizeof ctx );
-    ctx.not_allocated = 1;
-    ctx.primary = 1;
-    ctx.nitems = 1;
-    ctx.items[0].mode = 11;
-    ctx.items[0].keyid[0] = keyid[0];
-    ctx.items[0].keyid[1] = keyid[1];
-    rc = lookup_sk( &ctx, sk, NULL );
-    get_seckey_end( &ctx );
-    return rc;
-}
-
-
-
-/****************
  * Check whether the secret key is available
  * Returns: 0 := key is available
  *	    G10ERR_NO_SECKEY := not availabe
@@ -456,18 +533,17 @@ seckey_available( u32 *keyid )
 {
     int rc;
     struct getkey_ctx_s ctx;
-    PKT_secret_key *sk;
+    KBNODE kb = NULL;
 
-    sk = m_alloc_clear( sizeof *sk );
     memset( &ctx, 0, sizeof ctx );
     ctx.not_allocated = 1;
     ctx.nitems = 1;
     ctx.items[0].mode = 11;
     ctx.items[0].keyid[0] = keyid[0];
     ctx.items[0].keyid[1] = keyid[1];
-    rc = lookup_sk( &ctx, sk, NULL );
+    rc = lookup( &ctx, &kb, 1 );
     get_seckey_end( &ctx );
-    free_secret_key( sk );
+    release_kbnode ( kb );
     return rc;
 }
 
@@ -515,6 +591,8 @@ hextobyte( const byte *s )
  * 12 = it is a trustdb index (keyid is looked up)
  * 16 = it is a 16 byte fingerprint
  * 20 = it is a 20 byte fingerprint
+ * 21 = Unified fingerprint :fpr:pk_algo:
+ *      (We don't use pk_algo yet)
  *
  * if fprint is not NULL, it should be an array of at least 20 bytes.
  *
@@ -526,6 +604,8 @@ hextobyte( const byte *s )
  *   must be in the range 0..9), this is considered a fingerprint.
  * - If the username starts with a left angle, we assume it is a complete
  *   email address and look only at this part.
+ * - If the username starts with a colon we assume it is a unified 
+ *   key specfification. 
  * - If the username starts with a '.', we assume it is the ending
  *   part of an email address
  * - If the username starts with an '@', we assume it is a part of an
@@ -594,7 +674,32 @@ classify_user_id( const char *name, u32 *keyid, byte *fprint,
 		    keyid[0] = keyid[1] = 0;
 	    }
 	    break;
-
+        
+        case ':': /*Unified fingerprint */
+            {  
+                const char *se, *si;
+                int i;
+                
+                se = strchr( ++s,':');
+                if ( !se )
+                    return 0;
+                for (i=0,si=s; si < se; si++, i++ ) {
+                    if ( !strchr("01234567890abcdefABCDEF", *si ) )
+                        return 0; /* invalid digit */
+                }
+                if (i != 32 && i != 40)
+                    return 0; /* invalid length of fpr*/
+		if (fprint) {
+		    for (i=0,si=s; si < se; i++, si +=2) 
+			fprint[i] = hextobyte(si);
+                    for ( ; i < 20; i++)
+                        fprint[i]= 0;
+		}
+                s = se + 1;
+                mode = 21;
+            } 
+            break;
+           
 	default:
 	    if (s[0] == '0' && s[1] == 'x') {
 		hexprefix = 1;
@@ -611,7 +716,8 @@ classify_user_id( const char *name, u32 *keyid, byte *fprint,
 		    hexlength = 0;  /* a hex number, but really were not. */
 	    }
 
-	    if (hexlength == 8 || (!hexprefix && hexlength == 9 && *s == '0')){
+	    if (hexlength == 8
+                || (!hexprefix && hexlength == 9 && *s == '0')){
 		/* short keyid */
 		if (hexlength == 9)
 		    s++;
@@ -621,8 +727,8 @@ classify_user_id( const char *name, u32 *keyid, byte *fprint,
 		}
 		mode = 10;
 	    }
-	    else if (hexlength == 16 || (!hexprefix && hexlength == 17
-							  && *s == '0')) {
+	    else if (hexlength == 16
+                     || (!hexprefix && hexlength == 17 && *s == '0')) {
 		/* complete keyid */
 		char buf[9];
 		if (hexlength == 17)
@@ -700,26 +806,34 @@ key_byname( GETKEY_CTX *retctx, STRLIST namelist,
     int n;
     STRLIST r;
     GETKEY_CTX ctx;
-
+    KBNODE help_kb = NULL;
+    
     if( retctx ) /* reset the returned context in case of error */
 	*retctx = NULL;
-    assert( !pk ^ !sk );
 
     /* build the search context */
     /* Performance hint: Use a static buffer if there is only one name */
     /*			 and we don't have mode 6 */
     for(n=0, r=namelist; r; r = r->next )
 	n++;
-    ctx = m_alloc_clear( sizeof *ctx + (n-1)*sizeof ctx->items );
+    ctx = m_alloc_clear(  sizeof *ctx + (n-1)*sizeof ctx->items );
     ctx->nitems = n;
 
     for(n=0, r=namelist; r; r = r->next, n++ ) {
-	ctx->items[n].mode = classify_user_id( r->d,
-					      ctx->items[n].keyid,
-					      ctx->items[n].fprint,
-					      &ctx->items[n].name,
-					      NULL );
-	if( !ctx->items[n].mode ) {
+	int mode = classify_user_id( r->d,
+                                 ctx->items[n].keyid,
+                                 ctx->items[n].fprint,
+                                 &ctx->items[n].name,
+                                 NULL );
+
+        /* if we don't use one of the exact key specifications, we assume that
+         * the primary key is requested */
+        if ( mode != 10 && mode != 11
+             && mode != 16 && mode == 20 && mode != 21 )
+            ctx->primary = 1; 
+
+	ctx->items[n].mode = mode;
+        if( !ctx->items[n].mode ) {
 	    m_free( ctx );
 	    return G10ERR_INV_USER_ID;
 	}
@@ -729,18 +843,36 @@ key_byname( GETKEY_CTX *retctx, STRLIST namelist,
 	}
     }
 
-    /* and call the lookup function */
-    ctx->primary = 1; /* we want to look for the primary key only */
-    if( sk )
-	rc = lookup_sk( ctx, sk, ret_kb );
-    else
-	rc = lookup_pk( ctx, pk, ret_kb );
+
+
+    if ( !ret_kb ) 
+        ret_kb = &help_kb;
+
+    if( sk ) {
+        ctx->req_algo  = sk->req_algo;
+        ctx->req_usage = sk->req_usage;
+	rc = lookup( ctx, ret_kb, 1 );
+        if ( !rc && sk ) {
+            sk_from_block ( ctx, sk, *ret_kb );
+        }
+    }
+    else {
+        ctx->req_algo  = pk->req_algo;
+        ctx->req_usage = pk->req_usage;
+	rc = lookup( ctx, ret_kb, 0 );
+        if ( !rc && pk ) {
+            pk_from_block ( ctx, pk, *ret_kb, NULL /* FIXME need to get the namehash*/ );
+        }
+    }
+
+    release_kbnode ( help_kb );
 
     if( retctx ) /* caller wants the context */
 	*retctx = ctx;
     else {
 	/* Hmmm, why not get_pubkey-end here?? */
-	enum_keyblocks( 2, &ctx->kbpos, NULL ); /* close */
+	enum_keyblocks( 2, &ctx->kbpos, NULL );
+        memset (&ctx->kbpos, 0, sizeof ctx->kbpos);
 	for(n=0; n < ctx->nitems; n++ )
 	    m_free( ctx->items[n].namebuf );
 	m_free( ctx );
@@ -757,16 +889,7 @@ get_pubkey_byname( GETKEY_CTX *retctx, PKT_public_key *pk,
     STRLIST namelist = NULL;
 
     add_to_strlist( &namelist, name );
-
-    if( !pk ) {
-	/* Performance Hint: key_byname should not need a pk here */
-	pk = m_alloc_clear( sizeof *pk );
-	rc = key_byname( retctx, namelist, pk, NULL, ret_keyblock );
-	free_public_key( pk );
-    }
-    else
-	rc = key_byname( retctx, namelist, pk, NULL, ret_keyblock );
-
+    rc = key_byname( retctx, namelist, pk, NULL, ret_keyblock );
     free_strlist( namelist );
     return rc;
 }
@@ -775,18 +898,7 @@ int
 get_pubkey_bynames( GETKEY_CTX *retctx, PKT_public_key *pk,
 		    STRLIST names, KBNODE *ret_keyblock )
 {
-    int rc;
-
-    if( !pk ) {
-	/* Performance Hint: key_byname should not need a pk here */
-	pk = m_alloc_clear( sizeof *pk );
-	rc = key_byname( retctx, names, pk, NULL, ret_keyblock );
-	free_public_key( pk );
-    }
-    else
-	rc = key_byname( retctx, names, pk, NULL, ret_keyblock );
-
-    return rc;
+    return key_byname( retctx, names, pk, NULL, ret_keyblock );
 }
 
 int
@@ -794,24 +906,22 @@ get_pubkey_next( GETKEY_CTX ctx, PKT_public_key *pk, KBNODE *ret_keyblock )
 {
     int rc;
 
-    if( !pk ) {
-	/* Performance Hint: lookup_read should not need a pk in this case */
-	pk = m_alloc_clear( sizeof *pk );
-	rc = lookup_pk( ctx, pk, ret_keyblock );
-	free_public_key( pk );
-    }
-    else
-	rc = lookup_pk( ctx, pk, ret_keyblock );
+    rc = lookup( ctx, ret_keyblock, 0 );
+    if ( !rc && pk && ret_keyblock )
+        pk_from_block ( ctx, pk, *ret_keyblock, NULL );
+    
     return rc;
 }
 
+
 void
 get_pubkey_end( GETKEY_CTX ctx )
 {
     if( ctx ) {
 	int n;
 
-	enum_keyblocks( 2, &ctx->kbpos, NULL ); /* close */
+	enum_keyblocks( 2, &ctx->kbpos, NULL ); 
+        memset (&ctx->kbpos, 0, sizeof ctx->kbpos);
 	for(n=0; n < ctx->nitems; n++ )
 	    m_free( ctx->items[n].namebuf );
 	if( !ctx->not_allocated )
@@ -819,22 +929,34 @@ get_pubkey_end( GETKEY_CTX ctx )
     }
 }
 
+
+
+
 /****************
  * Search for a key with the given fingerprint.
+ * FIXME:
+ * We should replace this with the _byname function.  Thiscsan be done
+ * by creating a userID conforming to the unified fingerprint style. 
  */
 int
-get_pubkey_byfprint( PKT_public_key *pk, const byte *fprint, size_t fprint_len)
+get_pubkey_byfprint( PKT_public_key *pk,
+                     const byte *fprint, size_t fprint_len)
 {
     int rc;
 
     if( fprint_len == 20 || fprint_len == 16 ) {
 	struct getkey_ctx_s ctx;
+        KBNODE kb = NULL;
+
 	memset( &ctx, 0, sizeof ctx );
 	ctx.not_allocated = 1;
 	ctx.nitems = 1;
 	ctx.items[0].mode = fprint_len;
 	memcpy( ctx.items[0].fprint, fprint, fprint_len );
-	rc = lookup_pk( &ctx, pk, NULL );
+	rc = lookup( &ctx, &kb, 0 );
+        if (!rc && pk )
+            pk_from_block ( &ctx, pk, kb, NULL );
+        release_kbnode ( kb );
 	get_pubkey_end( &ctx );
     }
     else
@@ -851,35 +973,33 @@ get_keyblock_byfprint( KBNODE *ret_keyblock, const byte *fprint,
 						size_t fprint_len )
 {
     int rc;
-    PKT_public_key *pk = m_alloc_clear( sizeof *pk );
 
     if( fprint_len == 20 || fprint_len == 16 ) {
 	struct getkey_ctx_s ctx;
+
 	memset( &ctx, 0, sizeof ctx );
 	ctx.not_allocated = 1;
 	ctx.nitems = 1;
 	ctx.items[0].mode = fprint_len;
 	memcpy( ctx.items[0].fprint, fprint, fprint_len );
-	rc = lookup_pk( &ctx, pk, ret_keyblock );
+	rc = lookup( &ctx, ret_keyblock, 0 );
 	get_pubkey_end( &ctx );
     }
     else
 	rc = G10ERR_GENERAL; /* Oops */
 
-    free_public_key( pk );
     return rc;
 }
 
 
 
 /****************
- * Search for a key with the given lid and return the complete keyblock
+ * Search for a key with the given lid and return the entire keyblock
  */
 int
 get_keyblock_bylid( KBNODE *ret_keyblock, ulong lid )
 {
     int rc;
-    PKT_public_key *pk = m_alloc_clear( sizeof *pk );
     struct getkey_ctx_s ctx;
     u32 kid[2];
 
@@ -891,10 +1011,9 @@ get_keyblock_bylid( KBNODE *ret_keyblock, ulong lid )
     ctx.items[0].mode = 12;
     ctx.items[0].keyid[0] = kid[0];
     ctx.items[0].keyid[1] = kid[1];
-    rc = lookup_pk( &ctx, pk, ret_keyblock );
+    rc = lookup( &ctx,  ret_keyblock, 0 );
     get_pubkey_end( &ctx );
 
-    free_public_key( pk );
     return rc;
 }
 
@@ -906,30 +1025,38 @@ get_keyblock_bylid( KBNODE *ret_keyblock, ulong lid )
  * Get a secret key by name and store it into sk
  * If NAME is NULL use the default key
  */
-int
-get_seckey_byname( PKT_secret_key *sk, const char *name, int unprotect )
+static int
+get_seckey_byname2( GETKEY_CTX *retctx,
+                   PKT_secret_key *sk, const char *name, int unprotect,
+                   KBNODE *retblock )
 {
     STRLIST namelist = NULL;
     int rc;
 
     if( !name && opt.def_secret_key && *opt.def_secret_key ) {
 	add_to_strlist( &namelist, opt.def_secret_key );
-	rc = key_byname( NULL, namelist, NULL, sk, NULL );
+	rc = key_byname( retctx, namelist, NULL, sk, retblock );
     }
     else if( !name ) { /* use the first one as default key */
 	struct getkey_ctx_s ctx;
+        KBNODE kb = NULL;
 
+        assert (!retctx ); /* do we need this at all */
+        assert (!retblock);
 	memset( &ctx, 0, sizeof ctx );
 	ctx.not_allocated = 1;
 	ctx.primary = 1;
 	ctx.nitems = 1;
 	ctx.items[0].mode = 15;
-	rc = lookup_sk( &ctx, sk, NULL );
+	rc = lookup( &ctx, &kb, 1 );
+        if (!rc && sk )
+            sk_from_block ( &ctx, sk, kb );
+        release_kbnode ( kb );
 	get_seckey_end( &ctx );
     }
     else {
 	add_to_strlist( &namelist, name );
-	rc = key_byname( NULL, namelist, NULL, sk, NULL );
+	rc = key_byname( retctx, namelist, NULL, sk, retblock );
     }
 
     free_strlist( namelist );
@@ -940,22 +1067,18 @@ get_seckey_byname( PKT_secret_key *sk, const char *name, int unprotect )
     return rc;
 }
 
+int 
+get_seckey_byname( PKT_secret_key *sk, const char *name, int unlock )
+{
+    return get_seckey_byname2 ( NULL, sk, name, unlock, NULL );
+}
+
+
 int
 get_seckey_bynames( GETKEY_CTX *retctx, PKT_secret_key *sk,
 		    STRLIST names, KBNODE *ret_keyblock )
 {
-    int rc;
-
-    if( !sk ) {
-	/* Performance Hint: key_byname should not need a sk here */
-	sk = m_alloc_secure_clear( sizeof *sk );
-	rc = key_byname( retctx, names, NULL, sk, ret_keyblock );
-	free_secret_key( sk );
-    }
-    else
-	rc = key_byname( retctx, names, NULL, sk, ret_keyblock );
-
-    return rc;
+    return key_byname( retctx, names, NULL, sk, ret_keyblock );
 }
 
 
@@ -964,32 +1087,25 @@ get_seckey_next( GETKEY_CTX ctx, PKT_secret_key *sk, KBNODE *ret_keyblock )
 {
     int rc;
 
-    if( !sk ) {
-	/* Performance Hint: lookup_read should not need a pk in this case */
-	sk = m_alloc_secure_clear( sizeof *sk );
-	rc = lookup_sk( ctx, sk, ret_keyblock );
-	free_secret_key( sk );
-    }
-    else
-	rc = lookup_sk( ctx, sk, ret_keyblock );
+    rc = lookup( ctx, ret_keyblock, 1 );
+    if ( !rc && sk && ret_keyblock )
+        sk_from_block ( ctx, sk, *ret_keyblock );
+
     return rc;
 }
 
+
 void
 get_seckey_end( GETKEY_CTX ctx )
 {
-    if( ctx ) {
-	int n;
-
-	enum_keyblocks( 2, &ctx->kbpos, NULL ); /* close */
-	for(n=0; n < ctx->nitems; n++ )
-	    m_free( ctx->items[n].namebuf );
-	if( !ctx->not_allocated )
-	    m_free( ctx );
-    }
+    get_pubkey_end( ctx );
 }
 
 
+
+/*******************************************************
+ ************** compare functions **********************
+ *******************************************************/
 
 /****************
  * Do a word match (original user id starts with a '+').
@@ -1129,73 +1245,15 @@ compare_name( const char *uid, size_t uidlen, const char *name, int mode )
 
 
 
-/****************
- * Assume that knode points to a public key packet  and keyblock is
- * the entire keyblock.  This function adds all relevant information from
- * a selfsignature to the public key.
- */
-
-static void
-merge_one_pk_and_selfsig( KBNODE keyblock, KBNODE knode,
-			  PKT_public_key *orig_pk )
-{
-    PKT_public_key *pk = knode->pkt->pkt.public_key;
-    PKT_signature *sig;
-    KBNODE k;
-    u32 kid[2];
-    u32 sigdate = 0;
-
-    assert(    knode->pkt->pkttype == PKT_PUBLIC_KEY
-	    || knode->pkt->pkttype == PKT_PUBLIC_SUBKEY );
-
-    if( pk->version < 4 )
-	return; /* this is only needed for version >=4 packets */
-
-
-    /* find the selfsignature */
-    if( knode->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
-	k = find_kbnode( keyblock, PKT_PUBLIC_KEY );
-	if( !k )
-	   BUG(); /* keyblock without primary key!!! */
-	keyid_from_pk( k->pkt->pkt.public_key, kid );
-    }
-    else
-	keyid_from_pk( pk, kid );
-
-    for(k=knode->next; k; k = k->next ) {
-	if( k->pkt->pkttype == PKT_SIGNATURE
-	    && (sig=k->pkt->pkt.signature)->sig_class >= 0x10
-	    && sig->sig_class <= 0x30
-	    && sig->keyid[0] == kid[0]
-	    && sig->keyid[1] == kid[1]
-	    && sig->version > 3 ) {
-	    /* okay this is a self-signature which can be used.
-	     * We use the latest self-signature.
-	     * FIXME: We should only use this if the signature is valid
-	     *	      but this is time consuming - we must provide another
-	     *	      way to handle this
-	     */
-	    const byte *p;
-	    u32 ed;
-
-	    p = parse_sig_subpkt( sig->hashed_data, SIGSUBPKT_KEY_EXPIRE, NULL );
-	    ed = p? pk->timestamp + buffer_to_u32(p):0;
-	    /* use the latest self signature */
-	    if( sig->timestamp > sigdate ) {
-		pk->expiredate = ed;
-		orig_pk->expiredate = ed;
-		sigdate = sig->timestamp;
-	    }
-	    /* fixme: add usage etc. to pk */
-	}
-	else if( k->pkt->pkttype == PKT_PUBLIC_SUBKEY )
-	    break; /* stop here */
-    }
-}
-
+
+/************************************************
+ ************* Merging stuff ********************
+ ************************************************/
 
 /****************
  * merge all selfsignatures with the keys.
+ * FIXME: replace this at least for the public key parts
+ *        by merge_selfsigs
  */
 void
 merge_keys_and_selfsig( KBNODE keyblock )
@@ -1217,7 +1275,7 @@ merge_keys_and_selfsig( KBNODE keyblock )
 		keyid_from_pk( pk, kid );
 	    else if( !pk->expiredate ) { /* and subkey */
 		/* insert the expiration date here */
-		pk->expiredate = subkeys_expiretime( k, kid );
+		/*FIXME!!! pk->expiredate = subkeys_expiretime( k, kid );*/
 	    }
 	    sigdate = 0;
 	}
@@ -1265,541 +1323,897 @@ merge_keys_and_selfsig( KBNODE keyblock )
 }
 
 
-static KBNODE
-find_by_name( KBNODE keyblock, PKT_public_key *pk, const char *name,
-	      int mode, byte *namehash, int *use_namehash )
+static void
+fixup_uidnode ( KBNODE uidnode, KBNODE signode )
 {
-    KBNODE k, kk;
+    PKT_user_id   *uid = uidnode->pkt->pkt.user_id;
+    PKT_signature *sig = signode->pkt->pkt.signature;
+    const byte *p;
+    size_t n;
+
+    uid->created = 0; /* not created == invalid */
+    if ( !signode ) 
+        return; /* no self-signature */
+    if ( IS_UID_REV ( sig ) )
+        return; /* has been revoked */
+
+    uid->created = sig->timestamp; /* this one is okay */    
+ 
+        
+    /* store the key flags in the helper variable for later processing */
+    uid->help_key_usage = 0;
+    p = parse_sig_subpkt ( sig->hashed_data, SIGSUBPKT_KEY_FLAGS, &n );
+    if ( p && n ) {
+        /* first octet of the keyflags */   
+        if ( (*p & 3) )
+            uid->help_key_usage |= PUBKEY_USAGE_SIG;
+        if ( (*p & 12) )    
+            uid->help_key_usage |= PUBKEY_USAGE_ENC;
+    }
 
-    for(k=keyblock; k; k = k->next ) {
-	if( k->pkt->pkttype == PKT_USER_ID
-	    && !compare_name( k->pkt->pkt.user_id->name,
-			      k->pkt->pkt.user_id->len, name, mode)) {
-	    /* we found a matching name, look for the key */
-	    for(kk=keyblock; kk; kk = kk->next ) {
-		if( (	 kk->pkt->pkttype == PKT_PUBLIC_KEY
-		      || kk->pkt->pkttype == PKT_PUBLIC_SUBKEY )
-		    && ( !pk->pubkey_algo
-			 || pk->pubkey_algo
-			    == kk->pkt->pkt.public_key->pubkey_algo)
-		    && ( !pk->pubkey_usage
-			 || !check_pubkey_algo2(
-			       kk->pkt->pkt.public_key->pubkey_algo,
-						   pk->pubkey_usage ))
-		  )
-		    break;
-	    }
-	    if( kk ) {
-		u32 aki[2];
-		keyid_from_pk( kk->pkt->pkt.public_key, aki );
-		cache_user_id( k->pkt->pkt.user_id, aki );
-		if( k->pkt->pkt.user_id->photo )
-		    rmd160_hash_buffer( namehash,
-					k->pkt->pkt.user_id->photo,
-					k->pkt->pkt.user_id->photolen );
-		else
-		    rmd160_hash_buffer( namehash,
-					k->pkt->pkt.user_id->name,
-					k->pkt->pkt.user_id->len );
-		*use_namehash = 1;
-		return kk;
-	    }
-	    else if( is_RSA(pk->pubkey_algo) )
-		log_error(_("RSA key cannot be used in this version\n"));
-	    else
-		log_error(_("No key for user ID\n"));
-	}
+    /* ditto or the key expiration */
+    uid->help_key_expire = 0;
+    p = parse_sig_subpkt ( sig->hashed_data, SIGSUBPKT_KEY_EXPIRE, NULL);
+    if ( p ) {
+        uid->help_key_expire = sig->timestamp + buffer_to_u32(p);
     }
-    return NULL;
+
+    /* Set the primary user ID flag - we will later wipe out some
+     * of them to only have one in out keyblock */
+    uid->is_primary = 0;
+    p = parse_sig_subpkt ( sig->hashed_data, SIGSUBPKT_PRIMARY_UID, NULL );
+    if ( p && *p )
+        uid->is_primary = 1;
+    /* We could also query this from the unhashed area if it is not in
+     * the hased area and then later try to decide which is the better
+     * there should be no security problem with this.
+     * For now we only look at the hashed one. 
+     */
 }
 
-static KBNODE
-find_by_name_sk( KBNODE keyblock, PKT_secret_key *sk, const char *name,
-		 int mode )
+static void
+merge_selfsigs_main( KBNODE keyblock, int *r_revoked )
 {
-    KBNODE k, kk;
+    PKT_public_key *pk = NULL;
+    KBNODE k;
+    u32 kid[2];
+    u32 sigdate = 0, uiddate=0, uiddate2;
+    KBNODE signode, uidnode, uidnode2;
+    u32 curtime = make_timestamp ();
+    unsigned int key_usage = 0;
+    u32 key_expire = 0;
+    int key_expire_seen = 0;
+
+    *r_revoked = 0;
+    if ( keyblock->pkt->pkttype != PKT_PUBLIC_KEY )
+        BUG ();
+    pk = keyblock->pkt->pkt.public_key;
+    pk->created = 0;
+    keyid_from_pk( pk, kid );
+    pk->main_keyid[0] = kid[0];
+    pk->main_keyid[1] = kid[1];
+
+    if ( pk->version < 4 ) {
+        /* before v4 the key packet itself contains the expiration date
+         * and there was noway to change it.  So we also use only the
+         * one from the key packet */
+        key_expire = pk->expiredate;
+        key_expire_seen = 1;
+    }
 
-    for(k=keyblock; k; k = k->next ) {
-	if( k->pkt->pkttype == PKT_USER_ID
-	    && !compare_name( k->pkt->pkt.user_id->name,
-			      k->pkt->pkt.user_id->len, name, mode)) {
-	    /* we found a matching name, look for the key */
-	    for(kk=keyblock; kk; kk = kk->next ) {
-		if( (	 kk->pkt->pkttype == PKT_SECRET_KEY
-		      || kk->pkt->pkttype == PKT_SECRET_SUBKEY )
-		    && ( !sk->pubkey_algo
-			 || sk->pubkey_algo
-			    == kk->pkt->pkt.secret_key->pubkey_algo)
-		    && ( !sk->pubkey_usage
-			 || !check_pubkey_algo2(
-			       kk->pkt->pkt.secret_key->pubkey_algo,
-						   sk->pubkey_usage ))
-		  )
-		    break;
-	    }
-	    if( kk ) {
-		u32 aki[2];
-		keyid_from_sk( kk->pkt->pkt.secret_key, aki );
-		cache_user_id( k->pkt->pkt.user_id, aki );
-		return kk;
-	    }
-	    else if( is_RSA(sk->pubkey_algo) )
-		log_error(_("RSA key cannot be used in this version\n"));
-	    else
-		log_error(_("No key for user ID\n"));
-	}
+    /* first pass: find the latest direct key self-signature.
+     * We assume that the newest one overrides all others
+     */
+    signode = NULL;
+    sigdate = 0; /* helper to find the latest signature */
+    for(k=keyblock; k && k->pkt->pkttype != PKT_PUBLIC_SUBKEY; k = k->next ) {
+        if ( k->pkt->pkttype == PKT_SIGNATURE ) {
+            PKT_signature *sig = k->pkt->pkt.signature;
+            if ( sig->keyid[0] == kid[0] && sig->keyid[1]==kid[1] ) { 
+           	if ( check_key_signature( keyblock, k, NULL ) )
+                    ; /* signature did not verify */
+                else if ( IS_KEY_REV (sig) ){
+                    /* key has been revoked - there is no way to override
+                     * such a revocation, so we can stop now.
+                     * we can't cope with expiration times for revocations
+                     * here because we have to assumethat an attacker can
+                     * generate all kinds of signatures.
+                     */ 
+                    *r_revoked = 1;
+                    return;
+                }
+                else if ( IS_KEY_SIG (sig) && sig->timestamp >= sigdate ) {
+                    const byte *p;
+                    
+                    p = parse_sig_subpkt( sig->hashed_data,
+                                          SIGSUBPKT_SIG_EXPIRE, NULL );
+                    if ( p && (sig->timestamp + buffer_to_u32(p)) >= curtime )
+                        ; /* signature has expired - ignore it */
+                    else {
+                        sigdate = sig->timestamp;
+                        signode = k;
+                    }
+                }
+            }
+        }
     }
-    return NULL;
+
+    if ( signode ) {
+        /* some information from a direct key signature take precedence
+         * over the same information given in UID sigs.
+         */
+        PKT_signature *sig = signode->pkt->pkt.signature;
+        const byte *p;
+        size_t n;
+        
+        p = parse_sig_subpkt ( sig->hashed_data, SIGSUBPKT_KEY_FLAGS, &n );
+        if ( p && n ) {
+            /* first octet of the keyflags */   
+            if ( (*p & 3) )
+                key_usage |= PUBKEY_USAGE_SIG;
+            if ( (*p & 12) )    
+                key_usage |= PUBKEY_USAGE_ENC;
+        }
+
+        if ( pk->version > 3 ) {
+            p = parse_sig_subpkt ( sig->hashed_data,
+                                   SIGSUBPKT_KEY_EXPIRE, NULL);
+            if ( p ) {
+                key_expire = sig->timestamp + buffer_to_u32(p);
+                key_expire_seen = 1;
+            }
+        }
+        /* and set the created field */
+        pk->created = sigdate;
+        /* and mark that key as valid: one direct key signature should 
+         * render a key as valid */
+        pk->is_valid = 1;
+    }
+
+
+    /* second pass: look at the self-signature of all user IDs */
+    signode = uidnode = NULL;
+    sigdate = 0; /* helper to find the latest signature in one user ID */
+    uiddate = 0; /* and over of all user IDs */
+    for(k=keyblock; k && k->pkt->pkttype != PKT_PUBLIC_SUBKEY; k = k->next ) {
+	if ( k->pkt->pkttype == PKT_USER_ID
+             || k->pkt->pkttype == PKT_PHOTO_ID ) {
+            if ( uidnode ) 
+                fixup_uidnode ( uidnode, signode );
+            uidnode = k;
+            signode = NULL;
+            if ( sigdate > uiddate )
+                uiddate = sigdate;
+            sigdate = 0;
+      	}
+        else if ( k->pkt->pkttype == PKT_SIGNATURE && uidnode ) {
+            PKT_signature *sig = k->pkt->pkt.signature;
+            if ( sig->keyid[0] == kid[0] && sig->keyid[1]==kid[1] ) { 
+                if ( check_key_signature( keyblock, k, NULL ) )
+                    ; /* signature did not verify */
+                else if ( IS_UID_SIG (sig) || IS_UID_REV (sig)) {
+                    /* Note: we allow to invalidated cert revocations
+                     * by a newer signature.  An attacker can't use this
+                     * because a key should be revoced with a key revocation.
+                     * The reason why we have to allow for that is that at
+                     * one time an email address may become invalid but later
+                     * the same email address may become valid again (hired,
+                     * fired, hired again).
+                     */                    
+                    const byte *p;
+                    
+                    p = parse_sig_subpkt( sig->hashed_data,
+                                          SIGSUBPKT_SIG_EXPIRE, NULL );
+                    if ( p && (sig->timestamp + buffer_to_u32(p)) >= curtime )
+                        ; /* signature/revocation has expired - ignore it */
+                    else {
+                        sigdate = sig->timestamp;
+                        signode = k;
+                    }
+                }
+            }
+        }
+    }
+    if ( uidnode ) {
+        fixup_uidnode ( uidnode, signode );
+        pk->is_valid = 1;
+    }
+    if ( sigdate > uiddate )
+        uiddate = sigdate;
+    /* if we do not have a direct key signature, take the key creation date
+     * from the latest user ID.  Hmmm, another possibilty would be to take 
+     * it from the latest primary user ID - but we don't implement it for
+     * now */
+    if ( !pk->created )
+        pk->created = uiddate;
+    if ( !pk->created ) {
+        /* oops, still no creation date: use the timestamp */
+        if (DBG_CACHE)
+            log_debug( "merge_selfsigs_main: "
+                       "using timestamp as creation date\n");    
+        pk->created = pk->timestamp;
+    }
+
+    /* Now that we had a look at all user IDs we can now get some information
+     * from those user IDs.
+     */
+    
+    if ( !key_usage ) {
+        /* find the latest user ID with key flags set */
+        uiddate = 0; /* helper to find the latest user ID */
+        for(k=keyblock; k && k->pkt->pkttype != PKT_PUBLIC_SUBKEY;
+            k = k->next ) {
+            if ( k->pkt->pkttype == PKT_USER_ID
+                 || k->pkt->pkttype == PKT_PHOTO_ID ) {
+                PKT_user_id *uid = k->pkt->pkt.user_id;
+                if ( uid->help_key_usage && uid->created > uiddate ) {
+                    key_usage = uid->help_key_usage;
+                    uiddate = uid->created;
+                }
+            }
+      	}
+    }
+    if ( !key_usage ) { /* no key flags at all: get it from the algo */
+        key_usage = openpgp_pk_algo_usage ( pk->pubkey_algo );
+    }
+    else { /* check that the usage matches the usage as given by the algo */
+        int x = openpgp_pk_algo_usage ( pk->pubkey_algo );
+        if ( x ) /* mask it down to the actual allowed usage */
+            key_usage &= x; 
+    }
+    pk->pubkey_usage = key_usage;
+
+
+    if ( !key_expire_seen ) {
+        /* find the latest valid user ID with a key expiration set 
+         * Note, that this may be a diferent one from the above because
+         * some user IDs may have no expiration date set */
+        uiddate = 0; 
+        for(k=keyblock; k && k->pkt->pkttype != PKT_PUBLIC_SUBKEY;
+            k = k->next ) {
+            if ( k->pkt->pkttype == PKT_USER_ID
+                 || k->pkt->pkttype == PKT_PHOTO_ID ) {
+                PKT_user_id *uid = k->pkt->pkt.user_id;
+                if ( uid->help_key_expire && uid->created > uiddate ) {
+                    key_expire = uid->help_key_expire;
+                    uiddate = uid->created;
+                }
+            }
+      	}
+    }
+   
+    pk->has_expired = key_expire >= curtime? 0 : key_expire;
+    /* FIXME: we should see how to get rid of the expiretime fields */
+
+
+    /* and now find the real primary user ID and delete all others */
+    uiddate = uiddate2 = 0;
+    uidnode = uidnode2 = NULL;
+    for(k=keyblock; k && k->pkt->pkttype != PKT_PUBLIC_SUBKEY; k = k->next ) {
+        if ( k->pkt->pkttype == PKT_USER_ID
+             || k->pkt->pkttype == PKT_PHOTO_ID ) {
+            PKT_user_id *uid = k->pkt->pkt.user_id;
+            if ( uid->is_primary && uid->created > uiddate ) {
+                uiddate = uid->created;
+                uidnode = k;
+            }
+            if ( !uid->is_primary && uid->created > uiddate2 ) {
+                uiddate2 = uid->created;
+                uidnode2 = k;
+            }
+        }
+    }
+    if ( uidnode ) {
+        for(k=keyblock; k && k->pkt->pkttype != PKT_PUBLIC_SUBKEY;
+            k = k->next ) {
+            if ( k->pkt->pkttype == PKT_USER_ID
+                 || k->pkt->pkttype == PKT_PHOTO_ID ) {
+                PKT_user_id *uid = k->pkt->pkt.user_id;
+                if ( k != uidnode ) 
+                    uid->is_primary = 0;
+            }
+        }
+    }
+    else if( uidnode2 ) {
+        /* none is flagged primary - use the latest user ID we have */
+        uidnode2->pkt->pkt.user_id->is_primary = 1;
+    }
+
 }
 
 
-static KBNODE
-find_by_keyid( KBNODE keyblock, PKT_public_key *pk, u32 *keyid, int mode )
+static void
+merge_selfsigs_subkey( KBNODE keyblock, KBNODE subnode )
 {
+    PKT_public_key *mainpk = NULL, *subpk = NULL;
+    PKT_signature *sig;
     KBNODE k;
+    u32 mainkid[2];
+    u32 sigdate = 0;
+    KBNODE signode;
+    u32 curtime = make_timestamp ();
+    unsigned int key_usage = 0;
+    u32 key_expire = 0;
+    const byte *p;
+    size_t n;
+
+    if ( subnode->pkt->pkttype != PKT_PUBLIC_SUBKEY )
+        BUG ();
+    mainpk = keyblock->pkt->pkt.public_key;
+    if ( mainpk->version < 4 )
+        return; /* (actually this should never happen) */
+    keyid_from_pk( mainpk, mainkid );
+    subpk = subnode->pkt->pkt.public_key;
+    subpk->is_valid = 0;
+    subpk->main_keyid[0] = mainpk->main_keyid[0];
+    subpk->main_keyid[1] = mainpk->main_keyid[1];
+    if ( subpk->version < 4 )
+        return; /* there are no v3 subkeys */
+
+    /* find the latest key binding self-signature. */
+    signode = NULL;
+    sigdate = 0; /* helper to find the latest signature */
+    for(k=subnode->next; k && k->pkt->pkttype != PKT_PUBLIC_SUBKEY;
+                                                        k = k->next ) {
+        if ( k->pkt->pkttype == PKT_SIGNATURE ) {
+            sig = k->pkt->pkt.signature;
+            if ( sig->keyid[0] == mainkid[0] && sig->keyid[1]==mainkid[1] ) { 
+           	if ( check_key_signature( keyblock, k, NULL ) )
+                    ; /* signature did not verify */
+                else if ( IS_SUBKEY_REV (sig) ) {
+                    /* key has been revoked - given the fact that it is easy
+                     * to create a new subkey, it does not make sense to
+                     * revive a revoked key.  So we can stop here.
+                     */
+                    subpk->is_revoked = 1;
+                    return;
+                }
+                else if ( IS_SUBKEY_SIG (sig) && sig->timestamp >= sigdate ) {
+                    p = parse_sig_subpkt( sig->hashed_data,
+                                          SIGSUBPKT_SIG_EXPIRE, NULL );
+                    if ( p && (sig->timestamp + buffer_to_u32(p)) >= curtime )
+                        ; /* signature has expired - ignore it */
+                    else {
+                        sigdate = sig->timestamp;
+                        signode = k;
+                    }
+                }
+            }
+        }
+    }
 
-    if( DBG_CACHE )
-	log_debug("lookup keyid=%08lx%08lx req_algo=%d mode=%d\n",
-		   (ulong)keyid[0], (ulong)keyid[1], pk->pubkey_algo, mode );
+    if ( !signode ) {
+        subpk->created = subpk->timestamp;
+        return;  /* no valid key binding */
+    }
 
-    for(k=keyblock; k; k = k->next ) {
-	if(    k->pkt->pkttype == PKT_PUBLIC_KEY
-	    || k->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
-	    u32 aki[2];
-	    keyid_from_pk( k->pkt->pkt.public_key, aki );
-	    if( DBG_CACHE )
-		log_debug("         aki=%08lx%08lx algo=%d\n",
-				(ulong)aki[0], (ulong)aki[1],
-				 k->pkt->pkt.public_key->pubkey_algo	);
-
-	    if( aki[1] == keyid[1]
-		&& ( mode == 10 || aki[0] == keyid[0] )
-		&& ( !pk->pubkey_algo
-		     || pk->pubkey_algo
-			== k->pkt->pkt.public_key->pubkey_algo) ){
-		KBNODE kk;
-		/* cache the userid */
-		for(kk=keyblock; kk; kk = kk->next )
-		    if( kk->pkt->pkttype == PKT_USER_ID )
-			break;
-		if( kk )
-		    cache_user_id( kk->pkt->pkt.user_id, aki );
-		else
-		    log_error(_("No user ID for key\n"));
-		return k; /* found */
-	    }
-	}
+    subpk->is_valid = 1;
+    subpk->created = sigdate; 
+    sig = signode->pkt->pkt.signature;
+        
+    p = parse_sig_subpkt ( sig->hashed_data, SIGSUBPKT_KEY_FLAGS, &n );
+    if ( p && n ) {
+        /* first octet of the keyflags */   
+        if ( (*p & 3) )
+            key_usage |= PUBKEY_USAGE_SIG;
+        if ( (*p & 12) )    
+            key_usage |= PUBKEY_USAGE_ENC;
     }
-    return NULL;
+    if ( !key_usage ) { /* no key flags at all: get it from the algo */
+        key_usage = openpgp_pk_algo_usage ( subpk->pubkey_algo );
+    }
+    else { /* check that the usage matches the usage as given by the algo */
+        int x = openpgp_pk_algo_usage ( subpk->pubkey_algo );
+        if ( x ) /* mask it down to the actual allowed usage */
+            key_usage &= x; 
+    }
+    subpk->pubkey_usage = key_usage;
+    
+    p = parse_sig_subpkt ( sig->hashed_data, SIGSUBPKT_KEY_EXPIRE, NULL);
+    if ( p ) 
+        key_expire = sig->timestamp + buffer_to_u32(p);
+    else
+        key_expire = 0;
+    subpk->has_expired = key_expire >= curtime? 0 : key_expire;
 }
 
-static KBNODE
-find_by_keyid_sk( KBNODE keyblock, PKT_secret_key *sk, u32 *keyid, int mode )
+
+
+/* 
+ * Merge information from the self-signatures with the key, so that
+ * we can later use them more easy.
+ * The function works by first applying the self signatures to the
+ * primary key and the to each subkey.
+ * Here are the rules we use to decide which inormation from which
+ * self-signature is used:
+ * We check all self signatures or validity and ignore all invalid signatures.
+ * All signatures are then ordered by their creation date ....
+ * For the primary key:
+ *   FIXME the docs    
+ */
+static void
+merge_selfsigs( KBNODE keyblock )
 {
     KBNODE k;
+    int revoked;
+    PKT_public_key *main_pk;
+
+    if ( keyblock->pkt->pkttype != PKT_PUBLIC_KEY )
+        BUG ();
+
+    merge_selfsigs_main ( keyblock, &revoked );
+    main_pk = keyblock->pkt->pkt.public_key;
+    if ( revoked ) {
+        /* if the primary key has been revoked we better set the revoke
+         * flag on that key and all subkeys */
+        for(k=keyblock; k; k = k->next ) {
+            if ( k->pkt->pkttype == PKT_PUBLIC_KEY
+                || k->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
+                PKT_public_key *pk = k->pkt->pkt.public_key;
+                pk->is_revoked = 1;
+                pk->main_keyid[0] = main_pk->main_keyid[0];
+                pk->main_keyid[1] = main_pk->main_keyid[1];
+            }
+	}
+        return;
+    }
 
-    if( DBG_CACHE )
-	log_debug("lookup_sk keyid=%08lx%08lx req_algo=%d mode=%d\n",
-		   (ulong)keyid[0], (ulong)keyid[1], sk->pubkey_algo, mode );
-
+    /* now merge in the data from each of the subkeys */
     for(k=keyblock; k; k = k->next ) {
-	if(    k->pkt->pkttype == PKT_SECRET_KEY
-	    || k->pkt->pkttype == PKT_SECRET_SUBKEY ) {
-	    u32 aki[2];
-	    keyid_from_sk( k->pkt->pkt.secret_key, aki );
-	    if( DBG_CACHE )
-		log_debug("         aki=%08lx%08lx algo=%d\n",
-				(ulong)aki[0], (ulong)aki[1],
-				 k->pkt->pkt.secret_key->pubkey_algo	);
-
-	    if( aki[1] == keyid[1]
-		&& ( mode == 10 || aki[0] == keyid[0] )
-		&& ( !sk->pubkey_algo
-		     || sk->pubkey_algo
-			== k->pkt->pkt.secret_key->pubkey_algo) ){
-		KBNODE kk;
-		/* cache the userid */
-		for(kk=keyblock; kk; kk = kk->next )
-		    if( kk->pkt->pkttype == PKT_USER_ID )
-			break;
-		if( kk )
-		    cache_user_id( kk->pkt->pkt.user_id, aki );
-		else
-		    log_error(_("No user ID for key\n"));
-		return k; /* found */
-	    }
-	}
+	if (  k->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
+            merge_selfsigs_subkey ( keyblock, k );
+        }
     }
-    return NULL;
 }
 
 
-static KBNODE
-find_first( KBNODE keyblock, PKT_public_key *pk )
+/*
+ * Merge the secret keys from secblock into the pubblock thereby
+ * replacing the public (sub)keys with their secret counterparts Hmmm:
+ * It might be better to get away from the concept of entire secret
+ * keys at all and have a way to store just the real secret parts
+ * from the key.
+ */
+static void
+merge_public_with_secret ( KBNODE pubblock, KBNODE secblock )
 {
-    KBNODE k;
+    KBNODE pub;
+
+    assert ( pubblock->pkt->pkttype == PKT_PUBLIC_KEY );
+    assert ( secblock->pkt->pkttype == PKT_SECRET_KEY );
+    
+    for (pub=pubblock; pub; pub = pub->next ) {
+        if ( pub->pkt->pkttype == PKT_PUBLIC_KEY ) {
+             PKT_public_key *pk = pub->pkt->pkt.public_key;
+             PKT_secret_key *sk = secblock->pkt->pkt.secret_key;
+             assert ( pub == pubblock ); /* only in the first node */
+             /* there is nothing to compare in this case, so just replace
+              * some information */
+             copy_public_parts_to_secret_key ( pk, sk );
+             free_public_key ( pk );
+             pub->pkt->pkttype = PKT_SECRET_KEY;
+             pub->pkt->pkt.secret_key = copy_secret_key (NULL, sk);
+        }
+        else if ( pub->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
+            KBNODE sec;
+            PKT_public_key *pk = pub->pkt->pkt.public_key;
+
+            /* this is more complicated: it may happen that the sequence
+             * of the subkeys dosn't match, so we have to find the
+             * appropriate secret key */
+            for (sec=secblock->next; sec; sec = sec->next ) {
+                if ( sec->pkt->pkttype == PKT_SECRET_SUBKEY ) {
+                    PKT_secret_key *sk = sec->pkt->pkt.secret_key;
+                    if ( !cmp_public_secret_key ( pk, sk ) ) {
+                        copy_public_parts_to_secret_key ( pk, sk );
+                        free_public_key ( pk );
+                        pub->pkt->pkttype = PKT_SECRET_KEY;
+                        pub->pkt->pkt.secret_key = copy_secret_key (NULL, sk);
+                        break;
+                    }
+                }
+            }
+            if ( !sec ) 
+                BUG(); /* already checked in premerge */
+        }
+    }
+}
 
-    for(k=keyblock; k; k = k->next ) {
-	if(    k->pkt->pkttype == PKT_PUBLIC_KEY
-	    || k->pkt->pkttype == PKT_PUBLIC_SUBKEY )
-	{
-	    if( !pk->pubkey_algo
-		|| pk->pubkey_algo == k->pkt->pkt.public_key->pubkey_algo )
-		return k;
-	}
+/* This function checks that for every public subkey a corresponding
+ * secret subkey is avalable and deletes the public subkey otherwise.
+ * We need this function becuase we can'tdelete it later when we
+ * actually merge the secret parts into the pubring.
+ */
+static void
+premerge_public_with_secret ( KBNODE pubblock, KBNODE secblock )
+{
+    KBNODE last, pub;
+
+    assert ( pubblock->pkt->pkttype == PKT_PUBLIC_KEY );
+    assert ( secblock->pkt->pkttype == PKT_SECRET_KEY );
+    
+    for (pub=pubblock,last=NULL; pub; last = pub, pub = pub->next ) {
+        if ( pub->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
+            KBNODE sec;
+            PKT_public_key *pk = pub->pkt->pkt.public_key;
+
+            for (sec=secblock->next; sec; sec = sec->next ) {
+                if ( sec->pkt->pkttype == PKT_SECRET_SUBKEY ) {
+                    PKT_secret_key *sk = sec->pkt->pkt.secret_key;
+                    if ( !cmp_public_secret_key ( pk, sk ) ) 
+                        break;
+                }
+            }
+            if ( !sec ) {
+                KBNODE next, ll;
+                log_error ( "no corresponding secret subkey "
+                            "for public subkey - removing\n" );
+                /* we have to remove the subkey in this case */
+                assert ( last );
+                /* find the next subkey */
+                for (next=pub->next,ll=pub;
+                     next && pub->pkt->pkttype != PKT_PUBLIC_SUBKEY;
+                     ll = next, next = next->next ) 
+                    ;
+                /* make new link */
+                last->next = next;
+                /* release this public subkey with all sigs */
+                ll->next = NULL;
+                release_kbnode( pub );
+                /* let the loop continue */
+                pub = last;
+            }
+        }
     }
-    return NULL;
 }
 
-static KBNODE
-find_first_sk( KBNODE keyblock, PKT_secret_key *sk )
+
+
+
+/************************************************
+ ************* Find stuff ***********************
+ ************************************************/
+
+static int 
+find_by_name( KBNODE keyblock, const char *name,
+	      int mode, byte *namehash )
 {
     KBNODE k;
 
     for(k=keyblock; k; k = k->next ) {
-	if(    k->pkt->pkttype == PKT_SECRET_KEY
-	    || k->pkt->pkttype == PKT_SECRET_SUBKEY )
-	{
-	    if( !sk->pubkey_algo
-		|| sk->pubkey_algo == k->pkt->pkt.secret_key->pubkey_algo )
-		return k;
-	}
+	if( k->pkt->pkttype == PKT_USER_ID
+	    && !compare_name( k->pkt->pkt.user_id->name,
+			      k->pkt->pkt.user_id->len, name, mode)) {
+	    /* we found a matching name, look for the key */
+            if( k->pkt->pkt.user_id->photo ) {
+                /* oops: this can never happen */
+                rmd160_hash_buffer( namehash,
+                                    k->pkt->pkt.user_id->photo,
+                                    k->pkt->pkt.user_id->photolen );
+            }
+            else {
+                rmd160_hash_buffer( namehash,
+                                    k->pkt->pkt.user_id->name,
+                                    k->pkt->pkt.user_id->len );
+            }
+            return 1; 
+        }
     }
-    return NULL;
+    
+    return 0;
 }
 
 
+
 static KBNODE
-find_by_fpr( KBNODE keyblock, PKT_public_key *pk, const char *name, int mode )
+find_by_keyid( KBNODE keyblock, u32 *keyid, int mode )
 {
     KBNODE k;
 
     for(k=keyblock; k; k = k->next ) {
 	if(    k->pkt->pkttype == PKT_PUBLIC_KEY
 	    || k->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
-	    byte afp[MAX_FINGERPRINT_LEN];
-	    size_t an;
-
-	    fingerprint_from_pk(k->pkt->pkt.public_key, afp, &an );
-
-	    if( DBG_CACHE ) {
-		u32 aki[2];
-		keyid_from_pk( k->pkt->pkt.public_key, aki );
-		log_debug("         aki=%08lx%08lx algo=%d mode=%d an=%u\n",
-				(ulong)aki[0], (ulong)aki[1],
-			k->pkt->pkt.public_key->pubkey_algo, mode,
-							    (unsigned)an );
+	    u32 aki[2];
+	    keyid_from_pk( k->pkt->pkt.public_key, aki );
+	    if( aki[1] == keyid[1] && ( mode == 10 || aki[0] == keyid[0] ) ) {
+                return k; /* found */
 	    }
-
-	    if( an == mode
-		&& !memcmp( afp, name, an)
-		&& ( !pk->pubkey_algo
-		     || pk->pubkey_algo == k->pkt->pkt.public_key->pubkey_algo) )
-		return k;
 	}
     }
     return NULL;
 }
 
+
+
 static KBNODE
-find_by_fpr_sk( KBNODE keyblock, PKT_secret_key *sk,
-				 const char *name, int mode )
+find_by_fpr( KBNODE keyblock,  const char *name, int mode )
 {
     KBNODE k;
 
     for(k=keyblock; k; k = k->next ) {
-	if(    k->pkt->pkttype == PKT_SECRET_KEY
-	    || k->pkt->pkttype == PKT_SECRET_SUBKEY ) {
+	if(    k->pkt->pkttype == PKT_PUBLIC_KEY
+	    || k->pkt->pkttype == PKT_PUBLIC_SUBKEY ) {
 	    byte afp[MAX_FINGERPRINT_LEN];
 	    size_t an;
 
-	    fingerprint_from_sk(k->pkt->pkt.secret_key, afp, &an );
-
-	    if( DBG_CACHE ) {
-		u32 aki[2];
-		keyid_from_sk( k->pkt->pkt.secret_key, aki );
-		log_debug("         aki=%08lx%08lx algo=%d mode=%d an=%u\n",
-				(ulong)aki[0], (ulong)aki[1],
-			k->pkt->pkt.secret_key->pubkey_algo, mode,
-							(unsigned)an );
-	    }
-
-	    if( an == mode
-		&& !memcmp( afp, name, an)
-		&& ( !sk->pubkey_algo
-		     || sk->pubkey_algo == k->pkt->pkt.secret_key->pubkey_algo) )
-		return k;
+	    fingerprint_from_pk(k->pkt->pkt.public_key, afp, &an );
+            if ( mode == 21 ) {
+                /* Unified fingerprint. The fingerprint is always 20 bytes*/
+                while ( an < 20 )
+                    afp[an++] = 0;
+                if ( !memcmp( afp, name, 20 ) )
+                    return k;
+            }
+	    else { 
+                if( an == mode && !memcmp( afp, name, an) ) {
+                    return k;
+                }
+            }
 	}
     }
     return NULL;
 }
 
 
-/****************
- * Return the expiretime of a subkey.
- */
-static u32
-subkeys_expiretime( KBNODE node, u32 *mainkid )
-{
-    KBNODE k;
-    PKT_signature *sig;
-    u32 expires = 0, sigdate = 0;
-
-    assert( node->pkt->pkttype == PKT_PUBLIC_SUBKEY );
-    for(k=node->next; k; k = k->next ) {
-	if( k->pkt->pkttype == PKT_SIGNATURE
-	    && (sig=k->pkt->pkt.signature)->sig_class == 0x18
-	    && sig->keyid[0] == mainkid[0]
-	    && sig->keyid[1] == mainkid[1]
-	    && sig->version > 3
-	    && sig->timestamp > sigdate ) {
-	    /* okay this is a key-binding which can be used.
-	     * We use the latest self-signature.
-	     * FIXME: We should only use this if the binding signature is valid
-	     *	      but this is time consuming - we must provide another
-	     *	      way to handle this
-	     */
-	    const byte *p;
-	    u32 ed;
-
-	    p = parse_sig_subpkt( sig->hashed_data, SIGSUBPKT_KEY_EXPIRE, NULL );
-	    ed = p? node->pkt->pkt.public_key->timestamp + buffer_to_u32(p):0;
-	    sigdate = sig->timestamp;
-	    expires = ed;
-	}
-	else if( k->pkt->pkttype == PKT_PUBLIC_SUBKEY )
-	    break; /* stop at the next subkey */
-    }
-
-    return expires;
-}
 
 
-/****************
- * Check whether the subkey has expired.  Node must point to the subkey
+/* See see whether the key fits
+ * our requirements and in case we do not
+ * request a the primary key, we should select
+ * a suitable subkey.
+ * FIXME: Check against PGP 7 whether we still need a kludge
+ *        to favor type 16 keys over type 20 keys when type 20
+ *        has not been explitely requested.
+ * Returns: True when a suitable key has been found.
+ *
+ * We have to distinguish four cases:
+ *  1. No usage and no primary key requested
+ *     Examples for this case are that we have a keyID to be used
+ *     for decrytion or verification.
+ *  2. No usage but primary key requested
+ *     This is the case for all functions which work on an
+ *     entire keyblock, e.g. for editing or listing
+ *  3. Usage and primary key requested
+ *     FXME
+ *  4. Usage but no primary key requested
+ *     FIXME
+ * FIXME: Tell what is going to happen here and something about the rationale
+ *
  */
+
 static int
-has_expired( KBNODE node, u32 *mainkid, u32 cur_time )
+finish_lookup( GETKEY_CTX ctx,  KBNODE foundk )
 {
-    u32 expires = subkeys_expiretime( node, mainkid );
-    return expires && expires <= cur_time;
-}
+    KBNODE keyblock = ctx->keyblock;
+    KBNODE k;
+  #define USAGE_MASK  (PUBKEY_USAGE_SIG|PUBKEY_USAGE_ENC)
+    unsigned int req_usage = ( ctx->req_usage & USAGE_MASK );
+    u32 latest_date;
+    KBNODE latest_key;
 
-static void
-finish_lookup( KBNODE keyblock, PKT_public_key *pk, KBNODE k, byte *namehash,
-					       int use_namehash, int primary )
-{
-    assert(    k->pkt->pkttype == PKT_PUBLIC_KEY
-	    || k->pkt->pkttype == PKT_PUBLIC_SUBKEY );
+    assert( !foundk || foundk->pkt->pkttype == PKT_PUBLIC_KEY
+	            || foundk->pkt->pkttype == PKT_PUBLIC_SUBKEY );
     assert( keyblock->pkt->pkttype == PKT_PUBLIC_KEY );
-    if( primary && !pk->pubkey_usage ) {
-	copy_public_key_new_namehash( pk, keyblock->pkt->pkt.public_key,
-				      use_namehash? namehash:NULL);
-	merge_one_pk_and_selfsig( keyblock, keyblock, pk );
-    }
-    else {
-	if( primary && pk->pubkey_usage == PUBKEY_USAGE_ENC
-            && keyblock->pkt->pkt.public_key->version > 3
-            && keyblock->pkt->pkt.public_key->pubkey_algo == PUBKEY_ALGO_RSA
-            && k->pkt->pkttype == PKT_PUBLIC_KEY ) {
-	    /* Ugly hack to support v4 RSA keys.  Here we assume that the
-               primary key should be used only for signing and a subkey
-               should be used for encryption.  So now look for a subkey.
-            */
-            KBNODE save_k = k;
-	    u32 mainkid[2];
-	    u32 cur_time = make_timestamp();
-
-	    keyid_from_pk( keyblock->pkt->pkt.public_key, mainkid );
-
-            for(k = save_k ; k; k = k->next ) {
-                if( k->pkt->pkttype == PKT_PUBLIC_SUBKEY
-                    && !check_pubkey_algo2(
-                        k->pkt->pkt.public_key->pubkey_algo,
-                        pk->pubkey_usage )
-                    && !has_expired( k, mainkid, cur_time )
-                    )
-                    break;
+   
+    ctx->found_key = NULL;
+    
+    if ( DBG_CACHE )
+        log_debug( "finish_lookup: checking %s (req_usage=%x)\n",
+                   foundk? "one key":"all keys", req_usage);
+
+    latest_date = 0;
+    latest_key  = NULL;
+    /* We do check the subkeys only if we either have requested a specific
+     * usage or have not requested to get the primary key. */
+    if ( (req_usage || !ctx->primary)
+         && (!foundk || foundk->pkt->pkttype == PKT_PUBLIC_SUBKEY) ) {
+        KBNODE nextk;
+        /* either start a loop or check just this one subkey */
+        for (k=foundk?foundk:keyblock; k; k = nextk ) {
+            PKT_public_key *pk;
+            nextk = k->next;
+            if ( k->pkt->pkttype != PKT_PUBLIC_SUBKEY )
+                continue;
+            if ( foundk )
+                nextk = NULL;  /* what a hack */
+            pk = k->pkt->pkt.public_key;
+            if ( !pk->is_valid ) {
+                if (DBG_CACHE)
+                    log_debug( "\tsubkey not valid\n");
+                continue;
+            }
+            if ( pk->is_revoked ) {
+                if (DBG_CACHE)
+                    log_debug( "\tsubkey has been revoked\n");
+                continue;
+            }
+            if ( pk->has_expired ) {
+                if (DBG_CACHE)
+                    log_debug( "\tsubkey has expired\n");
+                continue;
+            }
+            
+            if ( req_usage &&
+                 !((pk->pubkey_usage&USAGE_MASK) & req_usage) ) {
+                if (DBG_CACHE)
+                    log_debug( "\tusage does not match: want=%x have=%x\n",
+                               req_usage, pk->pubkey_usage );
+                continue;
             }
-	    
-	    if( !k )
-		k = save_k; /* not found: better use the main key instead */
-	    else
-		log_info(_("using secondary key %08lX "
-			   "instead of primary key %08lX\n"),
-		      (ulong)keyid_from_pk( k->pkt->pkt.public_key, NULL),
-		      (ulong)keyid_from_pk( save_k->pkt->pkt.public_key, NULL)
-			);
-	}
-	else if( primary && pk->pubkey_usage
-	    && check_pubkey_algo2( k->pkt->pkt.public_key->pubkey_algo,
-		       pk->pubkey_usage ) == G10ERR_WR_PUBKEY_ALGO ) {
-	    /* if the usage is not correct, try to use a subkey */
-	    KBNODE save_k = k;
-	    u32 mainkid[2];
-	    u32 cur_time = make_timestamp();
-
-	    keyid_from_pk( keyblock->pkt->pkt.public_key, mainkid );
-
-	    k = NULL;
-	    /* kludge for pgp 5: which doesn't accept type 20:
-	     * try to use a type 16 subkey instead */
-	    if( pk->pubkey_usage == PUBKEY_USAGE_ENC ) {
-		for( k = save_k; k; k = k->next ) {
-		    if( k->pkt->pkttype == PKT_PUBLIC_SUBKEY
-			&& k->pkt->pkt.public_key->pubkey_algo
-			    == PUBKEY_ALGO_ELGAMAL_E
-			&& !check_pubkey_algo2(
-				k->pkt->pkt.public_key->pubkey_algo,
-						 pk->pubkey_usage )
-			&& !has_expired(k, mainkid, cur_time) )
-			break;
-		}
-	    }
-
-	    if( !k ) {
-		for(k = save_k ; k; k = k->next ) {
-		    if( k->pkt->pkttype == PKT_PUBLIC_SUBKEY
-			&& !check_pubkey_algo2(
-				k->pkt->pkt.public_key->pubkey_algo,
-						 pk->pubkey_usage )
-			&& ( pk->pubkey_usage != PUBKEY_USAGE_ENC
-			     || !has_expired( k, mainkid, cur_time ) )
-		      )
-			break;
-		}
-	    }
-	    if( !k )
-		k = save_k;
-	    else
-		log_info(_("using secondary key %08lX "
-			   "instead of primary key %08lX\n"),
-		      (ulong)keyid_from_pk( k->pkt->pkt.public_key, NULL),
-		      (ulong)keyid_from_pk( save_k->pkt->pkt.public_key, NULL)
-			);
-	}
 
-	copy_public_key_new_namehash( pk, k->pkt->pkt.public_key,
-				      use_namehash? namehash:NULL);
-	merge_one_pk_and_selfsig( keyblock, k, pk );
+            if (DBG_CACHE)
+                log_debug( "\tconsidering key %08lX\n",
+                           (ulong)keyid_from_pk( pk, NULL));
+            if ( pk->created > latest_date ) {
+                latest_date = pk->created;
+                latest_key  = k;
+            }
+        }
     }
-}
 
-static void
-finish_lookup_sk( KBNODE keyblock, PKT_secret_key *sk, KBNODE k, int primary )
-{
-    assert(    k->pkt->pkttype == PKT_SECRET_KEY
-	    || k->pkt->pkttype == PKT_SECRET_SUBKEY );
-    assert( keyblock->pkt->pkttype == PKT_SECRET_KEY );
-    if( primary && !sk->pubkey_usage ) {
-	copy_secret_key( sk, keyblock->pkt->pkt.secret_key );
+    if ( !latest_key ) {
+        PKT_public_key *pk;
+        if (DBG_CACHE && !foundk )
+            log_debug( "\tno suitable subkeys found - trying primary\n");
+        pk = keyblock->pkt->pkt.public_key;
+        if ( !pk->is_valid ) {
+            if (DBG_CACHE)
+                log_debug( "\tprimary key not valid\n");
+        }
+        else if ( pk->is_revoked ) {
+            if (DBG_CACHE)
+                log_debug( "\tprimary key has been revoked\n");
+        }
+        else if ( pk->has_expired ) {
+            if (DBG_CACHE)
+                log_debug( "\tprimary key has expired\n");
+        }
+        else  if ( req_usage
+                   && !((pk->pubkey_usage&USAGE_MASK) & req_usage) ) {
+            if (DBG_CACHE)
+                log_debug( "\tusage does not match: want=%x have=%x\n",
+                           req_usage, pk->pubkey_usage );
+        }
+        else { /* okay */
+            if (DBG_CACHE)
+                log_debug( "\tprimary key may be used\n");
+            latest_key = keyblock;
+            latest_date = pk->created;
+        }
+    }
+    
+    if ( !latest_key ) {
+        if (DBG_CACHE)
+            log_debug("\tno suitable key found -  giving up\n");
+        return 0;
     }
-    else {
-	if( primary && sk->pubkey_usage
-	    && check_pubkey_algo2( k->pkt->pkt.secret_key->pubkey_algo,
-		       sk->pubkey_usage ) == G10ERR_WR_PUBKEY_ALGO ) {
-	    /* if the usage is not correct, try to use a subkey */
-	    KBNODE save_k = k;
-
-	    k = NULL;
-	    /* kludge for pgp 5: which doesn't accept type 20:
-	     * try to use a type 16 subkey instead */
-	    if( sk->pubkey_usage == PUBKEY_USAGE_ENC ) {
-		for( k = save_k; k; k = k->next ) {
-		    if( k->pkt->pkttype == PKT_SECRET_SUBKEY
-			&& k->pkt->pkt.secret_key->pubkey_algo
-			    == PUBKEY_ALGO_ELGAMAL_E
-			&& !check_pubkey_algo2(
-				k->pkt->pkt.secret_key->pubkey_algo,
-						 sk->pubkey_usage ) )
-			break;
-		}
-	    }
 
-	    if( !k ) {
-		for(k = save_k ; k; k = k->next ) {
-		    if( k->pkt->pkttype == PKT_SECRET_SUBKEY
-			&& !check_pubkey_algo2(
-				k->pkt->pkt.secret_key->pubkey_algo,
-						 sk->pubkey_usage ) )
-			break;
-		}
-	    }
-	    if( !k )
-		k = save_k;
-	    else
-		log_info(_("using secondary key %08lX "
-			   "instead of primary key %08lX\n"),
-		      (ulong)keyid_from_sk( k->pkt->pkt.secret_key, NULL),
-		      (ulong)keyid_from_sk( save_k->pkt->pkt.secret_key, NULL)
-			);
-	}
+    if (DBG_CACHE)
+        log_debug( "\tusing key %08lX\n",
+                (ulong)keyid_from_pk( latest_key->pkt->pkt.public_key, NULL) );
+
+    ctx->found_key = latest_key;
 
-	copy_secret_key( sk, k->pkt->pkt.secret_key );
+    if ( latest_key != keyblock ) {
+        log_info(_("using secondary key %08lX "
+                   "instead of primary key %08lX\n"),
+                 (ulong)keyid_from_pk( latest_key->pkt->pkt.public_key, NULL),
+                 (ulong)keyid_from_pk( keyblock->pkt->pkt.public_key, NULL) );
     }
-}
 
+    cache_user_id( keyblock );
+    
+    return 1; /* found */
+}
 
+ 
 static int
-lookup_pk( GETKEY_CTX ctx, PKT_public_key *pk, KBNODE *ret_keyblock )
+lookup( GETKEY_CTX ctx, KBNODE *ret_keyblock, int secmode )
 {
     int rc;
-    KBNODE k;
     int oldmode = set_packet_list_mode(0);
     byte namehash[20];
     int use_namehash=0;
+    KBNODE secblock = NULL; /* helper */
 
     if( !ctx->count ) /* first time */
-	rc = enum_keyblocks( 0, &ctx->kbpos, &ctx->keyblock );
+	rc = enum_keyblocks( secmode? 5:0, &ctx->kbpos, NULL );
     else
 	rc = 0;
     if( !rc ) {
 	while( !(rc = enum_keyblocks( 1, &ctx->kbpos, &ctx->keyblock )) ) {
 	    int n;
 	    getkey_item_t *item;
-	    /* fixme: we don't enum the complete keyblock, but
-	     * use the first match and then continue with the next keyblock
-	     */
+
+            if ( secmode ) {
+                /* find the correspondig public key and use this 
+                 * this one for the selection process */
+                u32 aki[2];
+                KBNODE k = ctx->keyblock;
+                
+                if ( k->pkt->pkttype != PKT_SECRET_KEY )
+                    BUG();
+                keyid_from_sk( k->pkt->pkt.secret_key, aki );
+	        k = get_pubkeyblock( aki );
+	        if( !k ) {
+	            log_info(_("key %08lX: secret key without public key "
+                               "- skipped\n"),  (ulong)aki[1] );
+                    goto skip;
+                }
+                secblock = ctx->keyblock;
+                ctx->keyblock = k;
+                premerge_public_with_secret ( ctx->keyblock, secblock );
+            }
+
+
 	    /* loop over all the user ids we want to look for */
 	    item = ctx->items;
 	    for(n=0; n < ctx->nitems; n++, item++ ) {
-		if( item->mode < 10 )
-		    k = find_by_name( ctx->keyblock, pk,
-				      item->name, item->mode,
-				      namehash, &use_namehash );
-		else if( item->mode >= 10 && item->mode <= 12 )
-		    k = find_by_keyid( ctx->keyblock, pk,
+                KBNODE k = NULL;
+                int found = 0;
+    
+		if( item->mode < 10 ) {
+		    found = find_by_name( ctx->keyblock,
+                                          item->name, item->mode,
+                                          namehash );
+                    use_namehash = found;
+                }
+		else if( item->mode >= 10 && item->mode <= 12 ) {
+		    k = find_by_keyid( ctx->keyblock, 
 				       item->keyid, item->mode );
-		else if( item->mode == 15 )
-		    k = find_first( ctx->keyblock, pk );
-		else if( item->mode == 16 || item->mode == 20 )
-		    k = find_by_fpr( ctx->keyblock, pk,
+                    found = !!k;
+                }
+		else if( item->mode == 15 ) {
+		    found = 1;
+                }
+		else if( item->mode == 16 || item->mode == 20
+                         || item->mode == 21 ) {
+		    k = find_by_fpr( ctx->keyblock,
 				     item->fprint, item->mode );
+                    found = !!k;
+                }
 		else
 		    BUG();
-		if( k ) {
-		    finish_lookup( ctx->keyblock, pk, k, namehash,
-						 use_namehash, ctx->primary );
-		    goto found;
+		if( found ) { 
+                    /* this keyblock looks fine - do further investigation */
+                    merge_selfsigs ( ctx->keyblock );
+		    if ( finish_lookup( ctx, k ) ) {
+                        if ( secmode ) {
+                            merge_public_with_secret ( ctx->keyblock,
+                                                       secblock);
+                            release_kbnode (secblock);
+                            secblock = NULL;
+                        }
+                        goto found;
+                    }
 		}
 	    }
+          skip:
+            /* release resources and try the next keyblock */
+            if ( secmode ) {
+                release_kbnode( secblock );
+                secblock = NULL;
+            }
 	    release_kbnode( ctx->keyblock );
 	    ctx->keyblock = NULL;
 	}
-      found: ;
+      found:
+        ;
     }
     if( rc && rc != -1 )
 	log_error("enum_keyblocks failed: %s\n", g10_errstr(rc));
 
     if( !rc ) {
-	if( ret_keyblock ) {
-	    *ret_keyblock = ctx->keyblock;
-	    ctx->keyblock = NULL;
-	}
+        *ret_keyblock = ctx->keyblock; /* return the keyblock */
+        ctx->keyblock = NULL;
     }
     else if( rc == -1 )
-	rc = G10ERR_NO_PUBKEY;
+	rc = secmode ? G10ERR_NO_SECKEY : G10ERR_NO_PUBKEY;
 
+    if ( secmode ) {
+        release_kbnode( secblock );
+        secblock = NULL;
+    }
     release_kbnode( ctx->keyblock );
     ctx->keyblock = NULL;
     set_packet_list_mode(oldmode);
@@ -1816,7 +2230,7 @@ lookup_pk( GETKEY_CTX ctx, PKT_public_key *pk, KBNODE *ret_keyblock )
 	lkup_stats[ctx->mode].any = 1;
 	if( !rc )
 	    lkup_stats[ctx->mode].okay_count++;
-	else if ( rc == G10ERR_NO_PUBKEY )
+	else if ( rc == G10ERR_NO_PUBKEY || rc == G10ERR_NO_SECKEY )
 	    lkup_stats[ctx->mode].nokey_count++;
 	else
 	    lkup_stats[ctx->mode].error_count++;
@@ -1830,75 +2244,14 @@ lookup_pk( GETKEY_CTX ctx, PKT_public_key *pk, KBNODE *ret_keyblock )
 
 
 
-static int
-lookup_sk( GETKEY_CTX ctx, PKT_secret_key *sk, KBNODE *ret_keyblock )
-{
-    int rc;
-    KBNODE k;
-    int oldmode = set_packet_list_mode(0);
-
-    if( !ctx->count ) /* first time */
-	rc = enum_keyblocks( 5, &ctx->kbpos, &ctx->keyblock );
-    else
-	rc = 0;
-    if( !rc ) {
-	while( !(rc = enum_keyblocks( 1, &ctx->kbpos, &ctx->keyblock )) ) {
-	    int n;
-	    getkey_item_t *item;
-	    /* fixme: we don't enum the complete keyblock, but
-	     * use the first match and then continue with the next keyblock
-	     */
-	    /* loop over all the user ids we want to look for */
-	    item = ctx->items;
-	    for(n=0; n < ctx->nitems; n++, item++ ) {
-		if( item->mode < 10 )
-		    k = find_by_name_sk( ctx->keyblock, sk,
-					 item->name, item->mode );
-		else if( item->mode >= 10 && item->mode <= 12 )
-		    k = find_by_keyid_sk( ctx->keyblock, sk,
-					  item->keyid, item->mode );
-		else if( item->mode == 15 )
-		    k = find_first_sk( ctx->keyblock, sk );
-		else if( item->mode == 16 || item->mode == 20 )
-		    k = find_by_fpr_sk( ctx->keyblock, sk,
-					item->fprint, item->mode );
-		else
-		    BUG();
-		if( k ) {
-		    finish_lookup_sk( ctx->keyblock, sk, k, ctx->primary );
-		    goto found;
-		}
-	    }
-	    release_kbnode( ctx->keyblock );
-	    ctx->keyblock = NULL;
-	}
-      found: ;
-    }
-    if( rc && rc != -1 )
-	log_error("enum_keyblocks failed: %s\n", g10_errstr(rc));
-
-    if( !rc ) {
-	if( ret_keyblock ) {
-	    *ret_keyblock = ctx->keyblock;
-	    ctx->keyblock = NULL;
-	}
-    }
-    else if( rc == -1 )
-	rc = G10ERR_NO_SECKEY;
-
-    release_kbnode( ctx->keyblock );
-    ctx->keyblock = NULL;
-    set_packet_list_mode(oldmode);
-
-    ctx->last_rc = rc;
-    ctx->count++;
-    return rc;
-}
-
 
 
 /****************
- * fixme: replace by the generic function
+ * FIXME: Replace by the generic function 
+ *        It does not work as it is right now - it is used at 
+ *        2 places:  a) to get the key for an anonyous recipient
+ *                   b) to get the ultimately trusted keys.
+ *        The a) usage might have some problems.
  *
  * Enumerate all primary secret keys.  Caller must use these procedure:
  *  1) create a void pointer and initialize it to NULL
@@ -1973,6 +2326,11 @@ enum_secret_keys( void **context, PKT_secret_key *sk, int with_subkeys )
 }
 
 
+
+/*********************************************
+ ***********  user ID printing helpers *******
+ *********************************************/
+
 /****************
  * Return a string with a printable representation of the user_id.
  * this string must be freed by m_free.
@@ -1985,12 +2343,17 @@ get_user_id_string( u32 *keyid )
     int pass=0;
     /* try it two times; second pass reads from key resources */
     do {
-	for(r=user_id_db; r; r = r->next )
-	    if( r->keyid[0] == keyid[0] && r->keyid[1] == keyid[1] ) {
-		p = m_alloc( r->len + 10 );
-		sprintf(p, "%08lX %.*s", (ulong)keyid[1], r->len, r->name );
-		return p;
-	    }
+	for(r=user_id_db; r; r = r->next ) {
+            keyid_list_t a;
+            for (a=r->keyids; a; a= a->next ) {
+                if( a->keyid[0] == keyid[0] && a->keyid[1] == keyid[1] ) {
+                    p = m_alloc( r->len + 10 );
+                    sprintf(p, "%08lX %.*s",
+                            (ulong)keyid[1], r->len, r->name );
+                    return p;
+                }
+            }
+        }
     } while( ++pass < 2 && !get_pubkey( NULL, keyid ) );
     p = m_alloc( 15 );
     sprintf(p, "%08lX [?]", (ulong)keyid[1] );
@@ -2017,13 +2380,18 @@ get_long_user_id_string( u32 *keyid )
     int pass=0;
     /* try it two times; second pass reads from key resources */
     do {
-	for(r=user_id_db; r; r = r->next )
-	    if( r->keyid[0] == keyid[0] && r->keyid[1] == keyid[1] ) {
-		p = m_alloc( r->len + 20 );
-		sprintf(p, "%08lX%08lX %.*s",
-			  (ulong)keyid[0], (ulong)keyid[1], r->len, r->name );
-		return p;
-	    }
+	for(r=user_id_db; r; r = r->next ) {
+            keyid_list_t a;
+            for (a=r->keyids; a; a= a->next ) {
+                if( a->keyid[0] == keyid[0] && a->keyid[1] == keyid[1] ) {
+                    p = m_alloc( r->len + 20 );
+                    sprintf(p, "%08lX%08lX %.*s",
+                            (ulong)keyid[0], (ulong)keyid[1],
+                            r->len, r->name );
+                    return p;
+                }
+            }
+        }
     } while( ++pass < 2 && !get_pubkey( NULL, keyid ) );
     p = m_alloc( 25 );
     sprintf(p, "%08lX%08lX [?]", (ulong)keyid[0], (ulong)keyid[1] );
@@ -2039,13 +2407,17 @@ get_user_id( u32 *keyid, size_t *rn )
 
     /* try it two times; second pass reads from key resources */
     do {
-	for(r=user_id_db; r; r = r->next )
-	    if( r->keyid[0] == keyid[0] && r->keyid[1] == keyid[1] ) {
-		p = m_alloc( r->len );
-		memcpy(p, r->name, r->len );
-		*rn = r->len;
-		return p;
-	    }
+	for(r=user_id_db; r; r = r->next ) {
+            keyid_list_t a;
+            for (a=r->keyids; a; a= a->next ) {
+                if( a->keyid[0] == keyid[0] && a->keyid[1] == keyid[1] ) {
+                    p = m_alloc( r->len );
+                    memcpy(p, r->name, r->len );
+                    *rn = r->len;
+                    return p;
+                }
+            }
+        }
     } while( ++pass < 2 && !get_pubkey( NULL, keyid ) );
     p = m_strdup( _("[User id not found]") );
     *rn = strlen(p);
diff --git a/g10/keydb.h b/g10/keydb.h
index 40492b81e..44aa205e1 100644
--- a/g10/keydb.h
+++ b/g10/keydb.h
@@ -31,6 +31,14 @@
 
 #define MAX_FINGERPRINT_LEN 20
 
+#define IS_KEY_SIG(s)    ((s)->sig_class == 0x1f)
+#define IS_UID_SIG(s)    (((s)->sig_class & ~3) == 0x10)
+#define IS_SUBKEY_SIG(s) ((s)->sig_class == 0x18)
+#define IS_KEY_REV(s)    ((s)->sig_class == 0x20)
+#define IS_UID_REV(s)    ((s)->sig_class == 0x30)
+#define IS_SUBKEY_REV(s) ((s)->sig_class == 0x28)
+
+
 struct getkey_ctx_s;
 typedef struct getkey_ctx_s *GETKEY_CTX;
 
diff --git a/g10/main.h b/g10/main.h
index 150c42805..3bb26e3f1 100644
--- a/g10/main.h
+++ b/g10/main.h
@@ -61,6 +61,10 @@ u16 checksum_mpi( MPI a );
 u16 checksum_mpi_counted_nbits( MPI a );
 u32 buffer_to_u32( const byte *buffer );
 const byte *get_session_marker( size_t *rlen );
+int openpgp_cipher_test_algo( int algo );
+int openpgp_pk_test_algo( int algo, unsigned int usage_flags );
+int openpgp_pk_algo_usage ( int algo );
+int openpgp_md_test_algo( int algo );
 
 /*-- helptext.c --*/
 void display_online_help( const char *keyword );
diff --git a/g10/misc.c b/g10/misc.c
index ca9b45d60..5e9df40ed 100644
--- a/g10/misc.c
+++ b/g10/misc.c
@@ -275,5 +275,78 @@ get_session_marker( size_t *rlen )
     return marker;
 }
 
+/****************
+ * Wrapper around the libgcrypt function with addional checks on
+ * openPGP contraints for the algo ID.
+ */
+int
+openpgp_cipher_test_algo( int algo )
+{
+    if( algo < 0 || algo > 110 )
+        return G10ERR_CIPHER_ALGO;
+    return check_cipher_algo(algo);
+}
+
+int
+openpgp_pk_test_algo( int algo, unsigned int usage_flags )
+{
+    if( algo < 0 || algo > 110 )
+	return G10ERR_PUBKEY_ALGO;
+    return check_pubkey_algo2( algo, usage_flags );
+}
+
+int 
+openpgp_pk_algo_usage ( int algo )
+{
+    int usage = 0; 
+    
+    /* they are hardwired in gpg 1.0 */
+    switch ( algo ) {    
+      case PUBKEY_ALGO_RSA:
+          usage = PUBKEY_USAGE_SIG | PUBKEY_USAGE_ENC;
+          break;
+      case PUBKEY_ALGO_RSA_E:
+          usage = PUBKEY_USAGE_ENC;
+          break;
+      case PUBKEY_ALGO_RSA_S:
+          usage = PUBKEY_USAGE_SIG;
+          break;
+      case PUBKEY_ALGO_ELGAMAL_E:
+          usage = PUBKEY_USAGE_ENC;
+          break;
+      case PUBKEY_ALGO_DSA:  
+          usage = PUBKEY_USAGE_SIG;
+          break;
+      case PUBKEY_ALGO_ELGAMAL:
+          usage = PUBKEY_USAGE_SIG | PUBKEY_USAGE_ENC;
+          break;
+      default:
+          break;
+    }
+    return usage;
+
+}
+
+
+
+int
+openpgp_md_test_algo( int algo )
+{
+    if( algo < 0 || algo > 110 )
+        return G10ERR_DIGEST_ALGO;
+    return check_digest_algo(algo);
+}
+
+
+
+
+
+
+
+
+
+
+
+
 
 
diff --git a/g10/packet.h b/g10/packet.h
index db931d756..aef7938b9 100644
--- a/g10/packet.h
+++ b/g10/packet.h
@@ -122,7 +122,14 @@ typedef struct {
     byte    version;
     byte    pubkey_algo;    /* algorithm used for public key scheme */
     byte    pubkey_usage;   /* for now only used to pass it to getkey() */
+    u32     created;        /* according to the self-signature */
+    byte    req_usage;      /* hack to pass a request to getkey() */
+    byte    req_algo;       /* Ditto */
+    u32     has_expired;    /* set to the expiration date if expired */ 
+    int     is_revoked;     /* key has been revoked */
+    int     is_valid;       /* key (especially subkey) is valid */
     ulong   local_id;	    /* internal use, valid if > 0 */
+    u32     main_keyid[2];  /* keyid of the primary key */
     u32     keyid[2];	    /* calculated by keyid_from_pk() */
     byte    *namehash;	    /* if != NULL: found by this name */
     MPI     pkey[PUBKEY_MAX_NPKEY];
@@ -135,6 +142,14 @@ typedef struct {
     byte    version;
     byte    pubkey_algo;    /* algorithm used for public key scheme */
     byte    pubkey_usage;
+    u32     created;        /* according to the self-signature */
+    byte    req_usage;
+    byte    req_algo;
+    u32     has_expired;    /* set to the expiration date if expired */ 
+    int     is_revoked;     /* key has been revoked */
+    int     is_valid;       /* key (especially subkey) is valid */
+    u32     main_keyid[2];  /* keyid of the primary key */
+    u32     keyid[2];   
     byte is_primary;
     byte is_protected;	/* The secret info is protected and must */
 			/* be decrypted before use, the protected */
@@ -160,6 +175,10 @@ typedef struct {
     int  len;		  /* length of the name */
     char *photo;	  /* if this is not NULL, the packet is a photo ID */
     int photolen;	  /* and the length of the photo */
+    int help_key_usage;
+    u32 help_key_expire;
+    int is_primary;
+    u32 created;          /* according to the self-signature */
     char name[1];
 } PKT_user_id;
 
@@ -329,6 +348,7 @@ PKT_public_key *copy_public_key( PKT_public_key *d, PKT_public_key *s );
 PKT_public_key *copy_public_key_new_namehash( PKT_public_key *d,
 					      PKT_public_key *s,
 					      const byte *namehash );
+void copy_public_parts_to_secret_key( PKT_public_key *pk, PKT_secret_key *sk );
 PKT_secret_key *copy_secret_key( PKT_secret_key *d, PKT_secret_key *s );
 PKT_signature *copy_signature( PKT_signature *d, PKT_signature *s );
 PKT_user_id *copy_user_id( PKT_user_id *d, PKT_user_id *s );
diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index 2cdafe67f..fe4d99f6a 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -1315,6 +1315,7 @@ parse_key( IOBUF inp, int pkttype, unsigned long pktlen,
 	sk->version = version;
 	sk->is_primary = pkttype == PKT_SECRET_KEY;
 	sk->pubkey_algo = algorithm;
+	sk->req_usage = 0; 
 	sk->pubkey_usage = 0; /* not yet used */
     }
     else {
@@ -1325,7 +1326,9 @@ parse_key( IOBUF inp, int pkttype, unsigned long pktlen,
 	pk->hdrbytes	= hdrlen;
 	pk->version	= version;
 	pk->pubkey_algo = algorithm;
+	pk->req_usage = 0; 
 	pk->pubkey_usage = 0; /* not yet used */
+        pk->is_revoked = 0;
 	pk->keyid[0] = 0;
 	pk->keyid[1] = 0;
     }
@@ -1724,6 +1727,7 @@ parse_encrypted( IOBUF inp, int pkttype, unsigned long pktlen,
 				       PACKET *pkt, int new_ctb )
 {
     PKT_encrypted *ed;
+    unsigned long orig_pktlen = pktlen;
 
     ed = pkt->pkt.encrypted =  m_alloc(sizeof *pkt->pkt.encrypted );
     ed->len = pktlen;
@@ -1734,8 +1738,9 @@ parse_encrypted( IOBUF inp, int pkttype, unsigned long pktlen,
 	/* fixme: add some pktlen sanity checks */
 	int version;
 
-#warning decrementing pktlen here is bad as it gives a bad value in the listing
-	version = iobuf_get_noeof(inp); pktlen--;
+	version = iobuf_get_noeof(inp); 
+        if (orig_pktlen)
+            pktlen--;
 	if( version != 1 ) {
 	    log_error("encrypted_mdc packet with unknown version %d\n",
 								version);
@@ -1744,14 +1749,14 @@ parse_encrypted( IOBUF inp, int pkttype, unsigned long pktlen,
 	}
 	ed->mdc_method = DIGEST_ALGO_SHA1;
     }
-    if( pktlen && pktlen < 10 ) { /* actually this is blocksize+2 */
+    if( orig_pktlen && pktlen < 10 ) { /* actually this is blocksize+2 */
 	log_error("packet(%d) too short\n", pkttype);
 	skip_rest(inp, pktlen);
 	goto leave;
     }
     if( list_mode ) {
-	if( pktlen )
-	    printf(":encrypted data packet:\n\tlength: %lu\n", pktlen);
+	if( orig_pktlen )
+	    printf(":encrypted data packet:\n\tlength: %lu\n", orig_pktlen);
 	else
 	    printf(":encrypted data packet:\n\tlength: unknown\n");
 	if( ed->mdc_method )
diff --git a/g10/pkclist.c b/g10/pkclist.c
index 250446fe7..a65e01cda 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -813,7 +813,7 @@ build_pk_list( STRLIST remusr, PK_LIST *ret_pk_list, unsigned use )
 	    any_recipients = 1;
 	else if( (use & PUBKEY_USAGE_ENC) && !opt.no_encrypt_to ) {
 	    pk = m_alloc_clear( sizeof *pk );
-	    pk->pubkey_usage = use;
+	    pk->req_usage = use;
 	    if( (rc = get_pubkey_byname( NULL, pk, rov->d, NULL )) ) {
 		free_public_key( pk ); pk = NULL;
 		log_error(_("%s: skipped: %s\n"), rov->d, g10_errstr(rc) );
@@ -870,7 +870,7 @@ build_pk_list( STRLIST remusr, PK_LIST *ret_pk_list, unsigned use )
 	    if( pk )
 		free_public_key( pk );
 	    pk = m_alloc_clear( sizeof *pk );
-	    pk->pubkey_usage = use;
+	    pk->req_usage = use;
 	    rc = get_pubkey_byname( NULL, pk, answer, NULL );
 	    if( rc )
 		tty_printf(_("No such user ID.\n"));
@@ -936,7 +936,7 @@ build_pk_list( STRLIST remusr, PK_LIST *ret_pk_list, unsigned use )
     }
     else if( !any_recipients && (def_rec = default_recipient()) ) {
 	pk = m_alloc_clear( sizeof *pk );
-	pk->pubkey_usage = use;
+	pk->req_usage = use;
 	rc = get_pubkey_byname( NULL, pk, def_rec, NULL );
 	if( rc )
 	    log_error(_("unknown default recipient `%s'\n"), def_rec );
@@ -961,7 +961,7 @@ build_pk_list( STRLIST remusr, PK_LIST *ret_pk_list, unsigned use )
 		continue; /* encrypt-to keys are already handled */
 
 	    pk = m_alloc_clear( sizeof *pk );
-	    pk->pubkey_usage = use;
+	    pk->req_usage = use;
 	    if( (rc = get_pubkey_byname( NULL, pk, remusr->d, NULL )) ) {
 		free_public_key( pk ); pk = NULL;
 		log_error(_("%s: skipped: %s\n"), remusr->d, g10_errstr(rc) );
diff --git a/g10/seckey-cert.c b/g10/seckey-cert.c
index dd3556c33..cc8018eb0 100644
--- a/g10/seckey-cert.c
+++ b/g10/seckey-cert.c
@@ -63,10 +63,8 @@ do_check( PKT_secret_key *sk )
 	keyid_from_sk( sk, keyid );
 	keyid[2] = keyid[3] = 0;
 	if( !sk->is_primary ) {
-	    PKT_secret_key *sk2 = m_alloc_clear( sizeof *sk2 );
-	    if( !get_primary_seckey( sk2, keyid ) )
-		keyid_from_sk( sk2, keyid+2 );
-	    free_secret_key( sk2 );
+            keyid[2] = sk->main_keyid[0];
+            keyid[3] = sk->main_keyid[1];
 	}
 	dek = passphrase_to_dek( keyid, sk->pubkey_algo, sk->protect.algo,
 				 &sk->protect.s2k, 0 );
diff --git a/g10/skclist.c b/g10/skclist.c
index 3d4b930ce..994ed8c91 100644
--- a/g10/skclist.c
+++ b/g10/skclist.c
@@ -71,7 +71,7 @@ build_sk_list( STRLIST locusr, SK_LIST *ret_sk_list, int unlock,
 	PKT_secret_key *sk;
 
 	sk = m_alloc_clear( sizeof *sk );
-	sk->pubkey_usage = use;
+	sk->req_usage = use;
 	if( (rc = get_seckey_byname( sk, NULL, unlock )) ) {
 	    free_secret_key( sk ); sk = NULL;
 	    log_error("no default secret key: %s\n", g10_errstr(rc) );
@@ -107,7 +107,7 @@ build_sk_list( STRLIST locusr, SK_LIST *ret_sk_list, int unlock,
 	    PKT_secret_key *sk;
 
 	    sk = m_alloc_clear( sizeof *sk );
-	    sk->pubkey_usage = use;
+	    sk->req_usage = use;
 	    if( (rc = get_seckey_byname( sk, locusr->d, unlock )) ) {
 		free_secret_key( sk ); sk = NULL;
 		log_error(_("skipped `%s': %s\n"), locusr->d, g10_errstr(rc) );
diff --git a/po/ChangeLog b/po/ChangeLog
index 6870f8e98..624843459 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-23  Werner Koch  <[email protected]>
+
+	* de.po: Removed superfluous \r.
+
 2001-01-14  Werner Koch  <[email protected]>
 
 	* de.po, de.glo: Updated.
diff --git a/po/da.po b/po/da.po
index 96ccb56ee..7006cde2f 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-01-11 13:11+0100\n"
+"POT-Creation-Date: 2001-02-07 16:46+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"
@@ -338,7 +338,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:211
+#: g10/g10.c:212
 msgid ""
 "@Commands:\n"
 " "
@@ -346,139 +346,139 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: g10/g10.c:213
+#: g10/g10.c:214
 msgid "|[file]|make a signature"
 msgstr "|[filer]|opret en signatur"
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "|[file]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "make a detached signature"
 msgstr "opret en separat signatur"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "encrypt data"
 msgstr "krypt�r data"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "encryption only with symmetric cipher"
 msgstr "krypt�r kun med symmetriske cifre"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "store only"
 msgstr "gem kun"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "decrypt data (default)"
 msgstr "afkrypt�r data (standard)"
 
-#: g10/g10.c:220
+#: g10/g10.c:221
 msgid "verify a signature"
 msgstr "godkend en signatur"
 
-#: g10/g10.c:222
+#: g10/g10.c:223
 msgid "list keys"
 msgstr "vis n�gler"
 
-#: g10/g10.c:224
+#: g10/g10.c:225
 msgid "list keys and signatures"
 msgstr "vis n�gler og signaturer"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "check key signatures"
 msgstr "tjek n�glesignaturer"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "list keys and fingerprints"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "list secret keys"
 msgstr "vis hemmelige n�gler"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "generate a new key pair"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/g10.c:229
+#: g10/g10.c:230
 msgid "remove key from the public keyring"
 msgstr "fjern n�gle fra den offentlige n�glering"
 
-#: g10/g10.c:231
+#: g10/g10.c:232
 msgid "remove key from the secret keyring"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "sign a key"
 msgstr "sign�r en n�gle"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign a key locally"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "sign or edit a key"
 msgstr "sign�r eller redig�r en n�gle"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "generate a revocation certificate"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "export keys"
 msgstr "eksport�r n�gler"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "export keys to a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/g10.c:238
+#: g10/g10.c:239
 msgid "import keys from a key server"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/g10.c:242
+#: g10/g10.c:243
 msgid "import/merge keys"
 msgstr "import�r/fusion�r n�gler"
 
-#: g10/g10.c:244
+#: g10/g10.c:245
 msgid "list only the sequence of packets"
 msgstr "vis kun pakkesekvensen"
 
-#: g10/g10.c:246
+#: g10/g10.c:247
 msgid "export the ownertrust values"
 msgstr "eksport�r ejertillidsv�rdierne"
 
-#: g10/g10.c:248
+#: g10/g10.c:249
 msgid "import ownertrust values"
 msgstr "import�r ejertillidsv�rdierne"
 
-#: g10/g10.c:250
+#: g10/g10.c:251
 msgid "update the trust database"
 msgstr "opdat�r tillidsdatabasen"
 
-#: g10/g10.c:252
+#: g10/g10.c:253
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMES]|tjek tillidsdatabasen"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "fix a corrupted trust database"
 msgstr "repar�r en �delagt tillidsdatabase"
 
-#: g10/g10.c:254
+#: g10/g10.c:255
 msgid "De-Armor a file or stdin"
 msgstr "De-beskydt en fil el. stdin"
 
-#: g10/g10.c:256
+#: g10/g10.c:257
 msgid "En-Armor a file or stdin"
 msgstr "Beskydt en fil el. stdin"
 
-#: g10/g10.c:258
+#: g10/g10.c:259
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|print meddelelsesresum�"
 
-#: g10/g10.c:262
+#: g10/g10.c:263
 msgid ""
 "@\n"
 "Options:\n"
@@ -488,162 +488,162 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/g10.c:264
+#: g10/g10.c:265
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
 
-#: g10/g10.c:266
+#: g10/g10.c:267
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|krypt�r for NAME"
 
-#: g10/g10.c:269
+#: g10/g10.c:270
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|brug NAME som standard modtager"
 
-#: g10/g10.c:271
+#: g10/g10.c:272
 msgid "use the default key as default recipient"
 msgstr "brug standard n�glen som standard modtager"
 
-#: g10/g10.c:275
+#: g10/g10.c:276
 msgid "use this user-id to sign or decrypt"
 msgstr "brug denne bruger-id til at signere eller dekryptere"
 
-#: g10/g10.c:276
+#: g10/g10.c:277
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|s�t kompresningsniveau N (0 = sl�et fra)"
 
-#: g10/g10.c:278
+#: g10/g10.c:279
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "verbose"
 msgstr "meddelsom"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "be somewhat more quiet"
 msgstr "v�r mere stille"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "don't use the terminal at all"
 msgstr "brug overhovedet ikke terminalen"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "force v3 signatures"
 msgstr "tving v3 signaturer"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "always use a MDC for encryption"
 msgstr "brug altid en MDC for kryptering"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "do not make any changes"
 msgstr "lav ingen �ndringer"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "batch mode: never ask"
 msgstr "k�rselsmodus: sp�rg aldrig"
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "assume yes on most questions"
 msgstr "forvent ja til de fleste spr�gsm�l"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "assume no on most questions"
 msgstr "forvent nej til de fleste spr�gsm�l"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "add this keyring to the list of keyrings"
 msgstr "tilf�j denne n�glering til n�gleringslisten"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "add this secret keyring to the list"
 msgstr "tilf�j denne hemmeligen�glering til listen"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|brug NAME som standard hemmelign�gle"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|brug denne n�gletjener til at sl� n�gler op"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|s�t terminal karakters�t til NAME"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "read options from file"
 msgstr "l�s indstillinger fra fil"
 
-#: g10/g10.c:300
+#: g10/g10.c:301
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinfo til denne FD"
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "emulate the mode described in RFC1991"
 msgstr "emul�r modusen beskrevet i RFC1991"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 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:309
+#: g10/g10.c:310
 msgid "|N|use passphrase mode N"
 msgstr "|N|brug pasfrasemodus N"
 
-#: g10/g10.c:311
+#: g10/g10.c:312
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|brug meddelelses resum�algoritme NAME for pasfrase"
 
-#: g10/g10.c:313
+#: g10/g10.c:314
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|brug cifrealgoritme NAME for pasfrase"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|brug cifferalgoritme NAME"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|brug meddelelsesresum� algoritme NAME"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "|N|use compress algorithm N"
 msgstr "|N|brug kompresalgoritme N"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=VALUE|brug denne notationsdata"
 
-#: g10/g10.c:321
+#: g10/g10.c:322
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:324
+#: g10/g10.c:325
 msgid ""
 "@\n"
 "Examples:\n"
@@ -663,16 +663,16 @@ msgstr ""
 " --list-keys [navne]        vis n�gler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/g10.c:429
+#: g10/g10.c:431
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
 
-#: g10/g10.c:433
+#: g10/g10.c:435
 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:436
+#: g10/g10.c:438
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -682,7 +682,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -690,199 +690,204 @@ msgstr ""
 "\n"
 "Underst�ttede algoritmer:\n"
 
-#: g10/g10.c:522
+#: g10/g10.c:524
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/g10.c:575
+#: g10/g10.c:577
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/g10.c:725
+#: g10/g10.c:727
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/g10.c:729
+#: g10/g10.c:731
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: g10/g10.c:736
+#: g10/g10.c:738
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/g10.c:937
+#: g10/g10.c:943
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/g10.c:1008
+#: g10/g10.c:1014
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:1012 g10/g10.c:1021
+#: g10/g10.c:1018 g10/g10.c:1027
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/g10.c:1014
+#: g10/g10.c:1020
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1023
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/g10.c:1037 g10/g10.c:1049
+#: g10/g10.c:1043 g10/g10.c:1055
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/g10.c:1043 g10/g10.c:1055
+#: g10/g10.c:1049 g10/g10.c:1061
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/g10.c:1059
+#: g10/g10.c:1065
 msgid "the given policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/g10.c:1062
+#: g10/g10.c:1068
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr ""
 
-#: g10/g10.c:1064
+#: g10/g10.c:1070
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/g10.c:1066
+#: g10/g10.c:1072
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/g10.c:1068
+#: g10/g10.c:1074
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:1071
+#: g10/g10.c:1077
 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:1075
+#: g10/g10.c:1081
 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:1160
+#: g10/g10.c:1166
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/g10.c:1166
+#: g10/g10.c:1172
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/g10.c:1173
+#: g10/g10.c:1179
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:1181
+#: g10/g10.c:1187
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/g10.c:1194
+#: g10/g10.c:1200
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1213
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1227
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1244
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1252
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1260
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/g10.c:1262
+#: g10/g10.c:1268
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/g10.c:1278
+#: g10/g10.c:1284
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key bruger-id"
 
-#: g10/g10.c:1281
+#: g10/g10.c:1287
 msgid "--delete-key user-id"
 msgstr "--delete-key bruger-id"
 
-#: g10/encode.c:268 g10/g10.c:1318 g10/sign.c:393
+#: g10/g10.c:1295
+#, 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
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/g10.c:1333
+#: g10/g10.c:1347
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [bruger-id] [n�glering]"
 
-#: g10/g10.c:1399
+#: g10/g10.c:1413
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:1407
+#: g10/g10.c:1421
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:1478
+#: g10/g10.c:1492
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/g10.c:1565
+#: g10/g10.c:1579
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1583
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1572 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1586 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:1781
+#: g10/g10.c:1795
 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:1787
+#: g10/g10.c:1801
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1793
+#: g10/g10.c:1807
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1801
+#: g10/g10.c:1815
 msgid "a notation value must not use any control characters\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
@@ -1910,7 +1915,7 @@ msgstr ""
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr ""
 
-#: g10/delkey.c:64 g10/keyedit.c:94
+#: g10/delkey.c:67 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: bruger ikke fundet\n"
@@ -2484,7 +2489,7 @@ msgid "revoked"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:404 g10/mainproc.c:834
+#: g10/keylist.c:404 g10/mainproc.c:836
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "N�gle udl�ber d. %s\n"
@@ -2513,86 +2518,86 @@ msgstr ""
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:429
+#: g10/mainproc.c:431
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:434
+#: g10/mainproc.c:436
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:441
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:460
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:462
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:615
+#: g10/mainproc.c:617
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:702 g10/mainproc.c:711
+#: g10/mainproc.c:704 g10/mainproc.c:713
 msgid "WARNING: invalid notation data found\n"
 msgstr ""
 
-#: g10/mainproc.c:714
+#: g10/mainproc.c:716
 msgid "Notation: "
 msgstr ""
 
-#: g10/mainproc.c:723
+#: g10/mainproc.c:725
 msgid "Policy: "
 msgstr "Politik: "
 
-#: g10/mainproc.c:1233
+#: g10/mainproc.c:1235
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1270
+#: g10/mainproc.c:1272
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1305 g10/mainproc.c:1316
+#: g10/mainproc.c:1307 g10/mainproc.c:1318
 msgid "BAD signature from \""
 msgstr "D�RLIG signatur fra \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1317
+#: g10/mainproc.c:1308 g10/mainproc.c:1319
 msgid "Good signature from \""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1308
+#: g10/mainproc.c:1310
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1364
+#: g10/mainproc.c:1366
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/mainproc.c:1421 g10/mainproc.c:1436 g10/mainproc.c:1498
+#: g10/mainproc.c:1423 g10/mainproc.c:1438 g10/mainproc.c:1500
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:1447
+#: g10/mainproc.c:1449
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:1502
+#: g10/mainproc.c:1504
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) signatur\n"
 
-#: g10/mainproc.c:1507
+#: g10/mainproc.c:1509
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -2632,7 +2637,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:574
+#: g10/passphrase.c:313 g10/passphrase.c:576
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (hovedn�gle-ID %08lX)"
@@ -2672,27 +2677,27 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:560
+#: g10/passphrase.c:562
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
 "user: \""
 msgstr ""
 
-#: g10/passphrase.c:569
+#: g10/passphrase.c:571
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr ""
 
-#: g10/passphrase.c:607
+#: g10/passphrase.c:609
 msgid "can't query password in batchmode\n"
 msgstr ""
 
-#: g10/passphrase.c:611
+#: g10/passphrase.c:613
 msgid "Enter passphrase: "
 msgstr "Indtast kodes�tning: "
 
-#: g10/passphrase.c:615
+#: g10/passphrase.c:617
 msgid "Repeat passphrase: "
 msgstr "Gentag kodes�tning: "
 
@@ -3392,6 +3397,10 @@ msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 
+#: g10/encr-data.c:97
+msgid "problem handling encrypted packet\n"
+msgstr ""
+
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr ""
@@ -3401,14 +3410,6 @@ msgstr ""
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 
-#: g10/delkey.c:94
-msgid "there is a secret key for this public key!\n"
-msgstr ""
-
-#: g10/delkey.c:96
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr ""
-
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr ""
@@ -3421,6 +3422,14 @@ msgstr "Slet denne n�gle fra n�gleringen? "
 msgid "This is a secret key! - really delete? "
 msgstr ""
 
+#: g10/delkey.c:182
+msgid "there is a secret key for this public key!\n"
+msgstr ""
+
+#: g10/delkey.c:184
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr ""
+
 #: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
diff --git a/po/de.po b/po/de.po
index 113837009..ddf0837b0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2,15 +2,7 @@
 # Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
 # Walter Koch <[email protected]>, 1998, 1999, 2000
 msgid ""
-msgstr ""
-"Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2001-01-13 02:25+0000\n"
-"PO-Revision-Date: 2001-01-13 17:10+0100\n"
-"Last-Translator: Walter Koch <[email protected]>\n"
-"Language-Team: German <[email protected]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
+msgstr "POT-Creation-Date: 2001-02-07 16:46+0100\n"
 
 #: util/secmem.c:79
 msgid "Warning: using insecure memory!\n"
@@ -340,7 +332,7 @@ msgstr ""
 "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n"
 "(Es werden noch %d Byte ben�tigt.)\n"
 
-#: g10/g10.c:211
+#: g10/g10.c:212
 msgid ""
 "@Commands:\n"
 " "
@@ -348,139 +340,139 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: g10/g10.c:213
+#: g10/g10.c:214
 msgid "|[file]|make a signature"
 msgstr "|[Datei]|Eine Unterschrift erzeugen"
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "encrypt data"
 msgstr "Daten verschl�sseln"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschl�sseln"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "store only"
 msgstr "Nur speichern"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "decrypt data (default)"
 msgstr "Daten entschl�sseln (Voreinstellung)"
 
-#: g10/g10.c:220
+#: g10/g10.c:221
 msgid "verify a signature"
 msgstr "Signatur pr�fen"
 
-#: g10/g10.c:222
+#: g10/g10.c:223
 msgid "list keys"
 msgstr "Liste der Schl�ssel"
 
-#: g10/g10.c:224
+#: g10/g10.c:225
 msgid "list keys and signatures"
 msgstr "Liste der Schl�ssel und ihrer Signaturen"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "check key signatures"
 msgstr "Signaturen der Schl�ssel pr�fen"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "list keys and fingerprints"
 msgstr "Liste der Schl�ssel und ihrer \"Fingerabdr�cke\""
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "list secret keys"
 msgstr "Liste der geheimen Schl�ssel"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "generate a new key pair"
 msgstr "Ein neues Schl�sselpaar erzeugen"
 
-#: g10/g10.c:229
+#: g10/g10.c:230
 msgid "remove key from the public keyring"
 msgstr "Schl�ssel aus dem �ff. Schl�sselbund entfernen"
 
-#: g10/g10.c:231
+#: g10/g10.c:232
 msgid "remove key from the secret keyring"
 msgstr "Schl�ssel aus dem geh. Schl�sselbund entfernen"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "sign a key"
 msgstr "Schl�ssel signieren"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign a key locally"
 msgstr "Schl�ssel nur auf diesem Rechner signieren"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "sign or edit a key"
 msgstr "Unterschreiben oder Bearbeiten eines Schl."
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "generate a revocation certificate"
 msgstr "Ein Schl�sselwiderruf-Zertifikat erzeugen"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "export keys"
 msgstr "Schl�ssel exportieren"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "export keys to a key server"
 msgstr "Schl�ssel zu einem Schl�.server exportieren"
 
-#: g10/g10.c:238
+#: g10/g10.c:239
 msgid "import keys from a key server"
 msgstr "Schl�ssel von einem Schl�.server importieren"
 
-#: g10/g10.c:242
+#: g10/g10.c:243
 msgid "import/merge keys"
 msgstr "Schl�ssel importieren/kombinieren"
 
-#: g10/g10.c:244
+#: g10/g10.c:245
 msgid "list only the sequence of packets"
 msgstr "Lediglich Struktur der Datenpakete anzeigen"
 
-#: g10/g10.c:246
+#: g10/g10.c:247
 msgid "export the ownertrust values"
 msgstr "Exportieren der \"Owner trust\" Werte"
 
-#: g10/g10.c:248
+#: g10/g10.c:249
 msgid "import ownertrust values"
 msgstr "Importieren der \"Owner trust\" Werte"
 
-#: g10/g10.c:250
+#: g10/g10.c:251
 msgid "update the trust database"
 msgstr "�ndern der \"Trust\"-Datenbank"
 
-#: g10/g10.c:252
+#: g10/g10.c:253
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMEN]|�berpr�fen der \"Trust\"-Datenbank"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "fix a corrupted trust database"
 msgstr "Reparieren einer besch�digten \"Trust\"-Datenb."
 
-#: g10/g10.c:254
+#: g10/g10.c:255
 msgid "De-Armor a file or stdin"
 msgstr "Datei oder stdin von der ASCII-H�lle befreien"
 
-#: g10/g10.c:256
+#: g10/g10.c:257
 msgid "En-Armor a file or stdin"
 msgstr "Datei oder stdin in eine ASCII-H�lle einpacken"
 
-#: g10/g10.c:258
+#: g10/g10.c:259
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests f�r die Dateien ausgeben"
 
-#: g10/g10.c:262
+#: g10/g10.c:263
 msgid ""
 "@\n"
 "Options:\n"
@@ -490,160 +482,160 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/g10.c:264
+#: g10/g10.c:265
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-H�lle versehen"
 
-#: g10/g10.c:266
+#: g10/g10.c:267
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschl�sseln f�r NAME"
 
-#: g10/g10.c:269
+#: g10/g10.c:270
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|NAME als voreingestellten Empf�nger benutzen"
 
-#: g10/g10.c:271
+#: g10/g10.c:272
 msgid "use the default key as default recipient"
 msgstr ""
 "Den Standardschl�ssel als voreingestellten\n"
 "Empf�nger benutzen"
 
-#: g10/g10.c:275
+#: g10/g10.c:276
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/g10.c:276
+#: g10/g10.c:277
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/g10.c:278
+#: g10/g10.c:279
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "don't use the terminal at all"
 msgstr "das Terminal gar nicht benutzen"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "force v3 signatures"
 msgstr "v3 Signaturen erzwingen"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "always use a MDC for encryption"
 msgstr "Beim Verschl�sseln ein Siegel (MDC) verwenden"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "do not make any changes"
 msgstr "Keine wirklichen �nderungen durchf�hren"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "use the gpg-agent"
 msgstr "verwende den GPG-Agent"
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "add this keyring to the list of keyrings"
 msgstr "Als �ffentlichen Schl�sselbund mitbenutzen"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "add this secret keyring to the list"
 msgstr "Als geheimen Schl�sselbund mitbenutzen"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten Schl�ssel benutzen"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|Schl�ssel bei diesem Server nachschlagen"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|Terminalzeichensatz NAME benutzen"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "read options from file"
 msgstr "Optionen aus der Datei lesen"
 
-#: g10/g10.c:300
+#: g10/g10.c:301
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "|KEYID|ulimately trust this key"
 msgstr "|KEYID|diesem Schl�ssel uneingeschr�nkt vertrauen"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "|FILE|load extension module FILE"
 msgstr "|DATEI|Erweiterungsmodul DATEI laden"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "emulate the mode described in RFC1991"
 msgstr "Den in RFC1991 beschriebenen Modus nachahmen"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 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:309
+#: g10/g10.c:310
 msgid "|N|use passphrase mode N"
 msgstr "|N|Verwenden des Mantra-Modus N"
 
-#: g10/g10.c:311
+#: g10/g10.c:312
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|Hashverfahren NAME f�r Mantras benutzen"
 
-#: g10/g10.c:313
+#: g10/g10.c:314
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|Verschl�.verfahren NAME f�r Mantras benutzen"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Verschl�.verfahren NAME benutzen"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Hashverfahren NAME benutzen"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "|N|use compress algorithm N"
 msgstr "|N|Komprimierverfahren N benutzen"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "throw keyid field of encrypted packets"
 msgstr "Entferne Empf�nger-ID verschl�sselter Pakete"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=WERT|verwende diese \"notation\"-Daten"
 
-#: g10/g10.c:321
+#: g10/g10.c:322
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -652,7 +644,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollst�ndige Liste aller Kommandos und "
 "Optionen)\n"
 
-#: g10/g10.c:324
+#: g10/g10.c:325
 msgid ""
 "@\n"
 "Examples:\n"
@@ -672,17 +664,17 @@ msgstr ""
 " --list-keys [Namen]        Schl�ssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdr�cke\" anzeigen\n"
 
-#: g10/g10.c:429
+#: g10/g10.c:431
 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:433
+#: g10/g10.c:435
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -692,7 +684,7 @@ msgstr ""
 "Signieren, pr�fen, verschl�sseln, entschl�sseln\n"
 "Die voreingestellte Operation ist abh�ngig von den Eingabedaten\n"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -700,188 +692,193 @@ msgstr ""
 "\n"
 "Unterst�tzte Verfahren:\n"
 
-#: g10/g10.c:522
+#: g10/g10.c:524
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/g10.c:575
+#: g10/g10.c:577
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/g10.c:725
+#: g10/g10.c:727
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/g10.c:729
+#: g10/g10.c:731
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/g10.c:736
+#: g10/g10.c:738
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:937
+#: g10/g10.c:943
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ist kein g�ltiger Zeichensatz.\n"
 
-#: g10/g10.c:1008
+#: g10/g10.c:1014
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm k�nnte eine core-dump-Datei schreiben!\n"
 
-#: g10/g10.c:1012 g10/g10.c:1021
+#: g10/g10.c:1018 g10/g10.c:1027
 #, 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:1014
+#: g10/g10.c:1020
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1023
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/g10.c:1037 g10/g10.c:1049
+#: g10/g10.c:1043 g10/g10.c:1055
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgew�hlte Verschl�sslungsverfahren ist ung�ltig\n"
 
-#: g10/g10.c:1043 g10/g10.c:1055
+#: g10/g10.c:1049 g10/g10.c:1061
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:1059
+#: g10/g10.c:1065
 msgid "the given policy URL is invalid\n"
 msgstr "Die angegebene URL f�r Richtlinien ist ung�ltig\n"
 
-#: g10/g10.c:1062
+#: g10/g10.c:1068
 #, 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:1064
+#: g10/g10.c:1070
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m�ssen gr��er als 0 sein\n"
 
-#: g10/g10.c:1066
+#: g10/g10.c:1072
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed m�ssen gr��er als 1 sein\n"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1074
 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:1071
+#: g10/g10.c:1077
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:1075
+#: g10/g10.c:1081
 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:1160
+#: g10/g10.c:1166
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:1166
+#: g10/g10.c:1172
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:1173
+#: g10/g10.c:1179
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:1181
+#: g10/g10.c:1187
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:1194
+#: g10/g10.c:1200
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1213
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1227
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1244
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1252
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1260
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/g10.c:1262
+#: g10/g10.c:1268
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/g10.c:1278
+#: g10/g10.c:1284
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key User-ID"
 
-#: g10/g10.c:1281
+#: g10/g10.c:1287
 msgid "--delete-key user-id"
 msgstr "--delete-key User-ID"
 
-#: g10/encode.c:268 g10/g10.c:1318 g10/sign.c:393
+#: g10/g10.c:1295
+#, 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
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
 
-#: g10/g10.c:1333
+#: g10/g10.c:1347
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schl�sselbund]"
 
-#: g10/g10.c:1399
+#: g10/g10.c:1413
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1407
+#: g10/g10.c:1421
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1478
+#: g10/g10.c:1492
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ung�ltiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:1565
+#: g10/g10.c:1579
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1583
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1572 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1586 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:1781
+#: g10/g10.c:1795
 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:1787
+#: g10/g10.c:1801
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -889,12 +886,12 @@ msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und mu� mit einem '=' enden\n"
 
-#: g10/g10.c:1793
+#: g10/g10.c:1807
 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:1801
+#: g10/g10.c:1815
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
@@ -1895,7 +1892,9 @@ msgstr "Schl�ssel %08lX: Nicht ge�ndert\n"
 #: g10/import.c:593
 #, 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"
+msgstr ""
+"Geheimer Schl�ssel %08lX nicht importiert (%s verwenden, um das zu "
+"erm�glichen)\n"
 
 #: g10/import.c:623
 #, c-format
@@ -2005,7 +2004,7 @@ msgstr "Schl�ssel %08lX: Widerrufzertifikat hinzugef�gt\n"
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "Schl�ssel %08lX: Unsere Kopie hat keine Eigenbeglaubigung\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
+#: g10/delkey.c:67 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: Benutzer nicht gefunden\n"
@@ -2586,7 +2585,7 @@ msgid "revoked"
 msgstr "widerrufen"
 
 #. of subkey
-#: g10/keylist.c:404 g10/mainproc.c:834
+#: g10/keylist.c:404 g10/mainproc.c:836
 #, c-format
 msgid " [expires: %s]"
 msgstr " [verf�llt: %s]"
@@ -2617,88 +2616,88 @@ msgstr "verschl�sselt mit %s Schl�ssel, ID %08lX\n"
 msgid "public key decryption failed: %s\n"
 msgstr "Entschl�sselung mit �ffentlichem Schl�ssel fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:429
+#: g10/mainproc.c:431
 msgid "decryption okay\n"
 msgstr "Enschl�sselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:434
+#: g10/mainproc.c:436
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Warnung: Verschl�sselte Botschaft ist manipuliert worden!\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:441
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Enschl�sselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:460
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 "Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:462
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Urspr�nglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:615
+#: g10/mainproc.c:617
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "Einzelner Widerruf - verwenden Sie \"gpg --import\" um ihn anzuwenden\n"
 
-#: g10/mainproc.c:702 g10/mainproc.c:711
+#: g10/mainproc.c:704 g10/mainproc.c:713
 msgid "WARNING: invalid notation data found\n"
 msgstr "WARNUNG: Ung�ltige \"Notation\"-Daten gefunden\n"
 
-#: g10/mainproc.c:714
+#: g10/mainproc.c:716
 msgid "Notation: "
 msgstr "\"Notation\": "
 
-#: g10/mainproc.c:723
+#: g10/mainproc.c:725
 msgid "Policy: "
 msgstr "Richtlinie: "
 
-#: g10/mainproc.c:1233
+#: g10/mainproc.c:1235
 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:1270
+#: g10/mainproc.c:1272
 #, 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:1305 g10/mainproc.c:1316
+#: g10/mainproc.c:1307 g10/mainproc.c:1318
 msgid "BAD signature from \""
 msgstr "FALSCHE Unterschrift von \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1317
+#: g10/mainproc.c:1308 g10/mainproc.c:1319
 msgid "Good signature from \""
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:1308
+#: g10/mainproc.c:1310
 msgid "                aka \""
 msgstr "                    alias \""
 
-#: g10/mainproc.c:1364
+#: g10/mainproc.c:1366
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht gepr�ft werden: %s\n"
 
-#: g10/mainproc.c:1421 g10/mainproc.c:1436 g10/mainproc.c:1498
+#: g10/mainproc.c:1423 g10/mainproc.c:1438 g10/mainproc.c:1500
 msgid "not a detached signature\n"
 msgstr "keine abgetrennte Unterschrift\n"
 
-#: g10/mainproc.c:1447
+#: g10/mainproc.c:1449
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Unterschrift der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:1502
+#: g10/mainproc.c:1504
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:1507
+#: g10/mainproc.c:1509
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ung�ltiges root-Paket in proc_tree() entdeckt\n"
 
@@ -2712,9 +2711,9 @@ msgid "Experimental algorithms should not be used!\n"
 msgstr "Experimentiermethoden sollten nicht benutzt werden!\n"
 
 #: g10/misc.c:237
-msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
-msgstr ""
-"Es ist davon abzuraten, diese Verschl�sselungsmethode zu benutzen!\n"
+#, fuzzy
+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"
 
 #: g10/parse-packet.c:119
 #, c-format
@@ -2739,7 +2738,7 @@ msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
 msgid "can't connect to `%s': %s\n"
 msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:574
+#: g10/passphrase.c:313 g10/passphrase.c:576
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (Hauptschl�ssel-ID %08lX)"
@@ -2752,8 +2751,7 @@ msgid ""
 "%u-bit %s key, ID %08lX, created %s%s\n"
 msgstr ""
 "Sie ben�tigen ein Mantra, um den geheimen Schl�ssel zu entsperren.\n"
-"Benutzer: \""
-"\"%.*s\"\n"
+"Benutzer: \"\"%.*s\"\n"
 "%u-bit %s Schl�ssel, ID %08lX, erzeugt %s%s\n"
 
 #: g10/passphrase.c:344
@@ -2781,7 +2779,7 @@ msgstr "Abbruch durch Benutzer\n"
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "Schwierigkeiten mit dem Agenten: Agent antwortet 0x%lx\n"
 
-#: g10/passphrase.c:560
+#: g10/passphrase.c:562
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2791,20 +2789,20 @@ msgstr ""
 "Sie ben�tigen ein Mantra, um den geheimen Schl�ssel zu entsperren.\n"
 "Benutzer: \""
 
-#: g10/passphrase.c:569
+#: g10/passphrase.c:571
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-Bit %s Schl�ssel, ID %08lX, erzeugt %s"
 
-#: g10/passphrase.c:607
+#: g10/passphrase.c:609
 msgid "can't query password in batchmode\n"
 msgstr "Mantra kann im Batchmodus nicht abgefragt werden\n"
 
-#: g10/passphrase.c:611
+#: g10/passphrase.c:613
 msgid "Enter passphrase: "
 msgstr "Geben Sie das Mantra ein: "
 
-#: g10/passphrase.c:615
+#: g10/passphrase.c:617
 msgid "Repeat passphrase: "
 msgstr "Geben Sie das Mantra nochmal ein: "
 
@@ -3176,10 +3174,10 @@ msgid "key %08lX: accepted as trusted key.\n"
 msgstr "Schl�ssel %08lX: Akzeptiert als vertrauensw�rdiger Schl�ssel.\n"
 
 #: g10/trustdb.c:546
-#, c-format
+#, fuzzy, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
 msgstr ""
-"Schl�ssel %08lX: kein �ffentlicher Schl�ssel f�r den vertrauensw�rdig\ren "
+"Schl�ssel %08lX: kein �ffentlicher Schl�ssel f�r den vertrauensw�rdigen "
 "Schl�ssel - �bersprungen\n"
 
 #: g10/trustdb.c:565
@@ -3533,6 +3531,11 @@ msgid ""
 msgstr ""
 "Warnung: Botschaft wurde mit einem unsicheren Schl�ssel verschl�sselt.\n"
 
+#: g10/encr-data.c:97
+#, fuzzy
+msgid "problem handling encrypted packet\n"
+msgstr "Entferne Empf�nger-ID verschl�sselter Pakete"
+
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "Unsicherer Schl�ssel erzeugt - neuer Versuch\n"
@@ -3544,16 +3547,6 @@ msgstr ""
 "Trotz %d-fachen Versuch konnte die Erzeugung eines unsicheren Schl�ssels f�r "
 "sym.Verschl�sselung nicht vermieden werden!\n"
 
-#: g10/delkey.c:94
-msgid "there is a secret key for this public key!\n"
-msgstr "Es gibt einen privaten Schl�ssel zu diesem �ffentlichen Schl�ssel!\n"
-
-#: g10/delkey.c:96
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr ""
-"Benutzen Sie das Kommando \"--delete-secret-key\", um ihn vorab zu "
-"entfernen.\n"
-
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "Dies kann im Batchmodus ohne \"--yes\" nicht durchgef�hrt werden.\n"
@@ -3566,6 +3559,16 @@ msgstr "Diesen Schl�ssel aus dem Schl�sselbund l�schen? "
 msgid "This is a secret key! - really delete? "
 msgstr "Dies ist ein privater Schl�ssel! - Wirklich l�schen? "
 
+#: g10/delkey.c:182
+msgid "there is a secret key for this public key!\n"
+msgstr "Es gibt einen privaten Schl�ssel zu diesem �ffentlichen Schl�ssel!\n"
+
+#: g10/delkey.c:184
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr ""
+"Benutzen Sie das Kommando \"--delete-secret-key\", um ihn vorab zu "
+"entfernen.\n"
+
 #: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
diff --git a/po/eo.po b/po/eo.po
index e13dceb93..a664ef53d 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-01-11 13:11+0100\n"
+"POT-Creation-Date: 2001-02-07 16:46+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"
@@ -336,7 +336,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:211
+#: g10/g10.c:212
 msgid ""
 "@Commands:\n"
 " "
@@ -344,139 +344,139 @@ msgstr ""
 "@Komandoj:\n"
 " "
 
-#: g10/g10.c:213
+#: g10/g10.c:214
 msgid "|[file]|make a signature"
 msgstr "|[dosiero]|fari subskribon"
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "encrypt data"
 msgstr "�ifri datenojn"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "encryption only with symmetric cipher"
 msgstr "�ifri nur kun simetria �ifro"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "store only"
 msgstr "nur skribi"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "decrypt data (default)"
 msgstr "mal�ifri datenojn (implicita elekto)"
 
-#: g10/g10.c:220
+#: g10/g10.c:221
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/g10.c:222
+#: g10/g10.c:223
 msgid "list keys"
 msgstr "listigi �losilojn"
 
-#: g10/g10.c:224
+#: g10/g10.c:225
 msgid "list keys and signatures"
 msgstr "listigi �losilojn kaj subskribojn"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "check key signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "list keys and fingerprints"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "list secret keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "generate a new key pair"
 msgstr "krei novan �losilparon"
 
-#: g10/g10.c:229
+#: g10/g10.c:230
 msgid "remove key from the public keyring"
 msgstr "forigi �losilon de la publika �losilaro"
 
-#: g10/g10.c:231
+#: g10/g10.c:232
 msgid "remove key from the secret keyring"
 msgstr "forigi �losilon de la sekreta �losilaro"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "sign a key"
 msgstr "subskribi �losilon"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign a key locally"
 msgstr "subskribi �losilon loke"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "sign or edit a key"
 msgstr "subskribi a� redakti �losilon"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "export keys"
 msgstr "eksporti �losilojn"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "export keys to a key server"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/g10.c:238
+#: g10/g10.c:239
 msgid "import keys from a key server"
 msgstr "importi �losilojn de �losilservilo"
 
-#: g10/g10.c:242
+#: g10/g10.c:243
 msgid "import/merge keys"
 msgstr "importi/kunfandi �losilojn"
 
-#: g10/g10.c:244
+#: g10/g10.c:245
 msgid "list only the sequence of packets"
 msgstr "listigi nur la sinsekvon de paketoj"
 
-#: g10/g10.c:246
+#: g10/g10.c:247
 msgid "export the ownertrust values"
 msgstr "eksporti la posedantofido-valorojn"
 
-#: g10/g10.c:248
+#: g10/g10.c:249
 msgid "import ownertrust values"
 msgstr "importi posedantofido-valorojn"
 
-#: g10/g10.c:250
+#: g10/g10.c:251
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/g10.c:252
+#: g10/g10.c:253
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMOJ]|kontroli la fido-datenaron"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "fix a corrupted trust database"
 msgstr "ripari fu�itan fido-datenaron"
 
-#: g10/g10.c:254
+#: g10/g10.c:255
 msgid "De-Armor a file or stdin"
 msgstr "elkirasigi dosieron a� la normalan enigon"
 
-#: g10/g10.c:256
+#: g10/g10.c:257
 msgid "En-Armor a file or stdin"
 msgstr "enkirasigi dosieron a� la normalan enigon"
 
-#: g10/g10.c:258
+#: g10/g10.c:259
 msgid "|algo [files]|print message digests"
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/g10.c:262
+#: g10/g10.c:263
 msgid ""
 "@\n"
 "Options:\n"
@@ -486,156 +486,156 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: g10/g10.c:264
+#: g10/g10.c:265
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/g10.c:266
+#: g10/g10.c:267
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMO|�ifri por NOMO"
 
-#: g10/g10.c:269
+#: g10/g10.c:270
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: g10/g10.c:271
+#: g10/g10.c:272
 msgid "use the default key as default recipient"
 msgstr "uzi la implicitan �losilon kiel implicitan ricevonton"
 
-#: g10/g10.c:275
+#: g10/g10.c:276
 msgid "use this user-id to sign or decrypt"
 msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
 
-#: g10/g10.c:276
+#: g10/g10.c:277
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/g10.c:278
+#: g10/g10.c:279
 msgid "use canonical text mode"
 msgstr "uzi tekstan re�imon"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "verbose"
 msgstr "detala eligo"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "don't use the terminal at all"
 msgstr "tute ne uzi la terminalon"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "force v3 signatures"
 msgstr "devigi v3-subskribojn"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "always use a MDC for encryption"
 msgstr "�iam uzi sigelon (MDC) por �ifrado"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "batch mode: never ask"
 msgstr "neinteraga re�imo: neniam demandi"
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "assume yes on most questions"
 msgstr "supozi \"jes\" �e la plej multaj demandoj"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "assume no on most questions"
 msgstr "supozi \"ne\" �e la plej multaj demandoj"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "add this keyring to the list of keyrings"
 msgstr "aldoni �i tiun �losilaron al la listo de �losilaroj"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "add this secret keyring to the list"
 msgstr "aldoni �i tiun sekretan �losilaron al la listo"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVILO|uzi �i tiun �losilservilon por ser�i �losilojn"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "read options from file"
 msgstr "legi la opciojn el dosiero"
 
-#: g10/g10.c:300
+#: g10/g10.c:301
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "|FILE|load extension module FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "emulate the mode described in RFC1991"
 msgstr "imiti la re�imon priskribitan en RFC 1991"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 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:309
+#: g10/g10.c:310
 msgid "|N|use passphrase mode N"
 msgstr "|N|uzi pasfraz-re�imon N"
 
-#: g10/g10.c:311
+#: g10/g10.c:312
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOMO|uzi kompendi-metodon NOMO por pasfrazoj"
 
-#: g10/g10.c:313
+#: g10/g10.c:314
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO por pasfrazoj"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMO|uzi kompendi-metodon NOMO"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "|N|use compress algorithm N"
 msgstr "|N|uzi densig-metodon N"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "throw keyid field of encrypted packets"
 msgstr "forigi la �losilidentigilon de �ifritaj paketoj"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOMO=VALORO|uzi �i tiun notacian datenon"
 
-#: g10/g10.c:321
+#: g10/g10.c:322
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -643,7 +643,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
 
-#: g10/g10.c:324
+#: g10/g10.c:325
 msgid ""
 "@\n"
 "Examples:\n"
@@ -663,15 +663,15 @@ msgstr ""
 " --list-keys [nomoj]        montri �losilojn\n"
 " --fingerprint [nomoj]      montri fingro�purojn\n"
 
-#: g10/g10.c:429
+#: g10/g10.c:431
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
 
-#: g10/g10.c:433
+#: g10/g10.c:435
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -681,7 +681,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -689,186 +689,191 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/g10.c:522
+#: g10/g10.c:524
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/g10.c:575
+#: g10/g10.c:577
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/g10.c:725
+#: g10/g10.c:727
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/g10.c:729
+#: g10/g10.c:731
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: g10/g10.c:736
+#: g10/g10.c:738
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/g10.c:937
+#: g10/g10.c:943
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/g10.c:1008
+#: g10/g10.c:1014
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/g10.c:1012 g10/g10.c:1021
+#: g10/g10.c:1018 g10/g10.c:1027
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/g10.c:1014
+#: g10/g10.c:1020
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1023
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/g10.c:1037 g10/g10.c:1049
+#: g10/g10.c:1043 g10/g10.c:1055
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/g10.c:1043 g10/g10.c:1055
+#: g10/g10.c:1049 g10/g10.c:1061
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:1059
+#: g10/g10.c:1065
 msgid "the given policy URL is invalid\n"
 msgstr "la donita gvidlinia URL ne validas\n"
 
-#: g10/g10.c:1062
+#: g10/g10.c:1068
 #, 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:1064
+#: g10/g10.c:1070
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/g10.c:1066
+#: g10/g10.c:1072
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1074
 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:1071
+#: g10/g10.c:1077
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/g10.c:1075
+#: g10/g10.c:1081
 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:1160
+#: g10/g10.c:1166
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/g10.c:1166
+#: g10/g10.c:1172
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/g10.c:1173
+#: g10/g10.c:1179
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/g10.c:1181
+#: g10/g10.c:1187
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/g10.c:1194
+#: g10/g10.c:1200
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1213
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1227
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1244
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1252
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1260
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/g10.c:1262
+#: g10/g10.c:1268
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/g10.c:1278
+#: g10/g10.c:1284
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key uzantidentigilo"
 
-#: g10/g10.c:1281
+#: g10/g10.c:1287
 msgid "--delete-key user-id"
 msgstr "--delete-key uzantidentigilo"
 
-#: g10/encode.c:268 g10/g10.c:1318 g10/sign.c:393
+#: g10/g10.c:1295
+#, 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
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/g10.c:1333
+#: g10/g10.c:1347
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [uzantidentigilo] [�losilaro]"
 
-#: g10/g10.c:1399
+#: g10/g10.c:1413
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:1407
+#: g10/g10.c:1421
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:1478
+#: g10/g10.c:1492
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/g10.c:1565
+#: g10/g10.c:1579
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1583
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1572 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1586 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:1781
+#: g10/g10.c:1795
 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:1787
+#: g10/g10.c:1801
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -876,11 +881,11 @@ msgstr ""
 "notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
 "kaj fini per '='\n"
 
-#: g10/g10.c:1793
+#: g10/g10.c:1807
 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:1801
+#: g10/g10.c:1815
 msgid "a notation value must not use any control characters\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
@@ -1968,7 +1973,7 @@ msgstr "�losilo %08lX: revokatestilo aldonita\n"
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "�losilo %08lX: nia kopio ne havas mem-subskribon\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
+#: g10/delkey.c:67 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: uzanto ne trovita\n"
@@ -2551,7 +2556,7 @@ msgid "revoked"
 msgstr "rev"
 
 #. of subkey
-#: g10/keylist.c:404 g10/mainproc.c:834
+#: g10/keylist.c:404 g10/mainproc.c:836
 #, c-format
 msgid " [expires: %s]"
 msgstr " [eksvalidi�os: %s]"
@@ -2580,86 +2585,86 @@ msgstr "�ifrita per %s-�losilo, %08lX\n"
 msgid "public key decryption failed: %s\n"
 msgstr "publik�losila mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:429
+#: g10/mainproc.c:431
 msgid "decryption okay\n"
 msgstr "mal�ifrado sukcesis\n"
 
-#: g10/mainproc.c:434
+#: g10/mainproc.c:436
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTO: �ifrita mesa�o estis manipulita!\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:441
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:460
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:462
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originala dosiernomo='%.*s'\n"
 
-#: g10/mainproc.c:615
+#: g10/mainproc.c:617
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "memstara revoko - uzu \"gpg --import\" por apliki �in\n"
 
-#: g10/mainproc.c:702 g10/mainproc.c:711
+#: g10/mainproc.c:704 g10/mainproc.c:713
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVERTO: nevalida notacia dateno trovita\n"
 
-#: g10/mainproc.c:714
+#: g10/mainproc.c:716
 msgid "Notation: "
 msgstr "Notacio: "
 
-#: g10/mainproc.c:723
+#: g10/mainproc.c:725
 msgid "Policy: "
 msgstr "Gvidlinio: "
 
-#: g10/mainproc.c:1233
+#: g10/mainproc.c:1235
 msgid "signature verification suppressed\n"
 msgstr "kontrolo de subskribo estas mal�altita\n"
 
-#: g10/mainproc.c:1270
+#: g10/mainproc.c:1272
 #, 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:1305 g10/mainproc.c:1316
+#: g10/mainproc.c:1307 g10/mainproc.c:1318
 msgid "BAD signature from \""
 msgstr "MALBONA subskribo de \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1317
+#: g10/mainproc.c:1308 g10/mainproc.c:1319
 msgid "Good signature from \""
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1308
+#: g10/mainproc.c:1310
 msgid "                aka \""
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1364
+#: g10/mainproc.c:1366
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/mainproc.c:1421 g10/mainproc.c:1436 g10/mainproc.c:1498
+#: g10/mainproc.c:1423 g10/mainproc.c:1438 g10/mainproc.c:1500
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "fari apartan subskribon"
 
-#: g10/mainproc.c:1447
+#: g10/mainproc.c:1449
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/mainproc.c:1502
+#: g10/mainproc.c:1504
 msgid "old style (PGP 2.x) signature\n"
 msgstr "malnovstila subskribo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1507
+#: g10/mainproc.c:1509
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nevalida radikpaketo trovita en proc_tree()\n"
 
@@ -2700,7 +2705,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "ne povas konekti�i al '%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:574
+#: g10/passphrase.c:313 g10/passphrase.c:576
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (�ef�losilo %08lX)"
@@ -2743,7 +2748,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:560
+#: g10/passphrase.c:562
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2753,20 +2758,20 @@ msgstr ""
 "Vi bezonas pasfrazon por mal�losi la sekretan �losilon\n"
 "por la uzanto: \""
 
-#: g10/passphrase.c:569
+#: g10/passphrase.c:571
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bita %s-�losilo, %08lX, kreita je %s"
 
-#: g10/passphrase.c:607
+#: g10/passphrase.c:609
 msgid "can't query password in batchmode\n"
 msgstr "ne povas kontroli pasvorton en neinteraga re�imo\n"
 
-#: g10/passphrase.c:611
+#: g10/passphrase.c:613
 msgid "Enter passphrase: "
 msgstr "Donu pasfrazon: "
 
-#: g10/passphrase.c:615
+#: g10/passphrase.c:617
 msgid "Repeat passphrase: "
 msgstr "Ripetu pasfrazon: "
 
@@ -3479,6 +3484,11 @@ msgid ""
 msgstr ""
 "AVERTO: mesa�o estis �ifrita per malforta �losilo en la simetria �ifro.\n"
 
+#: g10/encr-data.c:97
+#, fuzzy
+msgid "problem handling encrypted packet\n"
+msgstr "forigi la �losilidentigilon de �ifritaj paketoj"
+
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "malforta �losilo kreita - provas denove\n"
@@ -3489,14 +3499,6 @@ msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "ne povas eviti malfortajn �losilojn por simetria �ifro; provis %d fojojn!\n"
 
-#: g10/delkey.c:94
-msgid "there is a secret key for this public key!\n"
-msgstr "mankas sekreta �losilo por �i tiu publika �losilo!\n"
-
-#: g10/delkey.c:96
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr "uzu la opcion \"--delete-secret-key\" por forvi�i �in unue.\n"
-
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "ne povas fari tion en neinteraga re�imo sen \"--yes\"\n"
@@ -3509,6 +3511,14 @@ 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
+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
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr "uzu la opcion \"--delete-secret-key\" por forvi�i �in unue.\n"
+
 #: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
diff --git a/po/es_ES.po b/po/es_ES.po
index 5519cdbcf..cdfe6473e 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-01-11 13:11+0100\n"
+"POT-Creation-Date: 2001-02-07 16:46+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"
@@ -348,7 +348,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:211
+#: g10/g10.c:212
 msgid ""
 "@Commands:\n"
 " "
@@ -356,140 +356,140 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:213
+#: g10/g10.c:214
 msgid "|[file]|make a signature"
 msgstr "|[file]|hace una firma"
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|hace una firma en texto claro"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "make a detached signature"
 msgstr "hace una firma separada"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "store only"
 msgstr "s�lo almacenar"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/g10.c:220
+#: g10/g10.c:221
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:222
+#: g10/g10.c:223
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/g10.c:224
+#: g10/g10.c:225
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "check key signatures"
 msgstr "comprueba las firmas de las claves"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/g10.c:229
+#: g10/g10.c:230
 msgid "remove key from the public keyring"
 msgstr "elimina la clave del anillo p�blico"
 
-#: g10/g10.c:231
+#: g10/g10.c:232
 #, fuzzy
 msgid "remove key from the secret keyring"
 msgstr "elimina la clave del anillo p�blico"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocaci�n"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/g10.c:238
+#: g10/g10.c:239
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/g10.c:242
+#: g10/g10.c:243
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/g10.c:244
+#: g10/g10.c:245
 msgid "list only the sequence of packets"
 msgstr "lista s�lo la secuencia de paquetes"
 
-#: g10/g10.c:246
+#: g10/g10.c:247
 msgid "export the ownertrust values"
 msgstr "exporta los valores de confianza"
 
-#: g10/g10.c:248
+#: g10/g10.c:249
 msgid "import ownertrust values"
 msgstr "importa los valores de confianza"
 
-#: g10/g10.c:250
+#: g10/g10.c:251
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/g10.c:252
+#: g10/g10.c:253
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMBRES]|comprueba la base de datos de confianza"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "fix a corrupted trust database"
 msgstr "arregla una base de datos de confianza da�ada"
 
-#: g10/g10.c:254
+#: g10/g10.c:255
 msgid "De-Armor a file or stdin"
 msgstr "quita la armadura de un fichero o stdin"
 
-#: g10/g10.c:256
+#: g10/g10.c:257
 msgid "En-Armor a file or stdin"
 msgstr "crea la armadura a un fichero o stdin"
 
-#: g10/g10.c:258
+#: g10/g10.c:259
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime res�menes de mensaje"
 
-#: g10/g10.c:262
+#: g10/g10.c:263
 msgid ""
 "@\n"
 "Options:\n"
@@ -499,168 +499,168 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/g10.c:264
+#: g10/g10.c:265
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/g10.c:266
+#: g10/g10.c:267
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/g10.c:269
+#: g10/g10.c:270
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
 
-#: g10/g10.c:271
+#: g10/g10.c:272
 msgid "use the default key as default recipient"
 msgstr "usa la clave por defecto como destinatario"
 
-#: g10/g10.c:275
+#: g10/g10.c:276
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/g10.c:276
+#: g10/g10.c:277
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivel de compresi�n N (0 no comprime)"
 
-#: g10/g10.c:278
+#: g10/g10.c:279
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "verbose"
 msgstr "prolijo"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "be somewhat more quiet"
 msgstr "algo m�s discreto"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "don't use the terminal at all"
 msgstr "no usa la terminal en absoluto"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "force v3 signatures"
 msgstr "fuerza firmas v3"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "always use a MDC for encryption"
 msgstr "siempre usa un MCD para cifrar"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "assume yes on most questions"
 msgstr "asume \"s�\" en casi todas las preguntas"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "add this keyring to the list of keyrings"
 msgstr "a�ade este anillo a la lista de anillos"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "add this secret keyring to the list"
 msgstr "a�ade este anillo secreto a la lista"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVIDOR|usa este servidor de claves"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "read options from file"
 msgstr "lee opciones del fichero"
 
-#: g10/g10.c:300
+#: g10/g10.c:301
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe informaci�n de estado en descriptor DF"
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "|KEYID|ulimately trust this key"
 msgstr "|ID-CLAVE|conf�a plenamente en esta clave"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "emulate the mode described in RFC1991"
 msgstr "emula el modo descrito en la RFC1991"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 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:309
+#: g10/g10.c:310
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa modo de contrase�a N"
 
-#: g10/g10.c:311
+#: g10/g10.c:312
 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:313
+#: g10/g10.c:314
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las\n"
 "contrase�as"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa el algoritmo de compresi�n N"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina campo keyid de los paquetes cifrados"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOMBRE=VALOR|usa estos datos de notaci�n"
 
-#: g10/g10.c:321
+#: g10/g10.c:322
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:324
+#: g10/g10.c:325
 msgid ""
 "@\n"
 "Examples:\n"
@@ -680,15 +680,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/g10.c:429
+#: g10/g10.c:431
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
-#: g10/g10.c:433
+#: g10/g10.c:435
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -698,7 +698,7 @@ msgstr ""
 "Firma, comprueba, cifra o descifra.\n"
 "La operaci�n por defecto depende del tipo de datos de entrada.\n"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -706,186 +706,191 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/g10.c:522
+#: g10/g10.c:524
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/g10.c:575
+#: g10/g10.c:577
 msgid "conflicting commands\n"
 msgstr "comandos incompatibles\n"
 
-#: g10/g10.c:725
+#: g10/g10.c:727
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/g10.c:729
+#: g10/g10.c:731
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/g10.c:736
+#: g10/g10.c:738
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/g10.c:937
+#: g10/g10.c:943
 #, 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:1008
+#: g10/g10.c:1014
 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:1012 g10/g10.c:1021
+#: g10/g10.c:1018 g10/g10.c:1027
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/g10.c:1014
+#: g10/g10.c:1020
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1023
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/g10.c:1037 g10/g10.c:1049
+#: g10/g10.c:1043 g10/g10.c:1055
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado no es v�lido\n"
 
-#: g10/g10.c:1043 g10/g10.c:1055
+#: g10/g10.c:1049 g10/g10.c:1061
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no es v�lido\n"
 
-#: g10/g10.c:1059
+#: g10/g10.c:1065
 msgid "the given policy URL is invalid\n"
 msgstr "URL de pol�tica no v�lida\n"
 
-#: g10/g10.c:1062
+#: g10/g10.c:1068
 #, 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:1064
+#: g10/g10.c:1070
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/g10.c:1066
+#: g10/g10.c:1072
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1074
 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:1071
+#: g10/g10.c:1077
 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:1075
+#: g10/g10.c:1081
 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:1160
+#: g10/g10.c:1166
 #, 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:1166
+#: g10/g10.c:1172
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/g10.c:1173
+#: g10/g10.c:1179
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:1181
+#: g10/g10.c:1187
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/g10.c:1194
+#: g10/g10.c:1200
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1213
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1227
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1244
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1252
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1260
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/g10.c:1262
+#: g10/g10.c:1268
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [comandos]"
 
-#: g10/g10.c:1278
+#: g10/g10.c:1284
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-usuario"
 
-#: g10/g10.c:1281
+#: g10/g10.c:1287
 msgid "--delete-key user-id"
 msgstr "--delete-key id-usuario"
 
-#: g10/encode.c:268 g10/g10.c:1318 g10/sign.c:393
+#: g10/g10.c:1295
+#, 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
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: g10/g10.c:1333
+#: g10/g10.c:1347
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/g10.c:1399
+#: g10/g10.c:1413
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:1407
+#: g10/g10.c:1421
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:1478
+#: g10/g10.c:1492
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n no v�lido `%s'\n"
 
-#: g10/g10.c:1565
+#: g10/g10.c:1579
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1583
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1572 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1586 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:1781
+#: g10/g10.c:1795
 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:1787
+#: g10/g10.c:1801
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -893,11 +898,11 @@ msgstr ""
 "un nombre de notaci�n debe tener s�lo letras, d�gitos, puntos o subrayados, "
 "y acabar con un '='\n"
 
-#: g10/g10.c:1793
+#: g10/g10.c:1807
 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:1801
+#: g10/g10.c:1815
 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"
 
@@ -1998,7 +2003,7 @@ msgstr "clave %08lX: certificado de revocaci�n a�adido\n"
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "clave %08lX: nuestra copia no tiene autofirma\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
+#: g10/delkey.c:67 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: usuario no encontrado\n"
@@ -2582,7 +2587,7 @@ msgid "revoked"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:404 g10/mainproc.c:834
+#: g10/keylist.c:404 g10/mainproc.c:836
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "La clave caduca el %s\n"
@@ -2611,86 +2616,86 @@ msgstr "cifrado con clave %s, ID %08lX\n"
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave p�blica fallido: %s\n"
 
-#: g10/mainproc.c:429
+#: g10/mainproc.c:431
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:434
+#: g10/mainproc.c:436
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCI�N: �el mensaje cifrado ha sido manipulado!\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:441
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:460
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitente solicit� \"s�lo-para-tus-ojos\"\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:462
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:615
+#: g10/mainproc.c:617
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:702 g10/mainproc.c:711
+#: g10/mainproc.c:704 g10/mainproc.c:713
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATENCI�N: encontrados datos de notaci�n no v�lidos\n"
 
-#: g10/mainproc.c:714
+#: g10/mainproc.c:716
 msgid "Notation: "
 msgstr "Notaci�n: "
 
-#: g10/mainproc.c:723
+#: g10/mainproc.c:725
 msgid "Policy: "
 msgstr "Pol�tica: "
 
-#: g10/mainproc.c:1233
+#: g10/mainproc.c:1235
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificaci�n de la firma\n"
 
-#: g10/mainproc.c:1270
+#: g10/mainproc.c:1272
 #, 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:1305 g10/mainproc.c:1316
+#: g10/mainproc.c:1307 g10/mainproc.c:1318
 msgid "BAD signature from \""
 msgstr "Firma INCORRECTA de \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1317
+#: g10/mainproc.c:1308 g10/mainproc.c:1319
 msgid "Good signature from \""
 msgstr "Firma correcta de \""
 
-#: g10/mainproc.c:1308
+#: g10/mainproc.c:1310
 msgid "                aka \""
 msgstr "tambi�n conocido como \""
 
-#: g10/mainproc.c:1364
+#: g10/mainproc.c:1366
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:1421 g10/mainproc.c:1436 g10/mainproc.c:1498
+#: g10/mainproc.c:1423 g10/mainproc.c:1438 g10/mainproc.c:1500
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "hace una firma separada"
 
-#: g10/mainproc.c:1447
+#: g10/mainproc.c:1449
 #, fuzzy, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Clase de firma desconocida"
 
-#: g10/mainproc.c:1502
+#: g10/mainproc.c:1504
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1507
+#: g10/mainproc.c:1509
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z no v�lido detectado en proc_tree()\n"
 
@@ -2733,7 +2738,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:574
+#: g10/passphrase.c:313 g10/passphrase.c:576
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr "(ID clave primaria %08lX)"
@@ -2777,7 +2782,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:560
+#: g10/passphrase.c:562
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2787,20 +2792,20 @@ msgstr ""
 "Necesita una contrase�a para desbloquear la clave secreta\n"
 "del usuario: \""
 
-#: g10/passphrase.c:569
+#: g10/passphrase.c:571
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s"
 
-#: g10/passphrase.c:607
+#: g10/passphrase.c:609
 msgid "can't query password in batchmode\n"
 msgstr "imposible pedir contrase�a en modo de proceso por lotes\n"
 
-#: g10/passphrase.c:611
+#: g10/passphrase.c:613
 msgid "Enter passphrase: "
 msgstr "Introduzca contrase�a: "
 
-#: g10/passphrase.c:615
+#: g10/passphrase.c:617
 msgid "Repeat passphrase: "
 msgstr "Repita contrase�a: "
 
@@ -3513,6 +3518,11 @@ msgid ""
 msgstr ""
 "ATENCI�N: mensaje cifrado con una clave d�bil en el cifrado sim�trico.\n"
 
+#: g10/encr-data.c:97
+#, fuzzy
+msgid "problem handling encrypted packet\n"
+msgstr "elimina campo keyid de los paquetes cifrados"
+
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "creada clave d�bil - reintentando\n"
@@ -3524,14 +3534,6 @@ msgstr ""
 "�imposible evitar clave d�bil para cifrado sim�trico despu�s de %d "
 "intentos!\n"
 
-#: g10/delkey.c:94
-msgid "there is a secret key for this public key!\n"
-msgstr "�hay una clave secreta para esta clave p�blica!\n"
-
-#: g10/delkey.c:96
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr "use la opci�n \"--delete-secret-key\" para borrarla antes.\n"
-
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "imposible hacer esto en modo de proceso por lotes sin \"--yes\"\n"
@@ -3544,6 +3546,14 @@ 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
+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
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr "use la opci�n \"--delete-secret-key\" para borrarla antes.\n"
+
 #: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
diff --git a/po/fr.po b/po/fr.po
index ed5a14bcb..de2280f85 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-01-11 13:11+0100\n"
+"POT-Creation-Date: 2001-02-07 16:46+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"
@@ -348,7 +348,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:211
+#: g10/g10.c:212
 msgid ""
 "@Commands:\n"
 " "
@@ -356,139 +356,139 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: g10/g10.c:213
+#: g10/g10.c:214
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "make a detached signature"
 msgstr "faire une signature d�tach�e"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "encrypt data"
 msgstr "chiffrer les donn�es"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement sym�trique seulement"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "store only"
 msgstr "pas d'action"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "decrypt data (default)"
 msgstr "d�chiffrer les donn�es (d�faut)"
 
-#: g10/g10.c:220
+#: g10/g10.c:221
 msgid "verify a signature"
 msgstr "v�rifier une signature"
 
-#: g10/g10.c:222
+#: g10/g10.c:223
 msgid "list keys"
 msgstr "lister les cl�s"
 
-#: g10/g10.c:224
+#: g10/g10.c:225
 msgid "list keys and signatures"
 msgstr "lister les cl�s et les signatures"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "check key signatures"
 msgstr "v�rifier les signatures des cl�s"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "list keys and fingerprints"
 msgstr "lister les cl�s et les empreintes"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "list secret keys"
 msgstr "lister les cl�s secr�tes"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "generate a new key pair"
 msgstr "g�n�rer une nouvelle paire de cl�s"
 
-#: g10/g10.c:229
+#: g10/g10.c:230
 msgid "remove key from the public keyring"
 msgstr "enlever la cl� du porte-cl�s public"
 
-#: g10/g10.c:231
+#: g10/g10.c:232
 msgid "remove key from the secret keyring"
 msgstr "enlever la cl� du porte-cl�s secret"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "sign a key"
 msgstr "signer une cl�"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign a key locally"
 msgstr "signer une cl� localement"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "sign or edit a key"
 msgstr "signer ou �diter une cl�"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "generate a revocation certificate"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "export keys"
 msgstr "exporter les cl�s"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "export keys to a key server"
 msgstr "exporter les cl�s vers un serveur de cl�s"
 
-#: g10/g10.c:238
+#: g10/g10.c:239
 msgid "import keys from a key server"
 msgstr "importer les cl�s d'un serveur de cl�s"
 
-#: g10/g10.c:242
+#: g10/g10.c:243
 msgid "import/merge keys"
 msgstr "importer/fusionner les cl�s"
 
-#: g10/g10.c:244
+#: g10/g10.c:245
 msgid "list only the sequence of packets"
 msgstr "ne lister que les paquets"
 
-#: g10/g10.c:246
+#: g10/g10.c:247
 msgid "export the ownertrust values"
 msgstr "exporter les indices de confiance"
 
-#: g10/g10.c:248
+#: g10/g10.c:249
 msgid "import ownertrust values"
 msgstr "importer les indices de confiance"
 
-#: g10/g10.c:250
+#: g10/g10.c:251
 msgid "update the trust database"
 msgstr "mettre la base de confiance � jour"
 
-#: g10/g10.c:252
+#: g10/g10.c:253
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMS]|v�rifier la base de confiance"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "fix a corrupted trust database"
 msgstr "r�parer une base de confiance corrompue"
 
-#: g10/g10.c:254
+#: g10/g10.c:255
 msgid "De-Armor a file or stdin"
 msgstr "Enlever l'armure d'un fichier ou de stdin"
 
-#: g10/g10.c:256
+#: g10/g10.c:257
 msgid "En-Armor a file or stdin"
 msgstr "Mettre une armure � un fichier ou � stdin"
 
-#: g10/g10.c:258
+#: g10/g10.c:259
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/g10.c:262
+#: g10/g10.c:263
 msgid ""
 "@\n"
 "Options:\n"
@@ -498,156 +498,156 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/g10.c:264
+#: g10/g10.c:265
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: g10/g10.c:266
+#: g10/g10.c:267
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/g10.c:269
+#: g10/g10.c:270
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOM|utiliser NOM comme r�cipient par d�faut"
 
-#: g10/g10.c:271
+#: g10/g10.c:272
 msgid "use the default key as default recipient"
 msgstr "utiliser la cl� par d�f. comme r�cipient"
 
-#: g10/g10.c:275
+#: g10/g10.c:276
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou d�chiffrer"
 
-#: g10/g10.c:276
+#: g10/g10.c:277
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 d�sactive)"
 
-#: g10/g10.c:278
+#: g10/g10.c:279
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "verbose"
 msgstr "bavard"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "don't use the terminal at all"
 msgstr "ne pas utiliser du tout le terminal"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "force v3 signatures"
 msgstr "forcer les signatures en v3"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "always use a MDC for encryption"
 msgstr "toujours utiliser un sceau pour le chiffrement"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "batch mode: never ask"
 msgstr "mode automatique: ne jamais rien demander"
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "assume yes on most questions"
 msgstr "r�pondre oui � la plupart des questions"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "assume no on most questions"
 msgstr "r�pondre non � la plupart des questions"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "add this keyring to the list of keyrings"
 msgstr "ajouter ce porte-cl�s � la liste"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "add this secret keyring to the list"
 msgstr "ajouter ce porte-cl�s secret � la liste"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|utiliser NOM comme cl� secr�te par d�faut"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|H�TE|utiliser ce serveur pour chercher des cl�s"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|le terminal utilise la table de caract�res NOM"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "read options from file"
 msgstr "lire les options du fichier"
 
-#: g10/g10.c:300
+#: g10/g10.c:301
 msgid "|FD|write status info to this FD"
 msgstr "|FD|�crire l'�tat sur ce descripteur"
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "|FILE|load extension module FILE"
 msgstr "|FICH|charger le module d'extension FICH"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "emulate the mode described in RFC1991"
 msgstr "imiter le mode d�crit dans la RFC1991"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "utiliser le comportement d�fini par OpenPGP"
 
-#: g10/g10.c:309
+#: g10/g10.c:310
 msgid "|N|use passphrase mode N"
 msgstr "|N|coder les mots de passe suivant le mode N"
 
-#: g10/g10.c:311
+#: g10/g10.c:312
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le hachage NOM pour les mots de passe"
 
-#: g10/g10.c:313
+#: g10/g10.c:314
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|utiliser la fonction de hachage NOM"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "|N|use compress algorithm N"
 msgstr "|N|utiliser l'algorithme de compression N"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "throw keyid field of encrypted packets"
 msgstr "supprimer l'ident. des paquets chiffr�s"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOM=VALEUR|utiliser ces donn�es de notation"
 
-#: g10/g10.c:321
+#: g10/g10.c:322
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -655,7 +655,7 @@ msgstr ""
 "@\n"
 "(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
 
-#: g10/g10.c:324
+#: g10/g10.c:325
 msgid ""
 "@\n"
 "Examples:\n"
@@ -675,17 +675,17 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les cl�s\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/g10.c:429
+#: g10/g10.c:431
 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:433
+#: g10/g10.c:435
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -695,7 +695,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:443
+#: g10/g10.c:445
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -703,188 +703,193 @@ msgstr ""
 "\n"
 "Algorithmes support�s:\n"
 
-#: g10/g10.c:522
+#: g10/g10.c:524
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/g10.c:575
+#: g10/g10.c:577
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/g10.c:725
+#: g10/g10.c:727
 #, 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:729
+#: g10/g10.c:731
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: g10/g10.c:736
+#: g10/g10.c:738
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/g10.c:937
+#: g10/g10.c:943
 #, 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:1008
+#: g10/g10.c:1014
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/g10.c:1012 g10/g10.c:1021
+#: g10/g10.c:1018 g10/g10.c:1027
 #, 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:1014
+#: g10/g10.c:1020
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1023
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/g10.c:1037 g10/g10.c:1049
+#: g10/g10.c:1043 g10/g10.c:1055
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/g10.c:1043 g10/g10.c:1055
+#: g10/g10.c:1049 g10/g10.c:1061
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/g10.c:1059
+#: g10/g10.c:1065
 msgid "the given policy URL is invalid\n"
 msgstr "l'URL de politique donn�e est invalide\n"
 
-#: g10/g10.c:1062
+#: g10/g10.c:1068
 #, 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:1064
+#: g10/g10.c:1070
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/g10.c:1066
+#: g10/g10.c:1072
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1074
 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:1071
+#: g10/g10.c:1077
 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:1075
+#: g10/g10.c:1081
 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:1160
+#: g10/g10.c:1166
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/g10.c:1166
+#: g10/g10.c:1172
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/g10.c:1173
+#: g10/g10.c:1179
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/g10.c:1181
+#: g10/g10.c:1187
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/g10.c:1194
+#: g10/g10.c:1200
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1213
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1227
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1244
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1252
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1260
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/g10.c:1262
+#: g10/g10.c:1268
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/g10.c:1278
+#: g10/g10.c:1284
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key utilisateur"
 
-#: g10/g10.c:1281
+#: g10/g10.c:1287
 msgid "--delete-key user-id"
 msgstr "--delete-key utilisateur"
 
-#: g10/encode.c:268 g10/g10.c:1318 g10/sign.c:393
+#: g10/g10.c:1295
+#, 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
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossible d'ouvrir %s: %s\n"
 
-#: g10/g10.c:1333
+#: g10/g10.c:1347
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
 
-#: g10/g10.c:1399
+#: g10/g10.c:1413
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/g10.c:1407
+#: g10/g10.c:1421
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/g10.c:1478
+#: g10/g10.c:1492
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/g10.c:1565
+#: g10/g10.c:1579
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1583
 msgid "Go ahead and type your message ...\n"
 msgstr "Continuez et tapez votre message...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1572 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1586 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:1781
+#: g10/g10.c:1795
 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:1787
+#: g10/g10.c:1801
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -893,13 +898,13 @@ msgstr ""
 "des points ou des traits de soulignement et doit se terminer par un signe "
 "�gal\n"
 
-#: g10/g10.c:1793
+#: g10/g10.c:1807
 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:1801
+#: g10/g10.c:1815
 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"
 
@@ -2000,7 +2005,7 @@ msgstr "cl� %08lX: certificat de r�vocation ajout�\n"
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "cl� %08lX: notre copie n'a pas d'auto-signature\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
+#: g10/delkey.c:67 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: utilisateur non trouv�\n"
@@ -2584,7 +2589,7 @@ msgid "revoked"
 msgstr "revcl�"
 
 #. of subkey
-#: g10/keylist.c:404 g10/mainproc.c:834
+#: g10/keylist.c:404 g10/mainproc.c:836
 #, c-format
 msgid " [expires: %s]"
 msgstr " [expire: %s]"
@@ -2613,86 +2618,86 @@ msgstr "chiffr� avec une cl� %s, %08lX\n"
 msgid "public key decryption failed: %s\n"
 msgstr "le d�chiffrement par cl� publique a �chou�: %s\n"
 
-#: g10/mainproc.c:429
+#: g10/mainproc.c:431
 msgid "decryption okay\n"
 msgstr "le d�chiffrement a r�ussi\n"
 
-#: g10/mainproc.c:434
+#: g10/mainproc.c:436
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENTION: le message chiffr� a �t� manipul� !\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:441
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "le d�chiffrement a �chou�: %s\n"
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:460
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTE: l'exp�diteur a demand� �pour vos yeux seulement�\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:462
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original: '%.*s'\n"
 
-#: g10/mainproc.c:615
+#: g10/mainproc.c:617
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "r�vocation autonome - utilisez �gpg --import� pour l'appliquer\n"
 
-#: g10/mainproc.c:702 g10/mainproc.c:711
+#: g10/mainproc.c:704 g10/mainproc.c:713
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENTION: des donn�es de notation invalides ont �t� d�tect�es\n"
 
-#: g10/mainproc.c:714
+#: g10/mainproc.c:716
 msgid "Notation: "
 msgstr "Notation: "
 
-#: g10/mainproc.c:723
+#: g10/mainproc.c:725
 msgid "Policy: "
 msgstr "Politique: "
 
-#: g10/mainproc.c:1233
+#: g10/mainproc.c:1235
 msgid "signature verification suppressed\n"
 msgstr "v�rification de signature supprim�e\n"
 
-#: g10/mainproc.c:1270
+#: g10/mainproc.c:1272
 #, 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:1305 g10/mainproc.c:1316
+#: g10/mainproc.c:1307 g10/mainproc.c:1318
 msgid "BAD signature from \""
 msgstr "MAUVAISE signature de \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1317
+#: g10/mainproc.c:1308 g10/mainproc.c:1319
 msgid "Good signature from \""
 msgstr "Bonne signature de \""
 
-#: g10/mainproc.c:1308
+#: g10/mainproc.c:1310
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1364
+#: g10/mainproc.c:1366
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de v�rifier la signature: %s\n"
 
-#: g10/mainproc.c:1421 g10/mainproc.c:1436 g10/mainproc.c:1498
+#: g10/mainproc.c:1423 g10/mainproc.c:1438 g10/mainproc.c:1500
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "faire une signature d�tach�e"
 
-#: g10/mainproc.c:1447
+#: g10/mainproc.c:1449
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:1502
+#: g10/mainproc.c:1504
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:1507
+#: g10/mainproc.c:1509
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
 
@@ -2735,7 +2740,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "impossible de se connecter � `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:574
+#: g10/passphrase.c:313 g10/passphrase.c:576
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID cl� principale %08lX)"
@@ -2778,7 +2783,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:560
+#: g10/passphrase.c:562
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2788,20 +2793,20 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour d�verrouiller la cl� secr�te pour\n"
 "l'utilisateur: \""
 
-#: g10/passphrase.c:569
+#: g10/passphrase.c:571
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "cl� de %u bits %s, ID %08lX, cr��e le %s"
 
-#: g10/passphrase.c:607
+#: g10/passphrase.c:609
 msgid "can't query password in batchmode\n"
 msgstr "impossible de demander un mot de passe en mode automatique\n"
 
-#: g10/passphrase.c:611
+#: g10/passphrase.c:613
 msgid "Enter passphrase: "
 msgstr "Entrez le mot de passe: "
 
-#: g10/passphrase.c:615
+#: g10/passphrase.c:617
 msgid "Repeat passphrase: "
 msgstr "R�p�tez le mot de passe: "
 
@@ -3539,6 +3544,11 @@ msgstr ""
 "ATTENTION: Le message a �t� chiffr� avec une cl� faible pendant le\n"
 "chiffrement sym�trique.\n"
 
+#: g10/encr-data.c:97
+#, fuzzy
+msgid "problem handling encrypted packet\n"
+msgstr "supprimer l'ident. des paquets chiffr�s"
+
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "cl� faible g�n�r�e - nouvel essai\n"
@@ -3550,14 +3560,6 @@ msgstr ""
 "impossible d'�viter une cl� faible pour le chiffrement sym�trique:\n"
 "%d essais ont eu lieu !\n"
 
-#: g10/delkey.c:94
-msgid "there is a secret key for this public key!\n"
-msgstr "il y a une cl� secr�te pour cette cl� publique !\n"
-
-#: g10/delkey.c:96
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr "utiliser l'option �--delete-secret-key� pour l'effacer d'abord.\n"
-
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "impossible de faire cela en mode automatique sans �--yes�\n"
@@ -3570,6 +3572,14 @@ 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
+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
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr "utiliser l'option �--delete-secret-key� pour l'effacer d'abord.\n"
+
 #: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
diff --git a/po/id.po b/po/id.po
index 7b4b84d8b..611371727 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-01-11 13:11+0100\n"
+"POT-Creation-Date: 2001-02-07 16:46+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"
@@ -337,7 +337,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:211
+#: g10/g10.c:212
 msgid ""
 "@Commands:\n"
 " "
@@ -345,140 +345,140 @@ msgstr ""
 "@Perintah:\n"
 "  "
 
-#: g10/g10.c:213
+#: g10/g10.c:214
 msgid "|[file]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "store only"
 msgstr "hanya disimpan"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/g10.c:220
+#: g10/g10.c:221
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/g10.c:222
+#: g10/g10.c:223
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/g10.c:224
+#: g10/g10.c:225
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/g10.c:229
+#: g10/g10.c:230
 msgid "remove key from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/g10.c:231
+#: g10/g10.c:232
 #, fuzzy
 msgid "remove key from the secret keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/g10.c:238
+#: g10/g10.c:239
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
-#: g10/g10.c:242
+#: g10/g10.c:243
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/g10.c:244
+#: g10/g10.c:245
 msgid "list only the sequence of packets"
 msgstr "tampilkan hanya urutan paket"
 
-#: g10/g10.c:246
+#: g10/g10.c:247
 msgid "export the ownertrust values"
 msgstr "ekspor nilai ownertrust"
 
-#: g10/g10.c:248
+#: g10/g10.c:249
 msgid "import ownertrust values"
 msgstr "impor nilai ownertrust"
 
-#: g10/g10.c:250
+#: g10/g10.c:251
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/g10.c:252
+#: g10/g10.c:253
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMA]|periksa database trust"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "fix a corrupted trust database"
 msgstr "perbaiki database trust yang terkorupsi"
 
-#: g10/g10.c:254
+#: g10/g10.c:255
 msgid "De-Armor a file or stdin"
 msgstr "De-Armor file atau stdin"
 
-#: g10/g10.c:256
+#: g10/g10.c:257
 msgid "En-Armor a file or stdin"
 msgstr "En-Armor file atau stdin"
 
-#: g10/g10.c:258
+#: g10/g10.c:259
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/g10.c:262
+#: g10/g10.c:263
 msgid ""
 "@\n"
 "Options:\n"
@@ -488,162 +488,162 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: g10/g10.c:264
+#: g10/g10.c:265
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/g10.c:266
+#: g10/g10.c:267
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/g10.c:269
+#: g10/g10.c:270
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: g10/g10.c:271
+#: g10/g10.c:272
 msgid "use the default key as default recipient"
 msgstr "gunakan kunci baku sebagai penerima baku"
 
-#: g10/g10.c:275
+#: g10/g10.c:276
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/g10.c:276
+#: g10/g10.c:277
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/g10.c:278
+#: g10/g10.c:279
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "verbose"
 msgstr "detil"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "don't use the terminal at all"
 msgstr "jangan menggunakan terminal"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "force v3 signatures"
 msgstr "paksa signature v3"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "always use a MDC for encryption"
 msgstr "selalu gunakan MDC untuk enkripsi"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "batch mode: never ask"
 msgstr "mode batch: tanpa tanya"
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "assume yes on most questions"
 msgstr "asumsikan ya untuk seluruh pertanyaan"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "assume no on most questions"
 msgstr "asumsikan tidak untuk seluruh pertanyaan"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "add this keyring to the list of keyrings"
 msgstr "tambah keyring ini ke daftar keyring"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "add this secret keyring to the list"
 msgstr "tambah keyring rahasia ini ke daftar"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMA|set charset terminal ke NAMA"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "read options from file"
 msgstr "baca pilihan dari file"
 
-#: g10/g10.c:300
+#: g10/g10.c:301
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "emulate the mode described in RFC1991"
 msgstr "emulasikan mode seperti dalam RFC1991"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "set pilihan paket, cipher, digest ke OpenPGP"
 
-#: g10/g10.c:309
+#: g10/g10.c:310
 msgid "|N|use passphrase mode N"
 msgstr "|N|gunakan passphrase mode N"
 
-#: g10/g10.c:311
+#: g10/g10.c:312
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma digest NAMA utk passphrase"
 
-#: g10/g10.c:313
+#: g10/g10.c:314
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMA|gunakan algoritma cipher NAMA"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "|N|use compress algorithm N"
 msgstr "|N|gunakan algoritma kompresi N"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "throw keyid field of encrypted packets"
 msgstr "buang field keyid paket terenkripsi"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAMA=NILAI|gunakan notasi data ini"
 
-#: g10/g10.c:321
+#: g10/g10.c:322
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:324
+#: g10/g10.c:325
 msgid ""
 "@\n"
 "Examples:\n"
@@ -663,15 +663,15 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/g10.c:429
+#: g10/g10.c:431
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Silakan laporkan kesalahan ke <[email protected]>.\n"
 
-#: g10/g10.c:433
+#: g10/g10.c:435
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -681,7 +681,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -689,186 +689,191 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/g10.c:522
+#: g10/g10.c:524
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/g10.c:575
+#: g10/g10.c:577
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/g10.c:725
+#: g10/g10.c:727
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: g10/g10.c:729
+#: g10/g10.c:731
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: g10/g10.c:736
+#: g10/g10.c:738
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/g10.c:937
+#: g10/g10.c:943
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/g10.c:1008
+#: g10/g10.c:1014
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/g10.c:1012 g10/g10.c:1021
+#: g10/g10.c:1018 g10/g10.c:1027
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/g10.c:1014
+#: g10/g10.c:1020
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1023
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/g10.c:1037 g10/g10.c:1049
+#: g10/g10.c:1043 g10/g10.c:1055
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:1043 g10/g10.c:1055
+#: g10/g10.c:1049 g10/g10.c:1061
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:1059
+#: g10/g10.c:1065
 msgid "the given policy URL is invalid\n"
 msgstr "kebijakan URL yang diberikan tidak valid\n"
 
-#: g10/g10.c:1062
+#: g10/g10.c:1068
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "algoritma kompresi harus di antara %d..%d\n"
 
-#: g10/g10.c:1064
+#: g10/g10.c:1070
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/g10.c:1066
+#: g10/g10.c:1072
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1074
 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:1071
+#: g10/g10.c:1077
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/g10.c:1075
+#: g10/g10.c:1081
 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:1160
+#: g10/g10.c:1166
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/g10.c:1166
+#: g10/g10.c:1172
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/g10.c:1173
+#: g10/g10.c:1179
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/g10.c:1181
+#: g10/g10.c:1187
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/g10.c:1194
+#: g10/g10.c:1200
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1213
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1227
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1244
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1252
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1260
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/g10.c:1262
+#: g10/g10.c:1268
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/g10.c:1278
+#: g10/g10.c:1284
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-user"
 
-#: g10/g10.c:1281
+#: g10/g10.c:1287
 msgid "--delete-key user-id"
 msgstr "--delete-key id-user"
 
-#: g10/encode.c:268 g10/g10.c:1318 g10/sign.c:393
+#: g10/g10.c:1295
+#, 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
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "tidak dapat membuka %s: %s\n"
 
-#: g10/g10.c:1333
+#: g10/g10.c:1347
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/g10.c:1399
+#: g10/g10.c:1413
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/g10.c:1407
+#: g10/g10.c:1421
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/g10.c:1478
+#: g10/g10.c:1492
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/g10.c:1565
+#: g10/g10.c:1579
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1583
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1572 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1586 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:1781
+#: g10/g10.c:1795
 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:1787
+#: g10/g10.c:1801
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -876,11 +881,11 @@ msgstr ""
 "nama notasi hanya terdiri dari huruf, digit, titik atau garis bawah dan "
 "diakhiri dengan sebuah '='\n"
 
-#: g10/g10.c:1793
+#: g10/g10.c:1807
 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:1801
+#: g10/g10.c:1815
 msgid "a notation value must not use any control characters\n"
 msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
@@ -1966,7 +1971,7 @@ msgstr "kunci %08lX: penambahan sertifikat pembatalan\n"
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "kunci %08lX: salinan kita tidak memiliki self-signature\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
+#: g10/delkey.c:67 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: user tidak ditemukan\n"
@@ -2549,7 +2554,7 @@ msgid "revoked"
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:404 g10/mainproc.c:834
+#: g10/keylist.c:404 g10/mainproc.c:836
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "Kunci berakhir pada %s\n"
@@ -2578,86 +2583,86 @@ msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
 msgid "public key decryption failed: %s\n"
 msgstr "gagal dekripsi kunci publik: %s\n"
 
-#: g10/mainproc.c:429
+#: g10/mainproc.c:431
 msgid "decryption okay\n"
 msgstr "dekripsi lancar\n"
 
-#: g10/mainproc.c:434
+#: g10/mainproc.c:436
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:441
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "gagal dekripsi: %s\n"
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:460
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:462
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nama file asli='%.*s'\n"
 
-#: g10/mainproc.c:615
+#: g10/mainproc.c:617
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:702 g10/mainproc.c:711
+#: g10/mainproc.c:704 g10/mainproc.c:713
 msgid "WARNING: invalid notation data found\n"
 msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
 
-#: g10/mainproc.c:714
+#: g10/mainproc.c:716
 msgid "Notation: "
 msgstr "Notasi: "
 
-#: g10/mainproc.c:723
+#: g10/mainproc.c:725
 msgid "Policy: "
 msgstr "Kebijakan: "
 
-#: g10/mainproc.c:1233
+#: g10/mainproc.c:1235
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak optimal\n"
 
-#: g10/mainproc.c:1270
+#: g10/mainproc.c:1272
 #, 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:1305 g10/mainproc.c:1316
+#: g10/mainproc.c:1307 g10/mainproc.c:1318
 msgid "BAD signature from \""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1317
+#: g10/mainproc.c:1308 g10/mainproc.c:1319
 msgid "Good signature from \""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1308
+#: g10/mainproc.c:1310
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1364
+#: g10/mainproc.c:1366
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:1421 g10/mainproc.c:1436 g10/mainproc.c:1498
+#: g10/mainproc.c:1423 g10/mainproc.c:1438 g10/mainproc.c:1500
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "buat detached signature"
 
-#: g10/mainproc.c:1447
+#: g10/mainproc.c:1449
 #, fuzzy, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature tidak dikenal"
 
-#: g10/mainproc.c:1502
+#: g10/mainproc.c:1504
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
 
-#: g10/mainproc.c:1507
+#: g10/mainproc.c:1509
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
@@ -2699,7 +2704,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:574
+#: g10/passphrase.c:313 g10/passphrase.c:576
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID kunci utama %08lX)"
@@ -2742,7 +2747,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:560
+#: g10/passphrase.c:562
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2752,20 +2757,20 @@ msgstr ""
 "Anda perlu passphrase untuk membuka kunci rahasia untuk\n"
 "pemakai: \""
 
-#: g10/passphrase.c:569
+#: g10/passphrase.c:571
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bit kunci %s, ID %08lX, tercipta %s"
 
-#: g10/passphrase.c:607
+#: g10/passphrase.c:609
 msgid "can't query password in batchmode\n"
 msgstr "tidak dapat meminta password dalam mode batch\n"
 
-#: g10/passphrase.c:611
+#: g10/passphrase.c:613
 msgid "Enter passphrase: "
 msgstr "Masukkan passphrase: "
 
-#: g10/passphrase.c:615
+#: g10/passphrase.c:617
 msgid "Repeat passphrase: "
 msgstr "Ulangi passphrase: "
 
@@ -3474,6 +3479,11 @@ msgid ""
 msgstr ""
 "PERINGATAN: pesan dienkripsi dengan kunci lemah dalam cipher simetrik.\n"
 
+#: g10/encr-data.c:97
+#, fuzzy
+msgid "problem handling encrypted packet\n"
+msgstr "buang field keyid paket terenkripsi"
+
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "kunci lemah tercipta - mengulang\n"
@@ -3484,14 +3494,6 @@ msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "tidak dapat menghindari kunci lemah untuk cipher simetrik; mencoba %d kali!\n"
 
-#: g10/delkey.c:94
-msgid "there is a secret key for this public key!\n"
-msgstr "terdapat kunci rahasia untuk kunci publik ini!\n"
-
-#: g10/delkey.c:96
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n"
-
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "tidak dapat dilakukan dalam mode batch tanpa \"--yes\"\n"
@@ -3504,6 +3506,14 @@ 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
+msgid "there is a secret key for this public key!\n"
+msgstr "terdapat kunci rahasia untuk kunci publik ini!\n"
+
+#: g10/delkey.c:184
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n"
+
 #: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
diff --git a/po/it.po b/po/it.po
index 39f135e71..d84efbfef 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-01-11 13:11+0100\n"
+"POT-Creation-Date: 2001-02-07 16:46+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"
@@ -339,7 +339,7 @@ msgstr ""
 "altra cosa per dare all'OS la possibilit� di raccogliere altra entropia!\n"
 "(Servono altri %d byte)\n"
 
-#: g10/g10.c:211
+#: g10/g10.c:212
 msgid ""
 "@Commands:\n"
 " "
@@ -347,139 +347,139 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/g10.c:213
+#: g10/g10.c:214
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "store only"
 msgstr "immagazzina soltanto"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/g10.c:220
+#: g10/g10.c:221
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:222
+#: g10/g10.c:223
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/g10.c:224
+#: g10/g10.c:225
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/g10.c:229
+#: g10/g10.c:230
 msgid "remove key from the public keyring"
 msgstr "rimuove una chiave dal portachiavi pubblico"
 
-#: g10/g10.c:231
+#: g10/g10.c:232
 msgid "remove key from the secret keyring"
 msgstr "rimuove una chiave dal portachiavi privato"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign a key locally"
 msgstr "firma localmente una chiave"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/g10.c:238
+#: g10/g10.c:239
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/g10.c:242
+#: g10/g10.c:243
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/g10.c:244
+#: g10/g10.c:245
 msgid "list only the sequence of packets"
 msgstr "elenca solo la sequenza dei pacchetti"
 
-#: g10/g10.c:246
+#: g10/g10.c:247
 msgid "export the ownertrust values"
 msgstr "esporta i valori di fiducia"
 
-#: g10/g10.c:248
+#: g10/g10.c:249
 msgid "import ownertrust values"
 msgstr "importa i valori di fiducia"
 
-#: g10/g10.c:250
+#: g10/g10.c:251
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/g10.c:252
+#: g10/g10.c:253
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMI]|controlla il database della fiducia"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "fix a corrupted trust database"
 msgstr "ripara un database della fiducia rovinato"
 
-#: g10/g10.c:254
+#: g10/g10.c:255
 msgid "De-Armor a file or stdin"
 msgstr "rimuovi l'armatura a un file o a stdin"
 
-#: g10/g10.c:256
+#: g10/g10.c:257
 msgid "En-Armor a file or stdin"
 msgstr "crea l'armatura a un file o a stdin"
 
-#: g10/g10.c:258
+#: g10/g10.c:259
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/g10.c:262
+#: g10/g10.c:263
 msgid ""
 "@\n"
 "Options:\n"
@@ -489,164 +489,164 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/g10.c:264
+#: g10/g10.c:265
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/g10.c:266
+#: g10/g10.c:267
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/g10.c:269
+#: g10/g10.c:270
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: g10/g10.c:271
+#: g10/g10.c:272
 msgid "use the default key as default recipient"
 msgstr "usa la chiave predefinita come destinatario predefinito"
 
-#: g10/g10.c:275
+#: g10/g10.c:276
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/g10.c:276
+#: g10/g10.c:277
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/g10.c:278
+#: g10/g10.c:279
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "verbose"
 msgstr "prolisso"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "don't use the terminal at all"
 msgstr "non usa per niente il terminale"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "force v3 signatures"
 msgstr "forza l'uso di firme v3"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "always use a MDC for encryption"
 msgstr "usa sempre un MDC per cifrare"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "batch mode: never ask"
 msgstr "modo batch: non fa domande"
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "assume yes on most questions"
 msgstr "assumi \"s�\" per quasi tutte le domande"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "assume no on most questions"
 msgstr "assumi \"no\" per quasi tutte le domande"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "add this keyring to the list of keyrings"
 msgstr "aggiungi questo portachiavi alla lista"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "add this secret keyring to the list"
 msgstr "aggiungi questo portachiavi segreto alla lista"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usa NOME come chiave segreta predefinita"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|cerca le chiavi in questo keyserver"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOME|imposta il set di caratteri del terminale NOME"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "read options from file"
 msgstr "leggi le opzioni dal file"
 
-#: g10/g10.c:300
+#: g10/g10.c:301
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato su questo FD"
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "emulate the mode described in RFC1991"
 msgstr "emula il modo descritto in RFC 1991"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 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:309
+#: g10/g10.c:310
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa il modo N per la passphrase"
 
-#: g10/g10.c:311
+#: g10/g10.c:312
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOME|usa l'algoritmo di message digest NOME per le passphrase"
 
-#: g10/g10.c:313
+#: g10/g10.c:314
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di cifratura NOME"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di message digest NOME"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritmo di compressione N"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina il campo keyid dei pacchetti cifrati"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALORE|usa questi dati per una nota"
 
-#: g10/g10.c:321
+#: g10/g10.c:322
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:324
+#: g10/g10.c:325
 msgid ""
 "@\n"
 "Examples:\n"
@@ -666,15 +666,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/g10.c:429
+#: g10/g10.c:431
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: g10/g10.c:433
+#: g10/g10.c:435
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -684,7 +684,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -692,188 +692,193 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/g10.c:522
+#: g10/g10.c:524
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/g10.c:575
+#: g10/g10.c:577
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/g10.c:725
+#: g10/g10.c:727
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/g10.c:729
+#: g10/g10.c:731
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/g10.c:736
+#: g10/g10.c:738
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/g10.c:937
+#: g10/g10.c:943
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/g10.c:1008
+#: g10/g10.c:1014
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/g10.c:1012 g10/g10.c:1021
+#: g10/g10.c:1018 g10/g10.c:1027
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/g10.c:1014
+#: g10/g10.c:1020
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1023
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/g10.c:1037 g10/g10.c:1049
+#: g10/g10.c:1043 g10/g10.c:1055
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/g10.c:1043 g10/g10.c:1055
+#: g10/g10.c:1049 g10/g10.c:1061
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:1059
+#: g10/g10.c:1065
 msgid "the given policy URL is invalid\n"
 msgstr "L'URL della policy indicato non � valido\n"
 
-#: g10/g10.c:1062
+#: g10/g10.c:1068
 #, 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:1064
+#: g10/g10.c:1070
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/g10.c:1066
+#: g10/g10.c:1072
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1074
 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:1071
+#: g10/g10.c:1077
 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:1075
+#: g10/g10.c:1081
 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:1160
+#: g10/g10.c:1166
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/g10.c:1166
+#: g10/g10.c:1172
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/g10.c:1173
+#: g10/g10.c:1179
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:1181
+#: g10/g10.c:1187
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/g10.c:1194
+#: g10/g10.c:1200
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1213
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1227
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1244
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1252
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1260
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:1262
+#: g10/g10.c:1268
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/g10.c:1278
+#: g10/g10.c:1284
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key user-id"
 
-#: g10/g10.c:1281
+#: g10/g10.c:1287
 msgid "--delete-key user-id"
 msgstr "--delete-key user-id"
 
-#: g10/encode.c:268 g10/g10.c:1318 g10/sign.c:393
+#: g10/g10.c:1295
+#, 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
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/g10.c:1333
+#: g10/g10.c:1347
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/g10.c:1399
+#: g10/g10.c:1413
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1407
+#: g10/g10.c:1421
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1478
+#: g10/g10.c:1492
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/g10.c:1565
+#: g10/g10.c:1579
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1583
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1572 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1586 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/g10.c:1781
+#: g10/g10.c:1795
 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:1787
+#: g10/g10.c:1801
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -881,11 +886,11 @@ msgstr ""
 "il nome di una nota deve essere formato solo da lettere, numeri, punti o\n"
 "underscore e deve finire con `='\n"
 
-#: g10/g10.c:1793
+#: g10/g10.c:1807
 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:1801
+#: g10/g10.c:1815
 msgid "a notation value must not use any control characters\n"
 msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 
@@ -1980,7 +1985,7 @@ msgstr "chiave %08lX: certificato di revoca aggiunto\n"
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "chiave %08lX: la nostra copia non ha autofirma\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
+#: g10/delkey.c:67 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: utente non trovato\n"
@@ -2566,7 +2571,7 @@ msgid "revoked"
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:404 g10/mainproc.c:834
+#: g10/keylist.c:404 g10/mainproc.c:836
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "La chiave scadr� il %s\n"
@@ -2595,86 +2600,86 @@ msgstr "Cifrato con la chiave %s con ID %08lX\n"
 msgid "public key decryption failed: %s\n"
 msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:429
+#: g10/mainproc.c:431
 msgid "decryption okay\n"
 msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:434
+#: g10/mainproc.c:436
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato � stato manipolato!\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:441
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:460
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:462
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:615
+#: g10/mainproc.c:617
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
 
-#: g10/mainproc.c:702 g10/mainproc.c:711
+#: g10/mainproc.c:704 g10/mainproc.c:713
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
 
-#: g10/mainproc.c:714
+#: g10/mainproc.c:716
 msgid "Notation: "
 msgstr "Nota: "
 
-#: g10/mainproc.c:723
+#: g10/mainproc.c:725
 msgid "Policy: "
 msgstr "Policy: "
 
-#: g10/mainproc.c:1233
+#: g10/mainproc.c:1235
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
-#: g10/mainproc.c:1270
+#: g10/mainproc.c:1272
 #, 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:1305 g10/mainproc.c:1316
+#: g10/mainproc.c:1307 g10/mainproc.c:1318
 msgid "BAD signature from \""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1317
+#: g10/mainproc.c:1308 g10/mainproc.c:1319
 msgid "Good signature from \""
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1308
+#: g10/mainproc.c:1310
 msgid "                aka \""
 msgstr "    anche noto come \""
 
-#: g10/mainproc.c:1364
+#: g10/mainproc.c:1366
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:1421 g10/mainproc.c:1436 g10/mainproc.c:1498
+#: g10/mainproc.c:1423 g10/mainproc.c:1438 g10/mainproc.c:1500
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "fai una firma separata"
 
-#: g10/mainproc.c:1447
+#: g10/mainproc.c:1449
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:1502
+#: g10/mainproc.c:1504
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/mainproc.c:1507
+#: g10/mainproc.c:1509
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
@@ -2715,7 +2720,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:574
+#: g10/passphrase.c:313 g10/passphrase.c:576
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (key ID principale %08lX)"
@@ -2758,7 +2763,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:560
+#: g10/passphrase.c:562
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2768,20 +2773,20 @@ msgstr ""
 "Ti serve una passphrase per sbloccare la chiave segreta\n"
 "dell'utente: \""
 
-#: g10/passphrase.c:569
+#: g10/passphrase.c:571
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s"
 
-#: g10/passphrase.c:607
+#: g10/passphrase.c:609
 msgid "can't query password in batchmode\n"
 msgstr "impossibile chiedere la password in modo batch\n"
 
-#: g10/passphrase.c:611
+#: g10/passphrase.c:613
 msgid "Enter passphrase: "
 msgstr "Inserisci la passphrase: "
 
-#: g10/passphrase.c:615
+#: g10/passphrase.c:617
 msgid "Repeat passphrase: "
 msgstr "Ripeti la passphrase: "
 
@@ -3504,6 +3509,11 @@ msgstr ""
 "ATTENZIONE: il messaggio era stato cifrato usando una chiave debole\n"
 "per il cifrario simmetrico\n"
 
+#: g10/encr-data.c:97
+#, fuzzy
+msgid "problem handling encrypted packet\n"
+msgstr "elimina il campo keyid dei pacchetti cifrati"
+
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "creata una chiave debole - riprovo\n"
@@ -3515,14 +3525,6 @@ msgstr ""
 "Impossibile evitare una chiave debole per il cifrario simmetrico;\n"
 "ho provato %d volte!\n"
 
-#: g10/delkey.c:94
-msgid "there is a secret key for this public key!\n"
-msgstr "c'� una chiave segreta per questa chiave pubblica!\n"
-
-#: g10/delkey.c:96
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr "prima usa l'opzione \"--delete-secret-key\" per cancellarla.\n"
-
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "impossibile fare questo in modo batch senza \"--yes\"\n"
@@ -3535,6 +3537,14 @@ 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
+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
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr "prima usa l'opzione \"--delete-secret-key\" per cancellarla.\n"
+
 #: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
diff --git a/po/ja.po b/po/ja.po
index 79eea8397..5c146c827 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-01-11 13:11+0100\n"
+"POT-Creation-Date: 2001-02-07 16:46+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"
@@ -338,7 +338,7 @@ msgstr ""
 "��ʬ��Ĺ��������������ޤ���OS����ä��𻨤������\n"
 "�Ǥ���褦���������Ƥ�������! (����%d�Х��Ȥ���ޤ�)\n"
 
-#: g10/g10.c:211
+#: g10/g10.c:212
 msgid ""
 "@Commands:\n"
 " "
@@ -346,141 +346,141 @@ msgstr ""
 "@���ޥ��:\n"
 " "
 
-#: g10/g10.c:213
+#: g10/g10.c:214
 msgid "|[file]|make a signature"
 msgstr "|[�ե�����]|��̾�����"
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "|[file]|make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "make a detached signature"
 msgstr "ʬΥ��̾�����"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "encrypt data"
 msgstr "�ǡ�����Ź沽"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "encryption only with symmetric cipher"
 msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "store only"
 msgstr "��¸�Τ�"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "decrypt data (default)"
 msgstr "�ǡ��������� (����)"
 
-#: g10/g10.c:220
+#: g10/g10.c:221
 msgid "verify a signature"
 msgstr "��̾�򸡾�"
 
-#: g10/g10.c:222
+#: g10/g10.c:223
 msgid "list keys"
 msgstr "�����"
 
-#: g10/g10.c:224
+#: g10/g10.c:225
 msgid "list keys and signatures"
 msgstr "���Ƚ�̾�ΰ���"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "check key signatures"
 msgstr "���ν�̾�򸡾�"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "list keys and fingerprints"
 msgstr "���Ȼ���ΰ���"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "list secret keys"
 msgstr "��̩���ΰ���"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "generate a new key pair"
 msgstr "��������������"
 
-#: g10/g10.c:229
+#: g10/g10.c:230
 msgid "remove key from the public keyring"
 msgstr "�������ؤ��鸰����"
 
-#: g10/g10.c:231
+#: g10/g10.c:232
 msgid "remove key from the secret keyring"
 msgstr "��̩���ؤ��鸰����"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "sign a key"
 msgstr "���˽�̾"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign a key locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "sign or edit a key"
 msgstr "���ؤν�̾���Խ�"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "generate a revocation certificate"
 msgstr "�˴������������"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "export keys"
 msgstr "����񤭽Ф�"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "export keys to a key server"
 msgstr "�������С��˸���񤭽Ф�"
 
-#: g10/g10.c:238
+#: g10/g10.c:239
 msgid "import keys from a key server"
 msgstr "�������С����鸰���ɤ߹���"
 
-#: g10/g10.c:242
+#: g10/g10.c:243
 msgid "import/merge keys"
 msgstr "�����ɹ���/ʻ��"
 
-#: g10/g10.c:244
+#: g10/g10.c:245
 msgid "list only the sequence of packets"
 msgstr "�ѥ��å���Τߤΰ���"
 
-#: g10/g10.c:246
+#: g10/g10.c:247
 msgid "export the ownertrust values"
 msgstr "��ͭ�Ԥ��Ѥ����ͤ�񤭽Ф�"
 
-#: g10/g10.c:248
+#: g10/g10.c:249
 msgid "import ownertrust values"
 msgstr "��ͭ�Ԥ��Ѥ����ͤ��ɤ߹���"
 
-#: g10/g10.c:250
+#: g10/g10.c:251
 msgid "update the trust database"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: g10/g10.c:252
+#: g10/g10.c:253
 msgid "|[NAMES]|check the trust database"
 msgstr "|[̾��]|���ѥǡ����١���������å�"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "fix a corrupted trust database"
 msgstr "���줿���ѥǡ����١�������"
 
-#: g10/g10.c:254
+#: g10/g10.c:255
 msgid "De-Armor a file or stdin"
 msgstr ""
 "�ե�����ޤ���ɸ�����Ϥ�\n"
 "��������"
 
-#: g10/g10.c:256
+#: g10/g10.c:257
 msgid "En-Armor a file or stdin"
 msgstr "�ե�����ޤ���ɸ�����Ϥ�������"
 
-#: g10/g10.c:258
+#: g10/g10.c:259
 msgid "|algo [files]|print message digests"
 msgstr "|���르�ꥺ�� [�ե�����]|��å�������������"
 
-#: g10/g10.c:262
+#: g10/g10.c:263
 msgid ""
 "@\n"
 "Options:\n"
@@ -490,192 +490,192 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/g10.c:264
+#: g10/g10.c:265
 msgid "create ascii armored output"
 msgstr "ASCII���������������"
 
-#: g10/g10.c:266
+#: g10/g10.c:267
 msgid "|NAME|encrypt for NAME"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: g10/g10.c:269
+#: g10/g10.c:270
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 "|̾��|����μ����ԤȤ���\n"
 "��̾���פ����"
 
-#: g10/g10.c:271
+#: g10/g10.c:272
 msgid "use the default key as default recipient"
 msgstr "����μ����Ԥ˴���θ������"
 
-#: g10/g10.c:275
+#: g10/g10.c:276
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "��̾������ˤ��Υ桼����id\n"
 "�����"
 
-#: g10/g10.c:276
+#: g10/g10.c:277
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|���̥�٥��N������\n"
 "(0���󰵽�)"
 
-#: g10/g10.c:278
+#: g10/g10.c:279
 msgid "use canonical text mode"
 msgstr "����ƥ����ȡ��⡼�ɤ����"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "use as output file"
 msgstr "���ϥե�����Ȥ��ƻ���"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "verbose"
 msgstr "��Ĺ"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "be somewhat more quiet"
 msgstr "����Ť�"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "don't use the terminal at all"
 msgstr "ü�����Ի���"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "force v3 signatures"
 msgstr "����Ū��v3��̾"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "always use a MDC for encryption"
 msgstr "�Ź沽�ˤϾ��MDC�����"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "do not make any changes"
 msgstr "̵�ѹ�"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "batch mode: never ask"
 msgstr "�Хå����⡼��: ��ǧ��ά"
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "assume yes on most questions"
 msgstr ""
 "�����Ƥ��μ����������yes\n"
 "�Ȥߤʤ�"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "assume no on most questions"
 msgstr ""
 "�����Ƥ��μ����������no\n"
 "�Ȥߤʤ�"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "add this keyring to the list of keyrings"
 msgstr "���ؤΰ����ˤ��θ��ؤ��ɲ�"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "add this secret keyring to the list"
 msgstr "�����ˤ�����̩���ؤ��ɲ�"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 "|̾��|�������̩���Ȥ���\n"
 "��̾���פ����"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|�ۥ���|���θ����ˤ��θ������С������"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|CHARSET̾|ü����charset���CHARSET̾��\n"
 "������"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "read options from file"
 msgstr ""
 "�ե����뤫�饪�ץ�����\n"
 "�ɤ߹���"
 
-#: g10/g10.c:300
+#: g10/g10.c:301
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
 "�񤭽Ф�"
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "|KEYID|ulimately trust this key"
 msgstr "|��ID|���Ρָ��פ���Ū�˿��Ѥ���"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "|FILE|load extension module FILE"
 msgstr ""
 "|�ե�����|��ĥ�⥸�塼��Υե������\n"
 "�ɤ߹���"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "emulate the mode described in RFC1991"
 msgstr ""
 "RFC1991�˵��Ҥ��줿�⡼�ɤ�\n"
 "����"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "�ѥ��åȤȰŹ�Ƚ�̾�Υ��ץ���\n"
 "�������OpenPGP��������"
 
-#: g10/g10.c:309
+#: g10/g10.c:310
 msgid "|N|use passphrase mode N"
 msgstr "|N|�ѥ��ե졼�����⡼��N�����"
 
-#: g10/g10.c:311
+#: g10/g10.c:312
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|̾��|�ѥ��ե졼���ˡ�̾���פΥ��\n"
 "���������󥢥르�ꥺ������"
 
-#: g10/g10.c:313
+#: g10/g10.c:314
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|̾��|�ѥ��ե졼���ˡ�̾���פΰŹ�\n"
 "���르�ꥺ������"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use cipher algorithm NAME"
 msgstr ""
 "|̾��|��̾���פΰŹ楢�르�ꥺ���\n"
 "����"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|NAME|use message digest algorithm NAME"
 msgstr ""
 "|̾��|��̾���פΥ�å���������\n"
 "���르�ꥺ������"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "|N|use compress algorithm N"
 msgstr ""
 "|̾��|��̾���פΰ��̥��르�ꥺ���\n"
 "����"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "�Ź�ѥ��åȤθ�ID�ե������\n"
 "������"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|̾��=��|��������ǡ��������"
 
-#: g10/g10.c:321
+#: g10/g10.c:322
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -684,7 +684,7 @@ msgstr ""
 "(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
 "�ޥ˥奢�롦�ڡ���������������)\n"
 
-#: g10/g10.c:324
+#: g10/g10.c:325
 msgid ""
 "@\n"
 "Examples:\n"
@@ -704,15 +704,15 @@ msgstr ""
 " --list-keys [̾��]         ����ɽ��\n"
 " --fingerprint [̾��]       �����ɽ��\n"
 
-#: g10/g10.c:429
+#: g10/g10.c:431
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
 
-#: g10/g10.c:433
+#: g10/g10.c:435
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -722,7 +722,7 @@ msgstr ""
 "��̾�����ڡ��Ź沽������\n"
 "�����ư��ϡ����ϥǡ����˰�¸\n"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -730,186 +730,191 @@ msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: g10/g10.c:522
+#: g10/g10.c:524
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/g10.c:575
+#: g10/g10.c:577
 msgid "conflicting commands\n"
 msgstr "���ޥ�ɤξ���\n"
 
-#: g10/g10.c:725
+#: g10/g10.c:727
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե�����`%s'������ޤ���\n"
 
-#: g10/g10.c:729
+#: g10/g10.c:731
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե�����`%s': %s\n"
 
-#: g10/g10.c:736
+#: g10/g10.c:738
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "`%s'���饪�ץ������ɤ߹��ߤޤ�\n"
 
-#: g10/g10.c:937
+#: g10/g10.c:943
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s��������ʸ������ǤϤ���ޤ���\n"
 
-#: g10/g10.c:1008
+#: g10/g10.c:1014
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/g10.c:1012 g10/g10.c:1021
+#: g10/g10.c:1018 g10/g10.c:1027
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s���Ѥ��ޤ���!\n"
 
-#: g10/g10.c:1014
+#: g10/g10.c:1020
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ���Ѥ��뤳�ȤϤǤ��ޤ���!\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1023
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ���Ѥ��Ƥ�̵��̣�Ǥ�!\n"
 
-#: g10/g10.c:1037 g10/g10.c:1049
+#: g10/g10.c:1043 g10/g10.c:1055
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ���̵���Ǥ�\n"
 
-#: g10/g10.c:1043 g10/g10.c:1055
+#: g10/g10.c:1049 g10/g10.c:1061
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ���̵���Ǥ�\n"
 
-#: g10/g10.c:1059
+#: g10/g10.c:1065
 msgid "the given policy URL is invalid\n"
 msgstr "��������줿�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/g10.c:1062
+#: g10/g10.c:1068
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "���̥��르�ꥺ���%d..%d���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1064
+#: g10/g10.c:1070
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:1066
+#: g10/g10.c:1072
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1074
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1071
+#: g10/g10.c:1077
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/g10.c:1075
+#: g10/g10.c:1081
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1160
+#: g10/g10.c:1166
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:1166
+#: g10/g10.c:1172
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/g10.c:1173
+#: g10/g10.c:1179
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/g10.c:1181
+#: g10/g10.c:1187
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/g10.c:1194
+#: g10/g10.c:1200
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1213
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1227
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1244
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1252
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1260
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/g10.c:1262
+#: g10/g10.c:1268
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/g10.c:1278
+#: g10/g10.c:1284
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key �桼����id"
 
-#: g10/g10.c:1281
+#: g10/g10.c:1287
 msgid "--delete-key user-id"
 msgstr "--delete-key �桼����id"
 
-#: g10/encode.c:268 g10/g10.c:1318 g10/sign.c:393
+#: g10/g10.c:1295
+#, 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
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s�������ޤ���: %s\n"
 
-#: g10/g10.c:1333
+#: g10/g10.c:1347
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [�桼����id] [����]"
 
-#: g10/g10.c:1399
+#: g10/g10.c:1413
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:1407
+#: g10/g10.c:1421
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:1478
+#: g10/g10.c:1492
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ��`%s'�Ǥ�\n"
 
-#: g10/g10.c:1565
+#: g10/g10.c:1579
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1583
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å������򥿥��פ��Ƥ������� ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1572 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1586 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s'�������ޤ���\n"
 
-#: g10/g10.c:1781
+#: g10/g10.c:1795
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "����̾����Ƭ��ʸ�����������������(_)�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1787
+#: g10/g10.c:1801
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -917,11 +922,11 @@ msgstr ""
 "����̾�ˤ�ʸ�����������ɥåȡ���������������Τߤ��Ѥ���\n"
 "'='�ǽ����ʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1793
+#: g10/g10.c:1807
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "����̾�ΥɥåȤ�¾��ʸ���ǰϤޤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1801
+#: g10/g10.c:1815
 msgid "a notation value must not use any control characters\n"
 msgstr "����̾���ͤ�����ʸ�����Ѥ��ƤϤ����ޤ���\n"
 
@@ -2001,7 +2006,7 @@ msgstr "��%08lX: �˴���������ɲ�\n"
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "��%08lX: �������ʣ���ˤϼ��ʽ�̾������ޤ���\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
+#: g10/delkey.c:67 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: �桼���������Ĥ���ޤ���\n"
@@ -2581,7 +2586,7 @@ msgid "revoked"
 msgstr "�˴��Ѥ�"
 
 #. of subkey
-#: g10/keylist.c:404 g10/mainproc.c:834
+#: g10/keylist.c:404 g10/mainproc.c:836
 #, c-format
 msgid " [expires: %s]"
 msgstr " [ͭ������: %s]"
@@ -2610,86 +2615,86 @@ msgstr "%s��, ID %08lX�ǰŹ沽����ޤ���\n"
 msgid "public key decryption failed: %s\n"
 msgstr "������������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:429
+#: g10/mainproc.c:431
 msgid "decryption okay\n"
 msgstr "���������\n"
 
-#: g10/mainproc.c:434
+#: g10/mainproc.c:436
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "�ٹ�: �Ź沽���줿��å������ϲ��⤵��Ƥ��ޤ�!\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:441
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:460
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "����: �����Ԥϡ����ˤ���פ褦�˵��Ƥ��ޤ�\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:462
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "���Υե�����̾='%.*s'\n"
 
-#: g10/mainproc.c:615
+#: g10/mainproc.c:617
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "��Ω�˴�����gpg --import�פ�Ȥä�Ŭ�Ѥ��Ƥ�������\n"
 
-#: g10/mainproc.c:702 g10/mainproc.c:711
+#: g10/mainproc.c:704 g10/mainproc.c:713
 msgid "WARNING: invalid notation data found\n"
 msgstr "�ٹ�: ̵��������ǡ���������ޤ�\n"
 
-#: g10/mainproc.c:714
+#: g10/mainproc.c:716
 msgid "Notation: "
 msgstr "����: "
 
-#: g10/mainproc.c:723
+#: g10/mainproc.c:725
 msgid "Policy: "
 msgstr "�ݥꥷ��: "
 
-#: g10/mainproc.c:1233
+#: g10/mainproc.c:1235
 msgid "signature verification suppressed\n"
 msgstr "��̾�θ��ڤ��ά\n"
 
-#: g10/mainproc.c:1270
+#: g10/mainproc.c:1272
 #, 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:1305 g10/mainproc.c:1316
+#: g10/mainproc.c:1307 g10/mainproc.c:1318
 msgid "BAD signature from \""
 msgstr "������ ��̾: \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1317
+#: g10/mainproc.c:1308 g10/mainproc.c:1319
 msgid "Good signature from \""
 msgstr "��������̾: \""
 
-#: g10/mainproc.c:1308
+#: g10/mainproc.c:1310
 msgid "                aka \""
 msgstr "       ��̾ \""
 
-#: g10/mainproc.c:1364
+#: g10/mainproc.c:1366
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "��̾�򸡾ڤǤ��ޤ���: %s\n"
 
-#: g10/mainproc.c:1421 g10/mainproc.c:1436 g10/mainproc.c:1498
+#: g10/mainproc.c:1423 g10/mainproc.c:1438 g10/mainproc.c:1500
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "ʬΥ��̾�����"
 
-#: g10/mainproc.c:1447
+#: g10/mainproc.c:1449
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���饹0x%02x����Ω��̾\n"
 
-#: g10/mainproc.c:1502
+#: g10/mainproc.c:1504
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�Ť����� (PGP 2.x) �ν�̾\n"
 
-#: g10/mainproc.c:1507
+#: g10/mainproc.c:1509
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() �����̵���ʥѥ��åȤ򸡽Ф��ޤ���\n"
 
@@ -2732,7 +2737,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "`%s'����³�Ǥ��ޤ���: %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:574
+#: g10/passphrase.c:313 g10/passphrase.c:576
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (�縰ID %08lX)"
@@ -2775,7 +2780,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:560
+#: g10/passphrase.c:562
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2785,20 +2790,20 @@ msgstr ""
 "���Υ桼��������̩���Υ��å���������ˤ�\n"
 "�ѥ��ե졼��������ޤ�: \""
 
-#: g10/passphrase.c:569
+#: g10/passphrase.c:571
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u�ӥå�%s��, ID %08lX�������դ�%s"
 
-#: g10/passphrase.c:607
+#: g10/passphrase.c:609
 msgid "can't query password in batchmode\n"
 msgstr "�Хå��⡼�ɤǤϥѥ���ɤ���礻���Ǥ��ޤ���\n"
 
-#: g10/passphrase.c:611
+#: g10/passphrase.c:613
 msgid "Enter passphrase: "
 msgstr "�ѥ��ե졼��������: "
 
-#: g10/passphrase.c:615
+#: g10/passphrase.c:617
 msgid "Repeat passphrase: "
 msgstr "�ѥ��ե졼���������: "
 
@@ -3510,6 +3515,13 @@ msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "�ٹ�: ��å��������оΰŹ�ˡ�μ夤���ǰŹ沽����Ƥ��ޤ���\n"
 
+#: g10/encr-data.c:97
+#, fuzzy
+msgid "problem handling encrypted packet\n"
+msgstr ""
+"�Ź�ѥ��åȤθ�ID�ե������\n"
+"������"
+
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "�夤�����Ǥ��ޤ��� - �Ƽ¹�\n"
@@ -3519,14 +3531,6 @@ msgstr "�夤�����Ǥ��ޤ��� - �Ƽ¹�\n"
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr "�оΰŹ�ˡ�μ夤������򤹤뤳�Ȥ��Ǥ��ޤ���%d���ߤޤ���!\n"
 
-#: g10/delkey.c:94
-msgid "there is a secret key for this public key!\n"
-msgstr "���θ������ˤ���������̩��������ޤ�!\n"
-
-#: g10/delkey.c:96
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr "�ޤ���--delete-secret-key�ץ��ץ����Ǥ���������Ƥ���������\n"
-
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "��--yes�פΤʤ��Хå��⡼�ɤǤϤǤ��ޤ���\n"
@@ -3539,6 +3543,14 @@ msgstr "���θ����ؤ��������ޤ���? "
 msgid "This is a secret key! - really delete? "
 msgstr "�������̩���Ǥ�! �����˺�����ޤ���? "
 
+#: g10/delkey.c:182
+msgid "there is a secret key for this public key!\n"
+msgstr "���θ������ˤ���������̩��������ޤ�!\n"
+
+#: g10/delkey.c:184
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr "�ޤ���--delete-secret-key�ץ��ץ����Ǥ���������Ƥ���������\n"
+
 #: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
diff --git a/po/nl.po b/po/nl.po
index 844a84b14..16e8010bb 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-01-11 13:11+0100\n"
+"POT-Creation-Date: 2001-02-07 16:46+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"
@@ -337,7 +337,7 @@ msgstr ""
 "om het besturingssysteem de kans te geven om meer entropie te\n"
 "verzamelen! (Nog %d bytes nodig)\n"
 
-#: g10/g10.c:211
+#: g10/g10.c:212
 msgid ""
 "@Commands:\n"
 " "
@@ -345,139 +345,139 @@ msgstr ""
 "@Opdrachten:\n"
 " "
 
-#: g10/g10.c:213
+#: g10/g10.c:214
 msgid "|[file]|make a signature"
 msgstr "|[bestand]|maak een ondertekening"
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "|[file]|make a clear text signature"
 msgstr "|[bestand]|maak een niet versleutelde ondertekening"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "make a detached signature"
 msgstr "maak een losstaande ondertekening"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "encrypt data"
 msgstr "versleutel gegevens"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "encryption only with symmetric cipher"
 msgstr "versleutel slechts met een symmetrische versleutelmethode"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "store only"
 msgstr "alleen bewaren"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "decrypt data (default)"
 msgstr "gegevens decoderen (standaard)"
 
-#: g10/g10.c:220
+#: g10/g10.c:221
 msgid "verify a signature"
 msgstr "ondertekening controleren"
 
-#: g10/g10.c:222
+#: g10/g10.c:223
 msgid "list keys"
 msgstr "lijst van sleutels genereren"
 
-#: g10/g10.c:224
+#: g10/g10.c:225
 msgid "list keys and signatures"
 msgstr "sleutels en ondertekeningen opnoemen"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "check key signatures"
 msgstr "sleutelverificaties controleren"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "list keys and fingerprints"
 msgstr "sleutels en vingerafdrukken opnoemen"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "list secret keys"
 msgstr "geheime sleutels opnoemen"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "generate a new key pair"
 msgstr "nieuw sleutelpaar genereren"
 
-#: g10/g10.c:229
+#: g10/g10.c:230
 msgid "remove key from the public keyring"
 msgstr "sleutel weghalen uit de publieke sleutelbos"
 
-#: g10/g10.c:231
+#: g10/g10.c:232
 msgid "remove key from the secret keyring"
 msgstr "sleutel weghalen uit de geheime sleutelbos"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "sign a key"
 msgstr "onderteken een sleutel"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign a key locally"
 msgstr "onderteken een sleutel lokaal"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "sign or edit a key"
 msgstr "onderteken of bewerk een sleutel"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "generate a revocation certificate"
 msgstr "genereer een terugtrekkings-certificaat"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "export keys"
 msgstr "exporteer sleutels"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "export keys to a key server"
 msgstr "exporteer sleutels naar een sleutelserver"
 
-#: g10/g10.c:238
+#: g10/g10.c:239
 msgid "import keys from a key server"
 msgstr "importeer sleutels van een sleutelserver"
 
-#: g10/g10.c:242
+#: g10/g10.c:243
 msgid "import/merge keys"
 msgstr "sleutels importeren/samenvoegen"
 
-#: g10/g10.c:244
+#: g10/g10.c:245
 msgid "list only the sequence of packets"
 msgstr "noem alleen de volgorde van pakketten"
 
-#: g10/g10.c:246
+#: g10/g10.c:247
 msgid "export the ownertrust values"
 msgstr "exporteer het vertrouwen in de eigenaars"
 
-#: g10/g10.c:248
+#: g10/g10.c:249
 msgid "import ownertrust values"
 msgstr "importeer het vertrouwen in de eigenaars"
 
-#: g10/g10.c:250
+#: g10/g10.c:251
 msgid "update the trust database"
 msgstr "werk de vertrouwensdatabase bij"
 
-#: g10/g10.c:252
+#: g10/g10.c:253
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMEN]|controleer de vertrouwensdatabase"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "fix a corrupted trust database"
 msgstr "repareer een beschadigde vertrouwensdatabase"
 
-#: g10/g10.c:254
+#: g10/g10.c:255
 msgid "De-Armor a file or stdin"
 msgstr "Verwijder de beveiliging op bestand of standaard invoer"
 
-#: g10/g10.c:256
+#: g10/g10.c:257
 msgid "En-Armor a file or stdin"
 msgstr "Voeg beveiliging toe aan bestad of standaard invoer"
 
-#: g10/g10.c:258
+#: g10/g10.c:259
 msgid "|algo [files]|print message digests"
 msgstr "|algo [bestanden]|geef controlegetal van berichten weer"
 
-#: g10/g10.c:262
+#: g10/g10.c:263
 msgid ""
 "@\n"
 "Options:\n"
@@ -487,163 +487,163 @@ msgstr ""
 "Opties:\n"
 " "
 
-#: g10/g10.c:264
+#: g10/g10.c:265
 msgid "create ascii armored output"
 msgstr "genereer beveiliging in ASCII"
 
-#: g10/g10.c:266
+#: g10/g10.c:267
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAAM|versleutel voor NAAM"
 
-#: g10/g10.c:269
+#: g10/g10.c:270
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAAM|gebruik NAAM als standaard ontvanger"
 
-#: g10/g10.c:271
+#: g10/g10.c:272
 msgid "use the default key as default recipient"
 msgstr "gebruik de standaard sleutel als standaard ontvanger"
 
-#: g10/g10.c:275
+#: g10/g10.c:276
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "gebruik deze gebruikersidentificatie om te ondertekenen of te decoderen"
 
-#: g10/g10.c:276
+#: g10/g10.c:277
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|stel compressieniveau in op N (uitzetten met 0)"
 
-#: g10/g10.c:278
+#: g10/g10.c:279
 msgid "use canonical text mode"
 msgstr "gebruik de verkorte tekstmodus"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "use as output file"
 msgstr "gebruik als uitvoerbestand"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "verbose"
 msgstr "geef meer informatie"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "be somewhat more quiet"
 msgstr "wees iets stiller"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "don't use the terminal at all"
 msgstr "gebruik de terminal helemaal niet"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "force v3 signatures"
 msgstr "forcees v3 ondertekening"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "always use a MDC for encryption"
 msgstr "gebruik altijd een MDC voor versleuteling"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "do not make any changes"
 msgstr "maak geen enkele verandering"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "batch mode: never ask"
 msgstr "doorlopende modus: vraag nooit"
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "assume yes on most questions"
 msgstr "veronderstel ja als antwoord op de meeste vragen"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "assume no on most questions"
 msgstr "veronderstel nee als antwoord op de meeste vragen"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "add this keyring to the list of keyrings"
 msgstr "voeg deze sleutelbos toe aan de lijst van sleutelbossen"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "add this secret keyring to the list"
 msgstr "voeg deze geheime sleutelbos toe aan de lijst"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAAM|gebruik NAAM als standaard geheime sleutel"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVER|gebruik deze sleutelserver om sleutels op te zoeken"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAAM|zet tekenverzameling van terminal op NAAM"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "read options from file"
 msgstr "lees opties uit bestand"
 
-#: g10/g10.c:300
+#: g10/g10.c:301
 msgid "|FD|write status info to this FD"
 msgstr "|BB|schrijf status naar deze bestandsbeschrijver"
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "|FILE|load extension module FILE"
 msgstr "|BESTAND|laad extensiemodule BESTAND"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "emulate the mode described in RFC1991"
 msgstr "doe als RFC1991 voorschrijft"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 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:309
+#: g10/g10.c:310
 msgid "|N|use passphrase mode N"
 msgstr "|N|gebruik sleuteltekst modus N"
 
-#: g10/g10.c:311
+#: g10/g10.c:312
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM voor sleutelteksten"
 
-#: g10/g10.c:313
+#: g10/g10.c:314
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAAM|gebruik versleutelalgoritme NAAM voor sleutelteksten"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAAM|gebruik versleutelalgoritme NAAM"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "|N|use compress algorithm N"
 msgstr "|N|gebruik compressiealgoritme N"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "throw keyid field of encrypted packets"
 msgstr "plaats geen sleutelidentificatieveld in versleutelde pakketten"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAAM=WAARDE|gebruik deze notitiegegevens"
 
-#: g10/g10.c:321
+#: g10/g10.c:322
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:324
+#: g10/g10.c:325
 msgid ""
 "@\n"
 "Examples:\n"
@@ -663,17 +663,17 @@ msgstr ""
 " --list-keys [namen]         toon sleutels\n"
 " --fingerprints [namen]      toon vingerafdrukken\n"
 
-#: g10/g10.c:429
+#: g10/g10.c:431
 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:433
+#: g10/g10.c:435
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Gebruik: gpg [opties] [bestanden] (-h voor hulp)"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -683,7 +683,7 @@ msgstr ""
 "onderteken, controleer, versleutel of decodeer de ingevoerde gegevens\n"
 "standaardactie hangt af van de gegevens\n"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -691,188 +691,193 @@ msgstr ""
 "\n"
 "Ondersteunde algoritmes:\n"
 
-#: g10/g10.c:522
+#: g10/g10.c:524
 msgid "usage: gpg [options] "
 msgstr "gebruik: gpg [opties] "
 
-#: g10/g10.c:575
+#: g10/g10.c:577
 msgid "conflicting commands\n"
 msgstr "tegenstrijdige commando's\n"
 
-#: g10/g10.c:725
+#: g10/g10.c:727
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "LET OP: geen bestand `%s' met standaardopties\n"
 
-#: g10/g10.c:729
+#: g10/g10.c:731
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "optiebestand `%s': %s\n"
 
-#: g10/g10.c:736
+#: g10/g10.c:738
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "opties inlezen van `%s'\n"
 
-#: g10/g10.c:937
+#: g10/g10.c:943
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s is een onbekende tekenverzameling\n"
 
-#: g10/g10.c:1008
+#: g10/g10.c:1014
 msgid "WARNING: program may create a core file!\n"
 msgstr "LET OP: programma zou een geheugendump kunnen maken!\n"
 
-#: g10/g10.c:1012 g10/g10.c:1021
+#: g10/g10.c:1018 g10/g10.c:1027
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "LET OP: %s is niet voor gewoon gebruik!\n"
 
-#: g10/g10.c:1014
+#: g10/g10.c:1020
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s is niet toegestaan met deze %s!\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1023
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s heeft geen betekenis met %s!\n"
 
-#: g10/g10.c:1037 g10/g10.c:1049
+#: g10/g10.c:1043 g10/g10.c:1055
 msgid "selected cipher algorithm is invalid\n"
 msgstr "geselecteerd versleutelalgoritme is ongeldig\n"
 
-#: g10/g10.c:1043 g10/g10.c:1055
+#: g10/g10.c:1049 g10/g10.c:1061
 msgid "selected digest algorithm is invalid\n"
 msgstr "geselecteerd controle-algoritme is ongeldig\n"
 
-#: g10/g10.c:1059
+#: g10/g10.c:1065
 msgid "the given policy URL is invalid\n"
 msgstr "de gegeven beleids-URL is ongeldig\n"
 
-#: g10/g10.c:1062
+#: g10/g10.c:1068
 #, 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:1064
+#: g10/g10.c:1070
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed(?) moet groter zijn dan 0\n"
 
-#: g10/g10.c:1066
+#: g10/g10.c:1072
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed(?) moet groter zijn dan 1\n"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1074
 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:1071
+#: g10/g10.c:1077
 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:1075
+#: g10/g10.c:1081
 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:1160
+#: g10/g10.c:1166
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "fout bij het initialiseren van de vertrouwensdatabase: %s\n"
 
-#: g10/g10.c:1166
+#: g10/g10.c:1172
 msgid "--store [filename]"
 msgstr "--store [bestandsnaam]"
 
-#: g10/g10.c:1173
+#: g10/g10.c:1179
 msgid "--symmetric [filename]"
 msgstr "--symmetric [bestandsnaam]"
 
-#: g10/g10.c:1181
+#: g10/g10.c:1187
 msgid "--encrypt [filename]"
 msgstr "--encrypt [bestandsnaam]"
 
-#: g10/g10.c:1194
+#: g10/g10.c:1200
 msgid "--sign [filename]"
 msgstr "--sign [bestandsnaam]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1213
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [bestandsnaam]"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1227
 msgid "--clearsign [filename]"
 msgstr "--clearsign [bestandsnaam]"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1244
 msgid "--decrypt [filename]"
 msgstr "--decrypt [bestandsnaam]"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1252
 msgid "--sign-key user-id"
 msgstr "--sign-key gebruikersidentificatie"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1260
 msgid "--lsign-key user-id"
 msgstr "--lsign-key gebruikers-identificatie"
 
-#: g10/g10.c:1262
+#: g10/g10.c:1268
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key gebruikersidentificatie [opdrachten]"
 
-#: g10/g10.c:1278
+#: g10/g10.c:1284
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key gebruikersidentificatie"
 
-#: g10/g10.c:1281
+#: g10/g10.c:1287
 msgid "--delete-key user-id"
 msgstr "--delete-key gebruikersidentificatie"
 
-#: g10/encode.c:268 g10/g10.c:1318 g10/sign.c:393
+#: g10/g10.c:1295
+#, 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
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan %s niet openen: %s\n"
 
-#: g10/g10.c:1333
+#: g10/g10.c:1347
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [gebruikersidentificatie] [sleutelbos]"
 
-#: g10/g10.c:1399
+#: g10/g10.c:1413
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "opheffen van beveiliging mislukt: %s\n"
 
-#: g10/g10.c:1407
+#: g10/g10.c:1421
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "beveiligen mislukt: %s\n"
 
-#: g10/g10.c:1478
+#: g10/g10.c:1492
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ongeldig frommelalgoritme `%s'\n"
 
-#: g10/g10.c:1565
+#: g10/g10.c:1579
 msgid "[filename]"
 msgstr "[bestandsnaam]"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1583
 msgid "Go ahead and type your message ...\n"
 msgstr "Gaat uw gang, type het bericht ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1572 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1586 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:1781
+#: g10/g10.c:1795
 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:1787
+#: g10/g10.c:1801
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -880,11 +885,11 @@ msgstr ""
 "een notitienaam mag alleen letters, cijfers, punten of underscores bevatten "
 "en eindig met een =\n"
 
-#: g10/g10.c:1793
+#: g10/g10.c:1807
 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:1801
+#: g10/g10.c:1815
 msgid "a notation value must not use any control characters\n"
 msgstr "een notitienaam mag geen controletekens bevatten\n"
 
@@ -1999,7 +2004,7 @@ msgstr "sleutel %08lX: terugtrekkingscertificaat toegevoegd\n"
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "sleutel %08lX: onze versie heeft geen zelfondertekening\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
+#: g10/delkey.c:67 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: gebruiker niet gevonden\n"
@@ -2585,7 +2590,7 @@ msgid "revoked"
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:404 g10/mainproc.c:834
+#: g10/keylist.c:404 g10/mainproc.c:836
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "Sleutel verloopt op %s\n"
@@ -2614,87 +2619,87 @@ msgstr "versleuteld met %s sleutel, nummer %08lX\n"
 msgid "public key decryption failed: %s\n"
 msgstr "openbare sleutel-ontsleuteling ging niet: %s\n"
 
-#: g10/mainproc.c:429
+#: g10/mainproc.c:431
 msgid "decryption okay\n"
 msgstr "ontsleutelen ging goed\n"
 
-#: g10/mainproc.c:434
+#: g10/mainproc.c:436
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "LET OP: het versleutelde bericht is veranderd!\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:441
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ontsleuteling mislukte: %s\n"
 
 # Dit kan wel Engels blijven.. toch?
-#: g10/mainproc.c:458
+#: g10/mainproc.c:460
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "LET OP: afzender vroeg om \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:462
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originele bestandsnaam='%.*s'\n"
 
-#: g10/mainproc.c:615
+#: g10/mainproc.c:617
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "alleenstaande intrekking - gebruik \"gpg --import\" om uit te voeren\n"
 
-#: g10/mainproc.c:702 g10/mainproc.c:711
+#: g10/mainproc.c:704 g10/mainproc.c:713
 msgid "WARNING: invalid notation data found\n"
 msgstr "LET OP: ongeldige aantekeningen gevonden\n"
 
-#: g10/mainproc.c:714
+#: g10/mainproc.c:716
 msgid "Notation: "
 msgstr "Aantekening: "
 
-#: g10/mainproc.c:723
+#: g10/mainproc.c:725
 msgid "Policy: "
 msgstr "Beleid: "
 
-#: g10/mainproc.c:1233
+#: g10/mainproc.c:1235
 msgid "signature verification suppressed\n"
 msgstr "controle van de ondertekening overgeslagen\n"
 
-#: g10/mainproc.c:1270
+#: g10/mainproc.c:1272
 #, 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:1305 g10/mainproc.c:1316
+#: g10/mainproc.c:1307 g10/mainproc.c:1318
 msgid "BAD signature from \""
 msgstr "FOUTE ondertekening van \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1317
+#: g10/mainproc.c:1308 g10/mainproc.c:1319
 msgid "Good signature from \""
 msgstr "Correcte ondertekening van \""
 
-#: g10/mainproc.c:1308
+#: g10/mainproc.c:1310
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1364
+#: g10/mainproc.c:1366
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ondertekening niet controleren: %s\n"
 
-#: g10/mainproc.c:1421 g10/mainproc.c:1436 g10/mainproc.c:1498
+#: g10/mainproc.c:1423 g10/mainproc.c:1438 g10/mainproc.c:1500
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "maak een losstaande ondertekening"
 
-#: g10/mainproc.c:1447
+#: g10/mainproc.c:1449
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "losstaande ondertekening van type 0x%02x\n"
 
-#: g10/mainproc.c:1502
+#: g10/mainproc.c:1504
 msgid "old style (PGP 2.x) signature\n"
 msgstr "oude stijl (PGP 2.x) ondertekening\n"
 
-#: g10/mainproc.c:1507
+#: g10/mainproc.c:1509
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ongeldig hoofdpakket gevonden in proc_tree()\n"
 
@@ -2735,7 +2740,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "kan geen verbinding maken met `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:574
+#: g10/passphrase.c:313 g10/passphrase.c:576
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (hoofdsleutelnummer %08lX)"
@@ -2778,7 +2783,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:560
+#: g10/passphrase.c:562
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2788,20 +2793,20 @@ msgstr ""
 "U heeft een sleuteltekst nodig om de beveiliging voor de geheime\n"
 "sleutel voor gebruiker op te heffen: \""
 
-#: g10/passphrase.c:569
+#: g10/passphrase.c:571
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bit %s sleutel, nummer %08lX, gemaakt op %s"
 
-#: g10/passphrase.c:607
+#: g10/passphrase.c:609
 msgid "can't query password in batchmode\n"
 msgstr "kan niet om wachtwoord vragen in lopende band-modus\n"
 
-#: g10/passphrase.c:611
+#: g10/passphrase.c:613
 msgid "Enter passphrase: "
 msgstr "Geef de sleuteltekst: "
 
-#: g10/passphrase.c:615
+#: g10/passphrase.c:617
 msgid "Repeat passphrase: "
 msgstr "Herhaal de sleuteltekst: "
 
@@ -3526,6 +3531,11 @@ msgstr ""
 "LET OP: dit bericht werd versleuteld met een zwakke sleutel in het\n"
 "symmetrische versleutelalgoritme.\n"
 
+#: g10/encr-data.c:97
+#, fuzzy
+msgid "problem handling encrypted packet\n"
+msgstr "plaats geen sleutelidentificatieveld in versleutelde pakketten"
+
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "zwakke sleutel gemaakt - ik probeer het opnieuw\n"
@@ -3537,15 +3547,6 @@ msgstr ""
 "kon het aanmaken van een zwakke sleutel voor het symmetrische\n"
 "algoritme niet voorkomen; ik heb het %d keer geprobeerd!\n"
 
-#: g10/delkey.c:94
-msgid "there is a secret key for this public key!\n"
-msgstr "er is een geheime sleutel voor deze openbare sleutel!\n"
-
-#: g10/delkey.c:96
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr ""
-"gebruik eerst de optie \"--delete-secret-key\" om hem te verwijderen.\n"
-
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "kan dat niet doen in lopende band-mode zonder \"--yes\"\n"
@@ -3558,6 +3559,15 @@ 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
+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
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr ""
+"gebruik eerst de optie \"--delete-secret-key\" om hem te verwijderen.\n"
+
 #: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
diff --git a/po/pl.po b/po/pl.po
index 5034fab50..ccf9f843a 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-01-11 13:11+0100\n"
+"POT-Creation-Date: 2001-02-07 16:46+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"
@@ -350,7 +350,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:211
+#: g10/g10.c:212
 msgid ""
 "@Commands:\n"
 " "
@@ -358,139 +358,139 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/g10.c:213
+#: g10/g10.c:214
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu na czytelnym dokumencie"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "make a detached signature"
 msgstr "z�o�enie podpisu oddzielonego od dokumentu"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "store only"
 msgstr "tylko zapis"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lnie)"
 
-#: g10/g10.c:220
+#: g10/g10.c:221
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/g10.c:222
+#: g10/g10.c:223
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/g10.c:224
+#: g10/g10.c:225
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpis�w"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "check key signatures"
 msgstr "sprawdzenie podpis�w kluczy"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "list secret keys"
 msgstr "lista kluczy tajnych"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "generate a new key pair"
 msgstr "generacja nowej pary klucza"
 
-#: g10/g10.c:229
+#: g10/g10.c:230
 msgid "remove key from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: g10/g10.c:231
+#: g10/g10.c:232
 msgid "remove key from the secret keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy tajnych"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "sign a key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign a key locally"
 msgstr "z�o�enie lokalnego podpisu na kluczu"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "generate a revocation certificate"
 msgstr "generacja certyfikatu uniewa�nienia klucza"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/g10.c:238
+#: g10/g10.c:239
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/g10.c:242
+#: g10/g10.c:243
 msgid "import/merge keys"
 msgstr "import/do��czenie kluczy"
 
-#: g10/g10.c:244
+#: g10/g10.c:245
 msgid "list only the sequence of packets"
 msgstr "wypisane sekwencji pakiet�w"
 
-#: g10/g10.c:246
+#: g10/g10.c:247
 msgid "export the ownertrust values"
 msgstr "eksport warto�ci zaufania"
 
-#: g10/g10.c:248
+#: g10/g10.c:249
 msgid "import ownertrust values"
 msgstr "wczytanie warto��i zaufania"
 
-#: g10/g10.c:250
+#: g10/g10.c:251
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/g10.c:252
+#: g10/g10.c:253
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAZWY]|sprawdzenie bazy zaufania"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "fix a corrupted trust database"
 msgstr "naprawa uszkodzonej bazy zaufania"
 
-#: g10/g10.c:254
+#: g10/g10.c:255
 msgid "De-Armor a file or stdin"
 msgstr "zdj�cie opakowania ASCII pliku lub potoku"
 
-#: g10/g10.c:256
+#: g10/g10.c:257
 msgid "En-Armor a file or stdin"
 msgstr "opakowanie ASCII pliku lub potoku"
 
-#: g10/g10.c:258
+#: g10/g10.c:259
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/g10.c:262
+#: g10/g10.c:263
 msgid ""
 "@\n"
 "Options:\n"
@@ -500,156 +500,156 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/g10.c:264
+#: g10/g10.c:265
 msgid "create ascii armored output"
 msgstr "plik wynikowy w opakowaniu ASCII"
 
-#: g10/g10.c:266
+#: g10/g10.c:267
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/g10.c:269
+#: g10/g10.c:270
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego adresata"
 
-#: g10/g10.c:271
+#: g10/g10.c:272
 msgid "use the default key as default recipient"
 msgstr "domy�lny klucz jest domy�lnym adresatem"
 
-#: g10/g10.c:275
+#: g10/g10.c:276
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/g10.c:276
+#: g10/g10.c:277
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - brak)"
 
-#: g10/g10.c:278
+#: g10/g10.c:279
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "use as output file"
 msgstr "plik wyj�ciowy"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "verbose"
 msgstr "z informacjami dodatkowymi"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "be somewhat more quiet"
 msgstr "mniej komunikat�ww"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "don't use the terminal at all"
 msgstr "bez odwo�a� do terminala"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "force v3 signatures"
 msgstr "wymuszenie trzeciej wersji formatu podpis�w"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "always use a MDC for encryption"
 msgstr "do szyfrowania b�dzie u�ywany MDC"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: �adnych pyta�"
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "assume yes on most questions"
 msgstr "automatyczna odpowied� tak na wi�kszo�� pyta�"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "assume no on most questions"
 msgstr "automatyczna odpowied� nie na wi�kszo�� pyta�"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "add this keyring to the list of keyrings"
 msgstr "doda� zbi�r kluczy do listy u�ywanych"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "add this secret keyring to the list"
 msgstr "doda� zbi�r kluczy tajnych do listy"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego klucza tajnego"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|serwer kluczy w kt�rym b�d� poszukiwane"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAZWA|zestaw znak�w terminala NAZWA"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "read options from file"
 msgstr "wczytanie opcji z pliku"
 
-#: g10/g10.c:300
+#: g10/g10.c:301
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapisa� opis stanu do FD"
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "|KEYID|ulimately trust this key"
 msgstr "|KLUCZ|ca�kowite zaufanie dla tego klucza"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "|FILE|load extension module FILE"
 msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "emulate the mode described in RFC1991"
 msgstr "emulacja trybu opisanego w RFC1991"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 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:309
+#: g10/g10.c:310
 msgid "|N|use passphrase mode N"
 msgstr "|N|N-ty tryb wprowadzania wyra�enia przej�ciowego"
 
-#: g10/g10.c:311
+#: g10/g10.c:312
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|ALG|algorytm obliczania skr�t�w wiadomo�ci ALG"
 
-#: g10/g10.c:313
+#: g10/g10.c:314
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|ALG|algorytmu szyfruj�cy ALG dla has�a"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|algorytm szyfruj�cy NAZWA"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|algorytm obliczania skr�t�w wiadomo�ci NAZWA"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "|N|use compress algorithm N"
 msgstr "|N|algorytm kompresji N"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "throw keyid field of encrypted packets"
 msgstr "usuni�cie identyfikator�w kluczy z pakiet�w"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAZWA=WARTO��|adnotacje"
 
-#: g10/g10.c:321
+#: g10/g10.c:322
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -657,7 +657,7 @@ msgstr ""
 "@\n"
 "(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
 
-#: g10/g10.c:324
+#: g10/g10.c:325
 msgid ""
 "@\n"
 "Examples:\n"
@@ -678,15 +678,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/g10.c:429
+#: g10/g10.c:431
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: g10/g10.c:433
+#: g10/g10.c:435
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -696,7 +696,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -704,186 +704,191 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/g10.c:522
+#: g10/g10.c:524
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/g10.c:575
+#: g10/g10.c:577
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/g10.c:725
+#: g10/g10.c:727
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji '%s'\n"
 
-#: g10/g10.c:729
+#: g10/g10.c:731
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji '%s': %s\n"
 
-#: g10/g10.c:736
+#: g10/g10.c:738
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z '%s'\n"
 
-#: g10/g10.c:937
+#: g10/g10.c:943
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/g10.c:1008
+#: g10/g10.c:1014
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/g10.c:1012 g10/g10.c:1021
+#: g10/g10.c:1018 g10/g10.c:1027
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/g10.c:1014
+#: g10/g10.c:1020
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1023
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu z %s!\n"
 
-#: g10/g10.c:1037 g10/g10.c:1049
+#: g10/g10.c:1043 g10/g10.c:1055
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/g10.c:1043 g10/g10.c:1055
+#: g10/g10.c:1049 g10/g10.c:1061
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm geenracji skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/g10.c:1059
+#: g10/g10.c:1065
 msgid "the given policy URL is invalid\n"
 msgstr "podany URL regulaminu jest niepoprawny\n"
 
-#: g10/g10.c:1062
+#: g10/g10.c:1068
 #, 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:1064
+#: g10/g10.c:1070
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/g10.c:1066
+#: g10/g10.c:1072
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1074
 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:1071
+#: g10/g10.c:1077
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/g10.c:1075
+#: g10/g10.c:1081
 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:1160
+#: g10/g10.c:1166
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1166
+#: g10/g10.c:1172
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/g10.c:1173
+#: g10/g10.c:1179
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:1181
+#: g10/g10.c:1187
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/g10.c:1194
+#: g10/g10.c:1200
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1213
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1227
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/g10.c:1238
+#: g10/g10.c:1244
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1252
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1260
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/g10.c:1262
+#: g10/g10.c:1268
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/g10.c:1278
+#: g10/g10.c:1284
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key nazwa u�ytkownika"
 
-#: g10/g10.c:1281
+#: g10/g10.c:1287
 msgid "--delete-key user-id"
 msgstr "--delete-key nazwa u�ytkownika"
 
-#: g10/encode.c:268 g10/g10.c:1318 g10/sign.c:393
+#: g10/g10.c:1295
+#, 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
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "nie mo�na otworzy� %s: %s\n"
 
-#: g10/g10.c:1333
+#: g10/g10.c:1347
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
 
-#: g10/g10.c:1399
+#: g10/g10.c:1413
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1407
+#: g10/g10.c:1421
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1478
+#: g10/g10.c:1492
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu '%s'\n"
 
-#: g10/g10.c:1565
+#: g10/g10.c:1579
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1583
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1572 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1586 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:1781
+#: g10/g10.c:1795
 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:1787
+#: g10/g10.c:1801
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -891,11 +896,11 @@ msgstr ""
 "nazwa adnotacji mo�e zawiera� tylko litery, cyfry, kropki,\n"
 "podkre�lenia, i musi ko�czy� si� '='\n"
 
-#: g10/g10.c:1793
+#: g10/g10.c:1807
 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:1801
+#: g10/g10.c:1815
 msgid "a notation value must not use any control characters\n"
 msgstr "warto�� adnotacji nie mo�e zawiera� znak�w steruj�cych\n"
 
@@ -2002,7 +2007,7 @@ msgstr "klucz %08lX: dodany certyfikat uniewa�nienia\n"
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "klucz %08lX: dost�pna kopia nie jest podpisana ni� sam�\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
+#: g10/delkey.c:67 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: nie znaleziono u�ytkownika\n"
@@ -2585,7 +2590,7 @@ msgid "revoked"
 msgstr "uniewa�niony"
 
 #. of subkey
-#: g10/keylist.c:404 g10/mainproc.c:834
+#: g10/keylist.c:404 g10/mainproc.c:836
 #, c-format
 msgid " [expires: %s]"
 msgstr "[wygasa :%s]"
@@ -2614,50 +2619,50 @@ msgstr "zaszyfrowane kluczem %s, o identyfikatorze %08lX\n"
 msgid "public key decryption failed: %s\n"
 msgstr "b��d odszyfrowywania kluczem publicznym: %s\n"
 
-#: g10/mainproc.c:429
+#: g10/mainproc.c:431
 msgid "decryption okay\n"
 msgstr "odszyfrowane poprawnie\n"
 
-#: g10/mainproc.c:434
+#: g10/mainproc.c:436
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "OSTRZE�ENIE: zaszyfrowana wiadomo�� by�a manipulowana!\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:441
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:460
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "UWAGA: nadawca zaznaczy� �e wiadomo�� nie powinna by� zapisywana\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:462
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:615
+#: g10/mainproc.c:617
 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:702 g10/mainproc.c:711
+#: g10/mainproc.c:704 g10/mainproc.c:713
 msgid "WARNING: invalid notation data found\n"
 msgstr "OSTRZE�ENIE: niepoprawne dane w adnotacji\n"
 
-#: g10/mainproc.c:714
+#: g10/mainproc.c:716
 msgid "Notation: "
 msgstr "Adnotacja:"
 
-#: g10/mainproc.c:723
+#: g10/mainproc.c:725
 msgid "Policy: "
 msgstr "Regulamin:"
 
-#: g10/mainproc.c:1233
+#: g10/mainproc.c:1235
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
 
-#: g10/mainproc.c:1270
+#: g10/mainproc.c:1272
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
@@ -2665,38 +2670,38 @@ msgstr ""
 "z u�yciem klucza o identyfikatorze %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1305 g10/mainproc.c:1316
+#: g10/mainproc.c:1307 g10/mainproc.c:1318
 msgid "BAD signature from \""
 msgstr "NIEPOPRAWNY podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1317
+#: g10/mainproc.c:1308 g10/mainproc.c:1319
 msgid "Good signature from \""
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1308
+#: g10/mainproc.c:1310
 msgid "                aka \""
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1364
+#: g10/mainproc.c:1366
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie mog� sprawdzi� podpisu: %s\n"
 
-#: g10/mainproc.c:1421 g10/mainproc.c:1436 g10/mainproc.c:1498
+#: g10/mainproc.c:1423 g10/mainproc.c:1438 g10/mainproc.c:1500
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "z�o�enie podpisu oddzielonego od dokumentu"
 
-#: g10/mainproc.c:1447
+#: g10/mainproc.c:1449
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "osobny podpis klasy 0x%02x\n"
 
-#: g10/mainproc.c:1502
+#: g10/mainproc.c:1504
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:1507
+#: g10/mainproc.c:1509
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
@@ -2738,7 +2743,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "nie mo�na po��czy� si� z %s: %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:574
+#: g10/passphrase.c:313 g10/passphrase.c:576
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (g��wny ID klucza %08lX)"
@@ -2782,7 +2787,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:560
+#: g10/passphrase.c:562
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2792,20 +2797,20 @@ msgstr ""
 "Musisz poda� wyra�enie przej�ciowe (has�o) aby uaktywni� klucz tajny\n"
 "dla u�ytkownika: \""
 
-#: g10/passphrase.c:569
+#: g10/passphrase.c:571
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "d�ugo�� %u bit�w, typ %s, klucz %08lX, stworzony %s"
 
-#: g10/passphrase.c:607
+#: g10/passphrase.c:609
 msgid "can't query password in batchmode\n"
 msgstr "pytanie o has�o nie dzia�a w trybie wsadowym\n"
 
-#: g10/passphrase.c:611
+#: g10/passphrase.c:613
 msgid "Enter passphrase: "
 msgstr "Wyra�enie przej�ciowe: "
 
-#: g10/passphrase.c:615
+#: g10/passphrase.c:617
 msgid "Repeat passphrase: "
 msgstr "Powt�rzone wyra�enie przej�ciowe: "
 
@@ -3527,6 +3532,11 @@ msgid ""
 msgstr ""
 "OSTRZE�ENIE: wiadomo�� by�a szyfrowana s�abym kluczem szyfru symetrycznego.\n"
 
+#: g10/encr-data.c:97
+#, fuzzy
+msgid "problem handling encrypted packet\n"
+msgstr "usuni�cie identyfikator�w kluczy z pakiet�w"
+
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "wygenerowano s�aby klucz - operacja zostaje powt�rzona\n"
@@ -3538,14 +3548,6 @@ msgstr ""
 "brak mo�liwo�ci generacji dobrego klucza dla szyfru symetrycznego;\n"
 "operacja by�a powtarzana %d razy!\n"
 
-#: g10/delkey.c:94
-msgid "there is a secret key for this public key!\n"
-msgstr "jest klucz tajny do tego klucza publicznego!\n"
-
-#: g10/delkey.c:96
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr "aby go usun�� nalezy najpierw u�y� opcji \"--delete-secret-key\".\n"
-
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "bez opcji \"--yes\" nie dzia�a w trybie wsadowym\n"
@@ -3558,6 +3560,14 @@ 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
+msgid "there is a secret key for this public key!\n"
+msgstr "jest klucz tajny do tego klucza publicznego!\n"
+
+#: g10/delkey.c:184
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr "aby go usun�� nalezy najpierw u�y� opcji \"--delete-secret-key\".\n"
+
 #: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 778a5795f..4baa0925b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2001-01-11 13:11+0100\n"
+"POT-Creation-Date: 2001-02-07 16:46+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"
@@ -343,7 +343,7 @@ msgstr ""
 "para que o sistema possa coletar mais entropia!\n"
 "(S�o necess�rios mais %d bytes)\n"
 
-#: g10/g10.c:211
+#: g10/g10.c:212
 msgid ""
 "@Commands:\n"
 " "
@@ -351,144 +351,144 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:213
+#: g10/g10.c:214
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "sim�trica"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padr�o)"
 
-#: g10/g10.c:220
+#: g10/g10.c:221
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:222
+#: g10/g10.c:223
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:224
+#: g10/g10.c:225
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:229
+#: g10/g10.c:230
 msgid "remove key from the public keyring"
 msgstr "remover a chave do chaveiro p�blico"
 
-#: g10/g10.c:231
+#: g10/g10.c:232
 msgid "remove key from the secret keyring"
 msgstr "remover a chave do chaveiro secreto"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:238
+#: g10/g10.c:239
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:242
+#: g10/g10.c:243
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:244
+#: g10/g10.c:245
 msgid "list only the sequence of packets"
 msgstr "listar apenas as seq��ncias de pacotes"
 
 # ownertrust ???
-#: g10/g10.c:246
+#: g10/g10.c:247
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confian�a"
 
-#: g10/g10.c:248
+#: g10/g10.c:249
 msgid "import ownertrust values"
 msgstr "importar os valores de confian�a"
 
-#: g10/g10.c:250
+#: g10/g10.c:251
 msgid "update the trust database"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/g10.c:252
+#: g10/g10.c:253
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMES]|verificar o banco de dados de confiabilidade"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "fix a corrupted trust database"
 msgstr ""
 "consertar um banco de dados de confiabilidade\n"
 "danificado"
 
-#: g10/g10.c:254
+#: g10/g10.c:255
 msgid "De-Armor a file or stdin"
 msgstr "retirar a armadura de um arquivo ou de \"stdin\""
 
-#: g10/g10.c:256
+#: g10/g10.c:257
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um arquivo ou \"stdin\""
 
-#: g10/g10.c:258
+#: g10/g10.c:259
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:262
+#: g10/g10.c:263
 msgid ""
 "@\n"
 "Options:\n"
@@ -498,179 +498,179 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/g10.c:264
+#: g10/g10.c:265
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/g10.c:266
+#: g10/g10.c:267
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/g10.c:269
+#: g10/g10.c:270
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: g10/g10.c:271
+#: g10/g10.c:272
 msgid "use the default key as default recipient"
 msgstr "usar a chave padr�o como destinat�rio padr�o"
 
-#: g10/g10.c:275
+#: g10/g10.c:276
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usu�rio para\n"
 "assinar ou descriptografar"
 
-#: g10/g10.c:276
+#: g10/g10.c:277
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desabilita)"
 
-#: g10/g10.c:278
+#: g10/g10.c:279
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "use as output file"
 msgstr "usar como arquivo de sa�da"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para criptografar"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "batch mode: never ask"
 msgstr "modo n�o-interativo: nunca perguntar"
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "add this keyring to the list of keyrings"
 msgstr "adicionar este chaveiro � lista de chaveiros"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "add this secret keyring to the list"
 msgstr "adicionar este chaveiro secreto � lista"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta padr�o"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "read options from file"
 msgstr "ler op��es do arquivo"
 
-#: g10/g10.c:300
+#: g10/g10.c:301
 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:305
+#: g10/g10.c:306
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "|FILE|load extension module FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 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:309
+#: g10/g10.c:310
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar frase secreta modo N"
 
-#: g10/g10.c:311
+#: g10/g10.c:312
 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:313
+#: g10/g10.c:314
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "eliminar o campo keyid dos pacotes\n"
 "criptografados"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALOR|usar estes dados de nota��o"
 
-#: g10/g10.c:321
+#: g10/g10.c:322
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:324
+#: g10/g10.c:325
 msgid ""
 "@\n"
 "Examples:\n"
@@ -690,15 +690,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:429
+#: g10/g10.c:431
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:433
+#: g10/g10.c:435
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -708,7 +708,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -716,189 +716,194 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:522
+#: g10/g10.c:524
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:575
+#: g10/g10.c:577
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/g10.c:725
+#: g10/g10.c:727
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/g10.c:729
+#: g10/g10.c:731
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: g10/g10.c:736
+#: g10/g10.c:738
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/g10.c:937
+#: g10/g10.c:943
 #, 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:1008
+#: g10/g10.c:1014
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/g10.c:1012 g10/g10.c:1021
+#: g10/g10.c:1018 g10/g10.c:1027
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/g10.c:1014
+#: g10/g10.c:1020
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1023
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:1037 g10/g10.c:1049
+#: g10/g10.c:1043 g10/g10.c:1055
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1043 g10/g10.c:1055
+#: g10/g10.c:1049 g10/g10.c:1061
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1059
+#: g10/g10.c:1065
 msgid "the given policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:1062
+#: g10/g10.c:1068
 #, 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:1064
+#: g10/g10.c:1070
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:1066
+#: g10/g10.c:1072
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1074
 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:1071
+#: g10/g10.c:1077
 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:1075
+#: g10/g10.c:1081
 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:1160
+#: g10/g10.c:1166
 #, 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:1166
+#: g10/g10.c:1172
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/g10.c:1173
+#: g10/g10.c:1179
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:1181
+#: g10/g10.c:1187
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1194
+#: g10/g10.c:1200
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1213
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1227
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1244
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1252
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1260
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/g10.c:1262
+#: g10/g10.c:1268
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/g10.c:1278
+#: g10/g10.c:1284
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-usu�rio"
 
-#: g10/g10.c:1281
+#: g10/g10.c:1287
 msgid "--delete-key user-id"
 msgstr "--delete-key id-usu�rio"
 
-#: g10/encode.c:268 g10/g10.c:1318 g10/sign.c:393
+#: g10/g10.c:1295
+#, 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
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/g10.c:1333
+#: g10/g10.c:1347
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usu�rio] [chaveiro]"
 
-#: g10/g10.c:1399
+#: g10/g10.c:1413
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1407
+#: g10/g10.c:1421
 #, 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:1478
+#: g10/g10.c:1492
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/g10.c:1565
+#: g10/g10.c:1579
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1583
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1572 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1586 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:1781
+#: g10/g10.c:1795
 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:1787
+#: g10/g10.c:1801
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -906,12 +911,12 @@ msgstr ""
 "um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:1793
+#: g10/g10.c:1807
 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:1801
+#: g10/g10.c:1815
 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"
 
@@ -2006,7 +2011,7 @@ msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "chave %08lX: nossa c�pia n�o tem auto-assinatura\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
+#: g10/delkey.c:67 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: usu�rio n�o encontrado\n"
@@ -2592,7 +2597,7 @@ msgid "revoked"
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:404 g10/mainproc.c:834
+#: g10/keylist.c:404 g10/mainproc.c:836
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "A chave expira em %s\n"
@@ -2621,86 +2626,86 @@ msgstr "criptografado com chave %s, ID %08lX\n"
 msgid "public key decryption failed: %s\n"
 msgstr "descriptografia de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:429
+#: g10/mainproc.c:431
 msgid "decryption okay\n"
 msgstr "descriptografia correta\n"
 
-#: g10/mainproc.c:434
+#: g10/mainproc.c:436
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem criptografada foi manipulada!\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:441
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:460
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:462
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome de arquivo original='%.*s'\n"
 
-#: g10/mainproc.c:615
+#: g10/mainproc.c:617
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoga��o isolada - use \"gpg --import\" para aplic�-la\n"
 
-#: g10/mainproc.c:702 g10/mainproc.c:711
+#: g10/mainproc.c:704 g10/mainproc.c:713
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 
-#: g10/mainproc.c:714
+#: g10/mainproc.c:716
 msgid "Notation: "
 msgstr "Nota��o: "
 
-#: g10/mainproc.c:723
+#: g10/mainproc.c:725
 msgid "Policy: "
 msgstr "Pol�tica: "
 
-#: g10/mainproc.c:1233
+#: g10/mainproc.c:1235
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1270
+#: g10/mainproc.c:1272
 #, 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:1305 g10/mainproc.c:1316
+#: g10/mainproc.c:1307 g10/mainproc.c:1318
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRETA de \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1317
+#: g10/mainproc.c:1308 g10/mainproc.c:1319
 msgid "Good signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1308
+#: g10/mainproc.c:1310
 msgid "                aka \""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1364
+#: g10/mainproc.c:1366
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1421 g10/mainproc.c:1436 g10/mainproc.c:1498
+#: g10/mainproc.c:1423 g10/mainproc.c:1438 g10/mainproc.c:1500
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1447
+#: g10/mainproc.c:1449
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura isolada da classe 0x%02x\n"
 
-#: g10/mainproc.c:1502
+#: g10/mainproc.c:1504
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1507
+#: g10/mainproc.c:1509
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -2743,7 +2748,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:574
+#: g10/passphrase.c:313 g10/passphrase.c:576
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID principal da chave %08lX)"
@@ -2787,7 +2792,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:560
+#: g10/passphrase.c:562
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2797,20 +2802,20 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "usu�rio: \""
 
-#: g10/passphrase.c:569
+#: g10/passphrase.c:571
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:607
+#: g10/passphrase.c:609
 msgid "can't query password in batchmode\n"
 msgstr "imposs�vel pedir senha em modo n�o-interativo\n"
 
-#: g10/passphrase.c:611
+#: g10/passphrase.c:613
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:615
+#: g10/passphrase.c:617
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
@@ -3530,6 +3535,13 @@ msgstr ""
 "AVISO: A mensagem foi criptografada com uma chave fraca na criptografia\n"
 "sim�trica.\n"
 
+#: g10/encr-data.c:97
+#, fuzzy
+msgid "problem handling encrypted packet\n"
+msgstr ""
+"eliminar o campo keyid dos pacotes\n"
+"criptografados"
+
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "chave fraca criada - tentando novamente\n"
@@ -3541,14 +3553,6 @@ msgstr ""
 "imposs�vel evitar chave fraca para criptografia sim�trica;\n"
 "%d tentativas!\n"
 
-#: g10/delkey.c:94
-msgid "there is a secret key for this public key!\n"
-msgstr "h� uma chave secreta para esta chave p�blica!\n"
-
-#: g10/delkey.c:96
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr "use a op��o \"--delete-secret-key\" para delet�-la antes.\n"
-
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo sem \"--yes\"\n"
@@ -3561,6 +3565,14 @@ 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
+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
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr "use a op��o \"--delete-secret-key\" para delet�-la antes.\n"
+
 #: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index d1cc8675d..5ffcb82ad 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-01-11 13:11+0100\n"
+"POT-Creation-Date: 2001-02-07 16:46+0100\n"
 "PO-Revision-Date: 1999-09-09 20:28+0000\n"
 "Last-Translator: Pedro Morais <[email protected]>\n"
 "Language-Team: pt\n"
@@ -339,7 +339,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:211
+#: g10/g10.c:212
 msgid ""
 "@Commands:\n"
 " "
@@ -347,140 +347,140 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:213
+#: g10/g10.c:214
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "encrypt data"
 msgstr "encriptar dados"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "encryption only with symmetric cipher"
 msgstr "encriptar apenas com cifra sim�trica"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "decrypt data (default)"
 msgstr "desencriptar dados (ac��o por omiss�o)"
 
-#: g10/g10.c:220
+#: g10/g10.c:221
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:222
+#: g10/g10.c:223
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:224
+#: g10/g10.c:225
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:229
+#: g10/g10.c:230
 msgid "remove key from the public keyring"
 msgstr "remover a chave do porta-chaves p�blico"
 
-#: g10/g10.c:231
+#: g10/g10.c:232
 msgid "remove key from the secret keyring"
 msgstr "remover a chave do porta-chaves secreto"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:238
+#: g10/g10.c:239
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:242
+#: g10/g10.c:243
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:244
+#: g10/g10.c:245
 msgid "list only the sequence of packets"
 msgstr "listar apenas as sequ�ncias de pacotes"
 
 # ownertrust ???
-#: g10/g10.c:246
+#: g10/g10.c:247
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confian�a"
 
-#: g10/g10.c:248
+#: g10/g10.c:249
 msgid "import ownertrust values"
 msgstr "importar os valores de confian�a"
 
-#: g10/g10.c:250
+#: g10/g10.c:251
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confian�a"
 
-#: g10/g10.c:252
+#: g10/g10.c:253
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMES]|verificar a base de dados de confian�a"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "fix a corrupted trust database"
 msgstr "consertar uma base de dados de confian�a"
 
-#: g10/g10.c:254
+#: g10/g10.c:255
 msgid "De-Armor a file or stdin"
 msgstr "retirar armadura de um ficheiro ou do \"stdin\""
 
-#: g10/g10.c:256
+#: g10/g10.c:257
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um ficheiro ou \"stdin\""
 
-#: g10/g10.c:258
+#: g10/g10.c:259
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:262
+#: g10/g10.c:263
 msgid ""
 "@\n"
 "Options:\n"
@@ -490,179 +490,179 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/g10.c:264
+#: g10/g10.c:265
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/g10.c:266
+#: g10/g10.c:267
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|encriptar para NOME"
 
-#: g10/g10.c:269
+#: g10/g10.c:270
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: g10/g10.c:271
+#: g10/g10.c:272
 msgid "use the default key as default recipient"
 msgstr "usar a chave padr�o como destinat�rio padr�o"
 
-#: g10/g10.c:275
+#: g10/g10.c:276
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou desencriptar"
 
-#: g10/g10.c:276
+#: g10/g10.c:277
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desactiva)"
 
-#: g10/g10.c:278
+#: g10/g10.c:279
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "use as output file"
 msgstr "usar como ficheiro de sa�da"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para encriptar"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "batch mode: never ask"
 msgstr "modo n�o-interactivo: nunca perguntar"
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "add this keyring to the list of keyrings"
 msgstr ""
 "adicionar este porta-chaves\n"
 "� lista de porta-chaves"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "add this secret keyring to the list"
 msgstr "adicionar este porta-chaves secreto � lista"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta por omiss�o"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "read options from file"
 msgstr "ler op��es do ficheiro"
 
-#: g10/g10.c:300
+#: g10/g10.c:301
 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:305
+#: g10/g10.c:306
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 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:309
+#: g10/g10.c:310
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar mode de frase secreta N"
 
-#: g10/g10.c:311
+#: g10/g10.c:312
 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:313
+#: g10/g10.c:314
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "throw keyid field of encrypted packets"
 msgstr "eliminar campo keyid dos pacotes encriptados"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALOR|usar estes dados de nota��o"
 
-#: g10/g10.c:321
+#: g10/g10.c:322
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:324
+#: g10/g10.c:325
 msgid ""
 "@\n"
 "Examples:\n"
@@ -682,15 +682,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:429
+#: g10/g10.c:431
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:433
+#: g10/g10.c:435
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -700,7 +700,7 @@ msgstr ""
 "assina, verifica, encripta ou desencripta\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -708,189 +708,194 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:522
+#: g10/g10.c:524
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:575
+#: g10/g10.c:577
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/g10.c:725
+#: g10/g10.c:727
 #, 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:729
+#: g10/g10.c:731
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: g10/g10.c:736
+#: g10/g10.c:738
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/g10.c:937
+#: g10/g10.c:943
 #, 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:1008
+#: g10/g10.c:1014
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/g10.c:1012 g10/g10.c:1021
+#: g10/g10.c:1018 g10/g10.c:1027
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/g10.c:1014
+#: g10/g10.c:1020
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1023
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:1037 g10/g10.c:1049
+#: g10/g10.c:1043 g10/g10.c:1055
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1043 g10/g10.c:1055
+#: g10/g10.c:1049 g10/g10.c:1061
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1059
+#: g10/g10.c:1065
 msgid "the given policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:1062
+#: g10/g10.c:1068
 #, 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:1064
+#: g10/g10.c:1070
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:1066
+#: g10/g10.c:1072
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1074
 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:1071
+#: g10/g10.c:1077
 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:1075
+#: g10/g10.c:1081
 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:1160
+#: g10/g10.c:1166
 #, 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:1166
+#: g10/g10.c:1172
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/g10.c:1173
+#: g10/g10.c:1179
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:1181
+#: g10/g10.c:1187
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1194
+#: g10/g10.c:1200
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1213
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1227
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1244
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1252
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1260
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/g10.c:1262
+#: g10/g10.c:1268
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/g10.c:1278
+#: g10/g10.c:1284
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-utilizador"
 
-#: g10/g10.c:1281
+#: g10/g10.c:1287
 msgid "--delete-key user-id"
 msgstr "--delete-key id-utilizador"
 
-#: g10/encode.c:268 g10/g10.c:1318 g10/sign.c:393
+#: g10/g10.c:1295
+#, 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
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/g10.c:1333
+#: g10/g10.c:1347
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/g10.c:1399
+#: g10/g10.c:1413
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1407
+#: g10/g10.c:1421
 #, 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:1478
+#: g10/g10.c:1492
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/g10.c:1565
+#: g10/g10.c:1579
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1583
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1572 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1586 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:1781
+#: g10/g10.c:1795
 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:1787
+#: g10/g10.c:1801
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -898,12 +903,12 @@ msgstr ""
 "um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:1793
+#: g10/g10.c:1807
 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:1801
+#: g10/g10.c:1815
 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"
 
@@ -2000,7 +2005,7 @@ msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "chave %08lX: a nossa c�pia n�o tem auto-assinatura\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
+#: g10/delkey.c:67 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: utilizador n�o encontrado\n"
@@ -2586,7 +2591,7 @@ msgid "revoked"
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:404 g10/mainproc.c:834
+#: g10/keylist.c:404 g10/mainproc.c:836
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "A chave expira em %s\n"
@@ -2615,86 +2620,86 @@ msgstr "encriptado com chave %s, ID %08lX\n"
 msgid "public key decryption failed: %s\n"
 msgstr "desencripta��o de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:429
+#: g10/mainproc.c:431
 msgid "decryption okay\n"
 msgstr "desencripta��o correcta\n"
 
-#: g10/mainproc.c:434
+#: g10/mainproc.c:436
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem encriptada foi manipulada!\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:441
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "desencripta��o falhou: %s\n"
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:460
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:462
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro original='%.*s'\n"
 
-#: g10/mainproc.c:615
+#: g10/mainproc.c:617
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca��o solit�ria - utilize \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:702 g10/mainproc.c:711
+#: g10/mainproc.c:704 g10/mainproc.c:713
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 
-#: g10/mainproc.c:714
+#: g10/mainproc.c:716
 msgid "Notation: "
 msgstr "Nota��o: "
 
-#: g10/mainproc.c:723
+#: g10/mainproc.c:725
 msgid "Policy: "
 msgstr "Pol�tica: "
 
-#: g10/mainproc.c:1233
+#: g10/mainproc.c:1235
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1270
+#: g10/mainproc.c:1272
 #, 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:1305 g10/mainproc.c:1316
+#: g10/mainproc.c:1307 g10/mainproc.c:1318
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1317
+#: g10/mainproc.c:1308 g10/mainproc.c:1319
 msgid "Good signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1308
+#: g10/mainproc.c:1310
 msgid "                aka \""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1364
+#: g10/mainproc.c:1366
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1421 g10/mainproc.c:1436 g10/mainproc.c:1498
+#: g10/mainproc.c:1423 g10/mainproc.c:1438 g10/mainproc.c:1500
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1447
+#: g10/mainproc.c:1449
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/mainproc.c:1502
+#: g10/mainproc.c:1504
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1507
+#: g10/mainproc.c:1509
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -2737,7 +2742,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:574
+#: g10/passphrase.c:313 g10/passphrase.c:576
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID principal da chave %08lX)"
@@ -2780,7 +2785,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:560
+#: g10/passphrase.c:562
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2790,20 +2795,20 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "utilizador: \""
 
-#: g10/passphrase.c:569
+#: g10/passphrase.c:571
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:607
+#: g10/passphrase.c:609
 msgid "can't query password in batchmode\n"
 msgstr "imposs�vel pedir senha em modo n�o-interactivo\n"
 
-#: g10/passphrase.c:611
+#: g10/passphrase.c:613
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:615
+#: g10/passphrase.c:617
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
@@ -3519,6 +3524,11 @@ msgstr ""
 "AVISO: A mensagem foi encriptada com uma chave fraca na criptografia\n"
 "sim�trica.\n"
 
+#: g10/encr-data.c:97
+#, fuzzy
+msgid "problem handling encrypted packet\n"
+msgstr "eliminar campo keyid dos pacotes encriptados"
+
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "chave fraca criada - tentando novamente\n"
@@ -3530,14 +3540,6 @@ msgstr ""
 "imposs�vel evitar chave fraca para criptografia sim�trica;\n"
 "tentei %d vezes!\n"
 
-#: g10/delkey.c:94
-msgid "there is a secret key for this public key!\n"
-msgstr "h� uma chave secreta para esta chave p�blica!\n"
-
-#: g10/delkey.c:96
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr "utilize a op��o \"--delete-secret-key\" para a apagar primeiro.\n"
-
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "imposs�vel fazer isso em modo n�o-interactivo sem utilizar \"--yes\"\n"
@@ -3550,6 +3552,14 @@ 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
+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
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr "utilize a op��o \"--delete-secret-key\" para a apagar primeiro.\n"
+
 #: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"
diff --git a/po/ru.po b/po/ru.po
index 6ae0b3577..bccaa795a 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-01-11 13:11+0100\n"
+"POT-Creation-Date: 2001-02-07 16:46+0100\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-01-26 22:08:36+0100\n"
 "From: Gregory Steuck <[email protected]>\n"
@@ -395,7 +395,7 @@ msgstr ""
 "������������ ��������� ������. ����������, ��������� ���-������, �����\n"
 "�� ����� ������� �������������� ��������� �����! (����� ��� %d ����)\n"
 
-#: g10/g10.c:211
+#: g10/g10.c:212
 msgid ""
 "@Commands:\n"
 " "
@@ -403,147 +403,147 @@ msgstr ""
 "@�������:\n"
 " "
 
-#: g10/g10.c:213
+#: g10/g10.c:214
 #, fuzzy
 msgid "|[file]|make a signature"
 msgstr "|[����]|������� �������"
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 #, fuzzy
 msgid "|[file]|make a clear text signature"
 msgstr "|[����]|������� ��������� �������"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "make a detached signature"
 msgstr "������� ��������� �������"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "encrypt data"
 msgstr "����������� ������"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "encryption only with symmetric cipher"
 msgstr "����������� ������������ ����������"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "store only"
 msgstr "������ ���������"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "decrypt data (default)"
 msgstr "������������ ������ (�� ���������)"
 
-#: g10/g10.c:220
+#: g10/g10.c:221
 msgid "verify a signature"
 msgstr "��������� �������"
 
-#: g10/g10.c:222
+#: g10/g10.c:223
 msgid "list keys"
 msgstr "������ ������"
 
-#: g10/g10.c:224
+#: g10/g10.c:225
 msgid "list keys and signatures"
 msgstr "������ ������ � ��������"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "check key signatures"
 msgstr "��������� ������� �� �����"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "list keys and fingerprints"
 msgstr "������ ������ � �� \"����������� �������\""
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "list secret keys"
 msgstr "������ ��������� ������"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "generate a new key pair"
 msgstr "������������� ����� ���� ������ (�������� � ���������)"
 
-#: g10/g10.c:229
+#: g10/g10.c:230
 msgid "remove key from the public keyring"
 msgstr "������� ���� �� ������"
 
-#: g10/g10.c:231
+#: g10/g10.c:232
 #, fuzzy
 msgid "remove key from the secret keyring"
 msgstr "������� ���� �� ������"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 #, fuzzy
 msgid "sign a key"
 msgstr "��������� ����"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 #, fuzzy
 msgid "sign a key locally"
 msgstr "��������� ����"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "sign or edit a key"
 msgstr "��������� ��� ������������� ����"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "generate a revocation certificate"
 msgstr "������������� ���������� ����������"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "export keys"
 msgstr "�������������� �����"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "export keys to a key server"
 msgstr ""
 
-#: g10/g10.c:238
+#: g10/g10.c:239
 msgid "import keys from a key server"
 msgstr ""
 
-#: g10/g10.c:242
+#: g10/g10.c:243
 msgid "import/merge keys"
 msgstr "�������������/�������� �����"
 
-#: g10/g10.c:244
+#: g10/g10.c:245
 msgid "list only the sequence of packets"
 msgstr "���������� ������ ������������������ �������"
 
-#: g10/g10.c:246
+#: g10/g10.c:247
 #, fuzzy
 msgid "export the ownertrust values"
 msgstr "�������������� ��������� �������\n"
 
-#: g10/g10.c:248
+#: g10/g10.c:249
 #, fuzzy
 msgid "import ownertrust values"
 msgstr "������������� ��������� �������\n"
 
-#: g10/g10.c:250
+#: g10/g10.c:251
 #, fuzzy
 msgid "update the trust database"
 msgstr "|[�����]|��������� ���� ������ �������"
 
-#: g10/g10.c:252
+#: g10/g10.c:253
 msgid "|[NAMES]|check the trust database"
 msgstr "|[�����]|��������� ���� ������ �������"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "fix a corrupted trust database"
 msgstr "��������� ����������� ���� ������ �������"
 
-#: g10/g10.c:254
+#: g10/g10.c:255
 msgid "De-Armor a file or stdin"
 msgstr "������������ stdin ��� ���� �� ASCII-�������������"
 
-#: g10/g10.c:256
+#: g10/g10.c:257
 msgid "En-Armor a file or stdin"
 msgstr "������������ stdin ��� ���� � ASCII-�������������"
 
-#: g10/g10.c:258
+#: g10/g10.c:259
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|���������� �������� ���������"
 
-#: g10/g10.c:262
+#: g10/g10.c:263
 msgid ""
 "@\n"
 "Options:\n"
@@ -553,172 +553,172 @@ msgstr ""
 "���������:\n"
 " "
 
-#: g10/g10.c:264
+#: g10/g10.c:265
 msgid "create ascii armored output"
 msgstr "����� � ASCII-�������������"
 
-#: g10/g10.c:266
+#: g10/g10.c:267
 #, fuzzy
 msgid "|NAME|encrypt for NAME"
 msgstr "|���|������������ ������������ ���������� ���"
 
-#: g10/g10.c:269
+#: g10/g10.c:270
 #, fuzzy
 msgid "|NAME|use NAME as default recipient"
 msgstr "|���|������������ ��� � �������� ���������� ����� �� ���������"
 
-#: g10/g10.c:271
+#: g10/g10.c:272
 msgid "use the default key as default recipient"
 msgstr ""
 
-#: g10/g10.c:275
+#: g10/g10.c:276
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "������������ ��������� ������������� ������������ ��� ������� ��� �����������"
 
-#: g10/g10.c:276
+#: g10/g10.c:277
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|���������� ������� ������ (0 - �� �������)"
 
-#: g10/g10.c:278
+#: g10/g10.c:279
 msgid "use canonical text mode"
 msgstr "������������ ������������ ��������� �����"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "use as output file"
 msgstr "������������ � �������� ��������� �����"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "verbose"
 msgstr "������������"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "be somewhat more quiet"
 msgstr ""
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "��������� ������� �� �����"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 #, fuzzy
 msgid "always use a MDC for encryption"
 msgstr "������������ ��������� ������������� ������������ ��� ����������"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "do not make any changes"
 msgstr "Keine wirklichen �nderungen durchf�hren"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "batch mode: never ask"
 msgstr "�������� �����: ������ �� ����������"
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "assume yes on most questions"
 msgstr "�������� \"��\" �� ����������� ��������"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "assume no on most questions"
 msgstr "�������� \"���\" �� ����������� ��������"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "add this keyring to the list of keyrings"
 msgstr "�������� ��� ������ � ������ ������ ������"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "add this secret keyring to the list"
 msgstr "�������� ��� ��������� ������ � ������ ������ ������"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "|NAME|use NAME as default secret key"
 msgstr "|���|������������ ��� � �������� ���������� ����� �� ���������"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|���|������������ ������������ ���������� ���"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "read options from file"
 msgstr "������ ��������� �� �����"
 
-#: g10/g10.c:300
+#: g10/g10.c:301
 msgid "|FD|write status info to this FD"
 msgstr "|FD| ���������� ���������� � ��������� � ���������� (FD)"
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 #, fuzzy
 msgid "|FILE|load extension module FILE"
 msgstr "|����|��������� ���� � ������������ ��������"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "emulate the mode described in RFC1991"
 msgstr "����������� ����� ��������� � RFC1991"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:309
+#: g10/g10.c:310
 #, fuzzy
 msgid "|N|use passphrase mode N"
 msgstr "|N|������������ �������� ����� ������ N\n"
 
-#: g10/g10.c:311
+#: g10/g10.c:312
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|���|������������ ���-�������� ��� ��� �������� ����"
 
-#: g10/g10.c:313
+#: g10/g10.c:314
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|���|������������ ������������ ���������� ��� ��� �������� ����"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|���|������������ ������������ ���������� ���"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|���|������������ ���-�������� ���"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "|N|use compress algorithm N"
 msgstr "|N|������������ �������� ������ N"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "throw keyid field of encrypted packets"
 msgstr "����������� ���� keyid � ������������� �������"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "|NAME=VALUE|use this notation data"
 msgstr ""
 
-#: g10/g10.c:321
+#: g10/g10.c:322
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:324
+#: g10/g10.c:325
 #, fuzzy
 msgid ""
 "@\n"
@@ -739,17 +739,17 @@ msgstr ""
 " --list-keys [names]        �������� ������ ������\n"
 " --fingerprint [names]      �������� \"��������� �������\" ������\n"
 
-#: g10/g10.c:429
+#: g10/g10.c:431
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "����������, ����������� ��������� �� ������� �� ������ "
 "<[email protected]>.\n"
 
-#: g10/g10.c:433
+#: g10/g10.c:435
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�������������: gpg [���������] [�����] (-h ��� ������)"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -759,7 +759,7 @@ msgstr ""
 "�����������, ��������� �������, ������� ��� ��������������\n"
 "����� ������ ������� �� ������� ������\n"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -767,202 +767,207 @@ msgstr ""
 "\n"
 "�������������� ���������:\n"
 
-#: g10/g10.c:522
+#: g10/g10.c:524
 msgid "usage: gpg [options] "
 msgstr "�������������: gpg [���������] "
 
-#: g10/g10.c:575
+#: g10/g10.c:577
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Kommandos\n"
 
-#: g10/g10.c:725
+#: g10/g10.c:727
 #, fuzzy, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "���������: ���� ���������� �� ��������� `%s' �����������\n"
 
-#: g10/g10.c:729
+#: g10/g10.c:731
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���� ���������� `%s': %s\n"
 
-#: g10/g10.c:736
+#: g10/g10.c:738
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� ��������� �� `%s'\n"
 
-#: g10/g10.c:937
+#: g10/g10.c:943
 #, fuzzy, c-format
 msgid "%s is not a valid character set\n"
 msgstr "������������ ������ � �����������.\n"
 
-#: g10/g10.c:1008
+#: g10/g10.c:1014
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:1012 g10/g10.c:1021
+#: g10/g10.c:1018 g10/g10.c:1027
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/g10.c:1014
+#: g10/g10.c:1020
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr ""
 
-#: g10/g10.c:1017
+#: g10/g10.c:1023
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr ""
 
-#: g10/g10.c:1037 g10/g10.c:1049
+#: g10/g10.c:1043 g10/g10.c:1055
 msgid "selected cipher algorithm is invalid\n"
 msgstr "������ ������������ �������� ����������\n"
 
-#: g10/g10.c:1043 g10/g10.c:1055
+#: g10/g10.c:1049 g10/g10.c:1061
 msgid "selected digest algorithm is invalid\n"
 msgstr "������ ������������ ��������-��������\n"
 
-#: g10/g10.c:1059
+#: g10/g10.c:1065
 msgid "the given policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:1062
+#: g10/g10.c:1068
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "�������� �������� ����� ����� �������� �� %d �� %d\n"
 
-#: g10/g10.c:1064
+#: g10/g10.c:1070
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ ���� ������ 0\n"
 
-#: g10/g10.c:1066
+#: g10/g10.c:1072
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ ���� ������ 1\n"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1074
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:1071
+#: g10/g10.c:1077
 #, fuzzy
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "���������: ������� S2K ����� (0) ����� �� �������������\n"
 
-#: g10/g10.c:1075
+#: g10/g10.c:1081
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "������������ ����� S2K: ������ ���� 0, 1 ��� 3\n"
 
-#: g10/g10.c:1160
+#: g10/g10.c:1166
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "������ ������������� ���� ������ �������: %s\n"
 
-#: g10/g10.c:1166
+#: g10/g10.c:1172
 msgid "--store [filename]"
 msgstr "--store [��� �����]"
 
-#: g10/g10.c:1173
+#: g10/g10.c:1179
 msgid "--symmetric [filename]"
 msgstr "--symmetric [��� �����]"
 
-#: g10/g10.c:1181
+#: g10/g10.c:1187
 msgid "--encrypt [filename]"
 msgstr "--encrypt [��� �����]"
 
-#: g10/g10.c:1194
+#: g10/g10.c:1200
 msgid "--sign [filename]"
 msgstr "--sign [��� �����]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1213
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [��� �����]"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1227
 msgid "--clearsign [filename]"
 msgstr "--clearsign [��� �����]"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1244
 msgid "--decrypt [filename]"
 msgstr "--decrypt [��� �����]"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1252
 msgid "--sign-key user-id"
 msgstr ""
 
-#: g10/g10.c:1254
+#: g10/g10.c:1260
 #, fuzzy
 msgid "--lsign-key user-id"
 msgstr "--delete-key ���-������������"
 
-#: g10/g10.c:1262
+#: g10/g10.c:1268
 #, fuzzy
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key ���-������������"
 
-#: g10/g10.c:1278
+#: g10/g10.c:1284
 #, fuzzy
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key ���-������������"
 
-#: g10/g10.c:1281
+#: g10/g10.c:1287
 #, fuzzy
 msgid "--delete-key user-id"
 msgstr "--delete-key ���-������������"
 
-#: g10/encode.c:268 g10/g10.c:1318 g10/sign.c:393
+#: g10/g10.c:1295
+#, 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
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "���������� ������� ���� `%s': %s\n"
 
-#: g10/g10.c:1333
+#: g10/g10.c:1347
 #, fuzzy
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [������������� ������������] [������ ������]"
 
-#: g10/g10.c:1399
+#: g10/g10.c:1413
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "������ �������������: %s\n"
 
-#: g10/g10.c:1407
+#: g10/g10.c:1421
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "������ �����������: %s\n"
 
-#: g10/g10.c:1478
+#: g10/g10.c:1492
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "������������ ���-�������� `%s'\n"
 
-#: g10/g10.c:1565
+#: g10/g10.c:1579
 msgid "[filename]"
 msgstr "[��� �����]"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1583
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/decrypt.c:59 g10/g10.c:1572 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1586 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "���������� ������� ���� `%s'\n"
 
-#: g10/g10.c:1781
+#: g10/g10.c:1795
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 
-#: g10/g10.c:1787
+#: g10/g10.c:1801
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1793
+#: g10/g10.c:1807
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1801
+#: g10/g10.c:1815
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
@@ -2070,7 +2075,7 @@ msgstr "���� %08lX: ���������� ���������� ��������\n"
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "���� %08lX: ���� ����� �� ����� ����-�������\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
+#: g10/delkey.c:67 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: ������������ �� ������\n"
@@ -2701,7 +2706,7 @@ msgid "revoked"
 msgstr "����"
 
 #. of subkey
-#: g10/keylist.c:404 g10/mainproc.c:834
+#: g10/keylist.c:404 g10/mainproc.c:836
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "���� ��������� �� %s\n"
@@ -2731,89 +2736,89 @@ msgstr "������� ������� %.*s, ��������� %s ���� %08lX\n"
 msgid "public key decryption failed: %s\n"
 msgstr "����������� �������� ������ �� ������� %s\n"
 
-#: g10/mainproc.c:429
+#: g10/mainproc.c:431
 #, fuzzy
 msgid "decryption okay\n"
 msgstr "����������� �� �������: %s\n"
 
-#: g10/mainproc.c:434
+#: g10/mainproc.c:436
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:441
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "����������� �� �������: %s\n"
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:460
 #, fuzzy
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "���������: ����������� �������� \"������-���-�����-����\"\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:462
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:615
+#: g10/mainproc.c:617
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:702 g10/mainproc.c:711
+#: g10/mainproc.c:704 g10/mainproc.c:713
 #, fuzzy
 msgid "WARNING: invalid notation data found\n"
 msgstr "�� ������� ���������� RFC1991 ��� OpenPGP ������.\n"
 
-#: g10/mainproc.c:714
+#: g10/mainproc.c:716
 msgid "Notation: "
 msgstr ""
 
-#: g10/mainproc.c:723
+#: g10/mainproc.c:725
 msgid "Policy: "
 msgstr ""
 
-#: g10/mainproc.c:1233
+#: g10/mainproc.c:1235
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1270
+#: g10/mainproc.c:1272
 #, 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:1305 g10/mainproc.c:1316
+#: g10/mainproc.c:1307 g10/mainproc.c:1318
 msgid "BAD signature from \""
 msgstr "������ ������� �� \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1317
+#: g10/mainproc.c:1308 g10/mainproc.c:1319
 msgid "Good signature from \""
 msgstr "������� ������� �� \""
 
-#: g10/mainproc.c:1308
+#: g10/mainproc.c:1310
 msgid "                aka \""
 msgstr ""
 
-#: g10/mainproc.c:1364
+#: g10/mainproc.c:1366
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "���������� ��������� �������: %s\n"
 
-#: g10/mainproc.c:1421 g10/mainproc.c:1436 g10/mainproc.c:1498
+#: g10/mainproc.c:1423 g10/mainproc.c:1438 g10/mainproc.c:1500
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "������� ��������� �������"
 
-#: g10/mainproc.c:1447
+#: g10/mainproc.c:1449
 #, fuzzy, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "������� ������������ ����"
 
-#: g10/mainproc.c:1502
+#: g10/mainproc.c:1504
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:1507
+#: g10/mainproc.c:1509
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -2853,7 +2858,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "���������� ������� ���� `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:574
+#: g10/passphrase.c:313 g10/passphrase.c:576
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr ""
@@ -2911,7 +2916,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:560
+#: g10/passphrase.c:562
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2921,22 +2926,22 @@ msgstr ""
 "��� ����� �������� �����, ����� ��������� ����\n"
 "������������: \""
 
-#: g10/passphrase.c:569
+#: g10/passphrase.c:571
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "(%u-��� %s ����, ID %08lX, ������ %s)\n"
 
-#: g10/passphrase.c:607
+#: g10/passphrase.c:609
 #, fuzzy
 msgid "can't query password in batchmode\n"
 msgstr "���������� ������� ��� � �������� ������.\n"
 
-#: g10/passphrase.c:611
+#: g10/passphrase.c:613
 #, fuzzy
 msgid "Enter passphrase: "
 msgstr "������� �������� �����: %s\n"
 
-#: g10/passphrase.c:615
+#: g10/passphrase.c:617
 #, fuzzy
 msgid "Repeat passphrase: "
 msgstr "��������� �������� �����: %s\n"
@@ -3660,6 +3665,11 @@ msgstr ""
 "��������������: ��������� ���� �����������, ��������� ������ ����, � "
 "������������ ��������� ����������.\n"
 
+#: g10/encr-data.c:97
+#, fuzzy
+msgid "problem handling encrypted packet\n"
+msgstr "����������� ���� keyid � ������������� �������"
+
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "��������� ������ ����, ������� ��� ���\n"
@@ -3671,16 +3681,6 @@ msgstr ""
 "�� ���������� �������� ������� ����� � ������������ ���������; ��������� %d "
 "���!\n"
 
-#: g10/delkey.c:94
-msgid "there is a secret key for this public key!\n"
-msgstr "Es gibt einen privaten ���� zu diesem �ffentlichen ����!\n"
-
-#: g10/delkey.c:96
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr ""
-"Benutzen Sie das Kommando \"--delete-secret-key\", um ihn vorab zu "
-"entfernen.\n"
-
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "Dies kann im Batchmodus ohne \"--yes\" nicht durchgef�hrt werden.\n"
@@ -3693,6 +3693,16 @@ 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
+msgid "there is a secret key for this public key!\n"
+msgstr "Es gibt einen privaten ���� zu diesem �ffentlichen ����!\n"
+
+#: g10/delkey.c:184
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr ""
+"Benutzen Sie das Kommando \"--delete-secret-key\", um ihn vorab zu "
+"entfernen.\n"
+
 #: g10/helptext.c:47
 #, fuzzy
 msgid ""
diff --git a/po/sv.po b/po/sv.po
index 95820bd76..86b7b17d9 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-01-11 13:11+0100\n"
+"POT-Creation-Date: 2001-02-07 16:46+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"
@@ -351,7 +351,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:211
+#: g10/g10.c:212
 msgid ""
 "@Commands:\n"
 " "
@@ -359,139 +359,139 @@ msgstr ""
 "@Kommandon:\n"
 " "
 
-#: g10/g10.c:213
+#: g10/g10.c:214
 msgid "|[file]|make a signature"
 msgstr "|[fil]|skapa en signatur"
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|skapa en klartext-signatur"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "make a detached signature"
 msgstr "skapa en signatur i en separat fil"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "encryption only with symmetric cipher"
 msgstr "endast kryptering med symmetriskt chiffer"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "store only"
 msgstr "endast lagring"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "decrypt data (default)"
 msgstr "dekryptera data (normall�ge)"
 
-#: g10/g10.c:220
+#: g10/g10.c:221
 msgid "verify a signature"
 msgstr "verifiera en signatur"
 
-#: g10/g10.c:222
+#: g10/g10.c:223
 msgid "list keys"
 msgstr "r�kna upp nycklar"
 
-#: g10/g10.c:224
+#: g10/g10.c:225
 msgid "list keys and signatures"
 msgstr "r�kna upp nycklar och signaturer"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "check key signatures"
 msgstr "verifiera nyckelsignaturer"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "list keys and fingerprints"
 msgstr "r�kna upp nycklar och fingeravtryck"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "list secret keys"
 msgstr "r�kna upp hemliga nycklar"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/g10.c:229
+#: g10/g10.c:230
 msgid "remove key from the public keyring"
 msgstr "ta bort en nyckel fr�n den publika nyckelringen"
 
-#: g10/g10.c:231
+#: g10/g10.c:232
 msgid "remove key from the secret keyring"
 msgstr "ta bort en nyckel fr�n den hemliga nyckelringen"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "generate a revocation certificate"
 msgstr "generera ett �terkallelesecertifikat"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/g10.c:238
+#: g10/g10.c:239
 msgid "import keys from a key server"
 msgstr "importera nycklar fr�n en nyckelserver"
 
-#: g10/g10.c:242
+#: g10/g10.c:243
 msgid "import/merge keys"
 msgstr "importera/sl� ihop nycklar"
 
-#: g10/g10.c:244
+#: g10/g10.c:245
 msgid "list only the sequence of packets"
 msgstr "skriv endast ut paketsekvensen"
 
-#: g10/g10.c:246
+#: g10/g10.c:247
 msgid "export the ownertrust values"
 msgstr "exportera de v�rden som representerar �gartillit"
 
-#: g10/g10.c:248
+#: g10/g10.c:249
 msgid "import ownertrust values"
 msgstr "importera v�rden som representerar �gartillit"
 
-#: g10/g10.c:250
+#: g10/g10.c:251
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/g10.c:252
+#: g10/g10.c:253
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMN]|kontrollera tillitsdatabasen"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "fix a corrupted trust database"
 msgstr "reparera en korrupt tillitsdatabas"
 
-#: g10/g10.c:254
+#: g10/g10.c:255
 msgid "De-Armor a file or stdin"
 msgstr "Skala av en fil eller standard in"
 
-#: g10/g10.c:256
+#: g10/g10.c:257
 msgid "En-Armor a file or stdin"
 msgstr "Skapa ett skal f�r en fil eller standard in"
 
-#: g10/g10.c:258
+#: g10/g10.c:259
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skriv ut kontrollsummor"
 
-#: g10/g10.c:262
+#: g10/g10.c:263
 msgid ""
 "@\n"
 "Options:\n"
@@ -501,156 +501,156 @@ msgstr ""
 "Flaggor:\n"
 " "
 
-#: g10/g10.c:264
+#: g10/g10.c:265
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/g10.c:266
+#: g10/g10.c:267
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMN|kryptera f�r NAMN"
 
-#: g10/g10.c:269
+#: g10/g10.c:270
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMN|anv�nd NAMN som standardv�rdet f�r mottagare"
 
-#: g10/g10.c:271
+#: g10/g10.c:272
 msgid "use the default key as default recipient"
 msgstr "anv�nd standardnyckeln som standardmottagare"
 
-#: g10/g10.c:275
+#: g10/g10.c:276
 msgid "use this user-id to sign or decrypt"
 msgstr "anv�nd denna anv�ndaridentitet f�r att signera eller dekryptera"
 
-#: g10/g10.c:276
+#: g10/g10.c:277
 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:278
+#: g10/g10.c:279
 msgid "use canonical text mode"
 msgstr "anv�nd \"ursprunglig text\"-l�get"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "use as output file"
 msgstr "anv�nd som fil f�r utdata"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "verbose"
 msgstr "utf�rlig"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "be somewhat more quiet"
 msgstr "var n�got tystare"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "don't use the terminal at all"
 msgstr "anv�nd inte terminalen alls"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "force v3 signatures"
 msgstr "anv�nd v3-signaturer"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "always use a MDC for encryption"
 msgstr "anv�nd alltid en MDC f�r kryptering"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "do not make any changes"
 msgstr "g�r inga �ndringar"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "batch mode: never ask"
 msgstr "batch-l�ge: fr�ga aldrig"
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "assume yes on most questions"
 msgstr "anta att svaret �r ja p� de flesta fr�gor"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "assume no on most questions"
 msgstr "anta att svaret �r nej p� de flesta fr�gor"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "add this keyring to the list of keyrings"
 msgstr "l�gg till denna nyckelring till listan av nyckelringar"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "add this secret keyring to the list"
 msgstr "l�gg till denna hemliga nyckelring till listan"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMN|anv�nd NAMN som f�rvald hemlig nyckel"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|V�RD|anv�nd denna nyckelserver f�r att sl� upp nycklar"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMN|s�tt teckentabellen f�r terminalen till NAMN"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "read options from file"
 msgstr "l�s flaggor fr�n fil"
 
-#: g10/g10.c:300
+#: g10/g10.c:301
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "|FILE|load extension module FILE"
 msgstr "|FIL|ladda till�ggsmodul FIL"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "emulate the mode described in RFC1991"
 msgstr "imitera l�get som beskrivs i RFC1991"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 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:309
+#: g10/g10.c:310
 msgid "|N|use passphrase mode N"
 msgstr "|N|anv�nd l�senordsl�get N"
 
-#: g10/g10.c:311
+#: g10/g10.c:312
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAMN|anv�nd kontrollsummealgoritmen NAMN f�r l�senordsfraser"
 
-#: g10/g10.c:313
+#: g10/g10.c:314
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAMN|anv�nd chifferalgoritmen NAMN f�r l�senordsfraser"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMN|anv�nd chifferalgoritmen NAMN"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMN|anv�nd kontrollsummealgoritmen NAMN"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "|N|use compress algorithm N"
 msgstr "|N|anv�nd komprimeringsalgoritmen N"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "throw keyid field of encrypted packets"
 msgstr "sl�ng bort nyckelidentitetsf�ltet fr�n krypterade paket"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAMN=V�RDE|anv�nd detta s�tt f�r att beskriva data"
 
-#: g10/g10.c:321
+#: g10/g10.c:322
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -658,7 +658,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan f�r en komplett lista p� alla kommandon och flaggor)\n"
 
-#: g10/g10.c:324
+#: g10/g10.c:325
 msgid ""
 "@\n"
 "Examples:\n"
@@ -678,17 +678,17 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/g10.c:429
+#: g10/g10.c:431
 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:433
+#: g10/g10.c:435
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Anv�ndning: gpg [flaggor] [filer] (-h f�r hj�lp)"
 
-#: g10/g10.c:436
+#: g10/g10.c:438
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -698,7 +698,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "vilken operation som utf�rs beror p� programmets indata\n"
 
-#: g10/g10.c:443
+#: g10/g10.c:445
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -706,66 +706,66 @@ msgstr ""
 "\n"
 "St�dda algoritmer:\n"
 
-#: g10/g10.c:522
+#: g10/g10.c:524
 msgid "usage: gpg [options] "
 msgstr "anv�ndning: gpg [flaggor] "
 
-#: g10/g10.c:575
+#: g10/g10.c:577
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
-#: g10/g10.c:725
+#: g10/g10.c:727
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTERA: inst�llningsfilen \"%s\" saknas\n"
 
-#: g10/g10.c:729
+#: g10/g10.c:731
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inst�llningsfil \"%s\": %s\n"
 
-#: g10/g10.c:736
+#: g10/g10.c:738
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser flaggor fr�n \"%s\"\n"
 
-#: g10/g10.c:937
+#: g10/g10.c:943
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s �r ingen giltig teckentabell\n"
 
-#: g10/g10.c:1008
+#: g10/g10.c:1014
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
 
-#: g10/g10.c:1012 g10/g10.c:1021
+#: g10/g10.c:1018 g10/g10.c:1027
 #, 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:1014
+#: g10/g10.c:1020
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �r inte till�ten tillsammans med %s!\n"
 
-#: g10/g10.c:1017
+#: g10/g10.c:1023
 #, 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:1037 g10/g10.c:1049
+#: g10/g10.c:1043 g10/g10.c:1055
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen �r ogiltig\n"
 
-#: g10/g10.c:1043 g10/g10.c:1055
+#: g10/g10.c:1049 g10/g10.c:1061
 msgid "selected digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen �r ogiltig\n"
 
-#: g10/g10.c:1059
+#: g10/g10.c:1065
 msgid "the given policy URL is invalid\n"
 msgstr "angiven URL �r ogiltig\n"
 
-#: g10/g10.c:1062
+#: g10/g10.c:1068
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "kompressionsalgoritmen m�ste vara i intervallet %d..%d\n"
@@ -776,127 +776,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:1064
+#: g10/g10.c:1070
 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:1066
+#: g10/g10.c:1072
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" m�ste vara st�rre �n 1\n"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1074
 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:1071
+#: g10/g10.c:1077
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTERA: enkelt S2K-l�ge (0) rekommenderas inte\n"
 
-#: g10/g10.c:1075
+#: g10/g10.c:1081
 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:1160
+#: g10/g10.c:1166
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/g10.c:1166
+#: g10/g10.c:1172
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/g10.c:1173
+#: g10/g10.c:1179
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/g10.c:1181
+#: g10/g10.c:1187
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/g10.c:1194
+#: g10/g10.c:1200
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1213
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1227
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/g10.c:1238
+#: g10/g10.c:1244
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1252
 msgid "--sign-key user-id"
 msgstr "--sign-key anv�ndaridentitet"
 
-#: g10/g10.c:1254
+#: g10/g10.c:1260
 msgid "--lsign-key user-id"
 msgstr "--lsign-key anv�ndaridentitet"
 
-#: g10/g10.c:1262
+#: g10/g10.c:1268
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key anv�ndaridentitet [kommandon]"
 
-#: g10/g10.c:1278
+#: g10/g10.c:1284
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key anv�ndaridentitet"
 
-#: g10/g10.c:1281
+#: g10/g10.c:1287
 msgid "--delete-key user-id"
 msgstr "--delete-key anv�ndaridentitet"
 
+#: g10/g10.c:1295
+#, 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:1318 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1332 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan inte �ppna %s: %s\n"
 
-#: g10/g10.c:1333
+#: g10/g10.c:1347
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [anv�ndaridentitet] [nyckelring]"
 
-#: g10/g10.c:1399
+#: g10/g10.c:1413
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort skalet: %s\n"
 
-#: g10/g10.c:1407
+#: g10/g10.c:1421
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa skal: %s\n"
 
-#: g10/g10.c:1478
+#: g10/g10.c:1492
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "felaktig hash-algoritm \"%s\"\n"
 
-#: g10/g10.c:1565
+#: g10/g10.c:1579
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/g10.c:1569
+#: g10/g10.c:1583
 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:1572 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1586 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:1781
+#: g10/g10.c:1795
 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:1787
+#: g10/g10.c:1801
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -904,11 +909,11 @@ msgstr ""
 "ett notationsnamn kan bara inneh�lla bokst�ver, siffror, punkter eller\n"
 "understrykningstecken och sluta med ett likhetstecken\n"
 
-#: g10/g10.c:1793
+#: g10/g10.c:1807
 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:1801
+#: g10/g10.c:1815
 msgid "a notation value must not use any control characters\n"
 msgstr "ett notationsv�rde f�r inte ineh�lla n�gra kontrolltecken\n"
 
@@ -2011,7 +2016,7 @@ msgstr "nyckel %08lX: lade till �terkallelsecertifikat\n"
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "nyckel %08lX: v�r kopia har ingen sj�lvsignatur\n"
 
-#: g10/delkey.c:64 g10/keyedit.c:94
+#: g10/delkey.c:67 g10/keyedit.c:94
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: hittade inte anv�ndaren\n"
@@ -2598,7 +2603,7 @@ msgid "revoked"
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:404 g10/mainproc.c:834
+#: g10/keylist.c:404 g10/mainproc.c:836
 #, c-format
 msgid " [expires: %s]"
 msgstr "[g�r ut: %s]"
@@ -2634,89 +2639,89 @@ msgstr "krypterad med %s-nyckel, ID %08lX\n"
 msgid "public key decryption failed: %s\n"
 msgstr "dekryptering med publik nyckel misslyckades: %s\n"
 
-#: g10/mainproc.c:429
+#: g10/mainproc.c:431
 msgid "decryption okay\n"
 msgstr "dekrypteringen lyckades\n"
 
-#: g10/mainproc.c:434
+#: g10/mainproc.c:436
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VARNING: det krypterade meddelandet har �ndrats!\n"
 
-#: g10/mainproc.c:439
+#: g10/mainproc.c:441
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/mainproc.c:458
+#: g10/mainproc.c:460
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTERA: avs�ndaren efterfr�gade \"endast-f�r-dina-�gon\"\n"
 
-#: g10/mainproc.c:460
+#: g10/mainproc.c:462
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "ursprungligt filnamn=\"%.*s\"\n"
 
-#: g10/mainproc.c:615
+#: g10/mainproc.c:617
 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:702 g10/mainproc.c:711
+#: g10/mainproc.c:704 g10/mainproc.c:713
 msgid "WARNING: invalid notation data found\n"
 msgstr "VARNING: ogiltig notationsdata hittades\n"
 
-#: g10/mainproc.c:714
+#: g10/mainproc.c:716
 msgid "Notation: "
 msgstr "Notation: "
 
 # finns det n�gon bra svensk �vers�ttning av policy?
-#: g10/mainproc.c:723
+#: g10/mainproc.c:725
 msgid "Policy: "
 msgstr "Policy: "
 
-#: g10/mainproc.c:1233
+#: g10/mainproc.c:1235
 msgid "signature verification suppressed\n"
 msgstr "signaturen verifierades inte\n"
 
-#: g10/mainproc.c:1270
+#: g10/mainproc.c:1272
 #, 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:1305 g10/mainproc.c:1316
+#: g10/mainproc.c:1307 g10/mainproc.c:1318
 msgid "BAD signature from \""
 msgstr "FELAKTIG signatur fr�n \""
 
-#: g10/mainproc.c:1306 g10/mainproc.c:1317
+#: g10/mainproc.c:1308 g10/mainproc.c:1319
 msgid "Good signature from \""
 msgstr "Korrekt signatur fr�n \""
 
-#: g10/mainproc.c:1308
+#: g10/mainproc.c:1310
 msgid "                aka \""
 msgstr "      �ven k�nd som \""
 
-#: g10/mainproc.c:1364
+#: g10/mainproc.c:1366
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte verifiera signaturen: %s\n"
 
-#: g10/mainproc.c:1421 g10/mainproc.c:1436 g10/mainproc.c:1498
+#: g10/mainproc.c:1423 g10/mainproc.c:1438 g10/mainproc.c:1500
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "skapa en signatur i en separat fil"
 
-#: g10/mainproc.c:1447
+#: g10/mainproc.c:1449
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "frist�ende signatur av klassen 0x%02x\n"
 
-#: g10/mainproc.c:1502
+#: g10/mainproc.c:1504
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
 
-#: g10/mainproc.c:1507
+#: g10/mainproc.c:1509
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "felaktigt rotpaket hittades i proc_tree()\n"
 
@@ -2759,7 +2764,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "kan inte ansluta till \"%s\": %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:574
+#: g10/passphrase.c:313 g10/passphrase.c:576
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (huvudnyckelns identitet %08lX)"
@@ -2802,7 +2807,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:560
+#: g10/passphrase.c:562
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2812,20 +2817,20 @@ msgstr ""
 "Du beh�ver en l�senordsfras f�r att l�sa upp den hemliga nyckeln f�r\n"
 "anv�ndaren: \""
 
-#: g10/passphrase.c:569
+#: g10/passphrase.c:571
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bits  %s-nyckel, ID %08lX, skapad %s"
 
-#: g10/passphrase.c:607
+#: g10/passphrase.c:609
 msgid "can't query password in batchmode\n"
 msgstr "kan inte fr�ga efter l�senord i batch-l�ge\n"
 
-#: g10/passphrase.c:611
+#: g10/passphrase.c:613
 msgid "Enter passphrase: "
 msgstr "Ange l�senordsfras: "
 
-#: g10/passphrase.c:615
+#: g10/passphrase.c:617
 msgid "Repeat passphrase: "
 msgstr "Repetera l�senordsfrasen: "
 
@@ -3550,6 +3555,11 @@ msgstr ""
 "VARNING: meddelandet krypterades med en svag nyckel i det symmetriska\n"
 "chiffret.\n"
 
+#: g10/encr-data.c:97
+#, fuzzy
+msgid "problem handling encrypted packet\n"
+msgstr "sl�ng bort nyckelidentitetsf�ltet fr�n krypterade paket"
+
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
 msgstr "skapade en svag nyckel - f�rs�ker igen\n"
@@ -3561,14 +3571,6 @@ msgstr ""
 "kan inte undvika en svag nyckel f�r symmetriskt chiffer; f�rs�kte\n"
 "%d g�nger!\n"
 
-#: g10/delkey.c:94
-msgid "there is a secret key for this public key!\n"
-msgstr "det finns en hemlig nyckel tillh�rande denna publika nyckel!\n"
-
-#: g10/delkey.c:96
-msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr "anv�nd flaggan \"--delete-secret-key\" f�r att ta bort den f�rst.\n"
-
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
 msgstr "kan inte g�ra s� i batch-l�ge utan flaggan \"--yes\"\n"
@@ -3581,6 +3583,14 @@ 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
+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
+msgid "use option \"--delete-secret-key\" to delete it first.\n"
+msgstr "anv�nd flaggan \"--delete-secret-key\" f�r att ta bort den f�rst.\n"
+
 #: g10/helptext.c:47
 msgid ""
 "It's up to you to assign a value here; this value will never be exported\n"