diff --git a/cipher/ChangeLog b/cipher/ChangeLog
index f13c0fb9c..e37e3c351 100644
--- a/cipher/ChangeLog
+++ b/cipher/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 31 10:04:47 CEST 2000  Werner Koch  <wk@openit.de>
+
+  * pubkey.c: Replaced all gcry_sexp_{car,cdr}_{data,mpi} by the new
+  gcry_sexp_nth_{data,mpi} functions.
+
 Tue Jul 25 17:44:15 CEST 2000  Werner Koch  <wk@openit.de>
 
   * pubkey.c (exp_to_key,sexp_to_sig,sexp_to_enc,gcry_pk_encrypt,
diff --git a/cipher/pubkey.c b/cipher/pubkey.c
index 15487ad67..bbf592bb4 100644
--- a/cipher/pubkey.c
+++ b/cipher/pubkey.c
@@ -704,7 +704,7 @@ sexp_to_key( GCRY_SEXP sexp, int want_private, MPI **retarray, int *retalgo)
     l2 = gcry_sexp_cadr( list );
     gcry_sexp_release ( list );
     list = l2;
-    name = gcry_sexp_car_data( list, &n );
+    name = gcry_sexp_nth_data( list, 0, &n );
     if( !name ) {
 	gcry_sexp_release ( list );
 	return GCRYERR_INV_OBJ; /* invalid structure of object */
@@ -737,7 +737,7 @@ sexp_to_key( GCRY_SEXP sexp, int want_private, MPI **retarray, int *retalgo)
 	    gcry_sexp_release ( list );
 	    return GCRYERR_NO_OBJ; /* required parameter not found */
 	}
-	array[idx] = gcry_sexp_cdr_mpi( l2, GCRYMPI_FMT_USG );
+	array[idx] = gcry_sexp_nth_mpi( l2, 1, GCRYMPI_FMT_USG );
 	gcry_sexp_release ( l2 );
 	if( !array[idx] ) {
 	    for(i=0; i<idx; i++)
@@ -756,7 +756,7 @@ sexp_to_key( GCRY_SEXP sexp, int want_private, MPI **retarray, int *retalgo)
 	    gcry_sexp_release ( list );
 	    return GCRYERR_NO_OBJ; /* required parameter not found */
 	}
-	array[idx] = gcry_sexp_cdr_mpi( l2, GCRYMPI_FMT_USG );
+	array[idx] = gcry_sexp_nth_mpi( l2, 1, GCRYMPI_FMT_USG );
 	gcry_sexp_release ( l2 );
 	if( !array[idx] ) {
 	    for(i=0; i<idx; i++)
@@ -790,17 +790,12 @@ sexp_to_sig( GCRY_SEXP sexp, MPI **retarray, int *retalgo)
     list = gcry_sexp_find_token( sexp, "sig-val" , 0 );
     if( !list )
 	return GCRYERR_INV_OBJ; /* Does not contain a signature value object */
-    l2 = gcry_sexp_cdr( list );
+    l2 = gcry_sexp_cadr( list );
     gcry_sexp_release ( list );
     list = l2;
     if( !list )
-	return GCRYERR_NO_OBJ; /* no cdr for the sig object */
-    l2 = gcry_sexp_car( list );
-    gcry_sexp_release ( list );
-    list = l2;
-    if( !list )
-	return GCRYERR_NO_OBJ; /* no car for the key object */
-    name = gcry_sexp_car_data( list, &n );
+	return GCRYERR_NO_OBJ; /* no cadr for the sig object */
+    name = gcry_sexp_nth_data( list, 0, &n );
     if( !name ) {
 	gcry_sexp_release ( list );
 	return GCRYERR_INV_OBJ; /* invalid structure of object */
@@ -829,7 +824,7 @@ sexp_to_sig( GCRY_SEXP sexp, MPI **retarray, int *retalgo)
 	    gcry_sexp_release ( list );
 	    return GCRYERR_NO_OBJ; /* required parameter not found */
 	}
-	array[idx] = gcry_sexp_cdr_mpi( l2, GCRYMPI_FMT_USG );
+	array[idx] = gcry_sexp_nth_mpi( l2, 1, GCRYMPI_FMT_USG );
 	gcry_sexp_release ( l2 );
 	if( !array[idx] ) {
 	    g10_free( array );
@@ -873,7 +868,7 @@ sexp_to_enc( GCRY_SEXP sexp, MPI **retarray, int *retalgo)
 	gcry_sexp_release ( list );
 	return GCRYERR_NO_OBJ; /* no cdr for the data object */
     }
-    name = gcry_sexp_car_data( list, &n );
+    name = gcry_sexp_nth_data( list, 0, &n );
     if( !name ) {
 	gcry_sexp_release ( list );
 	return GCRYERR_INV_OBJ; /* invalid structure of object */
@@ -903,7 +898,7 @@ sexp_to_enc( GCRY_SEXP sexp, MPI **retarray, int *retalgo)
 	    gcry_sexp_release ( list );
 	    return GCRYERR_NO_OBJ; /* required parameter not found */
 	}
-	array[idx] = gcry_sexp_cdr_mpi( l2, GCRYMPI_FMT_USG );
+	array[idx] = gcry_sexp_nth_mpi( l2, 1, GCRYMPI_FMT_USG );
 	gcry_sexp_release ( l2 );
 	if( !array[idx] ) {
 	    g10_free( array );
@@ -964,7 +959,7 @@ gcry_pk_encrypt( GCRY_SEXP *r_ciph, GCRY_SEXP s_data, GCRY_SEXP s_pkey )
     algo_elems = enc_info_table[i].elements;
 
     /* get the stuff we want to encrypt */
-    data = gcry_sexp_car_mpi( s_data, 0 );
+    data = gcry_sexp_nth_mpi( s_data, 0, 0 );
     if( !data ) {
 	release_mpi_array( pkey );
 	return GCRYERR_INV_OBJ;
@@ -1139,7 +1134,7 @@ gcry_pk_sign( GCRY_SEXP *r_sig, GCRY_SEXP s_hash, GCRY_SEXP s_skey )
     algo_elems = sig_info_table[i].elements;
 
     /* get the stuff we want to sign */
-    hash = gcry_sexp_car_mpi( s_hash, 0 );
+    hash = gcry_sexp_nth_mpi( s_hash, 0, 0 );
     if( !hash ) {
 	release_mpi_array( skey );
 	return -1; /* fixme: get a real errorcode for this */
@@ -1232,7 +1227,7 @@ gcry_pk_verify( GCRY_SEXP s_sig, GCRY_SEXP s_hash, GCRY_SEXP s_pkey )
 	return -1; /* fixme: add real errornumber - algo does not match */
     }
 
-    hash = gcry_sexp_car_mpi( s_hash, 0 );
+    hash = gcry_sexp_nth_mpi( s_hash, 0, 0 );
     if( !hash ) {
 	release_mpi_array( pkey );
 	release_mpi_array( sig );
@@ -1330,7 +1325,7 @@ gcry_pk_genkey( GCRY_SEXP *r_key, GCRY_SEXP s_parms )
     list = l2;
     if( !list )
 	return GCRYERR_NO_OBJ; /* no cdr for the genkey */
-    name = gcry_sexp_car_data( list, &n );
+    name = gcry_sexp_nth_data( list, 0, &n );
     if( !name ) {
 	gcry_sexp_release ( list );
 	return GCRYERR_INV_OBJ; /* algo string missing */
@@ -1355,8 +1350,8 @@ gcry_pk_genkey( GCRY_SEXP *r_key, GCRY_SEXP s_parms )
     gcry_sexp_release ( list );
     list = l2;
     if( !list )
-	return GCRYERR_NO_OBJ; /* no nbits aparemter */
-    name = gcry_sexp_cdr_data( list, &n );
+	return GCRYERR_NO_OBJ; /* no nbits parameter */
+    name = gcry_sexp_nth_data( list, 1, &n );
     if( !name ) {
 	gcry_sexp_release ( list );
 	return GCRYERR_INV_OBJ; /* nbits without a cdr */
@@ -1416,6 +1411,8 @@ gcry_pk_genkey( GCRY_SEXP *r_key, GCRY_SEXP s_parms )
 	    mpis[nelem++] = skey[i];
 	}
 	p = stpcpy ( p, "))" );
+	/* Very ugly hack to make release_mpi_array() work FIXME */
+	skey[i] = NULL;
 
 	p = stpcpy ( p, "(misc-key-info(pm1-factors" );
 	for(i=0; factors[i]; i++ ) {
@@ -1432,7 +1429,6 @@ gcry_pk_genkey( GCRY_SEXP *r_key, GCRY_SEXP s_parms )
 	 * we have. which normally should be no problem as only those
 	 * with a corresponding %m are used
 	 */
-	 log_debug ("retstr=`%s'\n", string);
 	if ( gcry_sexp_build ( r_key, NULL, string,
 		   mpis[0], mpis[1], mpis[2], mpis[3], mpis[4], mpis[5],
 		   mpis[6], mpis[7], mpis[8], mpis[9], mpis[10], mpis[11],
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 16abe9421..65137a440 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,13 @@
+Mon Jul 31 10:04:47 CEST 2000  Werner Koch  <wk@openit.de>
+
+  * encode.c, sign.c, keygen.c, pubkey-enc.c: Replaced all
+  gcry_sexp_{car,cdr}_{data,mpi} by the new gcry_sexp_nth_{data,mpi} functions.
+
+  * keygen.c (gen_dsa,gen_elg): Changed the way the factors are stored.
+  (factors_from_sexp): Removed.
+  * comment.c (make_mpi_comment_node): Removed.
+  (make_comment_node_from_buffer): New.
+
 Fri Jul 28 18:19:11 CEST 2000  Werner Koch  <wk@openit.de>
 
   * sig-check.c (pk_verify): Fixed the S-Exp withe the pkey.
diff --git a/g10/OPTIONS b/g10/OPTIONS
index e8cdb9e39..b1a49e254 100644
--- a/g10/OPTIONS
+++ b/g10/OPTIONS
@@ -1,7 +1,5 @@
 # Some notes used by the maintainers
 
-print-hmac
-# test function to print a HMAC
 
 store
 # simply packs the input data into a rfc1991 packet format
@@ -21,6 +19,6 @@ compress-sigs
 run-as-shm-coprocess [request-locked-shm-size]
 # very special :-)
 # You will have to use "--status-fd" too
-# Note:  This option dioes only work if given on the command line.
+# Note:  This option does only work if given on the command line.
 
 
diff --git a/g10/comment.c b/g10/comment.c
index f0d884979..b1732a29f 100644
--- a/g10/comment.c
+++ b/g10/comment.c
@@ -63,10 +63,9 @@ write_comment( IOBUF out, const char *s )
 
 
 KBNODE
-make_comment_node( const char *s )
+make_comment_node_from_buffer( const char *s, size_t n )
 {
     PACKET *pkt;
-    size_t n = strlen(s);
 
     pkt = gcry_xcalloc( 1, sizeof *pkt );
     pkt->pkttype = PKT_COMMENT;
@@ -76,26 +75,11 @@ make_comment_node( const char *s )
     return new_kbnode( pkt );
 }
 
-
 KBNODE
-make_mpi_comment_node( const char *s, MPI a )
+make_comment_node( const char *s )
 {
-    PACKET *pkt;
-    char *buf, *pp;
-    unsigned n1;
-    size_t n = strlen(s);
-
-    if( gcry_mpi_aprint( GCRYMPI_FMT_PGP, &buf, &n1, a ) )
-	BUG();
-    pkt = gcry_xcalloc( 1, sizeof *pkt );
-    pkt->pkttype = PKT_COMMENT;
-    pkt->pkt.comment = gcry_xmalloc( sizeof *pkt->pkt.comment + n + 1 + n1 );
-    pkt->pkt.comment->len = n+1+2+n1;
-    pp = pkt->pkt.comment->data;
-    memcpy(pp, s, n+1);
-    memcpy(pp+n+1, buf, n1 );
-    gcry_free(buf);
-    return new_kbnode( pkt );
+    return make_comment_node_from_buffer ( s, strlen (s) );
 }
 
 
+
diff --git a/g10/encode.c b/g10/encode.c
index e1ef5b2ae..a0048379f 100644
--- a/g10/encode.c
+++ b/g10/encode.c
@@ -78,13 +78,13 @@ pk_encrypt( int algo, MPI *resarr, MPI data, MPI *pkey )
     else { /* add better error handling or make gnupg use S-Exp directly */
 	GCRY_SEXP list = gcry_sexp_find_token( s_ciph, "a" , 0 );
 	assert( list );
-	resarr[0] = gcry_sexp_cdr_mpi( list, 0 );
+	resarr[0] = gcry_sexp_nth_mpi( list, 1, 0 );
 	assert( resarr[0] );
 	gcry_sexp_release ( list );
 
 	list = gcry_sexp_find_token( s_ciph, "b" , 0 );
 	assert( list );
-	resarr[1] = gcry_sexp_cdr_mpi( list, 0 );
+	resarr[1] = gcry_sexp_nth_mpi( list, 1, 0 );
 	assert( resarr[1] );
 	gcry_sexp_release ( list );
     }
diff --git a/g10/keygen.c b/g10/keygen.c
index 3e22d05d0..8e29090c3 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -271,7 +271,7 @@ key_from_sexp( GCRY_MPI *array,
 	    gcry_sexp_release ( list );
 	    return GCRYERR_NO_OBJ; /* required parameter not found */
 	}
-	array[idx] = gcry_sexp_cdr_mpi( l2, GCRYMPI_FMT_USG );
+	array[idx] = gcry_sexp_nth_mpi( l2, 1, GCRYMPI_FMT_USG );
 	gcry_sexp_release ( l2 );
 	if( !array[idx] ) {
 	    for(i=0; i<idx; i++) {
@@ -288,67 +288,6 @@ key_from_sexp( GCRY_MPI *array,
 }
 
 
-static int
-factors_from_sexp( MPI **retarray, GCRY_SEXP sexp )
-{
-    GCRY_SEXP list, l2;
-    size_t n;
-    int i;
-    GCRY_MPI *array;
-    void *ctx;
-
-    list = gcry_sexp_find_token( sexp, "misc-key-info", 0 );
-    if( !list )
-	return GCRYERR_INV_OBJ;
-    l2 = gcry_sexp_cdr( list );
-    gcry_sexp_release ( list );
-    list = l2;
-    if( !list )
-	return GCRYERR_NO_OBJ;
-    l2 = gcry_sexp_find_token( list, "pm1-factors", 0 );
-    gcry_sexp_release ( list );
-    list = l2;
-    if( !list )
-	return GCRYERR_NO_OBJ;
-
-  #if 0
-    /* count factors */
-    ctx = NULL;
-    for( n=0; (l2 = gcry_sexp_enum( list, &ctx, 0 )); n++ )
-	gcry_sexp_release ( l2 );
-
-    array = gcry_xcalloc( n, sizeof *array );
-    if( !array ) {
-	gcry_sexp_release ( list );
-	return GCRYERR_NO_MEM;
-    }
-    /* retrieve factors */
-    ctx = NULL;
-    if( (l2 = gcry_sexp_enum( list, &ctx, 0 )) ) {
-	gcry_sexp_release ( l2 ); /* skip the car */
-	for( n=0; (l2 = gcry_sexp_enum( list, &ctx, 0 )); n++ ) {
-	    array[n] = gcry_sexp_car_mpi( l2, 0 );
-	    gcry_sexp_release ( l2 );
-	    if( !array[n] ) {
-		for(i=0; i < n; i++ )
-		    gcry_mpi_release( array[i] );
-		gcry_free(array);
-		gcry_sexp_release ( list );
-		return GCRYERR_INV_OBJ;
-	    }
-	}
-    }
-  #else
-    array = gcry_xcalloc( 1, sizeof *array );
-    #warning dummy code here
-  #endif
-
-     gcry_sexp_release ( list );
-    *retarray = array;
-    return 0;
-}
-
-
 
 static int
 gen_elg(int algo, unsigned nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
@@ -359,7 +298,7 @@ gen_elg(int algo, unsigned nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
     PACKET *pkt;
     PKT_secret_key *sk;
     PKT_public_key *pk;
-    MPI *factors;
+    GCRY_SEXP misc_key_info;
     GCRY_SEXP s_parms, s_key;
 
     assert( is_ELGAMAL(algo) );
@@ -380,7 +319,6 @@ gen_elg(int algo, unsigned nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
 			   algo == GCRY_PK_ELG	 ? "elg" : "x-oops" ,
 			   (int)nbits ) )
 	BUG ();
-
     rc = gcry_pk_genkey( &s_key, s_parms );
     gcry_sexp_release( s_parms );
     if( rc ) {
@@ -408,11 +346,8 @@ gen_elg(int algo, unsigned nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
 	log_error("key_from_sexp failed: rc=%d\n", rc );
 	return rc;
     }
-    rc = factors_from_sexp( &factors, s_key );
-    if( rc ) {
-	log_error("factors_from_sexp failed: rc=%d\n", rc );
-	return rc;
-    }
+    misc_key_info = gcry_sexp_find_token( s_key, "misc-key-info", 0 );
+    gcry_sexp_release ( s_key );
 
     sk->is_protected = 0;
     sk->protect.algo = 0;
@@ -444,9 +379,20 @@ gen_elg(int algo, unsigned nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
     pkt->pkttype = ret_sk ? PKT_SECRET_KEY : PKT_SECRET_SUBKEY;
     pkt->pkt.secret_key = sk;
     add_kbnode(sec_root, new_kbnode( pkt ));
-    for(i=0; factors[i]; i++ ) {
-	add_kbnode( sec_root,
-		    make_mpi_comment_node("#:ELG_factor:", factors[i] ));
+    if ( misc_key_info ) {
+	size_t n;
+	char *buf;
+
+	n = gcry_sexp_sprint ( misc_key_info, 0, NULL, 0 );
+	buf = gcry_xmalloc ( n+4 );
+	strcpy ( buf, "#::" );
+	n = gcry_sexp_sprint ( misc_key_info, 0, buf+3, n );
+	if ( n ) {
+	    n += 3;
+	    add_kbnode( sec_root, make_comment_node_from_buffer( buf, n ));
+	}
+	gcry_free ( buf );
+	gcry_sexp_release (misc_key_info);
     }
 
     return 0;
@@ -465,7 +411,7 @@ gen_dsa(unsigned int nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
     PACKET *pkt;
     PKT_secret_key *sk;
     PKT_public_key *pk;
-    MPI *factors;
+    GCRY_SEXP misc_key_info;
     GCRY_SEXP s_parms, s_key;
 
     if( nbits > 1024 || nbits < 512 ) {
@@ -509,11 +455,8 @@ gen_dsa(unsigned int nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
 	log_error("key_from_sexp failed: rc=%d\n", rc );
 	return rc;
     }
-    rc = factors_from_sexp( &factors, s_key );
-    if( rc ) {
-	log_error("factors_from_sexp failed: rc=%d\n", rc );
-	return rc;
-    }
+    misc_key_info = gcry_sexp_find_token( s_key, "misc-key-info", 0 );
+    gcry_sexp_release ( s_key );
 
     sk->is_protected = 0;
     sk->protect.algo = 0;
@@ -530,6 +473,7 @@ gen_dsa(unsigned int nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
 	    log_error("protect_secret_key failed: %s\n", gpg_errstr(rc) );
 	    free_public_key(pk);
 	    free_secret_key(sk);
+	    gcry_sexp_release (misc_key_info);
 	    return rc;
 	}
     }
@@ -541,18 +485,26 @@ gen_dsa(unsigned int nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
 
     /* don't know whether it makes sense to have the factors, so for now
      * we store them in the secret keyring (but they are not secret)
-     * p = 2 * q * f1 * f2 * ... * fn
-     * We store only f1 to f_n-1;  fn can be calculated because p and q
-     * are known.
      */
     pkt = gcry_xcalloc( 1,sizeof *pkt);
     pkt->pkttype = ret_sk ? PKT_SECRET_KEY : PKT_SECRET_SUBKEY;
     pkt->pkt.secret_key = sk;
     add_kbnode(sec_root, new_kbnode( pkt ));
-    for(i=1; factors[i]; i++ )	/* the first one is q */
-	add_kbnode( sec_root,
-		    make_mpi_comment_node("#:DSA_factor:", factors[i] ));
+    if ( misc_key_info ) {
+	size_t n;
+	char *buf;
 
+	n = gcry_sexp_sprint ( misc_key_info, 0, NULL, 0 );
+	buf = gcry_xmalloc ( n+4 );
+	strcpy ( buf, "#::" );
+	n = gcry_sexp_sprint ( misc_key_info, 0, buf+3, n );
+	if ( n ) {
+	    n += 3;
+	    add_kbnode( sec_root, make_comment_node_from_buffer( buf, n ));
+	}
+	gcry_free ( buf );
+	gcry_sexp_release (misc_key_info);
+    }
     /* fixme: Merge this with the elg-generate function and release
      * some more stuff (memory-leak) */
     return 0;
diff --git a/g10/main.h b/g10/main.h
index 711f5b8d2..8e2436c70 100644
--- a/g10/main.h
+++ b/g10/main.h
@@ -124,8 +124,8 @@ MPI encode_md_value( int pubkey_algo,  GCRY_MD_HD md,
 		     int hash_algo, unsigned nbits, int v3compathack );
 
 /*-- comment.c --*/
+KBNODE make_comment_node_from_buffer( const char *s, size_t n );
 KBNODE make_comment_node( const char *s );
-KBNODE make_mpi_comment_node( const char *s, MPI a );
 
 /*-- import.c --*/
 void import_keys( char **fnames, int nnames, int fast );
diff --git a/g10/options.skel b/g10/options.skel
index fa4ac3f28..646e0152b 100644
--- a/g10/options.skel
+++ b/g10/options.skel
@@ -79,3 +79,8 @@ lock-once
 # Use "host -l pgp.net | grep www" to figure out a keyserver.
 #keyserver wwwkeys.eu.pgp.net
 
+# The environment variable http_proxy is only used when the
+# this option is set.
+
+honor-http-proxy
+
diff --git a/g10/pubkey-enc.c b/g10/pubkey-enc.c
index aa848a2cb..e6cbec4a0 100644
--- a/g10/pubkey-enc.c
+++ b/g10/pubkey-enc.c
@@ -87,7 +87,7 @@ pk_decrypt( int algo, MPI *result, MPI *data, MPI *skey )
     if( rc )
 	return rc;
 
-    *result = gcry_sexp_car_mpi( s_plain, 0 );
+    *result = gcry_sexp_nth_mpi( s_plain, 0, 0 );
     gcry_sexp_release( s_plain );
     if( !*result )
 	return -1; /* oops */
diff --git a/g10/pubring.asc b/g10/pubring.asc
index dc4e8bdb6..09b099bfe 100644
--- a/g10/pubring.asc
+++ b/g10/pubring.asc
@@ -1,225 +1,458 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v0.9.9 (GNU/Linux)
+Version: GnuPG v1.0.0e (GNU/Linux)
 Comment: For info see http://www.gnupg.org
 
-mQGiBDWiHh4RBAD+l0rg5p9rW4M3sKvmeyzhs2mDxhRKDTVVUnTwpMIR2kIA9pT4
-3No/coPajDvhZTaDM/vSz25IZDZWJ7gEu86RpoEdtr/eK8GuDcgsWvFs5+YpCDwW
-G2dx39ME7DN+SRvEE1xUm4E9G2Nnd2UNtLgg82wgi/ZK4Ih9CYDyo0a9awCgisn3
-RvZ/MREJmQq1+SjJgDx+c2sEAOEnxGYisqIKcOTdPOTTie7o7x+nem2uac7uOW68
-N+wRWxhGPIxsOdueMIa7U94Wg/Ydn4f2WngJpBvKNaHYmW8j1Q5zvZXXpIWRXSvy
-TR641BceGHNdYiR/PiDBJsGQ3ac7n7pwhV4qex3IViRDJWz5Dzr88x+Oju63KtxY
-urUIBACi7d1rUlHr4ok7iBRlWHYXU2hpUIQ8C+UOE1XXT+HB7mZLSRONQnWMyXnq
-bAAW+EUUX2xpb54CevAg4eOilt0es8GZMmU6c0wdUsnMWWqOKHBFFlDIvyI27aZ9
-quf0yvby63kFCanQKc0QnqGXQKzuXbFqBYW2UQrYgjXji8rd8bQnV2VybmVyIEtv
-Y2ggKGdudXBnIHNpZykgPGRkOWpuQGdudS5vcmc+iF0EExECAB0FAjZVoKYFCQht
-DIgDCwQDBRUDAgYBAxYCAQIXgAAKCRBot6uJV1SNzS4+AKCHdeYHMmKQV9mC7REE
-5Vz6d5rRBgCfVMcyRP7dxBwhytmwCDpAcCFvCLSJAV8DBRA1oh5DA28RuP8+qgsQ
-A2MyBR0eiPUovYMz0DUXBbNs5606eaVeTJOn9WqkYGcS9xOKlGd8Xj0IcAKN30st
-5AsC5hRqr82rrUjB5/CuVdbvk+Qkh6ixWCqo+RRrbgf8cKCg1x+lDj9PpeSD/B9U
-U45ntxYamoXnPszxtzU+e73Nkbtrej5rgMK8tgTLkhTAbO8M15Mgtw2yOeDFfiCj
-4xzDkYryvLiPI5p2vYXTVcgYnwpNRnMZBwUghb1PMSXj7AP0P/8wnpb656yIjH2O
-AkE5is5HvTEs2wGUCEXXYKxgLIl9bRPGd2DHfJQ6broxy1RHVmaOrOeDibspx67R
-RTm3WqbtLiK0/nRF0gEjFGxLjQiy92gp6xLRiQsMQdkz0Lwgr0dgSs6JejBlsQPp
-5nXXkIm9q/hl6Cly3Zx3KbAIwO5ZF5NyBciezCxSurg64xmxibNhSknblI0vyG+I
-RgQQEQIABgUCNaInPAAKCRBsfuG4YhzAE37WAJ9Xzmig1DrfnUt/KwfgidkPohJV
-iQCg0T6afKuRspWzPAz5TKQpVjd02KmIRgQQEQIABgUCNu1ObAAKCRBd4kmWWwNY
-omq2AJ9+alN2TpVRAhCxP91eqvfEN9HgGgCgrTvpWnB9EKtROr+AT//cujKCyIaZ
-AaIENaIg8xEEALYPe0XNsPjx+inTQ+Izz527ZJnoc6BhWik/4a2bZYENSOQXAMKT
-DQMv2lLeI0i6ceB967MNubhHeVdNeOWYHFSM1UGRfhmZERISho3bp+wVZvVG8GBV
-wpw34PJjgYU/0tDwnJaJ8BzX6j0ecTSTjQPnaUEtdJ/u/gmG9j0218TzAKDihdNo
-KJEU9IKUiSjdGomSuem/VwQArHfaucSiDmY8+zyZbVLLnK6UJMqtsIv1LvAg20xw
-XoUk2bY8H3tXL4UZ8YcoSXYozwALq3cIo5UZJ0q9Of71mI8WLK2iFSYVplpTX0WM
-ClAdkGt3HgVb7xtOhGt1mEKeRQjNZ2LteUQrRDD9MTQ+XxcvEN0IpAj4kBJe9bR6
-HzAD/iecCmGwSlHUZZrgqWzv78o79XxDdcuLdl4i2fL7kwEOf9jsDe7hGs27yrdJ
-EmAG9QF9TOF9LJFmE1CqkgW+EpKxsY01Wjm0BFJB1R7iPUaUtFRZxYqfgXarmPjq
-l2iBi+cVjLzGu+4BSojVAPgP/hhcnIowf4M4edPiICMP1GVjtCFXZXJuZXIgS29j
-aCA8d2VybmVyLmtvY2hAZ3V1Zy5kZT6IWwQTEQIAGwUCNs8JNwUJCCCxRAMLCgMD
-FQMCAxYCAQIXgAAKCRBsfuG4YhzAE2kgAJ92JKU+YcYHoRhX51+4s3fnPIyNEgCf
-aiWeoyb15xgdO6etGiD2MYCWy5mJAHUDBRA1o3cUHRn0wQyYV6UBAT3zAv9HMaPu
-MWFQKZRTtJyGMo0ID+w/DtLn8z7CMBd5L2+2+RTTY36fgwITehtBziIJC9xrFrQn
-x+VB2pYvprTRSCg6U7a/hf5T6WT9zj887C2UuIWE6pjLNTvwAqvGsSoAIpWJAV8D
-BRA1oicOA28RuP8+qgsQAwfcBR9Iuppp+q1mChXqSYV8oROMFqkTyQJ736IllJ7Q
-6eGiEMrOpTkYoFVyFqOJOEivxR+fWJ8xe+e/Kq02Vv0XANGyKias6mqrDnU2BBWu
-PXAo7y5wVuDnmyZS01LP555lNBVilvDsMC/qQrvHe3y0kp4IAbK1EMG3qbsNHCaH
-LRTwM+U9Z0CYnkClbB2gjcC9nbtF3nzoBebowdYytat6eFMrBfYRHAUfZbRN0x6/
-or+I7WV5gtT+GrfVuSxVrGLsK9FN8iXGikiqdL/8BhFntif4BUGdIQdft+UawmT4
-IlrBL/Owh2hul7UPtx4YqwQibGIZjopFSqBGp+j4VFUdapVxMraQLd/PUwZ78nHg
-F/IXBzhN3YrhryCxIGHrN4MN7OWZjO21F945tga1/FnIXsVBVECLiltnC9+/TBV0
-fE28aVca7EWBP+Ix2QWIRgQQEQIABgUCNu1OCwAKCRBd4kmWWwNYonyaAKCxLBst
-eoVfwn5g5Lug9QgVCMV76QCfRgQKXQv9zl4oO7Aa1Qljm9zEM3C5AY0ENs8HCBAG
-APc1hCpuXmaTDAUbIqS9CFHkihMnilIwAV+L2Dbq5eOPtoemPKx5+6xtZfzzY9/V
-CVwZCxY9Y5PEN9r/twUA478L/FOXv5E4BpX+4R91klt/EZGcNfDl2Ar56FpGJ3iL
-g4+vxx9m1TV5k2nNOUZAVD1L+MoapWhaZFXLMChrhDUcbo7/1Fr1Rfv9j/LkkIJJ
-hqf3G8HzE5AvCQVSywUayYZdbmqdiY2bklZJVFAXs1X9zSTGoFc8eOxz6i1ZeMq+
-GwADBgX/T7o5R+SOTlJ72ac/g121f1kFX1dbRkQq2pCI95qTehp1AxdSwG3ur2sl
-FCfi8ZDNUqkFXJrsv5mh1yfqq7zS5T6lGT5lOXCDZbAO2wqNZY1VKeeCdcvD2VMe
-h8XxJfy8y1ZK/iE1p8qnokYpA3nFH+JIsdrXk5ceiN3nKk+aDamUkV1sJzeEm5F7
-QHe60oBKbVGIUF4EhGq6daVyeCeK4KhWuPYyiEgyaq5/xJZbR3uRcdW6X5AiGJWJ
-OOQoGvWziEwEGBECAAwFAjbPBwgFCQbzyQAACgkQbH7huGIcwBN5FQCggakIOYzL
-X3lNq2WWgcAkSNm7kpoAnA69b3z2E5vxyD3bhggVUDX7j8hrmQGiBDbtSOkRBACU
-RhKnGIFyXIeX61GAY9hJA5FgG4UalV55ohdz4whBgDzDGLE3XYlO8HCn4ggKilll
-6MOwY0yZeg6PEU9Y3SqTzpQSV6qj2M7MgcS8xOpi6bNCu0iyZUik0KklUXMdI8e/
-CVmBpQJT9CofbD1dsP6z4dC6z3jil0+5Wbfw6yIXzwCgy/7Fagq5mN0H760/JEii
-XILS1n0D/3H26lTaxo1vGput9Td1FQN7Vn6YDP0/To5ipsOODROV3zyUwF5QleY+
-8zTFJA3qD5KxRfA726WELOF1mB6Mw44UdkPniOoGdMH5oSx6qnNnlVZBBu3U+e1q
-fQwLQjHu0WX4Z2q00DKpWLThGv7Loh5NKi6OfTbMhfHoevCAzQnmA/wKc6J8Gqth
-ENThKXxZaei3Ep0t+PlBmbUzuAYCXZhI6/0KyD6emyQ7LYIaPv9qEfMkMLhxicG0
-v/AAwOCBRKS3bkqc6wAYaO0bjUHJvem3HkWPux82t83+6YPyRnVjm/mwt0uEyKSv
-t7Md2DVrO3lEcKRkRHiYuf0nonPhl5Rs5bQaV2VybmVyIEtvY2ggPHdrQGdudXBn
-Lm9yZz6IWwQTEQIAGwUCNxrPkAUJDMl8gAMLCgMDFQMCAxYCAQIXgAAKCRBd4kmW
-WwNYol3CAJ47+zjeQIsMwiwcJvYfcsLn1yULlQCfUTKupaT6pw5culAis/pBrdBK
-ZciIRgQQEQIABgUCNxrRPQAKCRBsfuG4YhzAE4X0AJ43A7wbYbR6LTfPSD+fdBki
-mNvO8QCdFoSpfY+4FsKVagg/qH3KtGUARtSJAHUDBRA3GtFjHRn0wQyYV6UBAdGu
-Av9AM0o9XkmBbOLLNse8Qp9MjD8TC/oSXYxp1W9AjyRs83iqQ+vaZlbA/O5z2ud4
-I9DV4vwA50Lz5nLFbPHa+yuT8VxTl2icw5u9rZy3iSok3rGXzGOzENMmEFIVFqIE
-mPGIRgQQEQIABgUCNxrRowAKCRBot6uJV1SNzS34AKCErfsfa9Nh5deJ40nxpmSI
-8lK17gCfRYcU6i1B1Nbg2Zkkr5SqTnBtaWCIRgQQEQIABgUCN08fXQAKCRD27t8g
-GEvE2S2+AJ4udDl47EAnP4K+RvsWcv8qjqpzlgCeOFZZblzWjeie8oQfYl7bBBrx
-PqKIRgQQEQIABgUCN6cm/gAKCRCYNGXbIUOUIn7JAJ9LLXMt+0R8u4gdmxQeKz1T
-QyWoswCfYQh/tMjUzk4rKxBy4UtELnwJ9x+0C1dlcm5lciBLb2NoiFsEExECABsF
-AjbtSOoFCQzJfIADCwoDAxUDAgMWAgECF4AACgkQXeJJllsDWKK11gCfUgltInjq
-S+wGOrxfjiGjJsNmVtYAoJLaNHln4KYwLlYOo16kdcB7dqUDiQIeBBAUAwAGBQI3
-L1nUAAoJEGxMMaWx1RVnDcUH/24NeFhidBljDUrrjjkdFmM1Gjbc2KYi0lci663l
-7aPCwTcM24M49q2plu0YvrWCQBy4bbmvGYEnom5oAbmWrBfHW9ZuTTdWXBwVxk8r
-AI6fip4nE2fTq4++Q/aN6EpjMkXIrBIa/oJI9LVYRnzgDgunim7n1bsmBQ1SMjsl
-ARpVuwKXpswM2Hpn7Nw3Yx5/O5ZIxzFREjuHzOa7S7knO3AXy/3upY2lkHOVvEtI
-CA79FbS9/aTFuAZaSmtua9eKCcsLlKb1gmbrLw5u2SZ6mf1poDh0FLMmLnU0TqRi
-G5bDYPIqguoblqRkgUXbt6EUEYZKqX1XbM8+gQf5wMdNatsH/0PlPVyHdY8s8VC9
-UhoGmDH+kHcox0NaMbhSzcczOgvzNOvbcGzYFye9UbAw11cRWX0k40oh9dNAD/fv
-YW+ZsnGly1Dl2A7zkhcxwXfy7IxTVa6xWw7OV8PnCxlRziIEeSFgH4LuXdTwGVPb
-kFYHRp0H5mYN/N0Uj8b0d352c9axzVBpkusO8ehVW8WtUFNrd/IDWnCMBwEwD3Aa
-ciS316M526YNwA24Ahsg4wcJ7j0BEJGMEWpG3M0a4HvCGj2W7dh2D6FLHblzGciS
-PM+bb7u6VA8LOdZ1dRF9eQXDd/vmmOaVMgNSLWmg8pkFZqBW0AtATTMzDud3TJxZ
-KOIuNpKIRgQQEQIABgUCNzr5owAKCRB1D2SVyJ2TPoaLAJ0Z7QpI/+9LIRkz8YKV
-Be+MwPhG8wCgnDJMh1yM9ltCLMN4A7du2fYILBOIRgQQEQIABgUCNzcjxQAKCRD2
-7t8gGEvE2YdlAKCVZs8POchyc7F0Nb6TtiAD37+fTQCfVmNKImKm96tTEsQUcBtI
-FYjQie2JARUDBRA3Q97TUoBXRHZTQB0BAchxB/9iTH4O9RoIshiUysQgMpncn9o9
-snx+sCO/NiSuAVleHNBP1d/Kvo6SGLJYoVfbfLPMNVyuZ4jGi8JQjsgVjpAz93nI
-evhjz7Xwd3JpS9oUvPej1mdWnUB4AnkKQfN+5+eso9Gk7OC9cWq20lU9tpVMDIlO
-j8GHR9kYfJ4fBbzdCGbG5Z9pzo+96gDUMzX5ZrHlChdV4eHJPMi60XeK+mpocQFQ
-H3GBUSTeM3Sy93JoYJLdAA2ZcwMF5xI8HRx8u0rwCZNXnDTgPaRbDiW7587n3dWn
-7Pwmxu/CPtCQ4YO+WdjcKvHio7CqojtM8/7xuclkp3Wb1pE1s9w929ca9SHdmQBt
-AjBtg5QAAAEDALuW2Y7m90qyyiHDNcRl5i8NbaWXcJgPYj6u6I2rTJvGR8UGimr1
-zG1rQ69Uwvgsr9Mf7rR/8WrH3CDbKT0A9fJqiZ0utd9bJ9n3Vi00J+PcSULhcHiq
-qbQdGfTBDJhXpQAFEbQhV2VybmVyIEtvY2ggPHdlcm5lci5rb2NoQGd1dWcuZGU+
-iQCVAwUQNF+g6Y4HfUaLoGaNAQHPCAP/Z8dx0Ne5FFj5Ie8hURLB6KOy0H7b+xVG
-n4UIONHvgqDnvqwkd9MkLG1JKbOlpWl6VvnPhREYn8HKLkv0BTuELvlLVmcn4yMF
-PpV4/KT+vS4GsyRT+UwbuWT/LYHLceWX552PMmx3Cfpqg0+LJ6fgKHhQZMSC7Fiw
-urQcRL9S+iOJARUDBRM0QITaCen5CopyTkUBAf7UB/9AyVg+Usb7kTX2o/oCKUpB
-TM2R3VNYx6ddNLrqEYhXCQtVAOLpEKKaGcsyr8XsQ0DxtJvLIy6dxoHPl0fiSN+I
-OnWjrgtQtxOY3Utb1y2lMAh4sslmfDGgkuRRstRgoAMqogFccy3YHTNGaEU6oSNE
-34+EjtcJwd4dYeIN5QHnxAozJ6gn9Ab/vMvCc2AM3Y9WqrYTvYLfJ7kU6Rgtwd9Y
-rIFGufoF1SmEAHQvFm6NIaTyiFkVuJr7PGlZ0TzFIGFluNUaXAu6uZLZROOPEHIE
-2KF5QPogLe7k/qmyV3Q5+qemuJmh8/QIE/ahOTrmvnb1//WWzLaR9atU9ggUlcSc
-iQCVAwUQNDKd4aRYxL1Kcl8xAQEwEwP/UAO6GG5j2TI3s6PoM+sO3lKk9AMZLQm3
-DfK4g+h537HLOWsS4vYd5o6PU726umfxcs3tXbVqOTOWqzGcaQ66J9sT1RPrujZv
-a8KV0JxjidXmf5TWycwPA2/5GRwSA1rwA2JaSbTdQi13v8WkcNA/QUiBs8Q/BGgE
-3zsjiBp5t9GJAJUDBRA0NRLDFE2blK6PfPUBAYxMA/9RpdcyE/NyOMvEFbQBxxN0
-dS0uL4r6tLk83HF5/aedqwSEJ0rgaQz2fAmCw/QRnEIbdlIAiVYiBDcwrdkBXUC7
-mksqiVGMXIRkXjbTAC2ITtX7iXDcUKo2hcMkQULcFbjfWTHXACEOT1Vogcdp1hyh
-/h12YwtA5bZwnssMQQFb9YkAlQMFEDQz9VAiZsaFTfdptQEBFygD/156sMFkY8K4
-bISZAFyvbgo8kda/8RkgqXkMz9ifPVhllvMty8QXDDfia9jSMJ+hVwIoh4UUEwqJ
-Iqs4y2hULpxAwqmaET2FhFK3DgTRtx/QEP+y16l1W2nBGcbxIM/Zlua2DKNhP/tP
-hi3r/R/o3/Q0LsT2p+rhmWlTe4IYa7/jiQCVAwUQNDPySnaw9XG4JAR1AQFzlgP9
-GLG8VwtM7UfOdtuWs7RYzNBz5HipDnQKYKlZwUzC9V5Aej9vGjEaCA0ya5VPRup/
-syiVkNIk1L3ogA3fa5/bm1geARGdBoyGaLVpIe9EOHiPEW7yAZWAvqVaK3+8ENb8
-GIUEIfqxkkmsZK5J2l5xO1pYLw4kYOgpM70+oAD8dBGJAHUDBRA0MlLHTXV4WztU
-4BkBAZ0pAv95reoPY4/fBVPNe9+NAvUKixfjDIq6wEGF2327a85P4paSJGTWjfmc
-g4a5kse1IVANjwJUM6SqDqDixVs5xOXxBTAcD4DgBUMifBObWbgGTih4IjCTgGnq
-YN1bXWDbyT+JARUCBRI0MhY+b9jjA8N5ozEBAa8FCACoaHMD/bUrugv8vlLlfP/9
-47snyGC+qoZdZ3Xd2s3Ldsdso+ftPGKWQDdxrbiy37pg9kN1JQcswKqDXpg4zJAX
-yASRftkdY9pxWhSkKZLPW5Denpbf67lQKRGmBA3zAFsnHlmkEGp6rmr/fWiRqg2P
-MDaCERbJHkuX5TQLzsxjulzs+U0cYKvRk06GG1/WNT4f1qDlTJPp7EhiKbdCpZiu
-6IItJRyKbSXfArssxbXD/tDpxZ8AVC+XesaO3euDo5aD0ngfaHm6R/kk2JHJuS6m
-Zq1Qz45UxGR/3ePNTraRvJmkkEeJBm7HElouSGm/ZGBaJv2luR+3ATL9meaOTGUg
-iQCVAwUQNC9aOHjfXfFhHz81AQHftAQAiL29H2H16efPxWLtE1TjXeHVmhmPF8Rs
-6mRACMT8utn8vlaJZ2hK1KLKoIs+jI+lBp+JTydM6vUqZjhGBx4k2DEhbg6JIyhK
-+uFzaSo/6yRvwDYHj7jsCqOvl9IBV9V+sMyoMaKt46C6FD+F/0E5iwzSCz5E523I
-tY+0yNGcWW+IPwMFEDPypBKPqVFPlg4pchECe1IAn1K1IQwGgW+TyJFaldvr4sM0
-tRbMAJ9PyJjcjHC8wXqOMIetu7FCQvtyFIkBFQMFEDQww7vnr00jJ6oPcQEBMgAH
-/i0I9nWwtY7TuDZkKmI/UeVil/k8Q1pe1pqwW+FZyHt5R7cOSy4wQ/MHkadq6hBk
-CS6EQaSgR+t8vcBe1cf5Yyba3t0hxMEPindeR5n4+AmkqIBJcPK6X2u6Zde8zFIv
-gpXtqv4XVknTJwLHavZq7Sms9qjvSEMDMtPLXqGtaC90dIrv7DBpg7lM8IvkkOZw
-H50cpbvao1Q4PSnFt7S4KSRv6APF5VfbylkSQgg4wxX94Czluz+yZX54mpZP8TJ9
-UEOjuF4XZp7ImPl5zE044OvzzEoXuoSmprMJDjGG8Vj5ifr680Jxh+Shls6fRdAC
-+p9rZVpv3ChUhVJoOOL+aU+JAHUDBRA0MLbfcV94PgdgYEkBAWHpAv9cKCbk7er2
-RamC2zUwcqgeiHu/FJJAZI/aTt+U0/VQHae/iwq/IYzx4koCm5E4ih1xORxwzipd
-oG5e6cyvmQmW8Mk+b40vMrKG1A/Z9YjvEZjCIKIHb2CbUYUyN26vhqaJARUDBRA0
-MFH1+MN2oaLFF0kBAT6YB/4nKolkRUXA3BnaFIgx7B6QLWvs33un3biep9kqfOfr
-B4WkTzQoglJa0RXMjRe8eVUI6dL5ZHGfvPHCs5NutwQ7LSChVs2BSw/nKllrb8Qz
-njq7LIlO+APSfADjlDhs/mwaGOHQbrev1XCi/uK0V7hEMEYzyJsadlOv2Eejjr2O
-miYdI15q9xpRjISpyvgZulCZ2klOef8fQD58yXtkdGhpyU3H1mSzGKG4JGuRC9Q5
-ve5EP2UUiEK83ARqt03rZ0o4oleafVM63Jqdm+eZaKBTkCYa6ToWmwKWbenm++WJ
-3riLj19m329bmSuzZd9R69HigvQjJSX6pbYc3QMiUOIBiQCVAwUQNC9u/bByAnBQ
-8yElAQFUEgP+I61LwJB8zG0bQSat9p5VRTxH+l6AGZVYMFQsCnwItO11/GNXOz/o
-NfDRGiBcxFGXZoV+7VinTGEFiMgjoqq578XMAVdj1U0XWl6qc+3sAN16m1gymllr
-ywaf0EFG70WzDr3PomTKq8yJXEZwrLdcSlUavQkfHxe3oFh2tQuIqvaJAHUDBRA0
-LryfqNlH+e2VR+0BAVpiAv41RgSP+xf0znGrU5FfRKxU8yk1qYc7ckFKZlIjOOKj
-HkwCqgU4KKACSie7OTloHL9tEfLVyYME7F/iY2HOsfw3oiQa88TvRyKYOdsW+v6G
-hlKMirG0Qs1mwu4tVq8s8BeJAJUDBRA0Lq9ahwK4eWctBcEBAdvWBAC6CnrZpXMM
-K7Pie19eyaUZstjujmhldggp08/iuI6PiKZwmHpxKBgUvo4zN4in1Vb88ejaaTyS
-R2TPm6J/kuo6QS4jGCtrunVir8svhhWFYZB4PyHCma766Vig87DjR1VhLfo/Cscg
-f1p82GXw6vk7ZUgchaehD772vqDCeAVA7IkAlQMFEDMeeSHWw0q1fWuuhQEBamEE
-AJ2G6qbsYeiJem1D9jkXoGK8KPGv1yH6A9KNosyGrSQEdU75NtfJV59VUZWAJi8U
-+OjMzw8RXKRAC1j/94njvloZeMX4E4CGXbPQgyRAoIkwTGgQMdtyPSMggxnb/6m2
-C1sVLInYNDe+8J1vD/WTI8dM98/4va7jQZYwhhUFvKi6iQCVAwUQMx7v5RmzKaWf
-scbZAQHMwQP/cvQPI8r+7o/IB3UB2mNQ4NORZNmNnpcDa5tzohdexlamYKAH/bi/
-yOwncMiy9QPcp7nmROvrFX5q76YCTA5CpZRNRZ9AKRKtIOVtQnVU8HOHJOm7OMGi
-m17ujdHpdd9wuILmNjp4JfRC0saEqkuNOvm5GF/V9g4MawAZeYIHIO+JAHUCBRAz
-LpQwHRn0wQyYV6UBAdXgAwCN0VQjIW2lOvmOTJlJ3fL//QkY7TP1T2EtXF4EELC9
-0RDGyul5O1V2ql4pnEc3UaE8Ji+AsVkBCVw+H8Zzy7247vBVKAlzfNgoVOEqlB69
-0X+vONMId+CKB/ki6LSqKoGJAJUDBRAzHbZsC3OAb8QPTp0BAWLSBACSiypMxbL7
-V5RduLZrMUrdFfkRF/3CU3uaqHtO/Bw9e9VbNQBGfBG/7iSTe45YjXyrlQ+Kzsof
-cpg5V5Gs93xtunpKOEGHzai6tMRBRcsENCIjVXVxlmbDAR2WcCeEWeReAwE0zaru
-gF59EcAN9gN8aj3TBfKtVUv4aKEM2nNTA4kAlQMFEDMdQWc5a99QvA5HcQEBs5gD
-/3QkisqbGHA/qq5qF4U6OM+jEMYRmkYkQ7B6MQHJiP4CA40JGZBLcHJ225sD6eb/
-fYMV4byl792cW8Zz5CA1bnrSErbULYomPvaaGNGWD+druPPj8yYEC/mTrVDuuhaL
-SvDH5H01IfGmyELwD3bOa+jzD9fNVKiALyknTiNydjpiiQCVAwUQMx0+21r0vCW+
-5ILdAQG88wP/dMkaugeEdiMeGISkNllWzN5FDRy9Uj+4suLnKrdbgXonLjsMXxVy
-QDubDRtes4w0AI3sl7u7JpTzmq8kLbCChCkUZ0WWSOaQDAMCNH6SgTKyITwWiaI4
-eG8SkRj9KNJLiOPgg+aBXxWrrpeM/D6LtnRGw8s4h/rvJkfHKk2IGJiJAJUDBRAz
-HHCkqurobv/vwPkBAejZBACOenorE6XpW+/mstD/iuPc56a8XshRSrfjFvbmL8FK
-8YFSkNBVSaG/+oh9a8OpYZl53Iz4CU1J9RY9ac/jVLw4f6VwREfaDZ0YoaXuQfUX
-YHEHJmWpEQebarrbjA88DflEte1cjHTrJiMu0ntv4UIBfo9SBmS1liTmDCN2gAas
-LYkAlQMFEDMa9wIoLpzt/nc8ZQEBSjMD/2X+oqZypuLxG0uwpBKHe8d2z13bbNxu
-S4k8FKg6/YPuLZUuyFpAWOr7ra5hkYTqdTVY/mxlwEO5aOhfi3g2t9+c4b/VH0PS
-3W30XjsPvscnOO+j4nnZI3nbRgdxtPxWgd09GgQ5c83i3OG+fYZqlVV1oCVYzQwu
-WiE0fcj2Nqn2iQB1AwUQMxmVQCfJeCVLKSvFAQGe7AL+NdsUv6POzYdAK6jiDJWs
-+VSSxAIthmM2dm3DVxrr3sZXc2EGFJdH1YctAf5laelPODaIvdZhJ2L21s+zvyJj
-UVJ3gQbwf1XvTShAbx2UgIXlbZWPNHt8HI2iwozvRZJdiQEVAwUQMxYGwYLLW315
-yRYdAQEfMwf+OauwfBI+sDlHTnlUJO4PN1LQAn625aSojKpBCmpuiy3z0fGl6vcy
-aMslqz9Um/wSF65Te9D1rywbZKeVYou3MWqmTtMKTKr8fduW5vRqBERs2diEcdMZ
-AUJglviVaNa8yN8/43mO+UtycOpA+Whd8A6DLtb3Q86ioWuy+HF2mdeCguvPI02N
-rU7U1GP4J2/8aYlg2LqxB7jfOZdZ4DuzIsozDrTnyOgOoQkUqd2BKndnL/JeY5s5
-n8cLY4nADeDMRoC7w+p3Wy/AYgbOeq1M0Kf2TX6sy8k9rGCWDs9cglLbzaGYGX0B
-wmXCaHYZQKzCX3+yP5ERZNvxKAlRuQVynokAlQMFEDB1uhUw9+yDGKhcwQEBD8sD
-/0EVNn1P3k/9O2zF4LuWb2KaTaak1AIES9eTbzoVCcYW0Oh0Z8F9wflJ4odpQ3EV
-pevf2sMZS2hMT3yIBfeqAISV/hXavOCgcum5DMKDdTfl1+zWsjGWlxIOTmK9oek9
-XdK/6aWpYvTj3L7dsZpl4CfAzqS8Yw/a5xxL1TpxuGnDiEYEEBECAAYFAjca1F8A
-CgkQXeJJllsDWKKRZQCgilK5fO438Ijrd1m1PtEvtz8q1ZQAn3b1IC1Ov1KWlKDE
-wLxWTVPWLn9JiQEVAwUTNxycWdImKUTOasbBAQEnHAf/ahq4b4mVQLfMFSyhaFFD
-CqjsN2po+XuwfmgIYMpLjHgJEDbdTXk2JwMjujHoSLOTAKOTR1GvUR5Er5GovVv/
-ZPjYHqfKc4uFEbYDQE8dFEktygvicp+g9Kj/p0gL7eJWWIYSX3QplkPluc42tUlC
-RGNkvwCj70imahiHxeNLnEwsQX2gBCoCQD3edUGbnqUqZovWSX4zd0kW00q1UHx1
-7VleJ8OzwfKQPjaphW1yx4IrFleELdRMblgs2E++BkofxYEKvfNxHXeEUPG55xSa
-7QxWG8TOgrIFhi3SuuqfJavHBu/iBJNRYflluCxONzVJgpnHPqGs9Cd9hbM2TOeU
-VYkBFQMFEzTEvjcJ3HA5OfN/XQEBM4IH/RDpaunPA8yh+MePngyIYspU/75h/DN2
-+ewfFWlNktnlTHwSsOycua9QamGctUQtnASQQZGOWftrX2H2gvxRhlpX4hxHq1DT
-oVvWV1H6r7ede0FjMaGV5d2AlBIosmTM8Xva29jQMdQH/8ZRX0gEtAy98bwh/8AW
-yKHiJeL3oM61QBt64iGcyVbAskV4aMsuxfW7odJfffHLhsZfq/9RwdtNJJhrHNv3
-YZH/Gk/Ze3ffaE4VGQNkvnaDbsdLRSsQlZ0BVluHbkptkSXsLrNf/zY5nmdMTOIe
-jbR45Lo2u3b6AtJ4D1fmH/6pTHfSRM/PYtQ8FDIiosImQczz7SrmP1yJAKIDBRM0
-xL4dkV5OLNsIkwkBAWsaBGUQCQbUVhTi59PGxrGEVnLvG/XznbtjGmWzqZIKLUcv
-nmcmhx7pMj5nfgyss5qJmWN5A/cRSDMD5yzWwVFqCjirPbBLwxyZD3DQU1BAzPi9
-WD0JWLUlRV3gRZi8mkDyzAN3lv34Ch1gUSx/G31ndo/4BxYVvXRGVVWw3D0SE5tz
-ogyfAA4cIQj2+nkXPMWJAJUDBRA3HKvpTKNNLIhJ3D0BAd/7A/4r6rqEhDT22SBp
-hoMuVYotu7F49eozig7vaqLvQaSDQ9XmdTiXfrxHpbnGBHxmTGVCWDzmwnRsvrBb
-9KMzPuk/2GSE3CTTHcgWQYxNgbyLoa3w2bvHvR3MmiIL4Dj3o+vJgLSu8ZV/46by
-Pm5N7EEGNv+OkmEBD9Iap4N4IeF44LQuV2VybmVyIEtvY2ggKG1laW4gYWx0ZXIg
-a2V5KSA8d2tAY29tcHV0ZXIub3JnPokAdQMFEzYbYzIdGfTBDJhXpQEBIooC/jDO
-Yrtr1n6DQof7pbx98iHOtCjzAMBT1fVYkrMmNLbTm3HiaZ2cC3nzJF4Fz/7kddMj
-wgpHwiAX4tVcpYAa/k/kCoaGc8x5BIKzUlh1/0w+9t7fiMPzADUtNYVef179xYhG
-BBARAgAGBQI3GtRpAAoJEF3iSZZbA1ii9GIAn10kFV+PH2UYBGgVeYCJ5iswYOub
-AJkBDI7hajSe1D6Krh2j0zf8VMWOIA==
-=TbxO
+mQGiBDVBlNMRBADeX96LvyNiop30YPeeCBJZzeqQuQ3yQ+SK3AHoXLQ1qsGHrdoi
+HfHbVV2GfulRq+H/z97vUtA3APE2NZ7HuvBJzhXZCOE93wT59OZV8Pp5ir6TAEYm
+dvPCgvjYmwQvKgvaF0hG4eyvQst7SaevFUGV+jEz5DQhniy+/a2/W7nC/QCg/2SE
+nBeZNJnZauf9cXQ34GnXV68D/1BspMcbrpY/YFXsdLUSbroG0EXGma4jY9UlcRV8
+8cIftxl2jh04l91bvzzCFgSGvFdxVbHWnIgbQ+PQ1cme7SsS3ZFFI3B3zykXGOi8
+shhOT/Gip1Tk4O6MwTyOWdTdnEGSjk+qoVwEMxhY/ZZDd3bbUkymrPK5jtfumreB
+JjqwA/wL5fOdCzLWBev4/Xks2YENg0HVwN3a3iypNNGZOYCWTZKnFX5yel/mqiT0
+uEn1CJ5w29GKxRax/Ua9kr7ftMhpQ8lZdyy4Z/Br0NiU9fgvmWF/2WvOMx+hHf/k
+LRUYewxzOSLfapiM1SOQs/L+29tnu4wfAsezSuFfKjKVZHlx4rQnQnJpYW4gV2Fy
+bmVyIChob21lKSA8d2FybmVyQGxvdGhhci5jb20+iF0EExECAB0FAjZYxf4FCQPf
+GysDCwQDBRUDAgYBAxYCAQIXgAAKCRCQOaC/0TnMTJJUAKC0jAhA3fXI2UCbfZ6J
+Ti3CL0bcMQCgpA7pEUYM7edUlxqFJfWYtBblS5u5Ag0ENUGU1BAIAPZCV7cIfwgX
+cqK61qlC8wXo+VMROU+28W65Szgg2gGnVqMU6Y9AVfPQB8bLQ6mUrfdMZIZJ+AyD
+vWXpF9Sh01D49Vlf3HZSTz09jdvOmeFXklnN/biudE/F/Ha8g8VHMGHOfMlm/xX5
+u/2RXscBqtNbno2gpXI61Brwv0YAWCvl9Ij9WE5J280gtJ3kkQc2azNsOA1FHQ98
+iLMcfFstjvbzySPAQ/ClWxiNjrtVjLhdONM0/XwXV0OjHRhs3jMhLLUq/zzhsSlA
+GBGNfISnCnLWhsQDGcgHKXrKlQzZlp+r0ApQmwJG0wg9ZqRdQZ+cfL2JSyIZJrqr
+ol7DVekyCzsAAgIH/AlcnP6QSKd67ad/1lQpzMEBNyIX0X7//lns6XAGl/+U5Iqx
+i+8sd+oJikFlgVH+n0JD6vq4dO8XCBzUgIi3xV2cuJqj16zVp7JdMXKqIxkDu5Q/
+By3/IL7WWkc06FxyDraigP1Hu3W78l0lySK8yEW+fVlkyzK6irkJ7EFWkSDaZqT2
+IrPd94hoGFEyQOIgkYdy2DHoK00nUd9FzIbhrrz2ZDJIfCMVp2go4oCu6Zk0LxJX
+qTFU7K3SxVNN5jWsOCsPzWLyhKNrgnv8WzVaPKgqgMNdmdykAvC0iSTNat51p8Ad
+4mGtY1nW0aOAiufjBTMUtILfHKsknItj/P2D4seITAQYEQIADAUCNljGDQUJA98b
+OQAKCRCQOaC/0TnMTHKtAJsHojLJup9Niwsutt68U02uyl13BwCgpovl3ebeH41a
+k2Kp37si/9RsdICZAaIENt243BEEAOCNfiVnzetemJ2DpFA51QnnGUihYs0beBQ2
+ptJP47uLlxsZbix2Gg3wDCP7HNgcEWlXc29vrd2oiA9nanKLcJzLYVL0lBBbPVX4
+8PGvRFKvJVHI17LWqpq3aOF8kOSf/4QyRIafWdGzxvAFycAiq2Bs1/B7BeUqmhWO
+3FXs6VNLAKDqqMUc7apbVRFSV6/kbQ8PLTYw0QP/dRwVX9NtBEogFNoSU4jw1sRg
++nqGQplE9OXESMQO3fiszBkCWghsKk+/O+HcFrIiSAxRPR3y8nXCsaLQEf4WfrD7
+nKFeGWDIqPvi3KJOzuaqZP3DMf4LdfltmM/zHifZo4aBkkIQd6703vBFAYA0lONH
++W5qyx0ZnYr7XunDqkMD/2JC3cogap2H6IzaHl9oQegGKGwrCErBuJxCeL9i7h/+
+5Wg8ou6TE8kAGf1oMeeWwrWOBxub4xsUqfYk+mKM//O2OkCMfVFQgQQtjy5CtFQx
+X5AErQ4Ukoy8XmNGOAi9ipWpL0450XwNvusaeff4D1ztJbCb+LMkqI9gYEQWSwxF
+tCNKLiBNaWNoYWVsIEFzaGxleSA8amFzaGxleUBhY20ub3JnPohVBBMRAgAVBQI3
+RcCEAwsKAwMVAwIDFgIBAheAAAoJEAcDKpaJBMjiiuQAni3iUNjDvqvOQOlIgz1d
+5ibjHrA8AKDWPy7kZN+W3Leptp3FYTIMTbDpU7kBDQQ23bjuEAQAl1Txo5tRemsP
+8mNmoBlGQx/4EmN61ga/V8iBS7u7MvzI1zktNuHaK7rJItE4ilyGeivXitZ74eGV
+7P2/rbNhWnOo1fMlvLvl8mDNmLD2nJovu4LVFXGhoYdGb75d2YbCCBN5Q/BSYh+l
+b2wd6VewnqMy6A9iGULaAWz10G2IOYMAAwYD/iooRihzfIC6rw6K2kASGRiy/dts
+3w0L9Iu5DsxLFH2tHUpv8fPVDuvGkRfwPuKaTHAvq90/I46/3BBTOOneMaW1+RAL
+hM5f4ytsYNlDDerhRiuGyEjoGtXVjXye/3SwIxISrg0EO7UHNtr4rObQEfF69RcT
+gjzKdO2n2WlP+7/qiEwEGBECAAwFAjdVLZwFCQHwga4ACgkQBwMqlokEyOIEvwCe
+IHFkUaLTPmaZhAOs3yfwDtAC33gAn3f2BoDALaHL1uqu/unWQA1JZRTYmQGiBDfj
+Y5kRBADMfdIcB6LbzfMZAe9+3GMqLgx5fUEhX9GVZIxb3w+ZBGbJGrERMtEigd+S
+Y2xR9TWyhd/eVh80qcgGzA9Fyb6IOdVwN6HxtYdIz4CZP6ZmtSM8jecfbbKsf/Ol
+BJQ6RZlAWNjE6F2r1D/gHpw1ZEl+lSlW3ObCEkeXBC/er/fIowCgwia77SmSgm3b
+GgHEqfFQ8MID6lsD/0h45kDwi3K8WhI6lnZP0zpnNfA6753QaA9NqB8MY36YCVtx
+OhBm7GUCgKyfh9zrTpZWwcBcAQyyB8Ld3K7cWi0uLy+gO2169cRApR0S1l6BlkbO
+9wlv1zoRR1VT2gQCMGw6mjyne99v4Hst7UXV/nXvOsdrxdS5tTkAEL7Alzz0BACc
+imFIsBD1CKqqN0fTdZooVrBZzpn6ZjTgzX1hKr61fuFyPgMkhzutN2jXy8tweCZw
+FmN5XZ9cu7mxAdN9Xmwk7Kl0EGChwZdm7Sx9UTvu9kJnGOQvqtOkWB86Ts+r4fVb
+w65BqcrZZzuMQrUqliM/YVUGazN/w2uyApNPByJUzbQ4TWljaGFlbCBSb3RoIChV
+c2VkIGZvciBrZXkgc2lnbmF0dXJlcykgPG1yb3RoQGdudXBnLm9yZz6IVQQTEQIA
+FQUCN+NjmQMLCgMDFQMCAxYCAQIXgAAKCRDKFfq6GxOtQUZWAJ40vGK1b1f2KN7u
+BHOHLDAHvnuPLwCfXHyq3wGapWGDw6txlP9LMec1jf2JAJQDBRA342hqcwhlf6d9
+2r0BAenKA/d9luNiVpPciTyfM9W4GybmWSlLt0qxrY34WSNL5IOG6P2H335skdAC
+xSUlwBSkD2IzoaQ0LAyGw0jsk8yWhfQqgjWxjZ0zcmKHZJZsMLwtvA4FeOSQuscf
+kYsbA3vZWotYO1o9jyfAZTj0MeALzGEmxBeGUNiKUEnbBU0Lg+c8iEYEEBECAAYF
+AjfjadIACgkQAJxC28xc8YI7iQCfboS4b2tqYvml31ouMT6XPHhTsYMAnRGQId+W
+7mOHlWHvrddjwu8JHms6mQGiBDbYl60RBACxaonXMHpbmyzoQyxn7wYXGpEJZnKc
+IWRc/sE++XSebUZMJOk09qkKhtg1TQ8D0Siv1/EjuqjoKP2f9+EOIW55+55vQsti
+XwevF6pJBFYGGRluQPoFbUilDzCDmismFv0xwIEoOLftxvyvlmmw4Upx3/8TY83f
+dQGzxSDvNbPEtwCguK4ARxZub/SQgLMy6S9/7itEfHcD/RXRVGmz3dDxXtgdAqwV
+mY7RI+FOPQdn+DiFaaTjmqgP+NR6w5v72+jE5cdn/OnYmXQcERXc/4nZgWHdKmso
+eLvLs0hpk9zFhgHkSufCWlo0ZYemaWRYrRI5mukGFIMbPdPEaySNQEqC78Rgj2wm
+FJ2ttbAQlSRi332xTwFbzY4XA/9RppZOE9hGCh+2P4FgtHMgf7L8JUJVgR9tIKUv
+GXjDkSWEqIMeyKeXFoPk5QdxNVM5sRYf6gmV6U3zHUOfEzlOf5GUJyPkmwl9RADE
+6uyk4ySlW2d6+glsM0/Fd9Pyyzb0v6xfAPDFyTYU1X6vUDp0FyzPUijhbrdj4Fwm
+fAVf3LQeTWljaGFlbCBSb3RoIDxtcm90aEBnbnVwZy5vcmc+iFsEExECABsFAjfi
+yIQFCQlnNJ8DCwoDAxUDAgMWAgECF4AACgkQAJxC28xc8YKnHACeMFOdlg4xjXgE
+FzyA7MQFxyXmyuoAnRCcbQ4bvEm/fxaaBFRnJgavm25LiQCVAwUQN+NpSnMIZX+n
+fdq9AQF72gP7ByZG6W8yTz+1nv+CMvGIGLa4otN812X5lXvvIpH7bNgoWWD70xvH
+5GP/Q5e3yUh4aGGN59uOVVQ5uoa3VFYl1ufWt2LvxaSW2q7f0FcvEref/5biu3gx
+2O296DWENYPP3xZtaD+htaDP4h18RFBIvbZz9Ryp9C8myGEPQGcOxw+IRgQQEQIA
+BgUCN+NqjQAKCRDKFfq6GxOtQfhaAJ9bMyNoYhAf3jkeMy1cnXoyr9ZbwQCfeWjK
+xnAa+++nbYVEnuPP2gUdume0Hk1pY2hhZWwgUm90aCA8bXJvdGhAbmVzc2llLmRl
+PohbBBMRAgAbBQI34siUBQkJZzSfAwsKAwMVAwIDFgIBAheAAAoJEACcQtvMXPGC
+iF4AniaC76L0oLBvc0jA40NCXMDz4PX2AJ9RGPnHKf0XmaRXcTOlR8MiH1CeoLkB
+zQQ22JgDEAcAqtpFls8cnLDIh1r6gSRf8sYiv5qd+a8CDd/LWHveWeGCeuBiVbwv
+SG0q9ci13ZRIEtHXi0BVWLBpz/YqQCHJX4Vk2iV6yY7rCo0rFOEzyco+Glssjg1G
+/ZCuVkGo4rpLKqOn6oXq92ojwBNjdYeBOOoZ78jp65gJ3OC0ckYanrRUe3J9bc0W
+lAA+to/Dus91Ivkggu/iH5DEPrf/PQY14t7jxCcxBJCa8XaC04LrXVphPuuRziVe
+gINTU02fdyrZlAyWf+0KZq5rMza1N+NwSxjkxBOzM+lbhA5PSekqHp8AAwUG/12f
+DRpOtZ/GrKoUgkML8urMjxKFD4Hh6l1Wb5NCEe4tIm38yI+C/AwMCY5cDlf03YOZ
+0ThTVjpvQfYT8EJuPbZ+2dGYEroY3OBLetcg6DDh4saKsVU2XSLHyCh2xPzOiusB
+xNPrmvqd63S7JnRSSsEfgwYpKpA/GNMSJyyFpT4vtvK3jOON0v7uobYOBTLRuwj3
+OJMJfyQDa6WyiTJxUvsuQL0MK5cZG7oLUWTK9ZrFPuqzLeZAcpIgJ/QMJ/PnrRnZ
+gUnXEbsnCVZ33NVBtiK/ktS2RTQKcvCNPtnimRqsiEwEGBECAAwFAjbYmAMFCQlm
+AYAACgkQAJxC28xc8YJTTACgmUYdFZGR8pk9NbB4lpnKnum15WUAoIgDLWQA+qb1
+EPtpywwRBvqGOVUPmQGiBDgf7uARBADdNye00iQMSe4RULS0hDKVGNl1CFGzeol+
+AoNkW9bqXD3f9KNrWD11r9tef6C4OMN2fILO7cpD+YZwuHjXv6xSDAoZ31bmsxQn
+N51YhwFhZRh8K/XheaULO9gedCZaXndQ8dvXGC/doKKOo/CNGK8gct+cPPr0N6cu
+FztlgRpbqwCgm8u3ylalEvlWhXOjVYoTnEs04aMEAJVK0ZcYjHUdXWXi+TaDZCJq
+ktk/r2E4M4/EsBTIkuAuy6RvPediVShRQ/CZl0MCQHM17ywdC+PXgOmQLeGbR8m8
+flK9HROJQebHB23/MK2knm/yKgqSJbtoDv23QRfZjNd1aox50uFLvv36CDMhAMQ4
+ENHrBzuj5bMZo8nMELVaBACPlGKAcAO2FP6DpmcJIXDnO+oVHvs4QMzADn+/aBQp
+H3UQASAbu7aH/84SLBUH0h1Z9QNkKLuMtpC0rVHqRsw4d4FmOxoxvOF8hQnICiQr
+2XRMDKZwR/+gH9Vh2XFRi4j/xHH2h787C6bKoOPd6UPJM1HdxNPQlG89fb4hgv/e
+WbQ+TmlpYmUgWXV0YWthIChHTlUvTGludXggb24gU3VwZXJIIFByb2plY3QpIDxn
+bmlpYmVAY2hyb290Lm9yZz6IWwQTEQIAGwUCOB/u4AUJA8JnAAMLCgMDFQMCAxYC
+AQIXgAAKCRDj8lhUEo8OeTsQAJ96XKYFFJuwup2Mce9mDk6EOnEEdACdFp6gwm6x
+T6Hm1FD53oKNgrnafhqIRgQQEQIABgUCOB/w/QAKCRC+6Lh52/bl/+myAJ0UubvN
+9ydWvrdgkKbfokKJTrOC0wCgooxVzceD44Oo/C1kaHjXv5yFQeKIRgQQEQIABgUC
+OClPHgAKCRBd4kmWWwNYol/nAJ0YXC3/sGqBaddoLqoLpo1kapcthACglrEi6n5z
+6OcQO+II4Fe6wFOisYu5AQ0EOB/u8RAEALec6/ux2Py+0Wv/w5J/VmDzUNDOHQJM
+kxTEQbp+vZ80Quf8FoMy8i9PciekoDl+oB8/zQDs92SgqGVD0+y8K9UPIEvmifjr
+oPn+EsIrXf8M7dGGotCtwaiEwDxwmetlQMYLd84XqLj0LgGzdT3/7dMurhUiGZH7
+dpWMfUZAVNjHAAMFA/9iLg3F0Bqi1dVDeCMqOVCOcWKhulFG80il3TwS9Q7SpvJX
+/4yZyoEdyJ/VYm4PakvDUyiy4MuhsvGSwCEyXD4IskEkmlf97jDoBiiktexkjlKI
+vmp7P0XNQMURXFLqDilI9YY2jVAu4XNw+G0G1ImGgzbadbraUl1J1uJtvg+NOYhM
+BBgRAgAMBQI4H+7xBQkDwmcAAAoJEOPyWFQSjw55J58An1UbKjszsK+9Awtz3a+5
+gNiuzdo5AKCE5Pv3w56DMeZLH8GyZkVqo1QsrZkBogQ3KcaNEQQAsRxnSrRpASl8
+e0lOtR3C7I1MoCuivlawh48JzC9WXgA/Pgn+VOLiDDob/zjQoNbBEoG+BHrwq+AC
+CVBQFAiMMNur8u7qY+R4eLWD/KDKaNcydchdKehw0eiy7d9mv0hTHSmkUIgIpy4k
+d+XvsbozP40+/G+yNjGEHvJf3tsO8ocAoP4wWPnUPNwWkuKn41tR3cb2m+ZlA/0Q
+lIn4E3Na3o0AhhuLC3YrJ4X4rHJmUJg+i2mS3lJCM3HPJRCdz/eIlU4WiaBpNPve
+PMEeg5KSluqdYOsCvBa6XsAGm8gxQ2Wzf6ZqsXdBxztjwXqcLeuBKFfuDUlwloYI
+Rie+naIgPasYwu3ABG4peRJmc8aRXJCg39rE8MK4BAP+Pt+NqJQw9S9ykLDDIXDD
+ucH7YOBxfvUo18lPr+iNuPcbXh3fQQoibk4qK0w699YLGD25KizP+FTiCrD2fy9i
+knUplevJkGDTdeDLrAPYVYTM2hryLPcisSP55Yf0GW6SnkFbE5LKYHo5YQF+9rvp
+yUCR4xXm6CXo9m9FKBuuk5i0Hk5pa2xhcyBIZXJuYWV1cyA8bmhAZGYubHRoLnNl
+PohbBBMRAgAbBQI3KcaNBQklmAYAAwsKAwMVAwIDFgIBAheAAAoJEHUPZJXInZM+
+i40AoIykcWzV7PpBoEG4MbTXTNpKBeTIAJ9tJcXW7S/ox+iJGOrBXgSlB7bXnIhG
+BBARAgAGBQI3NDnLAAoJEF3iSZZbA1iipZEAoKm4vkXn0/4KC0aZp5o2U5zyErZe
+AKDF3mdMyHEumx4xSWJyX4TvDZ+3ybkCDQQ3Kc4MEAgAsgkRCXJQLlHgk4Fu1Jk+
+UKEDdMZYufSOGR0D57WxbRtArPqDMox1NqFHGi8Sg88TtDwH6/BnGkYCOuBQidaE
+BPQtl7jeU6fQhXL4kRY3KB50/ChzzUB/G+LsT8COCUIsNDiBQxwEiLTEOMFAqbRA
+ugQhZnUKrf0auZKnB53RPhAuIdGozC+k9+vJl0l76e+JcVr8AL6wWBQO00UbKgp+
+MKiWjFDSYIFtMNrXO9rfHW1n3jW79bvAVyFl9rwEbL0gbSWmaZKXIWI7D11J8aYF
+3ppDk5UsCc0Cs70okV9d58s0PjnTqwAcVxZcyoO81qJVOPesRVJ4jURdGeSBTqNM
+rwADBwgArjJRLMSTveaC2tELGSr7qBioUJ9FbFk0A5D8vH3Xcr34E/m0sgNGJSD3
+qWQNXN0OpH7hKdeiwEPLE8gR/Tnxwgb+r3S0dBViktQPMajdW5S/dJfusTdqBzo2
+LgdZ24lVl1O0ZKci+6SVWt5SBxbAYYtgSEjiGhbWUDdQoC52yNGUQvG9wL5OD1BK
+y94wzKQZi9WV/NdNfJPMjZv+tx3pezfGYTPDnUpP1CoLXY/gre+APwr9yHAg46Hz
+F+DQT+KAWQDTxahEUk9OE86nR3gO0zNN2KzGKb297ikcLWYusW9QQ46X3uIBTYmK
+PZP9l/bR7322tj88GPaKPesZE8rR2ohMBBgRAgAMBQI3Kc4MBQklmAYAAAoJEHUP
+ZJXInZM+GUwAn2qcZ8hOcrD1Bw7zZofZ+xm8wDL/AJ9DJQbxAae5kKnBDG1O28B4
+J0wF45kBogQ14HkWEQQA1qRbEQxVQzxv1QAvAgFoW3nT+BbWAs5fenhmvkWIMunk
+xhB8cIeYaImzmdDK0YioSgQ03ER5O4x5AcVKXiUJKUWqIermAqSCk6W0z8iWD0Vu
+boP8JrAJ6hd5WCWPpzb41OJumi5Xy3RzWdYWq2IOXOVZM2Wt1gnXA7p2PxS+ZqMA
+oKLnKFiDGdQPqKH5zwG488A95X9lA/4mkc0LBxfBIipWEE3HzgkcmNRb0zdxzUGY
+TGrHIYK3i7TZrfq09+jTA1dMbs2tX/nbUdd1oMaKefCqBw3hD50E685bla17TPFh
+NXhBRCCGhH8IGGAg0o6P3B0+QQHJsp7eof/VKgIFN6NeXga+621vkal5eU6jHQ44
+sHHkkkk0fQQAu8a0B2kf4VFHIE4kDraDPgIkhWV2r7efsLJj671NOKBHOMzWB+PK
+0eh0b6Tc34n44lyH6Cmc2F9xUzk7POa/uEi8aPB1z2/NdYeFg6nKTrkN4nYnQtYr
+GG4oPgeX0+DoNHmlRJto+pYMU8PwJA9fCT1K+szRr5p072LImZ7lsk20LlBldGVy
+IEdlcndpbnNraSAoRWxHL0RTQSkgPHBldGVyQGdlcndpbnNraS5kZT6IVwQTEQIA
+FwUCNmGXiwMLBAMFFQMCBgEDFgIBAheAAAoJEJg0ZdshQ5Qir60An1Zl/jBAU7Cx
+XINEaZupk1TmkdiDAKCFGR9orHjfKgw+xEA+idd/Ls0lDohGBBARAgAGBQI3pyH0
+AAoJEF3iSZZbA1iiXRAAnRCydbPV/ipvi0NfEzV9+RC8lBxNAJ9jQwXwCKt0HVc8
+/Y3OVY/WI1LnTbkCDQQ14Hp8EAgAoz58r9ogDLeyaL8NoMXoMhJ0ogHqC0jzt6xa
+zw/h6t0AJE1He5tMF1yVkenXo+sah2oTjrm38fRVXODbACvmn1oP+WLcK7/bG82V
+Ol4Zv0Iu+8X1KzXz2JGae+h0ogNcwyW7CXfPSEVhrCBTY7i7mdnAoyGFoW0yFSvt
+8YcRXdN7GU16tdATfruMV276MuStGwNIWYYfjFtqwFBdaVOpwMfJs2golT7PLEIj
+O2l1u1ZtAI6WvuEzQH4ftzzihmHQXMf4YsvtL5g/8TSJfmfUEFbbKFbU5bIbHzG4
+yj/O8uEBBj7u01oGpu/5UVFTgslvTIEAWx54sfT/oA06PvhsDwADBQf/VWZUn/wC
+/gktKZfh6Aq7RRI2K5bJEXhXE5p0rPWLMQy+v4DPGcuDF3nLg1IZT5mbLUGEh+7n
+zEgUsmLGPqBz54DgjhBxO1DfAfV3HVnYYpL7DO1u4ceCUh2O9PwLnp1+4W2XmND5
+nFrQ6gGChCgwb79/PxQdLEgj9dlf+vrv5SfajmTydiFCZ0+0GZRFDytdIda08TWv
+DabV/41F3T0TSbCMGPWr/TgrfQ6yeyOUpO9lmVbS0u9gKWGAedVOofMYi7Lqp+Pt
+zNQTwd9PKCP/HSjUxmm4xX3yVZuUxUV97ckucB8TOlr9deNnq32jnMuP9DeWpBz4
+05uwoBLYvOGNAYhGBBgRAgAGBQI14Hp8AAoJEJg0ZdshQ5QitJcAn0sn+TIAlbNC
+3YS5YxlYbExg6UnxAJwM+TJoHjFG8+rZ0nW7/vVq6+hHl5kBogQ3zBNgEQQA7vY0
+FBndb1BOSmisOzqCtcqwzP7iMKF+hwEKDqRKrO/oZ7zqMXigROEDb+ar95oSh2EX
+7tETk2b8ga9LA0UxT8nZ8e4eCOOchNggLyX4ZpsyrVTMGwahnjf8KsepIaKqfEnQ
+lzE4KsnLsuC+LKodhDUoInZIn/9bC6cRrCfe/xMAoJdLRTMDNe0+ruy2LtnwQg14
+vRp7BADm9fBrVW89COBepWr/xVQ89mDA23oiAaLrKjiJb8LQg9NpmGa5AFuWBym2
+Y5MzjremPeqmjMfXGyXIu5o+9e1k5DQ72NB/m24FdrYkCW38sinIVVghDtvzLniG
+fOwBL+c0iA0BweBCNuouoJjJegPQbzaliTgcV8ZjuCq4juyp4AQApBN45mj8JIwZ
+wbsNnAmZ4mtv3gR03k20Tk4uCurktNjd0HvU28HOyg/ZehxeoKMd14R/8NZBE39W
+vzJHnAVzfcsmNV1SQS7fSxD2f0FsWYxfF2ErBhwhK3GIuKAujPnlzjT57ZnhzBuH
+cALohJ1izyVOcBwFIAc+mwZSBRAKILq0OFJpY2hhcmQgR3V5IEJyaWdncyAoZ3Bn
+LWxhcCkgPHJnYkBjb25zY29vcC5vdHRhd2Eub24uY2E+iFsEExECABsFAjfME2AF
+CQPCZwADCwoDAxUDAgMWAgECF4AACgkQNmdg8X0u14ixOACfcmzB1f4YZ2yC0jyX
+efVFtbIZ/fMAn35OwFji+uU6/BFLYXnsMlsJMsOMuQENBDfME3QQBADQcXxUkW/f
+6s6S7RXOUIIV9CgHiZpHPV7T23wQhQOOtVjO2akFLryNI6Z6a66JRhS6fRa3+eiL
+9TB0umC8e297dHrzObs43bf5h7sTJB8xHTUI9v4rlMwC8Bk3oghnoCJ820MADttR
+p+CUWMkPaBQoDTJJhyfju66lgxZoycLVMwADBgQApLUhOmpHB+zGMvluBUJgBEja
+Z553bU/gLzRsTCvt1gnIXLjxYXkiKjLyXfym47mXNaGUGWC7b7yaMVjhfnF3bJ5t
+xeIiL7/p3ei17aYOlzXx3MhmuPRhS1IJbXfXChPc7toCqDeSFmnGmVWJZ+zuleTm
+OITYkgt5Lshp/N1NZXKITAQYEQIADAUCN8wTdAUJA8JnAAAKCRA2Z2DxfS7XiApb
+AJ94BeAKtqsshjVPWijCZ/8SBcJogwCggQjLX5KwZzhHASEXQ/oMvAgS6OKZAaIE
+Nuv2vBEEAJttf93iMoIaranZOJ8AR0V0ax+4bTo61nQ392tjaRiPv+9lWuY1O3rv
+pHTzTtXP5Qtz1Uw51jn5rDAA43mwz0+cR93g873ecb41/9LRKF8I9CbmZO6N70Re
+mLdGb4R1FQ2gMHAwIz+Z54esABLQgq1qUZ66k1+TL/3EZRLnRSk3AKD8fayzCfyw
+Vxgy8C67Z35FdBsVGwP9HLfVXrDoAkl3St52A9cIqYKCjWk7Hbv3mdNZIz8pEuhY
+7BlpPeMwP9p5cEqlTMjaQHfefHwm1K7GthihkGAHyWM2iZLZSQzIFPG1ER+feTCA
+VjSSbvoDGyhHbW+uhGYaNwSLQC36+NrC6ULoTq6Uh86Klpa7mJzLAq+b/6XKhR8D
+/jzTElA97kUJEzdpbm5YtqDsu9H16Zdlf+jO59MNi2rcElt3w+thNfucNHVo8fm0
+FGgTpXwNss0Ej4cBXKc8m1ujAWG/hC9s9MMaa1uUgbqngGhZrOvcXXFCJZwoWteW
+K4rqucRx7BAl3hyQwl3KK8TY60Te329VBIcKJyVvb7TFtDFVbHJpayBEaWNrb3cg
+KG9ubGluZSBHbnVQRyB0ZXN0KSA8dWtkQGthbXBzYXguZGs+iQCVAwUQNuwRdSDu
+hu1tZgc9AQEAzwP9HnvIc9zYRmjQEsB44Aik6/pQvrBsSpLNzAWelEaMw6bFHaQT
+1PtMnpFmGxbJR6MBBsWku2armlC8G4EUVn9AR07BtXGVGfn8xsHs4MK77QPO7C/I
+eqOdotrEYr/OmpXMjBHTfB3B/9vu1p4+ubA8jrY/9DKxRLeWtoJcT19Pe/+JARUD
+BRA2744i2gTMWm1DVDsBAQohCACL7/fi/RR7eZc6c0aXEqdytMmAoIg/056jdhwe
+OiJITmXxDwNzaDbofOMWGm2IbDb3XfAU52WmKRsnlUFZFWEmHQurUaApx6xGqQiG
+wJC38sBS+CfbMmhbvWBeu0XI4V/F/wfzpxYCbELULEHsAeDMXCa4TLhKfmZdrde5
+1RJgK+bNZx/HVCwwU5YtGHbyJ/lYDlg8FxxRCPAAb31mSviRJLLrdEwPWWdi9lGr
+G8kp10nnDsfl3mxlItWKAa7ey7ntYi/1glIxSdqgXhfKiXCgZLRC98cQMyj0J3fY
+HXF19fkugPCCx5itawmWLeS7sKAkMKBmsqcWKaYp3oy8WnR7iFsEExECABsFAjbr
+9rwFCQF+UwADCwoDAxUDAgMWAgECF4AACgkQ9u7fIBhLxNmwfgCg6vEPiWfYZ4Bt
+tUvCbLqw7qxl354AoMzEob55S7m8YjrkDP0iimJfHsKliEYEEBECAAYFAjc0ONQA
+CgkQXeJJllsDWKKeoACbB7pifCZOprEAEwLyaJmaSvYOvUkAn1CaMjj9cxhwQxLg
+7X1Db3FTm3PbuQINBDbr92cQCACHpMcXbJWET55YL4vcHhgZnlzdthEHunAp0EG4
+RznS4ESJX7D2Ll2jO74fD25XFQ/6HsvZl+ITZhMMDW5p8lTfniVBPRWRQaVSzjzw
+A0UykQVSf093unT7bSIsGZAMmUymD1ucG5Jh0eHGQq4REmBuvSm6CKh6JRmAJbyk
+TKWhfagX5TN0+mHD+CcFKzsgorYRh7KNlFLB6idtAZxFqdhHXkI64kysMVFt6ZlA
+2CV5LCQy8m1lLc0WuXM58tWDZ84UeBCJfO+5N8EwkS1S4dRWouOxFWx8nJpje0NP
+tb/vyZRQ+JMClVaKOLjmC017k4F8XxVYNqZ7Y5TWmr6sl2WnAAQLB/9iaLQ3eGPG
+9GWv9pp/wAYIYzMiDsokdHXf7gOifZXG1DT3Gn1gXqgJmYP3DQN1l6b7NboH+ekB
+Ua4D1Y9glIf4/HbdCtv6fGFGv2JWDwNWkU1H88ZrDmwAxcOS9vu9D78ElnACrV46
+OOfmc0PnDseZCgGSuAscXU8YM/zLIGFMvmeALzHxPVOLrLp/Ep0+kGNKdEEDV5ht
+5F81uOpTMNkacASAdUqS5iseSjITYbo1sk4j5Fn8pTTn0U9445b/KjKiEH+jbn4x
+fPcC03FaXvMnFP+1nAqLbgFmVJ2ljjgEBbgkDPumsrjIuU2ZgSN9CZZ4tQke/FU0
+7RttYHde48eziEwEGBECAAwFAjbr92cFCQF+UwAACgkQ9u7fIBhLxNmnUACgrtAG
+GLWPUQbGR/6OQa9AZ6xLhnMAn0SZudBARwp97yCM3Wcm433S6xVDmQGiBDWiHh4R
+BAD+l0rg5p9rW4M3sKvmeyzhs2mDxhRKDTVVUnTwpMIR2kIA9pT43No/coPajDvh
+ZTaDM/vSz25IZDZWJ7gEu86RpoEdtr/eK8GuDcgsWvFs5+YpCDwWG2dx39ME7DN+
+SRvEE1xUm4E9G2Nnd2UNtLgg82wgi/ZK4Ih9CYDyo0a9awCgisn3RvZ/MREJmQq1
++SjJgDx+c2sEAOEnxGYisqIKcOTdPOTTie7o7x+nem2uac7uOW68N+wRWxhGPIxs
+OdueMIa7U94Wg/Ydn4f2WngJpBvKNaHYmW8j1Q5zvZXXpIWRXSvyTR641BceGHNd
+YiR/PiDBJsGQ3ac7n7pwhV4qex3IViRDJWz5Dzr88x+Oju63KtxYurUIBACi7d1r
+UlHr4ok7iBRlWHYXU2hpUIQ8C+UOE1XXT+HB7mZLSRONQnWMyXnqbAAW+EUUX2xp
+b54CevAg4eOilt0es8GZMmU6c0wdUsnMWWqOKHBFFlDIvyI27aZ9quf0yvby63kF
+CanQKc0QnqGXQKzuXbFqBYW2UQrYgjXji8rd8bQnV2VybmVyIEtvY2ggKGdudXBn
+IHNpZykgPGRkOWpuQGdudS5vcmc+iF0EExECAB0FAjZVoKYFCQhtDIgDCwQDBRUD
+AgYBAxYCAQIXgAAKCRBot6uJV1SNzS4+AKCHdeYHMmKQV9mC7REE5Vz6d5rRBgCf
+VMcyRP7dxBwhytmwCDpAcCFvCLSJAV8DBRA1oh5DA28RuP8+qgsQA2MyBR0eiPUo
+vYMz0DUXBbNs5606eaVeTJOn9WqkYGcS9xOKlGd8Xj0IcAKN30st5AsC5hRqr82r
+rUjB5/CuVdbvk+Qkh6ixWCqo+RRrbgf8cKCg1x+lDj9PpeSD/B9UU45ntxYamoXn
+PszxtzU+e73Nkbtrej5rgMK8tgTLkhTAbO8M15Mgtw2yOeDFfiCj4xzDkYryvLiP
+I5p2vYXTVcgYnwpNRnMZBwUghb1PMSXj7AP0P/8wnpb656yIjH2OAkE5is5HvTEs
+2wGUCEXXYKxgLIl9bRPGd2DHfJQ6broxy1RHVmaOrOeDibspx67RRTm3WqbtLiK0
+/nRF0gEjFGxLjQiy92gp6xLRiQsMQdkz0Lwgr0dgSs6JejBlsQPp5nXXkIm9q/hl
+6Cly3Zx3KbAIwO5ZF5NyBciezCxSurg64xmxibNhSknblI0vyG+IRgQQEQIABgUC
+NaInPAAKCRBsfuG4YhzAE37WAJ9Xzmig1DrfnUt/KwfgidkPohJViQCg0T6afKuR
+spWzPAz5TKQpVjd02KmIRgQQEQIABgUCNu1ObAAKCRBd4kmWWwNYomq2AJ9+alN2
+TpVRAhCxP91eqvfEN9HgGgCgrTvpWnB9EKtROr+AT//cujKCyIaZAaIENaIg8xEE
+ALYPe0XNsPjx+inTQ+Izz527ZJnoc6BhWik/4a2bZYENSOQXAMKTDQMv2lLeI0i6
+ceB967MNubhHeVdNeOWYHFSM1UGRfhmZERISho3bp+wVZvVG8GBVwpw34PJjgYU/
+0tDwnJaJ8BzX6j0ecTSTjQPnaUEtdJ/u/gmG9j0218TzAKDihdNoKJEU9IKUiSjd
+GomSuem/VwQArHfaucSiDmY8+zyZbVLLnK6UJMqtsIv1LvAg20xwXoUk2bY8H3tX
+L4UZ8YcoSXYozwALq3cIo5UZJ0q9Of71mI8WLK2iFSYVplpTX0WMClAdkGt3HgVb
+7xtOhGt1mEKeRQjNZ2LteUQrRDD9MTQ+XxcvEN0IpAj4kBJe9bR6HzAD/iecCmGw
+SlHUZZrgqWzv78o79XxDdcuLdl4i2fL7kwEOf9jsDe7hGs27yrdJEmAG9QF9TOF9
+LJFmE1CqkgW+EpKxsY01Wjm0BFJB1R7iPUaUtFRZxYqfgXarmPjql2iBi+cVjLzG
+u+4BSojVAPgP/hhcnIowf4M4edPiICMP1GVjtCFXZXJuZXIgS29jaCA8d2VybmVy
+LmtvY2hAZ3V1Zy5kZT6IWwQTEQIAGwUCNs8JNwUJCCCxRAMLCgMDFQMCAxYCAQIX
+gAAKCRBsfuG4YhzAE2kgAJ92JKU+YcYHoRhX51+4s3fnPIyNEgCfaiWeoyb15xgd
+O6etGiD2MYCWy5mJAHUDBRA1o3cUHRn0wQyYV6UBAT3zAv9HMaPuMWFQKZRTtJyG
+Mo0ID+w/DtLn8z7CMBd5L2+2+RTTY36fgwITehtBziIJC9xrFrQnx+VB2pYvprTR
+SCg6U7a/hf5T6WT9zj887C2UuIWE6pjLNTvwAqvGsSoAIpWJAV8DBRA1oicOA28R
+uP8+qgsQAwfcBR9Iuppp+q1mChXqSYV8oROMFqkTyQJ736IllJ7Q6eGiEMrOpTkY
+oFVyFqOJOEivxR+fWJ8xe+e/Kq02Vv0XANGyKias6mqrDnU2BBWuPXAo7y5wVuDn
+myZS01LP555lNBVilvDsMC/qQrvHe3y0kp4IAbK1EMG3qbsNHCaHLRTwM+U9Z0CY
+nkClbB2gjcC9nbtF3nzoBebowdYytat6eFMrBfYRHAUfZbRN0x6/or+I7WV5gtT+
+GrfVuSxVrGLsK9FN8iXGikiqdL/8BhFntif4BUGdIQdft+UawmT4IlrBL/Owh2hu
+l7UPtx4YqwQibGIZjopFSqBGp+j4VFUdapVxMraQLd/PUwZ78nHgF/IXBzhN3Yrh
+ryCxIGHrN4MN7OWZjO21F945tga1/FnIXsVBVECLiltnC9+/TBV0fE28aVca7EWB
+P+Ix2QWIRgQQEQIABgUCNu1OCwAKCRBd4kmWWwNYonyaAKCxLBsteoVfwn5g5Lug
+9QgVCMV76QCfRgQKXQv9zl4oO7Aa1Qljm9zEM3C5AY0ENs8HCBAGAPc1hCpuXmaT
+DAUbIqS9CFHkihMnilIwAV+L2Dbq5eOPtoemPKx5+6xtZfzzY9/VCVwZCxY9Y5PE
+N9r/twUA478L/FOXv5E4BpX+4R91klt/EZGcNfDl2Ar56FpGJ3iLg4+vxx9m1TV5
+k2nNOUZAVD1L+MoapWhaZFXLMChrhDUcbo7/1Fr1Rfv9j/LkkIJJhqf3G8HzE5Av
+CQVSywUayYZdbmqdiY2bklZJVFAXs1X9zSTGoFc8eOxz6i1ZeMq+GwADBgX/T7o5
+R+SOTlJ72ac/g121f1kFX1dbRkQq2pCI95qTehp1AxdSwG3ur2slFCfi8ZDNUqkF
+XJrsv5mh1yfqq7zS5T6lGT5lOXCDZbAO2wqNZY1VKeeCdcvD2VMeh8XxJfy8y1ZK
+/iE1p8qnokYpA3nFH+JIsdrXk5ceiN3nKk+aDamUkV1sJzeEm5F7QHe60oBKbVGI
+UF4EhGq6daVyeCeK4KhWuPYyiEgyaq5/xJZbR3uRcdW6X5AiGJWJOOQoGvWziEwE
+GBECAAwFAjbPBwgFCQbzyQAACgkQbH7huGIcwBN5FQCggakIOYzLX3lNq2WWgcAk
+SNm7kpoAnA69b3z2E5vxyD3bhggVUDX7j8hruQGNBDWiITwUBgCRCYCU5eLFvzCt
+rzesTWLssIQ0vOW8FlYoFc3g416VkCeeQ6bsipGMyG0pEk3vnOpXIpRpTAMqOl/0
+nkra3vmZLEG2ds1Govdeh2Mcr3c5wBSTPdyLuK4L9vbgkjarhd5Ab+/hhHVWh0zT
+MRDUgLQkKrg+Xf1BnJcl1kKtQW8xxermu41KV3O0GpMUVSIVuTDUW6D9nJcm97YV
+VxuxFcWsHsQS7L6KJT+Rn81WIqTQvhPopEdWwSKuI2UKKJtbX18AAwUF/1Nu/rso
+UwOsupBqf/ShJKh2MNAoMaq2iHspBggo9ep+pPxx533J3kwsXA8p/e3sBYbW5xbb
+HXXwA1iQ9JTXbZROd0+xrHRxjheRofFo3Ck0UKi0ZDRRFKHEo2lypt1+/L7V3ymk
+Rq+A7LGdXUk6QuNkkvArxuDEV1s9ZywkmeO64fc/DPzsLNOA5JhDEw+cjBBzHlu5
+khXk14Qsm1xtt3dFW5or8ZCG3xAmm5dKOLw2XUWKFgOMAJHxNpGUCHnQaYhGBCgR
+AgAGBQI4K/uDAAoJEGx+4bhiHMAT2FMAn1xEe77uraGTGkV+eiTiZGKyh8JOAKDO
+g+M0i5iKJXr7AsHmjXXsw1Y9kIhMBBgRAgAMBQI1oiE8BQkHhM4AAAoJEGx+4bhi
+HMATDfUAoLstR8cg5QtHwSQ3nFCOKEREUFIwAKDID3K3hM+b6jW1o+tNX9dnjb+Y
+MZkAbQIwbYOUAAABAwC7ltmO5vdKssohwzXEZeYvDW2ll3CYD2I+ruiNq0ybxkfF
+Bopq9cxta0OvVML4LK/TH+60f/Fqx9wg2yk9APXyaomdLrXfWyfZ91YtNCfj3ElC
+4XB4qqm0HRn0wQyYV6UABRG0IVdlcm5lciBLb2NoIDx3ZXJuZXIua29jaEBndXVn
+LmRlPokAlQMFEDRfoOmOB31Gi6BmjQEBzwgD/2fHcdDXuRRY+SHvIVESweijstB+
+2/sVRp+FCDjR74Kg576sJHfTJCxtSSmzpaVpelb5z4URGJ/Byi5L9AU7hC75S1Zn
+J+MjBT6VePyk/r0uBrMkU/lMG7lk/y2By3Hll+edjzJsdwn6aoNPiyen4Ch4UGTE
+guxYsLq0HES/UvojiQEVAwUTNECE2gnp+QqKck5FAQH+1Af/QMlYPlLG+5E19qP6
+AilKQUzNkd1TWMenXTS66hGIVwkLVQDi6RCimhnLMq/F7ENA8bSbyyMuncaBz5dH
+4kjfiDp1o64LULcTmN1LW9ctpTAIeLLJZnwxoJLkUbLUYKADKqIBXHMt2B0zRmhF
+OqEjRN+PhI7XCcHeHWHiDeUB58QKMyeoJ/QG/7zLwnNgDN2PVqq2E72C3ye5FOkY
+LcHfWKyBRrn6BdUphAB0LxZujSGk8ohZFbia+zxpWdE8xSBhZbjVGlwLurmS2UTj
+jxByBNiheUD6IC3u5P6psld0OfqnpriZofP0CBP2oTk65r529f/1lsy2kfWrVPYI
+FJXEnIkAlQMFEDQyneGkWMS9SnJfMQEBMBMD/1ADuhhuY9kyN7Oj6DPrDt5SpPQD
+GS0Jtw3yuIPoed+xyzlrEuL2HeaOj1O9urpn8XLN7V21ajkzlqsxnGkOuifbE9UT
+67o2b2vCldCcY4nV5n+U1snMDwNv+RkcEgNa8ANiWkm03UItd7/FpHDQP0FIgbPE
+PwRoBN87I4gaebfRiQCVAwUQNDUSwxRNm5Suj3z1AQGMTAP/UaXXMhPzcjjLxBW0
+AccTdHUtLi+K+rS5PNxxef2nnasEhCdK4GkM9nwJgsP0EZxCG3ZSAIlWIgQ3MK3Z
+AV1Au5pLKolRjFyEZF420wAtiE7V+4lw3FCqNoXDJEFC3BW431kx1wAhDk9VaIHH
+adYcof4ddmMLQOW2cJ7LDEEBW/WJAJUDBRA0M/VQImbGhU33abUBARcoA/9eerDB
+ZGPCuGyEmQBcr24KPJHWv/EZIKl5DM/Ynz1YZZbzLcvEFww34mvY0jCfoVcCKIeF
+FBMKiSKrOMtoVC6cQMKpmhE9hYRStw4E0bcf0BD/stepdVtpwRnG8SDP2Zbmtgyj
+YT/7T4Yt6/0f6N/0NC7E9qfq4ZlpU3uCGGu/44kAlQMFEDQz8kp2sPVxuCQEdQEB
+c5YD/RixvFcLTO1HznbblrO0WMzQc+R4qQ50CmCpWcFMwvVeQHo/bxoxGggNMmuV
+T0bqf7MolZDSJNS96IAN32uf25tYHgERnQaMhmi1aSHvRDh4jxFu8gGVgL6lWit/
+vBDW/BiFBCH6sZJJrGSuSdpecTtaWC8OJGDoKTO9PqAA/HQRiQB1AwUQNDJSx011
+eFs7VOAZAQGdKQL/ea3qD2OP3wVTzXvfjQL1CosX4wyKusBBhdt9u2vOT+KWkiRk
+1o35nIOGuZLHtSFQDY8CVDOkqg6g4sVbOcTl8QUwHA+A4AVDInwTm1m4Bk4oeCIw
+k4Bp6mDdW11g28k/iQEVAgUSNDIWPm/Y4wPDeaMxAQGvBQgAqGhzA/21K7oL/L5S
+5Xz//eO7J8hgvqqGXWd13drNy3bHbKPn7TxilkA3ca24st+6YPZDdSUHLMCqg16Y
+OMyQF8gEkX7ZHWPacVoUpCmSz1uQ3p6W3+u5UCkRpgQN8wBbJx5ZpBBqeq5q/31o
+kaoNjzA2ghEWyR5Ll+U0C87MY7pc7PlNHGCr0ZNOhhtf1jU+H9ag5UyT6exIYim3
+QqWYruiCLSUcim0l3wK7LMW1w/7Q6cWfAFQvl3rGjt3rg6OWg9J4H2h5ukf5JNiR
+ybkupmatUM+OVMRkf93jzU62kbyZpJBHiQZuxxJaLkhpv2RgWib9pbkftwEy/Znm
+jkxlIIkAlQMFEDQvWjh4313xYR8/NQEB37QEAIi9vR9h9ennz8Vi7RNU413h1ZoZ
+jxfEbOpkQAjE/LrZ/L5WiWdoStSiyqCLPoyPpQafiU8nTOr1KmY4RgceJNgxIW4O
+iSMoSvrhc2kqP+skb8A2B4+47Aqjr5fSAVfVfrDMqDGireOguhQ/hf9BOYsM0gs+
+ROdtyLWPtMjRnFlviD8DBRAz8qQSj6lRT5YOKXIRAntSAJ9StSEMBoFvk8iRWpXb
+6+LDNLUWzACfT8iY3IxwvMF6jjCHrbuxQkL7chSJARUDBRA0MMO7569NIyeqD3EB
+ATIAB/4tCPZ1sLWO07g2ZCpiP1HlYpf5PENaXtaasFvhWch7eUe3DksuMEPzB5Gn
+auoQZAkuhEGkoEfrfL3AXtXH+WMm2t7dIcTBD4p3XkeZ+PgJpKiASXDyul9rumXX
+vMxSL4KV7ar+F1ZJ0ycCx2r2au0prPao70hDAzLTy16hrWgvdHSK7+wwaYO5TPCL
+5JDmcB+dHKW72qNUOD0pxbe0uCkkb+gDxeVX28pZEkIIOMMV/eAs5bs/smV+eJqW
+T/EyfVBDo7heF2aeyJj5ecxNOODr88xKF7qEpqazCQ4xhvFY+Yn6+vNCcYfkoZbO
+n0XQAvqfa2Vab9woVIVSaDji/mlPiQB1AwUQNDC233FfeD4HYGBJAQFh6QL/XCgm
+5O3q9kWpgts1MHKoHoh7vxSSQGSP2k7flNP1UB2nv4sKvyGM8eJKApuROIodcTkc
+cM4qXaBuXunMr5kJlvDJPm+NLzKyhtQP2fWI7xGYwiCiB29gm1GFMjdur4amiQEV
+AwUQNDBR9fjDdqGixRdJAQE+mAf+JyqJZEVFwNwZ2hSIMewekC1r7N97p924nqfZ
+Knzn6weFpE80KIJSWtEVzI0XvHlVCOnS+WRxn7zxwrOTbrcEOy0goVbNgUsP5ypZ
+a2/EM546uyyJTvgD0nwA45Q4bP5sGhjh0G63r9Vwov7itFe4RDBGM8ibGnZTr9hH
+o469jpomHSNeavcaUYyEqcr4GbpQmdpJTnn/H0A+fMl7ZHRoaclNx9ZksxihuCRr
+kQvUOb3uRD9lFIhCvNwEardN62dKOKJXmn1TOtyanZvnmWigU5AmGuk6FpsClm3p
+5vvlid64i49fZt9vW5krs2XfUevR4oL0IyUl+qW2HN0DIlDiAYkAlQMFEDQvbv2w
+cgJwUPMhJQEBVBID/iOtS8CQfMxtG0EmrfaeVUU8R/pegBmVWDBULAp8CLTtdfxj
+Vzs/6DXw0RogXMRRl2aFfu1Yp0xhBYjII6Kque/FzAFXY9VNF1peqnPt7ADdeptY
+MppZa8sGn9BBRu9Fsw69z6JkyqvMiVxGcKy3XEpVGr0JHx8Xt6BYdrULiKr2iQB1
+AwUQNC68n6jZR/ntlUftAQFaYgL+NUYEj/sX9M5xq1ORX0SsVPMpNamHO3JBSmZS
+Izjiox5MAqoFOCigAkonuzk5aBy/bRHy1cmDBOxf4mNhzrH8N6IkGvPE70cimDnb
+Fvr+hoZSjIqxtELNZsLuLVavLPAXiQCVAwUQNC6vWocCuHlnLQXBAQHb1gQAugp6
+2aVzDCuz4ntfXsmlGbLY7o5oZXYIKdPP4riOj4imcJh6cSgYFL6OMzeIp9VW/PHo
+2mk8kkdkz5uif5LqOkEuIxgra7p1Yq/LL4YVhWGQeD8hwpmu+ulYoPOw40dVYS36
+PwrHIH9afNhl8Or5O2VIHIWnoQ++9r6gwngFQOyJAJUDBRAzHnkh1sNKtX1rroUB
+AWphBACdhuqm7GHoiXptQ/Y5F6BivCjxr9ch+gPSjaLMhq0kBHVO+TbXyVefVVGV
+gCYvFPjozM8PEVykQAtY//eJ475aGXjF+BOAhl2z0IMkQKCJMExoEDHbcj0jIIMZ
+2/+ptgtbFSyJ2DQ3vvCdbw/1kyPHTPfP+L2u40GWMIYVBbyouokAlQMFEDMe7+UZ
+symln7HG2QEBzMED/3L0DyPK/u6PyAd1AdpjUODTkWTZjZ6XA2ubc6IXXsZWpmCg
+B/24v8jsJ3DIsvUD3Ke55kTr6xV+au+mAkwOQqWUTUWfQCkSrSDlbUJ1VPBzhyTp
+uzjBopte7o3R6XXfcLiC5jY6eCX0QtLGhKpLjTr5uRhf1fYODGsAGXmCByDviQB1
+AgUQMy6UMB0Z9MEMmFelAQHV4AMAjdFUIyFtpTr5jkyZSd3y//0JGO0z9U9hLVxe
+BBCwvdEQxsrpeTtVdqpeKZxHN1GhPCYvgLFZAQlcPh/Gc8u9uO7wVSgJc3zYKFTh
+KpQevdF/rzjTCHfgigf5Iui0qiqBiQCVAwUQMx22bAtzgG/ED06dAQFi0gQAkosq
+TMWy+1eUXbi2azFK3RX5ERf9wlN7mqh7TvwcPXvVWzUARnwRv+4kk3uOWI18q5UP
+is7KH3KYOVeRrPd8bbp6SjhBh82ourTEQUXLBDQiI1V1cZZmwwEdlnAnhFnkXgMB
+NM2q7oBefRHADfYDfGo90wXyrVVL+GihDNpzUwOJAJUDBRAzHUFnOWvfULwOR3EB
+AbOYA/90JIrKmxhwP6quaheFOjjPoxDGEZpGJEOwejEByYj+AgONCRmQS3Bydtub
+A+nm/32DFeG8pe/dnFvGc+QgNW560hK21C2KJj72mhjRlg/na7jz4/MmBAv5k61Q
+7roWi0rwx+R9NSHxpshC8A92zmvo8w/XzVSogC8pJ04jcnY6YokAlQMFEDMdPtta
+9LwlvuSC3QEBvPMD/3TJGroHhHYjHhiEpDZZVszeRQ0cvVI/uLLi5yq3W4F6Jy47
+DF8VckA7mw0bXrOMNACN7Je7uyaU85qvJC2wgoQpFGdFlkjmkAwDAjR+koEysiE8
+FomiOHhvEpEY/SjSS4jj4IPmgV8Vq66XjPw+i7Z0RsPLOIf67yZHxypNiBiYiQCV
+AwUQMxxwpKrq6G7/78D5AQHo2QQAjnp6KxOl6Vvv5rLQ/4rj3OemvF7IUUq34xb2
+5i/BSvGBUpDQVUmhv/qIfWvDqWGZedyM+AlNSfUWPWnP41S8OH+lcERH2g2dGKGl
+7kH1F2BxByZlqREHm2q624wPPA35RLXtXIx06yYjLtJ7b+FCAX6PUgZktZYk5gwj
+doAGrC2JAJUDBRAzGvcCKC6c7f53PGUBAUozA/9l/qKmcqbi8RtLsKQSh3vHds9d
+22zcbkuJPBSoOv2D7i2VLshaQFjq+62uYZGE6nU1WP5sZcBDuWjoX4t4NrffnOG/
+1R9D0t1t9F47D77HJzjvo+J52SN520YHcbT8VoHdPRoEOXPN4tzhvn2GapVVdaAl
+WM0MLlohNH3I9jap9okAdQMFEDMZlUAnyXglSykrxQEBnuwC/jXbFL+jzs2HQCuo
+4gyVrPlUksQCLYZjNnZtw1ca697GV3NhBhSXR9WHLQH+ZWnpTzg2iL3WYSdi9tbP
+s78iY1FSd4EG8H9V700oQG8dlICF5W2VjzR7fByNosKM70WSXYkBFQMFEDMWBsGC
+y1t9eckWHQEBHzMH/jmrsHwSPrA5R055VCTuDzdS0AJ+tuWkqIyqQQpqbost89Hx
+per3MmjLJas/VJv8EheuU3vQ9a8sG2SnlWKLtzFqpk7TCkyq/H3blub0agREbNnY
+hHHTGQFCYJb4lWjWvMjfP+N5jvlLcnDqQPloXfAOgy7W90POoqFrsvhxdpnXgoLr
+zyNNja1O1NRj+Cdv/GmJYNi6sQe43zmXWeA7syLKMw6058joDqEJFKndgSp3Zy/y
+XmObOZ/HC2OJwA3gzEaAu8Pqd1svwGIGznqtTNCn9k1+rMvJPaxglg7PXIJS282h
+mBl9AcJlwmh2GUCswl9/sj+REWTb8SgJUbkFcp6JAJUDBRAwdboVMPfsgxioXMEB
+AQ/LA/9BFTZ9T95P/TtsxeC7lm9imk2mpNQCBEvXk286FQnGFtDodGfBfcH5SeKH
+aUNxFaXr39rDGUtoTE98iAX3qgCElf4V2rzgoHLpuQzCg3U35dfs1rIxlpcSDk5i
+vaHpPV3Sv+mlqWL049y+3bGaZeAnwM6kvGMP2uccS9U6cbhpw4hGBBARAgAGBQI3
+GtRfAAoJEF3iSZZbA1iikWUAoIpSuXzuN/CI63dZtT7RL7c/KtWUAJ929SAtTr9S
+lpSgxMC8Vk1T1i5/SYkBFQMFEzccnFnSJilEzmrGwQEBJxwH/2oauG+JlUC3zBUs
+oWhRQwqo7DdqaPl7sH5oCGDKS4x4CRA23U15NicDI7ox6EizkwCjk0dRr1EeRK+R
+qL1b/2T42B6nynOLhRG2A0BPHRRJLcoL4nKfoPSo/6dIC+3iVliGEl90KZZD5bnO
+NrVJQkRjZL8Ao+9IpmoYh8XjS5xMLEF9oAQqAkA93nVBm56lKmaL1kl+M3dJFtNK
+tVB8de1ZXifDs8HykD42qYVtcseCKxZXhC3UTG5YLNhPvgZKH8WBCr3zcR13hFDx
+uecUmu0MVhvEzoKyBYYt0rrqnyWrxwbv4gSTUWH5ZbgsTjc1SYKZxz6hrPQnfYWz
+NkznlFWJARUDBRM0xL43CdxwOTnzf10BATOCB/0Q6WrpzwPMofjHj54MiGLKVP++
+YfwzdvnsHxVpTZLZ5Ux8ErDsnLmvUGphnLVELZwEkEGRjln7a19h9oL8UYZaV+Ic
+R6tQ06Fb1ldR+q+3nXtBYzGhleXdgJQSKLJkzPF72tvY0DHUB//GUV9IBLQMvfG8
+If/AFsih4iXi96DOtUAbeuIhnMlWwLJFeGjLLsX1u6HSX33xy4bGX6v/UcHbTSSY
+axzb92GR/xpP2Xt332hOFRkDZL52g27HS0UrEJWdAVZbh25KbZEl7C6zX/82OZ5n
+TEziHo20eOS6Nrt2+gLSeA9X5h/+qUx30kTPz2LUPBQyIqLCJkHM8+0q5j9ciQCi
+AwUTNMS+HZFeTizbCJMJAQFrGgRlEAkG1FYU4ufTxsaxhFZy7xv18527Yxpls6mS
+Ci1HL55nJoce6TI+Z34MrLOaiZljeQP3EUgzA+cs1sFRago4qz2wS8McmQ9w0FNQ
+QMz4vVg9CVi1JUVd4EWYvJpA8swDd5b9+AodYFEsfxt9Z3aP+AcWFb10RlVVsNw9
+EhObc6IMnwAOHCEI9vp5FzzFiQCVAwUQNxyr6UyjTSyISdw9AQHf+wP+K+q6hIQ0
+9tkgaYaDLlWKLbuxePXqM4oO72qi70Gkg0PV5nU4l368R6W5xgR8ZkxlQlg85sJ0
+bL6wW/SjMz7pP9hkhNwk0x3IFkGMTYG8i6Gt8Nm7x70dzJoiC+A496PryYC0rvGV
+f+Om8j5uTexBBjb/jpJhAQ/SGqeDeCHheOC0Lldlcm5lciBLb2NoIChtZWluIGFs
+dGVyIGtleSkgPHdrQGNvbXB1dGVyLm9yZz6JAHUDBRM2G2MyHRn0wQyYV6UBASKK
+Av4wzmK7a9Z+g0KH+6W8ffIhzrQo8wDAU9X1WJKzJjS205tx4mmdnAt58yReBc/+
+5HXTI8IKR8IgF+LVXKWAGv5P5AqGhnPMeQSCs1JYdf9MPvbe34jD8wA1LTWFXn9e
+/cWIRgQQEQIABgUCNxrUaQAKCRBd4kmWWwNYovRiAJ9dJBVfjx9lGARoFXmAieYr
+MGDrmwCZAQyO4Wo0ntQ+iq4do9M3/FTFjiCZAaIENu1I6REEAJRGEqcYgXJch5fr
+UYBj2EkDkWAbhRqVXnmiF3PjCEGAPMMYsTddiU7wcKfiCAqKWWXow7BjTJl6Do8R
+T1jdKpPOlBJXqqPYzsyBxLzE6mLps0K7SLJlSKTQqSVRcx0jx78JWYGlAlP0Kh9s
+PV2w/rPh0LrPeOKXT7lZt/DrIhfPAKDL/sVqCrmY3QfvrT8kSKJcgtLWfQP/cfbq
+VNrGjW8am631N3UVA3tWfpgM/T9OjmKmw44NE5XfPJTAXlCV5j7zNMUkDeoPkrFF
+8DvbpYQs4XWYHozDjhR2Q+eI6gZ0wfmhLHqqc2eVVkEG7dT57Wp9DAtCMe7RZfhn
+arTQMqlYtOEa/suiHk0qLo59NsyF8eh68IDNCeYD/Apzonwaq2EQ1OEpfFlp6LcS
+nS34+UGZtTO4BgJdmEjr/QrIPp6bJDstgho+/2oR8yQwuHGJwbS/8ADA4IFEpLdu
+SpzrABho7RuNQcm96bceRY+7Hza3zf7pg/JGdWOb+bC3S4TIpK+3sx3YNWs7eURw
+pGREeJi5/Seic+GXlGzltBpXZXJuZXIgS29jaCA8d2tAZ251cGcub3JnPohbBBMR
+AgAbBQI3Gs+QBQkMyXyAAwsKAwMVAwIDFgIBAheAAAoJEF3iSZZbA1iiXcIAnjv7
+ON5AiwzCLBwm9h9ywufXJQuVAJ9RMq6lpPqnDly6UCKz+kGt0EplyIhGBBARAgAG
+BQI3GtE9AAoJEGx+4bhiHMAThfQAnjcDvBthtHotN89IP590GSKY287xAJ0WhKl9
+j7gWwpVqCD+ofcq0ZQBG1IkAdQMFEDca0WMdGfTBDJhXpQEB0a4C/0AzSj1eSYFs
+4ss2x7xCn0yMPxML+hJdjGnVb0CPJGzzeKpD69pmVsD87nPa53gj0NXi/ADnQvPm
+csVs8dr7K5PxXFOXaJzDm72tnLeJKiTesZfMY7MQ0yYQUhUWogSY8YhGBBARAgAG
+BQI3GtGjAAoJEGi3q4lXVI3NLfgAoISt+x9r02Hl14njSfGmZIjyUrXuAJ9FhxTq
+LUHU1uDZmSSvlKpOcG1pYIhGBBARAgAGBQI3Tx9dAAoJEPbu3yAYS8TZLb4Ani50
+OXjsQCc/gr5G+xZy/yqOqnOWAJ44VlluXNaN6J7yhB9iXtsEGvE+oohGBBARAgAG
+BQI3pyb+AAoJEJg0ZdshQ5QifskAn0stcy37RHy7iB2bFB4rPVNDJaizAJ9hCH+0
+yNTOTisrEHLhS0QufAn3H4hFBBARAgAGBQI34UEzAAoJEDZnYPF9LteIeecAn3eT
+mQldy/AIYuEFvyaF1FPmQdDNAJj3trsO1mAyzs7+PB++rZunMveeiEYEEBECAAYF
+AjgqYg8ACgkQ4/JYVBKPDnkbHQCfRR7qUYmwTxtrf+Fw6hfsYjCy//AAn1eRdkkd
+CExOJPwvrHEtZydSmVA1tAtXZXJuZXIgS29jaIhbBBMRAgAbBQI27UjqBQkMyXyA
+AwsKAwMVAwIDFgIBAheAAAoJEF3iSZZbA1iitdYAn1IJbSJ46kvsBjq8X44hoybD
+ZlbWAKCS2jR5Z+CmMC5WDqNepHXAe3alA4kCHgQQFAMABgUCNy9Z1AAKCRBsTDGl
+sdUVZw3FB/9uDXhYYnQZYw1K6445HRZjNRo23NimItJXIuut5e2jwsE3DNuDOPat
+qZbtGL61gkAcuG25rxmBJ6JuaAG5lqwXx1vWbk03VlwcFcZPKwCOn4qeJxNn06uP
+vkP2jehKYzJFyKwSGv6CSPS1WEZ84A4Lp4pu59W7JgUNUjI7JQEaVbsCl6bMDNh6
+Z+zcN2MefzuWSMcxURI7h8zmu0u5JztwF8v97qWNpZBzlbxLSAgO/RW0vf2kxbgG
+WkprbmvXignLC5Sm9YJm6y8Obtkmepn9aaA4dBSzJi51NE6kYhuWw2DyKoLqG5ak
+ZIFF27ehFBGGSql9V2zPPoEH+cDHTWrbB/9D5T1ch3WPLPFQvVIaBpgx/pB3KMdD
+WjG4Us3HMzoL8zTr23Bs2BcnvVGwMNdXEVl9JONKIfXTQA/372FvmbJxpctQ5dgO
+85IXMcF38uyMU1WusVsOzlfD5wsZUc4iBHkhYB+C7l3U8BlT25BWB0adB+ZmDfzd
+FI/G9Hd+dnPWsc1QaZLrDvHoVVvFrVBTa3fyA1pwjAcBMA9wGnIkt9ejOdumDcAN
+uAIbIOMHCe49ARCRjBFqRtzNGuB7who9lu3Ydg+hSx25cxnIkjzPm2+7ulQPCznW
+dXURfXkFw3f75pjmlTIDUi1poPKZBWagVtALQE0zMw7nd0ycWSjiLjaSiEYEEBEC
+AAYFAjc6+aMACgkQdQ9klcidkz6GiwCdGe0KSP/vSyEZM/GClQXvjMD4RvMAoJwy
+TIdcjPZbQizDeAO3btn2CCwTiEYEEBECAAYFAjc3I8UACgkQ9u7fIBhLxNmHZQCg
+lWbPDznIcnOxdDW+k7YgA9+/n00An1ZjSiJipverUxLEFHAbSBWI0IntiQEVAwUQ
+N0Pe01KAV0R2U0AdAQHIcQf/Ykx+DvUaCLIYlMrEIDKZ3J/aPbJ8frAjvzYkrgFZ
+XhzQT9Xfyr6OkhiyWKFX23yzzDVcrmeIxovCUI7IFY6QM/d5yHr4Y8+18HdyaUva
+FLz3o9ZnVp1AeAJ5CkHzfufnrKPRpOzgvXFqttJVPbaVTAyJTo/Bh0fZGHyeHwW8
+3QhmxuWfac6PveoA1DM1+Wax5QoXVeHhyTzIutF3ivpqaHEBUB9xgVEk3jN0svdy
+aGCS3QANmXMDBecSPB0cfLtK8AmTV5w04D2kWw4lu+fO593Vp+z8Jsbvwj7QkOGD
+vlnY3Crx4qOwqqI7TPP+8bnJZKd1m9aRNbPcPdvXGvUh3YhGBBARAgAGBQI4KmIe
+AAoJEOPyWFQSjw55D5AAoJs5OxzJSdYdKsOjh8jLQxOESOE6AJ4vgpvtNaR384dB
+JxUE7yxNTPT7aA==
+=gKwz
 -----END PGP PUBLIC KEY BLOCK-----
diff --git a/g10/sign.c b/g10/sign.c
index ca469c07c..d52010a4c 100644
--- a/g10/sign.c
+++ b/g10/sign.c
@@ -86,13 +86,13 @@ pk_sign( int algo, MPI *data, MPI hash, MPI *skey )
     else {
 	list = gcry_sexp_find_token( s_sig, "r" , 0 );
 	assert( list );
-	data[0] = gcry_sexp_cdr_mpi( list, 0 );
+	data[0] = gcry_sexp_nth_mpi( list, 1, 0 );
 	assert( data[0] );
 	gcry_sexp_release (list);
 
 	list = gcry_sexp_find_token( s_sig, "s" , 0 );
 	assert( list );
-	data[1] = gcry_sexp_cdr_mpi( list, 0 );
+	data[1] = gcry_sexp_nth_mpi( list, 1, 0 );
 	assert( data[1] );
 	gcry_sexp_release (list);
     }
diff --git a/po/da.po b/po/da.po
index b4d652d3d..0771f1016 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-07-30 20:02+0200\n"
 "PO-Revision-Date: 2000-03-07 22:51+01:00\n"
 "Last-Translator: Birger Langkjer <birger.langkjer@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -15,305 +15,289 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:79
-msgid "Warning: using insecure memory!\n"
-msgstr "Advarsel: benytter ubeskyttet hukommelse!\n"
-
-#: util/secmem.c:289
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "operation er ikke mulig uden beskyttet hukommelse indlæst\n"
-
-#: util/secmem.c:290
-msgid "(you may have used the wrong program for this task)\n"
-msgstr "(du kan have brugt et forkert program til denne opgave)\n"
-
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:278 util/miscutil.c:307
 msgid "yes"
 msgstr "ja"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:279 util/miscutil.c:310
 msgid "yY"
 msgstr "jJ"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:280 util/miscutil.c:308
 msgid "no"
 msgstr "n"
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:281 util/miscutil.c:311
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:580 util/miscutil.c:309
 msgid "quit"
 msgstr "afslut"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:312
 msgid "qQ"
 msgstr "aA"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "generel fejl"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "ukendt pakketype"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "ukendt version"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "ukendt offentlig nøglealgoritme"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "ukendt sammenfatningsalgoritme"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "dårlig offentlig nøgle"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "dårlig hemmelig nøgle"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "dårlig signatur"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "tjeksumsfejl"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "dårlig kodesætning"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "offentlig nøgle ikke fundet"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "ukendt cifferalgoritme "
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "kan ikke åbne nøgleringen"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "ugyldig pakke"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "ugyldig rustning"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "ikke-eksisterende bruger id"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "hemmelig nøgle ikke tilgængelig"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "forkert hemmelig nøgle brugt"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "ikke understøttet"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "dårlig nøgle"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "fillæsningsfejl"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "filskrivningsfejl"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "ukendt kompressionsalgoritme"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "filåbningsfejl"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "filoprettelsesfejl"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "ugyldig kodesætning"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "uimplementeret offentlig nøglealgoritme"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "uimplementeret cifferalgoritme"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "ukendt signaturklasse"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "tillidsdatabasefejl"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "dårlig mpi"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "resursegrænse"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "ugyldig nøglering"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "ugyldigt certifikat"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "dårlig bruger-id"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "fillukningsfejl"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "filomdøbningsfejl"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "filsletningsfejl"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "uforventet data"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "tidsstempelkonflikt"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "uanvendelig offentlig nøglealgoritme"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "fil eksisterer"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "svag nøgle"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "ugyldigt argument"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "ugyldig URI"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "ikke-understøttet URI"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "netværksfejl"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "ikke krypteret"
 
-#: util/errors.c:103
-msgid "not processed"
-msgstr "ikke bearbejdet"
-
-#: util/logger.c:224
+#: util/logger.c:225
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... dette er en fejl (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:231
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du fandt en fejl ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:321 g10/import.c:127 g10/keygen.c:1348
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke åbne '%s': %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:325
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan ikke åbne '%s': %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:330
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:325
+#: cipher/random.c:335
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:331
+#: cipher/random.c:341
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:339
+#: cipher/random.c:349
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan ikke åbne '%s': %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:387
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:397
+#: cipher/random.c:407
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:414
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan ikke åbne '%s': %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:417
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan ikke åbne '%s': %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:428
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:647
+#: cipher/random.c:657
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ADVARSEL: bruger usikker tilfældig-nummer-generator!!!\n"
 
-#: cipher/random.c:648
+#: cipher/random.c:663
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -327,7 +311,7 @@ msgstr ""
 "BENYT IKKE DATA GENERERET AF DETTE PROGRAM!!!\n"
 "\n"
 
-#: cipher/rndlinux.c:141
+#: cipher/rndlinux.c:125
 #, c-format
 msgid ""
 "\n"
@@ -338,7 +322,19 @@ 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:197
+#: gcrypt/secmem.c:77
+msgid "Warning: using insecure memory!\n"
+msgstr "Advarsel: benytter ubeskyttet hukommelse!\n"
+
+#: gcrypt/secmem.c:287
+msgid "operation is not possible without initialized secure memory\n"
+msgstr "operation er ikke mulig uden beskyttet hukommelse indlæst\n"
+
+#: gcrypt/secmem.c:288
+msgid "(you may have used the wrong program for this task)\n"
+msgstr "(du kan have brugt et forkert program til denne opgave)\n"
+
+#: g10/gpg.c:197
 msgid ""
 "@Commands:\n"
 " "
@@ -346,139 +342,139 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: g10/g10.c:199
+#: g10/gpg.c:199
 msgid "|[file]|make a signature"
 msgstr "|[filer]|opret en signatur"
 
-#: g10/g10.c:200
+#: g10/gpg.c:200
 msgid "|[file]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: g10/g10.c:201
+#: g10/gpg.c:201
 msgid "make a detached signature"
 msgstr "opret en separat signatur"
 
-#: g10/g10.c:202
+#: g10/gpg.c:202
 msgid "encrypt data"
 msgstr "kryptér data"
 
-#: g10/g10.c:203
+#: g10/gpg.c:203
 msgid "encryption only with symmetric cipher"
 msgstr "kryptér kun med symmetriske cifre"
 
-#: g10/g10.c:204
+#: g10/gpg.c:204
 msgid "store only"
 msgstr "gem kun"
 
-#: g10/g10.c:205
+#: g10/gpg.c:205
 msgid "decrypt data (default)"
 msgstr "afkryptér data (standard)"
 
-#: g10/g10.c:206
+#: g10/gpg.c:206
 msgid "verify a signature"
 msgstr "godkend en signatur"
 
-#: g10/g10.c:208
+#: g10/gpg.c:208
 msgid "list keys"
 msgstr "vis nøgler"
 
-#: g10/g10.c:210
+#: g10/gpg.c:210
 msgid "list keys and signatures"
 msgstr "vis nøgler og signaturer"
 
-#: g10/g10.c:211
+#: g10/gpg.c:211
 msgid "check key signatures"
 msgstr "tjek nøglesignaturer"
 
-#: g10/g10.c:212
+#: g10/gpg.c:212
 msgid "list keys and fingerprints"
 msgstr "vis nøgle og fingeraftryk"
 
-#: g10/g10.c:213
+#: g10/gpg.c:213
 msgid "list secret keys"
 msgstr "vis hemmelige nøgler"
 
-#: g10/g10.c:214
+#: g10/gpg.c:214
 msgid "generate a new key pair"
 msgstr "generér et nyt nøglepar"
 
-#: g10/g10.c:215
+#: g10/gpg.c:215
 msgid "remove key from the public keyring"
 msgstr "fjern nøgle fra den offentlige nøglering"
 
-#: g10/g10.c:217
+#: g10/gpg.c:217
 msgid "remove key from the secret keyring"
 msgstr "fjern nøgle fra den hemmelige nøglering"
 
-#: g10/g10.c:218
+#: g10/gpg.c:218
 msgid "sign a key"
 msgstr "signér en nøgle"
 
-#: g10/g10.c:219
+#: g10/gpg.c:219
 msgid "sign a key locally"
 msgstr "signér en nøgle lokalt"
 
-#: g10/g10.c:220
+#: g10/gpg.c:220
 msgid "sign or edit a key"
 msgstr "signér eller redigér en nøgle"
 
-#: g10/g10.c:221
+#: g10/gpg.c:221
 msgid "generate a revocation certificate"
 msgstr "Generér en annullérbar certifikat"
 
-#: g10/g10.c:222
+#: g10/gpg.c:222
 msgid "export keys"
 msgstr "eksportér nøgler"
 
-#: g10/g10.c:223
+#: g10/gpg.c:223
 msgid "export keys to a key server"
 msgstr "eksportér nøgler til en nøgletjener"
 
-#: g10/g10.c:224
+#: g10/gpg.c:224
 msgid "import keys from a key server"
 msgstr "importér nøgler fra en nøgleserver"
 
-#: g10/g10.c:228
+#: g10/gpg.c:228
 msgid "import/merge keys"
 msgstr "importér/fusionér nøgler"
 
-#: g10/g10.c:230
+#: g10/gpg.c:230
 msgid "list only the sequence of packets"
 msgstr "vis kun pakkesekvensen"
 
-#: g10/g10.c:232
+#: g10/gpg.c:232
 msgid "export the ownertrust values"
 msgstr "eksportér ejertillidsværdierne"
 
-#: g10/g10.c:234
+#: g10/gpg.c:234
 msgid "import ownertrust values"
 msgstr "importér ejertillidsværdierne"
 
-#: g10/g10.c:236
+#: g10/gpg.c:236
 msgid "update the trust database"
 msgstr "opdatér tillidsdatabasen"
 
-#: g10/g10.c:238
+#: g10/gpg.c:238
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMES]|tjek tillidsdatabasen"
 
-#: g10/g10.c:239
+#: g10/gpg.c:239
 msgid "fix a corrupted trust database"
 msgstr "reparér en ødelagt tillidsdatabase"
 
-#: g10/g10.c:240
+#: g10/gpg.c:240
 msgid "De-Armor a file or stdin"
 msgstr "De-beskydt en fil el. stdin"
 
-#: g10/g10.c:242
+#: g10/gpg.c:242
 msgid "En-Armor a file or stdin"
 msgstr "Beskydt en fil el. stdin"
 
-#: g10/g10.c:244
+#: g10/gpg.c:244
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|print meddelelsesresumé"
 
-#: g10/g10.c:248
+#: g10/gpg.c:249
 msgid ""
 "@\n"
 "Options:\n"
@@ -488,154 +484,154 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/g10.c:250
+#: g10/gpg.c:251
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
 
-#: g10/g10.c:252
+#: g10/gpg.c:253
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|kryptér for NAME"
 
-#: g10/g10.c:255
+#: g10/gpg.c:256
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|brug NAME som standard modtager"
 
-#: g10/g10.c:257
+#: g10/gpg.c:258
 msgid "use the default key as default recipient"
 msgstr "brug standard nøglen som standard modtager"
 
-#: g10/g10.c:261
+#: g10/gpg.c:262
 msgid "use this user-id to sign or decrypt"
 msgstr "brug denne bruger-id til at signere eller dekryptere"
 
-#: g10/g10.c:262
+#: g10/gpg.c:263
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sæt kompresningsniveau N (0 = slået fra)"
 
-#: g10/g10.c:264
+#: g10/gpg.c:265
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/g10.c:265
+#: g10/gpg.c:266
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: g10/g10.c:266
+#: g10/gpg.c:267
 msgid "verbose"
 msgstr "meddelsom"
 
-#: g10/g10.c:267
+#: g10/gpg.c:268
 msgid "be somewhat more quiet"
 msgstr "vær mere stille"
 
-#: g10/g10.c:268
+#: g10/gpg.c:269
 msgid "don't use the terminal at all"
 msgstr "brug overhovedet ikke terminalen"
 
-#: g10/g10.c:269
+#: g10/gpg.c:270
 msgid "force v3 signatures"
 msgstr "tving v3 signaturer"
 
-#: g10/g10.c:270
+#: g10/gpg.c:271
 msgid "always use a MDC for encryption"
 msgstr "brug altid en MDC for kryptering"
 
-#: g10/g10.c:271
+#: g10/gpg.c:272
 msgid "do not make any changes"
 msgstr "lav ingen ændringer"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/gpg.c:274
 msgid "batch mode: never ask"
 msgstr "kørselsmodus: spørg aldrig"
 
-#: g10/g10.c:274
+#: g10/gpg.c:275
 msgid "assume yes on most questions"
 msgstr "forvent ja til de fleste sprøgsmål"
 
-#: g10/g10.c:275
+#: g10/gpg.c:276
 msgid "assume no on most questions"
 msgstr "forvent nej til de fleste sprøgsmål"
 
-#: g10/g10.c:276
+#: g10/gpg.c:277
 msgid "add this keyring to the list of keyrings"
 msgstr "tilføj denne nøglering til nøgleringslisten"
 
-#: g10/g10.c:277
+#: g10/gpg.c:278
 msgid "add this secret keyring to the list"
 msgstr "tilføj denne hemmeligenøglering til listen"
 
-#: g10/g10.c:278
+#: g10/gpg.c:279
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|brug NAME som standard hemmelignøgle"
 
-#: g10/g10.c:279
+#: g10/gpg.c:280
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|brug denne nøgletjener til at slå nøgler op"
 
-#: g10/g10.c:280
+#: g10/gpg.c:281
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|sæt terminal karaktersæt til NAME"
 
-#: g10/g10.c:281
+#: g10/gpg.c:282
 msgid "read options from file"
 msgstr "læs indstillinger fra fil"
 
-#: g10/g10.c:285
+#: g10/gpg.c:286
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinfo til denne FD"
 
-#: g10/g10.c:290
+#: g10/gpg.c:291
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|indlæs udvidelsesmodul FILE"
 
-#: g10/g10.c:291
+#: g10/gpg.c:292
 msgid "emulate the mode described in RFC1991"
 msgstr "emulér modusen beskrevet i RFC1991"
 
-#: g10/g10.c:292
+#: g10/gpg.c:293
 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:293
+#: g10/gpg.c:294
 msgid "|N|use passphrase mode N"
 msgstr "|N|brug pasfrasemodus N"
 
-#: g10/g10.c:295
+#: g10/gpg.c:296
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|brug meddelelses resuméalgoritme NAME for pasfrase"
 
-#: g10/g10.c:297
+#: g10/gpg.c:298
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|brug cifrealgoritme NAME for pasfrase"
 
-#: g10/g10.c:298
+#: g10/gpg.c:299
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|brug cifferalgoritme NAME"
 
-#: g10/g10.c:299
+#: g10/gpg.c:300
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|brug meddelelsesresumé algoritme NAME"
 
-#: g10/g10.c:300
+#: g10/gpg.c:301
 msgid "|N|use compress algorithm N"
 msgstr "|N|brug kompresalgoritme N"
 
-#: g10/g10.c:301
+#: g10/gpg.c:302
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 
-#: g10/g10.c:302
+#: g10/gpg.c:303
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=VALUE|brug denne notationsdata"
 
-#: g10/g10.c:305
+#: g10/gpg.c:306
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:308
+#: g10/gpg.c:309
 msgid ""
 "@\n"
 "Examples:\n"
@@ -655,16 +651,16 @@ msgstr ""
 " --list-keys [navne]        vis nøgler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/g10.c:403
+#: g10/gpg.c:409
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Rapportér venligst fejl til <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:407
+#: g10/gpg.c:413
 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:410
+#: g10/gpg.c:416
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -674,7 +670,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afhænger af inddata\n"
 
-#: g10/g10.c:417
+#: g10/gpg.c:423
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -682,195 +678,200 @@ msgstr ""
 "\n"
 "Understøttede algoritmer:\n"
 
-#: g10/g10.c:496
+#: g10/gpg.c:525
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/g10.c:549
+#: g10/gpg.c:583
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/g10.c:692
+#: g10/gpg.c:638
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
+#: g10/gpg.c:734
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/g10.c:696
+#: g10/gpg.c:738
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: g10/g10.c:703
+#: g10/gpg.c:745
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "læser indstillinger fra `%s'\n"
 
-#: g10/g10.c:893
+#: g10/gpg.c:937
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegnsæt\n"
 
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/gpg.c:1002 g10/gpg.c:1011
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/g10.c:951
+#: g10/gpg.c:1004
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/g10.c:954
+#: g10/gpg.c:1007
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsløs sammen med %s!\n"
 
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/gpg.c:1027 g10/gpg.c:1039
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/gpg.c:1033 g10/gpg.c:1045
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resuméalgoritme er ugyldig\n"
 
-#: g10/g10.c:995
+#: g10/gpg.c:1049
 msgid "the given policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/g10.c:998
+#: g10/gpg.c:1052
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr ""
 
-#: g10/g10.c:1000
+#: g10/gpg.c:1054
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/g10.c:1002
+#: g10/gpg.c:1056
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/g10.c:1004
+#: g10/gpg.c:1058
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:1007
+#: g10/gpg.c:1061
 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:1011
+#: g10/gpg.c:1065
 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:1096
+#: g10/gpg.c:1154
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/g10.c:1102
+#: g10/gpg.c:1160
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/g10.c:1109
+#: g10/gpg.c:1167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:1117
+#: g10/gpg.c:1175
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/g10.c:1130
+#: g10/gpg.c:1188
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/g10.c:1143
+#: g10/gpg.c:1201
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:1157
+#: g10/gpg.c:1215
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/g10.c:1174
+#: g10/gpg.c:1232
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/g10.c:1182
+#: g10/gpg.c:1240
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:1190
+#: g10/gpg.c:1248
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/g10.c:1198
+#: g10/gpg.c:1256
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/g10.c:1214
+#: g10/gpg.c:1272
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key bruger-id"
 
-#: g10/g10.c:1217
+#: g10/gpg.c:1275
 msgid "--delete-key user-id"
 msgstr "--delete-key bruger-id"
 
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:311 g10/gpg.c:1312 g10/sign.c:449
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan ikke åbne %s: %s\n"
 
-#: g10/g10.c:1269
+#: g10/gpg.c:1327
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [bruger-id] [nøglering]"
 
-#: g10/g10.c:1335
+#: g10/gpg.c:1393
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:1343
+#: g10/gpg.c:1401
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "påklædning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:1411
+#: g10/gpg.c:1474 g10/gpg.c:1495
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/g10.c:1492
+#: g10/gpg.c:1580
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/g10.c:1496
+#: g10/gpg.c:1584
 msgid "Go ahead and type your message ...\n"
 msgstr "Gå til sagen og skriv meddelelsen ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/gpg.c:1587 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke åbne `%s'\n"
 
-#: g10/g10.c:1669
+#: g10/gpg.c:1765
 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:1675
+#: g10/gpg.c:1771
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1681
+#: g10/gpg.c:1777
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1689
+#: g10/gpg.c:1785
 msgid "a notation value must not use any control characters\n"
 msgstr "en notationsværdi må ikke bruge nogen kontroltegn\n"
 
@@ -953,49 +954,49 @@ msgstr "quoted printable-tegn i panser - m
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1188 g10/pkclist.c:53
+#: g10/keyedit.c:1191 g10/pkclist.c:54
 msgid "             Fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#: g10/pkclist.c:80
+#: g10/pkclist.c:81
 msgid "Fingerprint:"
 msgstr "Fingeraftryk:"
 
-#: g10/pkclist.c:116
+#: g10/pkclist.c:117
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:118
+#: g10/pkclist.c:119
 #, fuzzy
-msgid "Key is superseded"
+msgid "Key is superseeded"
 msgstr "Nøglen er beskyttet.\n"
 
-#: g10/pkclist.c:120
+#: g10/pkclist.c:121
 msgid "Key has been compromised"
 msgstr ""
 
-#: g10/pkclist.c:122
+#: g10/pkclist.c:123
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:124
+#: g10/pkclist.c:125
 msgid "User ID is no longer valid"
 msgstr ""
 
-#: g10/pkclist.c:128
+#: g10/pkclist.c:129
 msgid "Reason for revocation: "
 msgstr ""
 
-#: g10/pkclist.c:145
+#: g10/pkclist.c:146
 msgid "Revocation comment: "
 msgstr ""
 
 #. a string with valid answers
-#: g10/pkclist.c:303
+#: g10/pkclist.c:304
 msgid "sSmMqQ"
 msgstr "sSmMqQ"
 
-#: g10/pkclist.c:307
+#: g10/pkclist.c:308
 #, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -1004,7 +1005,7 @@ msgstr ""
 "Ingen tillidsværdi tildelt til %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1017,92 +1018,92 @@ msgid ""
 " s = please show me more information\n"
 msgstr ""
 
-#: g10/pkclist.c:328
+#: g10/pkclist.c:329
 msgid " m = back to the main menu\n"
 msgstr " m = tilbage til hovedmenu\n"
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:331
 msgid " q = quit\n"
 msgstr " q = afslut\n"
 
-#: g10/pkclist.c:336
+#: g10/pkclist.c:337
 msgid "Your decision? "
 msgstr "Dit valg? "
 
-#: g10/pkclist.c:358
+#: g10/pkclist.c:359
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr ""
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 msgid ""
 "Could not find a valid trust path to the key.  Let's see whether we\n"
 "can assign some missing owner trust values.\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:438
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:439
+#: g10/pkclist.c:440
 msgid ""
 "No trust values changed.\n"
 "\n"
 msgstr "Ingen tillidsværdier er ændret.\n"
 
-#: g10/pkclist.c:457
+#: g10/pkclist.c:458
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "nøgle %08lX: nøgle er blevet annulleret!\n"
 
-#: g10/pkclist.c:464 g10/pkclist.c:476 g10/pkclist.c:598
+#: g10/pkclist.c:465 g10/pkclist.c:477 g10/pkclist.c:599
 msgid "Use this key anyway? "
 msgstr "Brug denne nøgle alligevel? "
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "nøgle %08lX: undernøgle er blevet annulleret!\n"
 
-#: g10/pkclist.c:512
+#: g10/pkclist.c:513
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: nøgle er udløbet\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr "%08lX: ignen info til at udregne en tillidssandsynlighed\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: Vi stoler IKKE på denne nøgle\n"
 
-#: g10/pkclist.c:539
+#: g10/pkclist.c:540
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
 "but it is accepted anyway\n"
 msgstr ""
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:546
 msgid "This key probably belongs to the owner\n"
 msgstr "Denne nøgle tilhører sikkert ejeren\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid "This key belongs to us\n"
 msgstr "Denne nøgle tilhører os\n"
 
-#: g10/pkclist.c:593
+#: g10/pkclist.c:594
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -1110,63 +1111,63 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:607 g10/pkclist.c:630
+#: g10/pkclist.c:608 g10/pkclist.c:631
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ADVARSEL: Bruger nøgle uden tillid!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:652
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ADVARSEL: Denne nøgle er blevet annulleret af dets ejer!\n"
 
-#: g10/pkclist.c:652
+#: g10/pkclist.c:653
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Dette kan betyde at signaturen er forfalsket.\n"
 
-#: g10/pkclist.c:657
+#: g10/pkclist.c:658
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ADVARSEL: Denne undernøgle er blevet tilbagekaldt af dens ejer!\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:680
 msgid "Note: This key has expired!\n"
 msgstr "Bemærk: Denne nøgle er forældet!\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:688
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 
-#: g10/pkclist.c:689
+#: g10/pkclist.c:690
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Intet tyder på at denne signatur tilhører ejeren.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:707
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ADVARSEL: Vi tror IKKE på denne nøgle!\n"
 
-#: g10/pkclist.c:707
+#: g10/pkclist.c:708
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Signaturen er formentlig FORFALSKET.\n"
 
-#: g10/pkclist.c:714
+#: g10/pkclist.c:715
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:718
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Det er ikke sikkert at signaturen tilhører ejeren.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:968 g10/pkclist.c:1013
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:828 g10/pkclist.c:995
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: udelod: offentlig nøgle er allerede tilstede\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:855
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1174,42 +1175,42 @@ msgstr ""
 "Du angav ikke en bruger-id. (du kan bruge \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:865
 msgid "Enter the user ID: "
 msgstr "Indtast bruger-id: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:877
 msgid "No such user ID.\n"
 msgstr "Ingen sådan bruger-id.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:882
 msgid "skipped: public key already set as default recipient\n"
 msgstr "udeladt: offentlig nøgle er allerede valgt som standard modtager\n"
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:905
 msgid "Public key is disabled.\n"
 msgstr "Offentlig nøgle er slået fra.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:912
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "udeladt: offentlig nøgle er allerede valgt med --encrypt-to\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:943
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:976
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: fejl ved undersøgelse af nøgle: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:981
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: udelod: offentlignøgle er slået fra\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1019
 msgid "no valid addressees\n"
 msgstr "ingen gyldige adresser\n"
 
@@ -1221,58 +1222,58 @@ msgstr "skriver selvsignatur\n"
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
+#: g10/keygen.c:308 g10/keygen.c:419 g10/keygen.c:529
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Ønsket nøglestørrelse er %u bit\n"
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:438
+#: g10/keygen.c:313 g10/keygen.c:424 g10/keygen.c:534
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:537
+#: g10/keygen.c:633
 msgid "Please select what kind of key you want:\n"
 msgstr "Vælg venligst hvilken slags nøgle du vil have:\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:635
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA og ElGamal (standard)\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:636
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (signér kun)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:638
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (kryptér kun)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:639
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signér og kryptér)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:641
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signér og kryptér)\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:645
 msgid "Your selection? "
 msgstr "Dit valg? "
 
-#: g10/keygen.c:560 g10/keygen.c:568
+#: g10/keygen.c:656 g10/keygen.c:664
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Vil du gerne oprette en underskrivnings- og krypteringsnøgle? "
 
-#: g10/keygen.c:582
+#: g10/keygen.c:678
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:690
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1281,19 +1282,19 @@ msgid ""
 "    highest suggested keysize is 2048 bits\n"
 msgstr ""
 
-#: g10/keygen.c:601
+#: g10/keygen.c:697
 msgid "What keysize do you want? (1024) "
 msgstr "Hvilken nøglestørrelse ønsker du? (1024) "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:702
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA tillader kun nøglestørrelser fra 512 til 1024\n"
 
-#: g10/keygen.c:608
+#: g10/keygen.c:704
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr ""
 
-#: g10/keygen.c:610
+#: g10/keygen.c:706
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr ""
 
@@ -1305,42 +1306,42 @@ msgstr ""
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:621
+#: g10/keygen.c:717
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr ""
 
-#: g10/keygen.c:626
+#: g10/keygen.c:722
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
 msgstr ""
 
-#: g10/keygen.c:629
+#: g10/keygen.c:725
 msgid "Are you sure that you want this keysize? "
 msgstr "Er du sikker på at de vil benytte denne nøglestørrelse? "
 
-#: g10/keygen.c:630
+#: g10/keygen.c:726
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
 msgstr ""
 
-#: g10/keygen.c:638
+#: g10/keygen.c:734
 msgid "Do you really need such a large keysize? "
 msgstr ""
 
-#: g10/keygen.c:644
+#: g10/keygen.c:740
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Ønsket nøglestørrelse er %u bit\n"
 
-#: g10/keygen.c:647 g10/keygen.c:651
+#: g10/keygen.c:743 g10/keygen.c:747
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:795
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1350,36 +1351,36 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:714
+#: g10/keygen.c:810
 msgid "Key is valid for? (0) "
 msgstr "Nøgle er gyldig for? (0) "
 
-#: g10/keygen.c:719
+#: g10/keygen.c:815
 msgid "invalid value\n"
 msgstr "ugyldig værdi\n"
 
-#: g10/keygen.c:724
+#: g10/keygen.c:820
 msgid "Key does not expire at all\n"
 msgstr "Nøglen udløber aldrig\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:730
+#: g10/keygen.c:826
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Nøgle udløber d. %s\n"
 
-#: g10/keygen.c:733
+#: g10/keygen.c:829
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
 # virker j automatisk istedetfor y?
-#: g10/keygen.c:738
+#: g10/keygen.c:834
 msgid "Is this correct (y/n)? "
 msgstr "Er dette korrekt (j/n)? "
 
-#: g10/keygen.c:781
+#: g10/keygen.c:877
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1389,44 +1390,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:793
+#: g10/keygen.c:889
 msgid "Real name: "
 msgstr "Rigtige navn: "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:893
 msgid "Invalid character in name\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:799
+#: g10/keygen.c:895
 msgid "Name may not start with a digit\n"
 msgstr "Navn må ikke starte med et tal\n"
 
-#: g10/keygen.c:801
+#: g10/keygen.c:897
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navn skal være mindst 5 bogstaver langt\n"
 
-#: g10/keygen.c:809
+#: g10/keygen.c:905
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:820
+#: g10/keygen.c:916
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:828
+#: g10/keygen.c:924
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:834
+#: g10/keygen.c:930
 msgid "Invalid character in comment\n"
 msgstr "Ugyldigt tegn i kommentar\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:956
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruger '%s' tegnsættet.\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:962
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1437,28 +1438,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:867
+#: g10/keygen.c:966
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:872
+#: g10/keygen.c:971
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:882
+#: g10/keygen.c:981
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ændr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? "
 
-#: g10/keygen.c:883
+#: g10/keygen.c:982
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ændr (N)avn, (K)ommentar, (E)post eller (O)kay/(Q)vit? "
 
-#: g10/keygen.c:902
+#: g10/keygen.c:1001
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:940
+#: g10/keygen.c:1039
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1466,11 +1467,11 @@ msgstr ""
 "Du skal bruge en kodesætning til at beskytte din hemmelige nøgle.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:948
+#: g10/keyedit.c:468 g10/keygen.c:1047
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "kodesætningen blev ikke ordentlig gentaget; prøv igen.\n"
 
-#: g10/keygen.c:954
+#: g10/keygen.c:1053
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1478,7 +1479,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1074
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1486,77 +1487,77 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:1424
+#: g10/keygen.c:1523
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA nøglepar vil have 1024 bit.\n"
 
-#: g10/keygen.c:1467
+#: g10/keygen.c:1566
 msgid "Key generation canceled.\n"
 msgstr "Nøgleoprettelse annulleret.\n"
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1663
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/keygen.c:1565
+#: g10/keygen.c:1664
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1760
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig nøgle oprettet og signeret.\n"
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1765
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
 msgstr ""
 
-#: g10/keygen.c:1683 g10/keygen.c:1784
+#: g10/keygen.c:1782 g10/keygen.c:1883
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1826 g10/sig-check.c:300 g10/sign.c:167
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1828 g10/sig-check.c:302 g10/sign.c:169
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1861
 msgid "Really create? "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:142 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: kan ikke åbne: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:164
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fejl ved oprettelse af kodesætning: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:222 g10/encode.c:370
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ADVARSEL: tom fil\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:317
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "læser fra '%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:534
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s krypteret for: %s\n"
@@ -1585,32 +1586,32 @@ msgstr "n
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:212
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:350
+#: g10/getkey.c:351
 msgid "too many entries in unk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
+#: g10/getkey.c:1311 g10/getkey.c:1350
 msgid "RSA key cannot be used in this version\n"
 msgstr "RSA nøgle kan ikke bruges i denne version\n"
 
-#: g10/getkey.c:1310 g10/getkey.c:1349
+#: g10/getkey.c:1313 g10/getkey.c:1352
 msgid "No key for user ID\n"
 msgstr "Ingen nøgle for bruger-ID\n"
 
-#: g10/getkey.c:1388 g10/getkey.c:1428
+#: g10/getkey.c:1391 g10/getkey.c:1431
 msgid "No user ID for key\n"
 msgstr "Ingen bruger-ID for nøgle\n"
 
-#: g10/getkey.c:1642 g10/getkey.c:1698
+#: g10/getkey.c:1645 g10/getkey.c:1701
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "bruger sekundær nøgle %08lX istedetfor primær nøgle %08lX\n"
 
-#: g10/getkey.c:2017
+#: g10/getkey.c:2020
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: bruger ikke fundet\n"
@@ -1620,7 +1621,7 @@ msgstr "%s: bruger ikke fundet\n"
 msgid "skipping block of type %d\n"
 msgstr "sprang over blok af typen %d\n"
 
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:188 g10/trustdb.c:1748 g10/trustdb.c:1789
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu nøgler behandlet indtil nu\n"
@@ -1708,7 +1709,7 @@ msgstr "n
 msgid "no default public keyring\n"
 msgstr "ingen standard offentlig nøglering\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:350 g10/sign.c:669
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til `%s'\n"
@@ -1960,7 +1961,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1870 g10/keyedit.c:1932 g10/sign.c:136
+#: g10/keyedit.c:373 g10/keyedit.c:1873 g10/keyedit.c:1935 g10/sign.c:191
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering fejlede: %s\n"
@@ -2312,282 +2313,291 @@ msgstr ""
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
-#: g10/keyedit.c:1080 g10/keyedit.c:1106
+#: g10/keyedit.c:1083 g10/keyedit.c:1109
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1089
+#: g10/keyedit.c:1092
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1093
+#: g10/keyedit.c:1096
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1125
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "nøgle %08lX: undernøgle er blevet annulleret!\n"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1128
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "  nye nøgletilbagekald: %lu\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1130
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1368
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1372
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1376
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1382
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1396
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettede %d signatur.\n"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1397
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1400
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:1466
+#: g10/keyedit.c:1469
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:1472
+#: g10/keyedit.c:1475
 msgid "Please select at most one secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1479
 msgid "Changing expiration time for a secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1481
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1520
+#: g10/keyedit.c:1523
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:1536
+#: g10/keyedit.c:1539
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1600
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1646
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ingen sekundær nøgle med indeks %d\n"
 
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1744
 msgid "user ID: \""
 msgstr "bruger-id: \""
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1747
 #, c-format
 msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:1751
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr ""
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1775
 msgid "You have signed these user IDs:\n"
 msgstr ""
 
-#: g10/keyedit.c:1786 g10/keyedit.c:1821
+#: g10/keyedit.c:1789 g10/keyedit.c:1824
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1791
+#: g10/keyedit.c:1794
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1811
+#: g10/keyedit.c:1814
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:1829
+#: g10/keyedit.c:1832
 msgid "Really create the revocation certificates? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1861
 msgid "no secret key\n"
 msgstr ""
 
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "ugyldig rustning"
+
+#: g10/keylist.c:178
+msgid "revoked"
+msgstr ""
+
 #. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:401 g10/mainproc.c:754
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "Nøgle udløber d. %s\n"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:212
 #, c-format
 msgid "public key is %08lX\n"
 msgstr ""
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:247
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:281
+#: g10/mainproc.c:280
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr ""
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr ""
 
-#: g10/mainproc.c:297
+#: g10/mainproc.c:296
 msgid "no secret key for decryption available\n"
 msgstr ""
 
-#: g10/mainproc.c:306
+#: g10/mainproc.c:305
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:343
+#: g10/mainproc.c:342
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:348
+#: g10/mainproc.c:347
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:352
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:372
+#: g10/mainproc.c:371
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:374
+#: g10/mainproc.c:373
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:538
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:625 g10/mainproc.c:634
 msgid "WARNING: invalid notation data found\n"
 msgstr ""
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:637
 msgid "Notation: "
 msgstr ""
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:644
 msgid "Policy: "
 msgstr "Politik: "
 
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1074
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1080
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1106 g10/mainproc.c:1117
 msgid "BAD signature from \""
 msgstr "DÅRLIG signatur fra \""
 
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1107 g10/mainproc.c:1118
 msgid "Good signature from \""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1109
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1165
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1230
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1282
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) signatur\n"
 
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1287
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:94
+#: g10/misc.c:83
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan ikke slå core-dump fra: %s\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:86
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/misc.c:205
+#: g10/misc.c:312
 msgid "Experimental algorithms should not be used!\n"
 msgstr ""
 
-#: g10/misc.c:219
+#: g10/misc.c:326
 msgid ""
 "RSA keys are deprecated; please consider creating a new key and use this key "
 "in the future\n"
 msgstr ""
 
-#: g10/misc.c:241
+#: g10/misc.c:348
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 
-#: g10/parse-packet.c:117
+#: g10/parse-packet.c:115
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:965
+#: g10/parse-packet.c:963
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -2621,51 +2631,51 @@ msgstr "Indtast kodes
 msgid "Repeat passphrase: "
 msgstr "Gentag kodesætning: "
 
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
 msgid "Please enter name of data file: "
 msgstr ""
 
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
 msgid "reading stdin ...\n"
 msgstr "læser stdin ...\n"
 
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:79
+#: g10/pubkey-enc.c:138
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:85
+#: g10/pubkey-enc.c:144
 msgid "okay, we are the anonymous recipient.\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:137
+#: g10/pubkey-enc.c:200
 msgid "old encoding of the DEK is not supported\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:156
+#: g10/pubkey-enc.c:219
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/pubkey-enc.c:195
+#: g10/pubkey-enc.c:258
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:201
+#: g10/pubkey-enc.c:264
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr ""
@@ -2709,67 +2719,63 @@ msgstr ""
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
 
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:90
 #, fuzzy
 msgid "secret key parts are not available\n"
 msgstr "hemmelig nøgle ikke tilgængelig"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:96
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr ""
 
-#: g10/seckey-cert.c:175
+#: g10/seckey-cert.c:239
 msgid "Invalid passphrase; please try again ...\n"
 msgstr ""
 
-#: g10/seckey-cert.c:231
+#: g10/seckey-cert.c:302
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 
-#: g10/sig-check.c:202
-msgid "assuming bad MDC due to an unknown critical bit\n"
-msgstr ""
-
-#: g10/sig-check.c:300
+#: g10/sig-check.c:282
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 
-#: g10/sig-check.c:308
+#: g10/sig-check.c:290
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:291
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:327
+#: g10/sig-check.c:309
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr ""
 
-#: g10/sig-check.c:396
+#: g10/sig-check.c:378
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sign.c:140
+#: g10/sign.c:195
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:606
+#: g10/sign.c:345 g10/sign.c:664
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/sign.c:388
+#: g10/sign.c:444
 msgid "signing:"
 msgstr "signerer:"
 
-#: g10/sign.c:431
+#: g10/sign.c:487
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
@@ -2808,7 +2814,8 @@ msgstr ""
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1363 g10/tdbio.c:444
+#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1407
+#: g10/ringedit.c:1878 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr ""
@@ -2993,200 +3000,200 @@ msgstr ""
 msgid "enumerate secret keys failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:921
+#: g10/trustdb.c:925
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr ""
 
-#: g10/trustdb.c:927 g10/trustdb.c:962
+#: g10/trustdb.c:931 g10/trustdb.c:966
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:939
+#: g10/trustdb.c:943
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr ""
 
-#: g10/trustdb.c:945
+#: g10/trustdb.c:949
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:956
+#: g10/trustdb.c:960
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr ""
 
-#: g10/trustdb.c:1067
+#: g10/trustdb.c:1071
 msgid "Good self-signature"
 msgstr ""
 
-#: g10/trustdb.c:1077
+#: g10/trustdb.c:1081
 msgid "Invalid self-signature"
 msgstr ""
 
-#: g10/trustdb.c:1104
+#: g10/trustdb.c:1108
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 
-#: g10/trustdb.c:1110
+#: g10/trustdb.c:1114
 msgid "Valid user ID revocation"
 msgstr ""
 
-#: g10/trustdb.c:1115
+#: g10/trustdb.c:1119
 msgid "Invalid user ID revocation"
 msgstr ""
 
-#: g10/trustdb.c:1157
+#: g10/trustdb.c:1161
 msgid "Valid certificate revocation"
 msgstr ""
 
-#: g10/trustdb.c:1158
+#: g10/trustdb.c:1162
 msgid "Good certificate"
 msgstr "Godt certifikat"
 
-#: g10/trustdb.c:1186
+#: g10/trustdb.c:1190
 msgid "Invalid certificate revocation"
 msgstr ""
 
-#: g10/trustdb.c:1187
+#: g10/trustdb.c:1191
 msgid "Invalid certificate"
 msgstr ""
 
-#: g10/trustdb.c:1204 g10/trustdb.c:1208
+#: g10/trustdb.c:1208 g10/trustdb.c:1212
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr ""
 
-#: g10/trustdb.c:1267
+#: g10/trustdb.c:1271
 msgid "duplicated certificate - deleted"
 msgstr ""
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1592
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1718
+#: g10/trustdb.c:1726
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1723
+#: g10/trustdb.c:1731
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1729
+#: g10/trustdb.c:1737
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr ""
 
-#: g10/trustdb.c:1734
+#: g10/trustdb.c:1742
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1742 g10/trustdb.c:1805
+#: g10/trustdb.c:1750 g10/trustdb.c:1813
 #, c-format
 msgid "%lu keys processed\n"
 msgstr ""
 
-#: g10/trustdb.c:1744 g10/trustdb.c:1811
+#: g10/trustdb.c:1752 g10/trustdb.c:1819
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr ""
 
-#: g10/trustdb.c:1746
+#: g10/trustdb.c:1754
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr ""
 
-#: g10/trustdb.c:1749
+#: g10/trustdb.c:1757
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:1797
+#: g10/trustdb.c:1805
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr ""
 
-#: g10/trustdb.c:1807
+#: g10/trustdb.c:1815
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr ""
 
-#: g10/trustdb.c:1809
+#: g10/trustdb.c:1817
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr ""
 
-#: g10/trustdb.c:1813
+#: g10/trustdb.c:1821
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr ""
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2166
 msgid "Ooops, no keys\n"
 msgstr ""
 
-#: g10/trustdb.c:2162
+#: g10/trustdb.c:2170
 msgid "Ooops, no user IDs\n"
 msgstr ""
 
-#: g10/trustdb.c:2320
+#: g10/trustdb.c:2328
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2337
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2333
+#: g10/trustdb.c:2341
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2349
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2364
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2372
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2523
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2517
+#: g10/trustdb.c:2525
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2520
+#: g10/trustdb.c:2528
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr ""
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2531
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2709 g10/trustdb.c:2739
+#: g10/trustdb.c:2717 g10/trustdb.c:2747
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr ""
 
@@ -3202,44 +3209,40 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: g10/ringedit.c:302
+#: g10/ringedit.c:324
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr ""
 
-#: g10/ringedit.c:319 g10/ringedit.c:1368
+#: g10/ringedit.c:341 g10/ringedit.c:1412 g10/ringedit.c:1883
 #, c-format
 msgid "%s: keyring created\n"
 msgstr ""
 
-#: g10/ringedit.c:1545
+#: g10/ringedit.c:1589 g10/ringedit.c:2060
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/ringedit.c:1546
+#: g10/ringedit.c:1590 g10/ringedit.c:2061
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr ""
 
-#: g10/ringedit.c:1547
+#: g10/ringedit.c:1591 g10/ringedit.c:2062
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/ringedit.c:1548
+#: g10/ringedit.c:1592 g10/ringedit.c:2063
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
-#: g10/skclist.c:88 g10/skclist.c:125
-msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr ""
-
-#: g10/skclist.c:113
+#: g10/skclist.c:96
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr ""
 
-#: g10/skclist.c:119
+#: g10/skclist.c:102
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3293,26 +3296,26 @@ msgstr "%s: mappe oprettet\n"
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 
-#: g10/encr-data.c:66
-#, c-format
-msgid "%s encrypted data\n"
-msgstr ""
-
-#: g10/encr-data.c:68
+#: g10/encr-data.c:64
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
 
-#: g10/encr-data.c:90
+#: g10/encr-data.c:69
+#, c-format
+msgid "%s encrypted data\n"
+msgstr ""
+
+#: g10/encr-data.c:99
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 
-#: g10/seskey.c:52
+#: g10/seskey.c:61
 msgid "weak key created - retrying\n"
 msgstr ""
 
-#: g10/seskey.c:57
+#: g10/seskey.c:66
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
@@ -3504,7 +3507,7 @@ msgid ""
 "  \"Key has been compromised\"\n"
 "      Use this if you have a reason to believe that unauthorized persons\n"
 "      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
+"  \"Key is superseeded\"\n"
 "      Use this if you have replaced this key with a newer one.\n"
 "  \"Key is no longer used\"\n"
 "      Use this if you have retired this key.\n"
@@ -3529,6 +3532,9 @@ msgstr "Ingen hj
 msgid "No help available for `%s'"
 msgstr "Ingen hjælp tilgængelig for `%s'"
 
+#~ msgid "not processed"
+#~ msgstr "ikke bearbejdet"
+
 #~ msgid "set debugging flags"
 #~ msgstr "sæt aflusningsflag"
 
diff --git a/po/de.po b/po/de.po
index bd919479c..fe393d344 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-07-30 20:02+0200\n"
 "PO-Revision-Date: 2000-06-12  12:50+0200\n"
 "Last-Translator: Walter Koch <koch@hsp.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -12,309 +12,290 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:79
-msgid "Warning: using insecure memory!\n"
-msgstr "Warnung: Sensible Daten könnten auf Platte ausgelagert werden.\n"
-
-# "  Um dies zu vermeiden, kann das Programm suid(root) installiert werden.\n"
-# "  Bitte wenden Sie sich hierzu an den Systemadministrator.\n"
-#: util/secmem.c:289
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "Vorgang ist ohne sicheren Hauptspeicher nicht möglich\n"
-
-#: util/secmem.c:290
-msgid "(you may have used the wrong program for this task)\n"
-msgstr ""
-"(möglicherweise haben Sie das falsche Programm für diese Aufgabe benutzt)\n"
-
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:278 util/miscutil.c:307
 msgid "yes"
 msgstr "ja"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:279 util/miscutil.c:310
 msgid "yY"
 msgstr "jJyY"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:280 util/miscutil.c:308
 msgid "no"
 msgstr "nein"
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:281 util/miscutil.c:311
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:580 util/miscutil.c:309
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:312
 msgid "qQ"
 msgstr "qQ"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "Allgemeiner Fehler"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "Unbekannter Pakettyp"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "Unbekannte Version"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "Unbekanntes Public-Key Verfahren"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "Unbekanntes Hashverfahren"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "Falscher öffentlicher Schüssel"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "Falscher geheimer Schlüssel"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "Falsche Unterschrift"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "Prüfsummen-Fehler"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "Falsches Mantra"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "Öffentlicher Schlüssel nicht gefunden"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "Unbekanntes Verschlüsselungsverfahren"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "Der Schlüsselbund kann nicht geöffnet werden"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "Ungültiges Paket"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "Ungültige ASCII-Hülle"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "Keine solche User-ID"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "Geheimer Schlüssel ist nicht vorhanden"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "Falscher geheimer Schlüssel benutzt"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "Wird nicht unterstützt"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "Falscher Schlüssel"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "Dateilesefehler"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "Dateischreibfehler"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "Unbekanntes Komprimierverfahren"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "Fehler beim Öffnen der Datei"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "Fehler beim Erzeugen der Datei"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "Ungültiges Mantra"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "Öffentliches Schlüsselverfahren ist nicht implementiert."
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "Verschlüsselungsverfahren ist nicht implementiert"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "Unbekannte Unterschriftenklasse"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "Fehler in der Trust-DB"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "Falsche MPI"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "festdefinierte Resourcenobergrenze erreicht"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "Ungültiger Schlüsselbund"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "Falsches Zertifikat"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "Ungünstig aufgebaute User-ID"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "Fehler beim Schließen der Datei"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "Fehler beim Umbenennen einer Datei"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "Fehler beim Löschen einer Datei"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "Unerwartete Daten"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "Zeitangaben differieren"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "Unbenutzbares öffentliches Schlüsselverfahren"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "Datei existiert bereits"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "Unsicherer Schlüssel"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "Ungültiges Argument"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "fehlerhafter URI"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "Nicht unterstützter URI"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "Netzwerkfehler"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "nicht verschlüsselt"
 
-#: util/errors.c:103
-msgid "not processed"
-msgstr "nicht bearbeitet"
-
-#: util/logger.c:224
+#: util/logger.c:225
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... dies ist ein Bug (Programmfehler) (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:231
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:321 g10/import.c:127 g10/keygen.c:1348
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:325
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "Status von '%s' ist nicht feststellbar: %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:330
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' ist keine normale Datei - sie bleibt unbeachtet\n"
 
-#: cipher/random.c:325
+#: cipher/random.c:335
 msgid "note: random_seed file is empty\n"
 msgstr "Hinweis: 'random_seed'-Datei ist leer\n"
 
-#: cipher/random.c:331
+#: cipher/random.c:341
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 "Warnung: Falsche Größe der 'random_seed'-Datei - sie wird nicht verwendet\n"
 
-#: cipher/random.c:339
+#: cipher/random.c:349
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "'%s' ist unlesbar: %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:387
 msgid "note: random_seed file not updated\n"
 msgstr "Hinweis: 'random_seed'-Datei bleibt unverändert\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:407
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:414
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kann '%s' nicht schreiben: %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:417
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kann '%s' nicht schliessen: %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:428
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr "Zu viele Zufallswerte angefordert: Die Grenze liegt bei %d\n"
 
-#: cipher/random.c:647
+#: cipher/random.c:657
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "WARNUNG: Der Zufallsgenerator erzeugt keine echten Zufallszahlen!\n"
 
-#: cipher/random.c:648
+#: cipher/random.c:663
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -328,7 +309,7 @@ msgstr ""
 "BENUTZEN SIE DIE DURCH DIESES PROGRAMM ERZEUGTEN DATEN NICHT!\n"
 "\n"
 
-#: cipher/rndlinux.c:141
+#: cipher/rndlinux.c:125
 #, c-format
 msgid ""
 "\n"
@@ -340,7 +321,22 @@ msgstr ""
 "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n"
 "(Es werden noch %d Byte benötigt.)\n"
 
-#: g10/g10.c:197
+#: gcrypt/secmem.c:77
+msgid "Warning: using insecure memory!\n"
+msgstr "Warnung: Sensible Daten könnten auf Platte ausgelagert werden.\n"
+
+# "  Um dies zu vermeiden, kann das Programm suid(root) installiert werden.\n"
+# "  Bitte wenden Sie sich hierzu an den Systemadministrator.\n"
+#: gcrypt/secmem.c:287
+msgid "operation is not possible without initialized secure memory\n"
+msgstr "Vorgang ist ohne sicheren Hauptspeicher nicht möglich\n"
+
+#: gcrypt/secmem.c:288
+msgid "(you may have used the wrong program for this task)\n"
+msgstr ""
+"(möglicherweise haben Sie das falsche Programm für diese Aufgabe benutzt)\n"
+
+#: g10/gpg.c:197
 msgid ""
 "@Commands:\n"
 " "
@@ -348,139 +344,139 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: g10/g10.c:199
+#: g10/gpg.c:199
 msgid "|[file]|make a signature"
 msgstr "|[Datei]|Eine Unterschrift erzeugen"
 
-#: g10/g10.c:200
+#: g10/gpg.c:200
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/g10.c:201
+#: g10/gpg.c:201
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/g10.c:202
+#: g10/gpg.c:202
 msgid "encrypt data"
 msgstr "Daten verschlüsseln"
 
-#: g10/g10.c:203
+#: g10/gpg.c:203
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschlüsseln"
 
-#: g10/g10.c:204
+#: g10/gpg.c:204
 msgid "store only"
 msgstr "Nur speichern"
 
-#: g10/g10.c:205
+#: g10/gpg.c:205
 msgid "decrypt data (default)"
 msgstr "Daten entschlüsseln (Voreinstellung)"
 
-#: g10/g10.c:206
+#: g10/gpg.c:206
 msgid "verify a signature"
 msgstr "Signatur prüfen"
 
-#: g10/g10.c:208
+#: g10/gpg.c:208
 msgid "list keys"
 msgstr "Liste der Schlüssel"
 
-#: g10/g10.c:210
+#: g10/gpg.c:210
 msgid "list keys and signatures"
 msgstr "Liste der Schlüssel und ihrer Signaturen"
 
-#: g10/g10.c:211
+#: g10/gpg.c:211
 msgid "check key signatures"
 msgstr "Signaturen der Schlüssel prüfen"
 
-#: g10/g10.c:212
+#: g10/gpg.c:212
 msgid "list keys and fingerprints"
 msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\""
 
-#: g10/g10.c:213
+#: g10/gpg.c:213
 msgid "list secret keys"
 msgstr "Liste der geheimen Schlüssel"
 
-#: g10/g10.c:214
+#: g10/gpg.c:214
 msgid "generate a new key pair"
 msgstr "Ein neues Schlüsselpaar erzeugen"
 
-#: g10/g10.c:215
+#: g10/gpg.c:215
 msgid "remove key from the public keyring"
 msgstr "Schlüssel aus dem öff. Schlüsselbund entfernen"
 
-#: g10/g10.c:217
+#: g10/gpg.c:217
 msgid "remove key from the secret keyring"
 msgstr "Schlüssel aus dem geh. Schlüsselbund entfernen"
 
-#: g10/g10.c:218
+#: g10/gpg.c:218
 msgid "sign a key"
 msgstr "Schlüssel signieren"
 
-#: g10/g10.c:219
+#: g10/gpg.c:219
 msgid "sign a key locally"
 msgstr "Schlüssel nur auf diesem Rechner signieren"
 
-#: g10/g10.c:220
+#: g10/gpg.c:220
 msgid "sign or edit a key"
 msgstr "Unterschreiben oder Bearbeiten eines Schl."
 
-#: g10/g10.c:221
+#: g10/gpg.c:221
 msgid "generate a revocation certificate"
 msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen"
 
-#: g10/g10.c:222
+#: g10/gpg.c:222
 msgid "export keys"
 msgstr "Schlüssel exportieren"
 
-#: g10/g10.c:223
+#: g10/gpg.c:223
 msgid "export keys to a key server"
 msgstr "Schlüssel zu einem Schlü.server exportieren"
 
-#: g10/g10.c:224
+#: g10/gpg.c:224
 msgid "import keys from a key server"
 msgstr "Schlüssel von einem Schlü.server importieren"
 
-#: g10/g10.c:228
+#: g10/gpg.c:228
 msgid "import/merge keys"
 msgstr "Schlüssel importieren/kombinieren"
 
-#: g10/g10.c:230
+#: g10/gpg.c:230
 msgid "list only the sequence of packets"
 msgstr "Lediglich Struktur der Datenpakete anzeigen"
 
-#: g10/g10.c:232
+#: g10/gpg.c:232
 msgid "export the ownertrust values"
 msgstr "Exportieren der \"Owner trust\" Werte"
 
-#: g10/g10.c:234
+#: g10/gpg.c:234
 msgid "import ownertrust values"
 msgstr "Importieren der \"Owner trust\" Werte"
 
-#: g10/g10.c:236
+#: g10/gpg.c:236
 msgid "update the trust database"
 msgstr "Ändern der \"Trust\"-Datenbank"
 
-#: g10/g10.c:238
+#: g10/gpg.c:238
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMEN]|Überprüfen der \"Trust\"-Datenbank"
 
-#: g10/g10.c:239
+#: g10/gpg.c:239
 msgid "fix a corrupted trust database"
 msgstr "Reparieren einer beschädigten \"Trust\"-Datenb."
 
-#: g10/g10.c:240
+#: g10/gpg.c:240
 msgid "De-Armor a file or stdin"
 msgstr "Datei oder stdin von der ASCII-Hülle befreien"
 
-#: g10/g10.c:242
+#: g10/gpg.c:242
 msgid "En-Armor a file or stdin"
 msgstr "Datei oder stdin in eine ASCII-Hülle einpacken"
 
-#: g10/g10.c:244
+#: g10/gpg.c:244
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests für die Dateien ausgeben"
 
-#: g10/g10.c:248
+#: g10/gpg.c:249
 msgid ""
 "@\n"
 "Options:\n"
@@ -490,152 +486,152 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/g10.c:250
+#: g10/gpg.c:251
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-Hülle versehen"
 
-#: g10/g10.c:252
+#: g10/gpg.c:253
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschlüsseln für NAME"
 
-#: g10/g10.c:255
+#: g10/gpg.c:256
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|NAME als voreingestellten Empfänger benutzen"
 
-#: g10/g10.c:257
+#: g10/gpg.c:258
 msgid "use the default key as default recipient"
 msgstr ""
 "Den Standardschlüssel als voreingestellten\n"
 "Empfänger benutzen"
 
-#: g10/g10.c:261
+#: g10/gpg.c:262
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/g10.c:262
+#: g10/gpg.c:263
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/g10.c:264
+#: g10/gpg.c:265
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/g10.c:265
+#: g10/gpg.c:266
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/g10.c:266
+#: g10/gpg.c:267
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: g10/g10.c:267
+#: g10/gpg.c:268
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
-#: g10/g10.c:268
+#: g10/gpg.c:269
 msgid "don't use the terminal at all"
 msgstr "das Terminal gar nicht benutzen"
 
-#: g10/g10.c:269
+#: g10/gpg.c:270
 msgid "force v3 signatures"
 msgstr "v3 Signaturen erzwingen"
 
-#: g10/g10.c:270
+#: g10/gpg.c:271
 msgid "always use a MDC for encryption"
 msgstr "Beim Verschlüsseln ein Siegel (MDC) verwenden"
 
-#: g10/g10.c:271
+#: g10/gpg.c:272
 msgid "do not make any changes"
 msgstr "Keine wirklichen Änderungen durchführen"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/gpg.c:274
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: g10/g10.c:274
+#: g10/gpg.c:275
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: g10/g10.c:275
+#: g10/gpg.c:276
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: g10/g10.c:276
+#: g10/gpg.c:277
 msgid "add this keyring to the list of keyrings"
 msgstr "Als öffentlichen Schlüsselbund mitbenutzen"
 
-#: g10/g10.c:277
+#: g10/gpg.c:278
 msgid "add this secret keyring to the list"
 msgstr "Als geheimen Schlüsselbund mitbenutzen"
 
-#: g10/g10.c:278
+#: g10/gpg.c:279
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen"
 
-#: g10/g10.c:279
+#: g10/gpg.c:280
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|Schlüssel bei diesem Server nachschlagen"
 
-#: g10/g10.c:280
+#: g10/gpg.c:281
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|Terminalzeichensatz NAME benutzen"
 
-#: g10/g10.c:281
+#: g10/gpg.c:282
 msgid "read options from file"
 msgstr "Optionen aus der Datei lesen"
 
-#: g10/g10.c:285
+#: g10/gpg.c:286
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
-#: g10/g10.c:290
+#: g10/gpg.c:291
 msgid "|FILE|load extension module FILE"
 msgstr "|DATEI|Erweiterungsmodul DATEI laden"
 
-#: g10/g10.c:291
+#: g10/gpg.c:292
 msgid "emulate the mode described in RFC1991"
 msgstr "Den in RFC1991 beschriebenen Modus nachahmen"
 
-#: g10/g10.c:292
+#: g10/gpg.c:293
 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:293
+#: g10/gpg.c:294
 msgid "|N|use passphrase mode N"
 msgstr "|N|Verwenden des Mantra-Modus N"
 
-#: g10/g10.c:295
+#: g10/gpg.c:296
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|Hashverfahren NAME für Mantras benutzen"
 
-#: g10/g10.c:297
+#: g10/gpg.c:298
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|Verschlü.verfahren NAME für Mantras benutzen"
 
-#: g10/g10.c:298
+#: g10/gpg.c:299
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Verschlü.verfahren NAME benutzen"
 
-#: g10/g10.c:299
+#: g10/gpg.c:300
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Hashverfahren NAME benutzen"
 
-#: g10/g10.c:300
+#: g10/gpg.c:301
 msgid "|N|use compress algorithm N"
 msgstr "|N|Komprimierverfahren N benutzen"
 
-#: g10/g10.c:301
+#: g10/gpg.c:302
 msgid "throw keyid field of encrypted packets"
 msgstr "Entferne Empfänger-ID verschlüsselter Pakete"
 
-#: g10/g10.c:302
+#: g10/gpg.c:303
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=WERT|verwende diese \"notation\"-Daten"
 
-#: g10/g10.c:305
+#: g10/gpg.c:306
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -644,7 +640,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollständige Liste aller Kommandos und "
 "Optionen)\n"
 
-#: g10/g10.c:308
+#: g10/gpg.c:309
 msgid ""
 "@\n"
 "Examples:\n"
@@ -664,17 +660,17 @@ msgstr ""
 " --list-keys [Namen]        Schlüssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdrücke\" anzeigen\n"
 
-#: g10/g10.c:403
+#: g10/gpg.c:409
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Berichte über Bugs (Programmfehler) bitte an <gnupg-bugs@gnu.org>.\n"
 "Sinn- oder Schreibfehler in den deutschen Texten bitte an <de@li.org>.\n"
 
-#: g10/g10.c:407
+#: g10/gpg.c:413
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h für Hilfe)"
 
-#: g10/g10.c:410
+#: g10/gpg.c:416
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -684,7 +680,7 @@ msgstr ""
 "Signieren, prüfen, verschlüsseln, entschlüsseln\n"
 "Die voreingestellte Operation ist abhängig von den Eingabedaten\n"
 
-#: g10/g10.c:417
+#: g10/gpg.c:423
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -692,184 +688,189 @@ msgstr ""
 "\n"
 "Unterstützte Verfahren:\n"
 
-#: g10/g10.c:496
+#: g10/gpg.c:525
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/g10.c:549
+#: g10/gpg.c:583
 msgid "conflicting commands\n"
 msgstr "Widersprüchliche Befehle\n"
 
-#: g10/g10.c:692
+#: g10/gpg.c:638
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
+#: g10/gpg.c:734
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/g10.c:696
+#: g10/gpg.c:738
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/g10.c:703
+#: g10/gpg.c:745
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:893
+#: g10/gpg.c:937
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ist kein gültiger Zeichensatz.\n"
 
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/gpg.c:1002 g10/gpg.c:1011
 #, 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:951
+#: g10/gpg.c:1004
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/g10.c:954
+#: g10/gpg.c:1007
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/gpg.c:1027 g10/gpg.c:1039
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgewählte Verschlüsslungsverfahren ist ungültig\n"
 
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/gpg.c:1033 g10/gpg.c:1045
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/g10.c:995
+#: g10/gpg.c:1049
 msgid "the given policy URL is invalid\n"
 msgstr "Die angegebene URL für Richtlinien ist ungültig\n"
 
-#: g10/g10.c:998
+#: g10/gpg.c:1052
 #, 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:1000
+#: g10/gpg.c:1054
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed müssen größer als 0 sein\n"
 
-#: g10/g10.c:1002
+#: g10/gpg.c:1056
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed müssen größer als 1 sein\n"
 
-#: g10/g10.c:1004
+#: g10/gpg.c:1058
 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:1007
+#: g10/gpg.c:1061
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:1011
+#: g10/gpg.c:1065
 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:1096
+#: g10/gpg.c:1154
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:1102
+#: g10/gpg.c:1160
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:1109
+#: g10/gpg.c:1167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:1117
+#: g10/gpg.c:1175
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:1130
+#: g10/gpg.c:1188
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:1143
+#: g10/gpg.c:1201
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:1157
+#: g10/gpg.c:1215
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:1174
+#: g10/gpg.c:1232
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:1182
+#: g10/gpg.c:1240
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/g10.c:1190
+#: g10/gpg.c:1248
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/g10.c:1198
+#: g10/gpg.c:1256
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/g10.c:1214
+#: g10/gpg.c:1272
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key User-ID"
 
-#: g10/g10.c:1217
+#: g10/gpg.c:1275
 msgid "--delete-key user-id"
 msgstr "--delete-key User-ID"
 
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:311 g10/gpg.c:1312 g10/sign.c:449
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
 
-#: g10/g10.c:1269
+#: g10/gpg.c:1327
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schlüsselbund]"
 
-#: g10/g10.c:1335
+#: g10/gpg.c:1393
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1343
+#: g10/gpg.c:1401
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1411
+#: g10/gpg.c:1474 g10/gpg.c:1495
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ungültiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:1492
+#: g10/gpg.c:1580
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:1496
+#: g10/gpg.c:1584
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/gpg.c:1587 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht geöffnet werden\n"
 
-#: g10/g10.c:1669
+#: g10/gpg.c:1765
 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:1675
+#: g10/gpg.c:1771
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -877,12 +878,12 @@ msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und muß mit einem '=' enden\n"
 
-#: g10/g10.c:1681
+#: g10/gpg.c:1777
 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:1689
+#: g10/gpg.c:1785
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
@@ -967,49 +968,50 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1188 g10/pkclist.c:53
+#: g10/keyedit.c:1191 g10/pkclist.c:54
 msgid "             Fingerprint:"
 msgstr "           Fingerabdruck:"
 
-#: g10/pkclist.c:80
+#: g10/pkclist.c:81
 msgid "Fingerprint:"
 msgstr "Fingerabdruck:"
 
-#: g10/pkclist.c:116
+#: g10/pkclist.c:117
 msgid "No reason specified"
 msgstr "Kein Grund angegeben"
 
-#: g10/pkclist.c:118
-msgid "Key is superseded"
+#: g10/pkclist.c:119
+#, fuzzy
+msgid "Key is superseeded"
 msgstr "Schlüssel ist überholt"
 
-#: g10/pkclist.c:120
+#: g10/pkclist.c:121
 msgid "Key has been compromised"
 msgstr "Hinweis: Dieser Schlüssel ist nicht mehr sicher"
 
-#: g10/pkclist.c:122
+#: g10/pkclist.c:123
 msgid "Key is no longer used"
 msgstr "Schlüssel wird nicht mehr benutzt"
 
-#: g10/pkclist.c:124
+#: g10/pkclist.c:125
 msgid "User ID is no longer valid"
 msgstr "User-ID ist nicht mehr gültig"
 
-#: g10/pkclist.c:128
+#: g10/pkclist.c:129
 msgid "Reason for revocation: "
 msgstr "Grund für Widerruf: "
 
-#: g10/pkclist.c:145
+#: g10/pkclist.c:146
 msgid "Revocation comment: "
 msgstr "Widerruf-Bemerkung: "
 
 # valid user replies (not including 1..4)
 #. a string with valid answers
-#: g10/pkclist.c:303
+#: g10/pkclist.c:304
 msgid "sSmMqQ"
 msgstr "sSmMqQ"
 
-#: g10/pkclist.c:307
+#: g10/pkclist.c:308
 #, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -1018,7 +1020,7 @@ msgstr ""
 "Es ist kein \"Owner trust\" für %lu definiert:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1041,23 +1043,23 @@ msgstr ""
 " 4 = Ich vertraue ihm vollständig\n"
 " s = Bitte weitere Information anzeigen\n"
 
-#: g10/pkclist.c:328
+#: g10/pkclist.c:329
 msgid " m = back to the main menu\n"
 msgstr " m = Zurück zum Menü\n"
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:331
 msgid " q = quit\n"
 msgstr " q = verlassen\n"
 
-#: g10/pkclist.c:336
+#: g10/pkclist.c:337
 msgid "Your decision? "
 msgstr "Ihre Auswahl? "
 
-#: g10/pkclist.c:358
+#: g10/pkclist.c:359
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Zertifikate führen zu einem letztlich vertrauenswürdigen Schlüssel:\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 msgid ""
 "Could not find a valid trust path to the key.  Let's see whether we\n"
 "can assign some missing owner trust values.\n"
@@ -1068,7 +1070,7 @@ msgstr ""
 "ermitteln können.\n"
 "\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
@@ -1076,7 +1078,7 @@ msgstr ""
 "Kein Pfad führt zu einen unserer Schlüsseln.\n"
 "\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:438
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
@@ -1084,7 +1086,7 @@ msgstr ""
 "Keine Zertifikate mit undefinierten Vertrauen gefunden.\n"
 "\n"
 
-#: g10/pkclist.c:439
+#: g10/pkclist.c:440
 msgid ""
 "No trust values changed.\n"
 "\n"
@@ -1092,38 +1094,38 @@ msgstr ""
 "Keine \"trust\" Werte geändert.\n"
 "\n"
 
-#: g10/pkclist.c:457
+#: g10/pkclist.c:458
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "Schlüssel %08lX: Schlüssel wurde widerrufen\n"
 
-#: g10/pkclist.c:464 g10/pkclist.c:476 g10/pkclist.c:598
+#: g10/pkclist.c:465 g10/pkclist.c:477 g10/pkclist.c:599
 msgid "Use this key anyway? "
 msgstr "Diesen Schlüssel trotzdem benutzen?"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "Schlüssel %08lX: Unterschlüssel wurde widerrufen\n"
 
-#: g10/pkclist.c:512
+#: g10/pkclist.c:513
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: Schlüssel ist verfallen!\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr ""
 "%08lX: Keine Infos zur Berechnung der Vertrauenswahrscheinlichkeit "
 "vorgefunden\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: Wir haben KEIN Vertrauen zu diesem Schlüssel!\n"
 
-#: g10/pkclist.c:539
+#: g10/pkclist.c:540
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -1132,18 +1134,18 @@ msgstr ""
 "%08lX: Es ist nicht sicher, daß dieser Schlüssel wirklich dem vorgeblichen\n"
 "Besitzer gehört, aber er wird trotzdem akzeptiert\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:546
 msgid "This key probably belongs to the owner\n"
 msgstr ""
 "Dieser Schlüssel gehört höchstwahrscheinlich dem angegebenen Besitzer\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid "This key belongs to us\n"
 msgstr ""
 "Dieser Schlüssel gehört uns (da wir nämlich den geheimen Schlüssel dazu "
 "haben)\n"
 
-#: g10/pkclist.c:593
+#: g10/pkclist.c:594
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -1154,69 +1156,69 @@ msgstr ""
 "Wenn Sie *wirklich* wissen, was Sie tun, können Sie die nächste\n"
 "Frage mit ja beantworten\n"
 
-#: g10/pkclist.c:607 g10/pkclist.c:630
+#: g10/pkclist.c:608 g10/pkclist.c:631
 msgid "WARNING: Using untrusted key!\n"
 msgstr "WARNUNG: Ein Schlüssel ohne gesichertes Vertrauen wird benutzt!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:652
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "WARNUNG: Dieser Schlüssel wurde von seinem Besitzer widerrufen!\n"
 
-#: g10/pkclist.c:652
+#: g10/pkclist.c:653
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Das könnte bedeuten, daß die Signatur gefälscht ist.\n"
 
-#: g10/pkclist.c:657
+#: g10/pkclist.c:658
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "WARNUNG: Dieser Unterschlüssel wurde von seinem Besitzer widerrufen!\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:680
 msgid "Note: This key has expired!\n"
 msgstr "Hinweis: Dieser Schlüssel ist verfallen!\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:688
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "WARNUNG: Dieser Schlüssel trägt keine vertrauenswürdige Signatur!\n"
 
-#: g10/pkclist.c:689
+#: g10/pkclist.c:690
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Es gibt keinen Hinweis, daß die Signatur wirklich dem vorgeblichen "
 "Besitzer gehört.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:707
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "WARNUNG: Wir haben KEIN Vertrauen zu diesem Schlüssel!\n"
 
-#: g10/pkclist.c:707
+#: g10/pkclist.c:708
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Die Signatur ist wahrscheinlich eine FÄLSCHUNG.\n"
 
-#: g10/pkclist.c:714
+#: g10/pkclist.c:715
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "WARNUNG: Dieser Schlüssel ist nicht durch hinreichend vertrauenswürdige "
 "Signaturen zertifiziert!\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:718
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "         Es ist nicht sicher, daß die Signatur wirklich dem vorgeblichen "
 "Besitzer gehört.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:968 g10/pkclist.c:1013
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: übersprungen: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:828 g10/pkclist.c:995
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: übersprungen: öffentlicher Schlüssel bereits vorhanden\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:855
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1224,44 +1226,44 @@ msgstr ""
 "Sie gaben keine User-ID angegeben (Benutzen Sie die Option \"-r\").\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:865
 msgid "Enter the user ID: "
 msgstr "Geben Sie die User-ID ein: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:877
 msgid "No such user ID.\n"
 msgstr "Keine solche User-ID vorhanden.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:882
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "übersprungen: öffentlicher Schlüssel bereits als Standardempfänger gesetzt\n"
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:905
 msgid "Public key is disabled.\n"
 msgstr "Öffentlicher Schlüssel ist abgeschaltet.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:912
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr ""
 "übersprungen: öffentlicher Schlüssel bereits mittels --encrypt-to gesetzt\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:943
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "Unbekannter voreingestellter Empfänger '%s'\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:976
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: Fehler beim Prüfen des Schlüssels: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:981
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: übersprungen: öffentlicher Schlüssel ist abgeschaltet\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1019
 msgid "no valid addressees\n"
 msgstr "Keine gültigen Adressaten\n"
 
@@ -1273,60 +1275,60 @@ msgstr "Die Eigenbeglaubigung wird geschrieben\n"
 msgid "writing key binding signature\n"
 msgstr "Schreiben der \"key-binding\" Signatur\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
+#: g10/keygen.c:308 g10/keygen.c:419 g10/keygen.c:529
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Ungültig Schlüssellänge; %u Bit werden verwendet\n"
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:438
+#: g10/keygen.c:313 g10/keygen.c:424 g10/keygen.c:534
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Schlüssellänge auf %u Bit aufgerundet\n"
 
-#: g10/keygen.c:537
+#: g10/keygen.c:633
 msgid "Please select what kind of key you want:\n"
 msgstr "Bitte wählen Sie, welche Art von Schlüssel Sie möchten:\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:635
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA und ElGamal (voreingestellt)\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:636
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:638
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur verschlüsseln)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:639
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signieren/beglaubigen und verschlüsseln)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:641
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signieren/beglaubigen und verschlüsseln)\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:645
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
-#: g10/keygen.c:560 g10/keygen.c:568
+#: g10/keygen.c:656 g10/keygen.c:664
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr ""
 "Möchten Sie wirklich einen Unterschriften-/Verschlüsselungschlüssel "
 "erzeugen? "
 
-#: g10/keygen.c:582
+#: g10/keygen.c:678
 msgid "Invalid selection.\n"
 msgstr "Ungültige Auswahl.\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:690
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1339,19 +1341,19 @@ msgstr ""
 "              standard Schlüssellänge ist 1024 Bit\n"
 "      größte sinnvolle Schlüssellänge ist 2048 Bit\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:697
 msgid "What keysize do you want? (1024) "
 msgstr "Welche Schlüssellänge wünschen Sie? (1024) "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:702
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA erlaubt nur Schlüssellängen von 512 bis 1024\n"
 
-#: g10/keygen.c:608
+#: g10/keygen.c:704
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "zu kurz; 768 ist die kleinste mögliche Schlüssellänge.\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:706
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "zu kurz; 768 ist die kleinste mögliche Schlüssellänge.\n"
@@ -1364,12 +1366,12 @@ msgstr "zu kurz; 768 ist die kleinste m
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:621
+#: g10/keygen.c:717
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "Schüsselgröße zu hoch; %d ist der Maximalwert.\n"
 
-#: g10/keygen.c:626
+#: g10/keygen.c:722
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1377,11 +1379,11 @@ msgstr ""
 "Schlüssellängen größer als 2048 werden nicht empfohlen, da die\n"
 "Berechnungen dann WIRKLICH lange brauchen!\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:725
 msgid "Are you sure that you want this keysize? "
 msgstr "Sind Sie sicher, daß Sie diese Schlüssellänge wünschen? "
 
-#: g10/keygen.c:630
+#: g10/keygen.c:726
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1389,21 +1391,21 @@ msgstr ""
 "Gut, aber bitte denken Sie auch daran, daß Monitor und Tastatur Daten "
 "abstrahlen und diese leicht mitgelesen werden können.\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:734
 msgid "Do you really need such a large keysize? "
 msgstr "Brauchen Sie wirklich einen derartig langen Schlüssel? "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:740
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Die verlangte Schlüssellänge beträgt %u Bit\n"
 
-#: g10/keygen.c:647 g10/keygen.c:651
+#: g10/keygen.c:743 g10/keygen.c:747
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "aufgerundet auf %u Bit\n"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:795
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1419,25 +1421,25 @@ msgstr ""
 "      <n>m = Schlüssel verfällt nach n Monaten\n"
 "      <n>y = Schlüssel verfällt nach n Jahren\n"
 
-#: g10/keygen.c:714
+#: g10/keygen.c:810
 msgid "Key is valid for? (0) "
 msgstr "Der Schlüssel bleibt wie lange gültig? (0) "
 
-#: g10/keygen.c:719
+#: g10/keygen.c:815
 msgid "invalid value\n"
 msgstr "Ungültiger Wert.\n"
 
-#: g10/keygen.c:724
+#: g10/keygen.c:820
 msgid "Key does not expire at all\n"
 msgstr "Der Schlüssel verfällt nie.\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:730
+#: g10/keygen.c:826
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Der Schlüssel verfällt am %s\n"
 
-#: g10/keygen.c:733
+#: g10/keygen.c:829
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1445,11 +1447,11 @@ msgstr ""
 "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
 "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
 
-#: g10/keygen.c:738
+#: g10/keygen.c:834
 msgid "Is this correct (y/n)? "
 msgstr "Ist dies richtig? (j/n) "
 
-#: g10/keygen.c:781
+#: g10/keygen.c:877
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1465,44 +1467,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:793
+#: g10/keygen.c:889
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:893
 msgid "Invalid character in name\n"
 msgstr "Ungültiges Zeichen im Namen\n"
 
-#: g10/keygen.c:799
+#: g10/keygen.c:895
 msgid "Name may not start with a digit\n"
 msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
-#: g10/keygen.c:801
+#: g10/keygen.c:897
 msgid "Name must be at least 5 characters long\n"
 msgstr "Der Name muß min. 5 Zeichen lang sein.\n"
 
-#: g10/keygen.c:809
+#: g10/keygen.c:905
 msgid "Email address: "
 msgstr "E-Mail-Adresse: "
 
-#: g10/keygen.c:820
+#: g10/keygen.c:916
 msgid "Not a valid email address\n"
 msgstr "Diese E-Mail-Adresse ist ungültig\n"
 
-#: g10/keygen.c:828
+#: g10/keygen.c:924
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:834
+#: g10/keygen.c:930
 msgid "Invalid character in comment\n"
 msgstr "Ungültiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:956
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Sie benutzen den Zeichensatz `%s'\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:962
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1513,27 +1515,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:867
+#: g10/keygen.c:966
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Bitte keine E-Mailadressen als Namen oder Kommentar verwenden\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:971
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfBb"
 
-#: g10/keygen.c:882
+#: g10/keygen.c:981
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (B)eenden? "
 
-#: g10/keygen.c:883
+#: g10/keygen.c:982
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (F)ertig/(B)eenden? "
 
-#: g10/keygen.c:902
+#: g10/keygen.c:1001
 msgid "Please correct the error first\n"
 msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
 
-#: g10/keygen.c:940
+#: g10/keygen.c:1039
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1541,11 +1543,11 @@ msgstr ""
 "Sie benötigen ein Mantra, um den geheimen Schlüssel zu schützen.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:948
+#: g10/keyedit.c:468 g10/keygen.c:1047
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "Mantra wurde nicht richtig wiederholt; noch einmal versuchen.\n"
 
-#: g10/keygen.c:954
+#: g10/keygen.c:1053
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1558,7 +1560,7 @@ msgstr ""
 "aufrufen.\n"
 "\n"
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1074
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1569,29 +1571,29 @@ msgstr ""
 "unterstützen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n"
 "tippen, die Maus verwenden oder irgendwelche anderen Programme benutzen.\n"
 
-#: g10/keygen.c:1424
+#: g10/keygen.c:1523
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Der DSA Schlüssel wird 1024 Bit haben.\n"
 
-#: g10/keygen.c:1467
+#: g10/keygen.c:1566
 msgid "Key generation canceled.\n"
 msgstr "Schlüsselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1663
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n"
 
-#: g10/keygen.c:1565
+#: g10/keygen.c:1664
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "schreiben des geheimen Schlüssels nach '%s'\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1760
 msgid "public and secret key created and signed.\n"
 msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1765
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1600,12 +1602,12 @@ msgstr ""
 "werden kann.  Sie können aber mit dem Befehl \"--edit-key\" einen\n"
 "Zweitschlüssel für diesem Zweck erzeugen.\n"
 
-#: g10/keygen.c:1683 g10/keygen.c:1784
+#: g10/keygen.c:1782 g10/keygen.c:1883
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1826 g10/sig-check.c:300 g10/sign.c:167
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1613,7 +1615,7 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht überein)\n"
 
-#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1828 g10/sig-check.c:302 g10/sign.c:169
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1621,32 +1623,32 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht überein)\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1861
 msgid "Really create? "
 msgstr "Wirklich erzeugen? "
 
-#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:142 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: kann nicht geöffnet werden: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:164
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Fehler beim Erzeugen des Mantras: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:222 g10/encode.c:370
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: WARNUNG: Leere Datei\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:317
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Lesen von '%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:534
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s verschlüsselt für: %s\n"
@@ -1675,33 +1677,33 @@ msgstr "Schl
 msgid "WARNING: nothing exported\n"
 msgstr "WARNUNG: Nichts exportiert\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:212
 msgid "too many entries in pk cache - disabled\n"
 msgstr "zu viele Einträge im pk-Lager - abgeschaltet\n"
 
-#: g10/getkey.c:350
+#: g10/getkey.c:351
 msgid "too many entries in unk cache - disabled\n"
 msgstr "zu viele Einträge im unk-Lager - abgeschaltet\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
+#: g10/getkey.c:1311 g10/getkey.c:1350
 msgid "RSA key cannot be used in this version\n"
 msgstr "RSA-Schlüssel können in dieser Version nicht verwendet werden\n"
 
-#: g10/getkey.c:1310 g10/getkey.c:1349
+#: g10/getkey.c:1313 g10/getkey.c:1352
 msgid "No key for user ID\n"
 msgstr "Kein Schlüssel für User-ID\n"
 
-#: g10/getkey.c:1388 g10/getkey.c:1428
+#: g10/getkey.c:1391 g10/getkey.c:1431
 msgid "No user ID for key\n"
 msgstr "Keine User-ID für Schlüssel\n"
 
-#: g10/getkey.c:1642 g10/getkey.c:1698
+#: g10/getkey.c:1645 g10/getkey.c:1701
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr ""
 "der Zweitschlüssel %08lX wird anstelle des Hauptschlüssels %08lX verwendet\n"
 
-#: g10/getkey.c:2017
+#: g10/getkey.c:2020
 msgid "[User id not found]"
 msgstr "[User-ID nicht gefunden]"
 
@@ -1710,7 +1712,7 @@ msgstr "[User-ID nicht gefunden]"
 msgid "skipping block of type %d\n"
 msgstr "überspringe den Block vom Typ %d\n"
 
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:188 g10/trustdb.c:1748 g10/trustdb.c:1789
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu Schlüssel bislang bearbeitet\n"
@@ -1798,7 +1800,7 @@ msgstr "Schl
 msgid "no default public keyring\n"
 msgstr "Kein voreingestellter öffentlicher Schlüsselbund\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:350 g10/sign.c:669
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
@@ -2060,7 +2062,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "Wirklich unterschreiben? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1870 g10/keyedit.c:1932 g10/sign.c:136
+#: g10/keyedit.c:373 g10/keyedit.c:1873 g10/keyedit.c:1935 g10/sign.c:191
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
@@ -2415,104 +2417,104 @@ msgstr "Schl
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
-#: g10/keyedit.c:1080 g10/keyedit.c:1106
+#: g10/keyedit.c:1083 g10/keyedit.c:1109
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1089
+#: g10/keyedit.c:1092
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1093
+#: g10/keyedit.c:1096
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schlüssel ist abgeschaltet"
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1125
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "Schlüssel %08lX: Unterschlüssel wurde widerrufen\n"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1128
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "neue Schlüsselwiderrufe: %lu\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1130
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1368
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1372
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ungültige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1376
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1382
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1396
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1397
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1400
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:1466
+#: g10/keyedit.c:1469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schlüsseln.\n"
 
-#: g10/keyedit.c:1472
+#: g10/keyedit.c:1475
 msgid "Please select at most one secondary key.\n"
 msgstr "Bitte wählen Sie höchstens einen Zweitschlüssel aus.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1479
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Ändern des Verfallsdatums des Zweitschlüssels.\n"
 
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1481
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändern des Verfallsdatums des Hauptschlüssels.\n"
 
-#: g10/keyedit.c:1520
+#: g10/keyedit.c:1523
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Sie können das Verfallsdatum eines v3-Schlüssels nicht ändern\n"
 
-#: g10/keyedit.c:1536
+#: g10/keyedit.c:1539
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen Schlüsselbund\n"
 
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1600
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1646
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Kein Zweitschlüssel mit Index %d\n"
 
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1744
 msgid "user ID: \""
 msgstr "User-ID: \""
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1747
 #, c-format
 msgid ""
 "\"\n"
@@ -2521,168 +2523,178 @@ msgstr ""
 "\"\n"
 "unterschrieben mit Ihrem Schlüssel %08lX um %s\n"
 
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:1751
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Ein Widerrufszertifikat für diese Unterschrift erzeugen (j/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1775
 msgid "You have signed these user IDs:\n"
 msgstr "Sie haben folgende User-IDs beglaubigt:\n"
 
-#: g10/keyedit.c:1786 g10/keyedit.c:1821
+#: g10/keyedit.c:1789 g10/keyedit.c:1824
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   beglaubigt durch %08lX um %s\n"
 
-#: g10/keyedit.c:1791
+#: g10/keyedit.c:1794
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   widerrufen durch %08lX um %s\n"
 
-#: g10/keyedit.c:1811
+#: g10/keyedit.c:1814
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:1829
+#: g10/keyedit.c:1832
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1861
 msgid "no secret key\n"
 msgstr "Kein geheimer Schlüssel\n"
 
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "Ungültige ASCII-Hülle"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "revkey"
+
 #. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:401 g10/mainproc.c:754
 #, c-format
 msgid " [expires: %s]"
 msgstr " [verfällt: %s]"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:212
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "Öffentlicher Schlüssel ist %08lX\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:247
 msgid "public key encrypted data: good DEK\n"
 msgstr "Mit öffentlichem Schüssel verschlüsselte Daten: Korrekte DEK\n"
 
-#: g10/mainproc.c:281
+#: g10/mainproc.c:280
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "verschlüsselt mit %u-Bit %s Schlüssel, ID %08lX, erzeugt %s\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "verschlüsselt mit %s Schlüssel, ID %08lX\n"
 
-#: g10/mainproc.c:297
+#: g10/mainproc.c:296
 msgid "no secret key for decryption available\n"
 msgstr "kein geheimer Schlüssel zur Entschlüsselung vorhanden\n"
 
-#: g10/mainproc.c:306
+#: g10/mainproc.c:305
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Entschlüsselung mit öffentlichem Schlüssel fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:343
+#: g10/mainproc.c:342
 msgid "decryption okay\n"
 msgstr "Enschlüsselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:348
+#: g10/mainproc.c:347
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Warnung: Verschlüsselte Botschaft ist manipuliert worden!\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:352
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Enschlüsselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:372
+#: g10/mainproc.c:371
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 "Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:374
+#: g10/mainproc.c:373
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Ursprünglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:538
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "Einzelner Widerruf - verwenden Sie \"gpg --import\" um ihn anzuwenden\n"
 
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:625 g10/mainproc.c:634
 msgid "WARNING: invalid notation data found\n"
 msgstr "WARNUNG: Ungültige \"Notation\"-Daten gefunden\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:637
 msgid "Notation: "
 msgstr "\"Notation\": "
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:644
 msgid "Policy: "
 msgstr "Richtlinie: "
 
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1074
 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:1068
+#: g10/mainproc.c:1080
 #, 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:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1106 g10/mainproc.c:1117
 msgid "BAD signature from \""
 msgstr "FALSCHE Unterschrift von \""
 
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1107 g10/mainproc.c:1118
 msgid "Good signature from \""
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1109
 msgid "                aka \""
 msgstr "                    alias \""
 
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1165
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht geprüft werden: %s\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1230
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Unterschrift der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1282
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1287
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ungültiges root-Paket in proc_tree() entdeckt\n"
 
-#: g10/misc.c:94
+#: g10/misc.c:83
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "core-dump-Dateierzeugung kann nicht abgeschaltet werden: %s\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:86
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
 
-#: g10/misc.c:205
+#: g10/misc.c:312
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Experimentiermethoden sollten nicht benutzt werden!\n"
 
-#: g10/misc.c:219
+#: g10/misc.c:326
 msgid ""
 "RSA keys are deprecated; please consider creating a new key and use this key "
 "in the future\n"
@@ -2690,18 +2702,18 @@ msgstr ""
 "RSA Schlüssel sind nicht erwünscht; bitte denken Sie darüber nach, einen\n"
 "neuen Schlüssel zu erzeugen und diesen in Zukunft zu benutzen\n"
 
-#: g10/misc.c:241
+#: g10/misc.c:348
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "Diese Verschlüsselungsmethode taugt nicht mehr viel; verwenden Sie eine "
 "stärker standardisierte Methode!\n"
 
-#: g10/parse-packet.c:117
+#: g10/parse-packet.c:115
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
 
-#: g10/parse-packet.c:965
+#: g10/parse-packet.c:963
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
@@ -2738,52 +2750,52 @@ msgstr "Geben Sie das Mantra ein: "
 msgid "Repeat passphrase: "
 msgstr "Geben Sie das Mantra nochmal ein: "
 
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "Daten wurden nicht gespeichert; verwenden Sie dafür die Option \"--output\"\n"
 
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
 msgid "Detached signature.\n"
 msgstr "Abgetrennte Beglaubigungen.\n"
 
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
 msgid "Please enter name of data file: "
 msgstr "Bitte geben Sie den Namen der Datendatei ein: "
 
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
 msgid "reading stdin ...\n"
 msgstr "lese stdin ...\n"
 
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kann signierte Datei '%s' nicht öffnen.\n"
 
-#: g10/pubkey-enc.c:79
+#: g10/pubkey-enc.c:138
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "Ungenannter Empfänger: Versuch mit geheimen Schlüssel %08lX ...\n"
 
-#: g10/pubkey-enc.c:85
+#: g10/pubkey-enc.c:144
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "Alles klar, wir sind der ungenannte Empfänger.\n"
 
-#: g10/pubkey-enc.c:137
+#: g10/pubkey-enc.c:200
 msgid "old encoding of the DEK is not supported\n"
 msgstr "alte Kodierung des DEK wird nicht unterstützt\n"
 
-#: g10/pubkey-enc.c:156
+#: g10/pubkey-enc.c:219
 #, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "Verschüsselungsverfahren %d ist unbekannt oder abgeschaltet\n"
 
-#: g10/pubkey-enc.c:195
+#: g10/pubkey-enc.c:258
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "Hinweis: Verfahren %d ist kein bevorzugtes Verschlüsselungsverfahren\n"
 
-#: g10/pubkey-enc.c:201
+#: g10/pubkey-enc.c:264
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "Hinweis: geheimer Schlüssel %08lX verfällt am %s\n"
@@ -2827,75 +2839,69 @@ msgstr "Senden an `%s' erfolgreich (status=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "Senden an `%s' erfolglos (status=%u)\n"
 
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:90
 msgid "secret key parts are not available\n"
 msgstr "Teile des geheimen Schlüssels sind nicht vorhanden\n"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:96
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "Schutzverfahren %d wird nicht unterstützt\n"
 
-#: g10/seckey-cert.c:175
+#: g10/seckey-cert.c:239
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Ungültiges Mantra; versuchen Sie's doch noch einmal ...\n"
 
-#: g10/seckey-cert.c:231
+#: g10/seckey-cert.c:302
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "WARNUNG: Unsicherer Schlüssel entdeckt -\n"
 "         bitte Mantra nochmals wechseln.\n"
 
-#: g10/sig-check.c:202
-msgid "assuming bad MDC due to an unknown critical bit\n"
-msgstr ""
-"Vermutlich ist das Siegel (MDC) BESCHÄDIGT (wegen unbekanntem \"critical "
-"bit\")\n"
-
-#: g10/sig-check.c:300
+#: g10/sig-check.c:282
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "Dieser durch PGP erzeugte ElGamal-Schlüssel ist für Signaturen NICHT sicher "
 "genug!\n"
 
-#: g10/sig-check.c:308
+#: g10/sig-check.c:290
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr ""
 "Öffentlicher Schlüssel ist um %lu Sekunde jünger als die Unterschrift\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:291
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr ""
 "Öffentlicher Schlüssel ist um %lu Sekunden jünger als die Unterschrift\n"
 
-#: g10/sig-check.c:327
+#: g10/sig-check.c:309
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "Hinweis: Schlüssel der Signatur ist verfallen am %s.\n"
 
-#: g10/sig-check.c:396
+#: g10/sig-check.c:378
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "Vermutlich eine FALSCHE Unterschrift, wegen unbekanntem \"critical bit\"\n"
 
-#: g10/sign.c:140
+#: g10/sign.c:195
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s Unterschrift von: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:606
+#: g10/sign.c:345 g10/sign.c:664
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s kann nicht erzeugt werden: %s\n"
 
-#: g10/sign.c:388
+#: g10/sign.c:444
 msgid "signing:"
 msgstr "unterschreibe:"
 
-#: g10/sign.c:431
+#: g10/sign.c:487
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
@@ -2934,7 +2940,8 @@ msgstr "%s: kann nicht zugegriffen werden: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: Verzeichnis existiert nicht!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1363 g10/tdbio.c:444
+#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1407
+#: g10/ringedit.c:1878 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: kann nicht erzeugt werden: %s\n"
@@ -3124,204 +3131,204 @@ msgstr "Schl
 msgid "enumerate secret keys failed: %s\n"
 msgstr "enum_secret_keys fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:921
+#: g10/trustdb.c:925
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "Schlüssel %08lX.%lu: Korrekte Unterschlüssel-Anbindung\n"
 
-#: g10/trustdb.c:927 g10/trustdb.c:962
+#: g10/trustdb.c:931 g10/trustdb.c:966
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "Schlüssel %08lX.%lu: Ungültige Unterschlüssel-Anbindung: %s\n"
 
-#: g10/trustdb.c:939
+#: g10/trustdb.c:943
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "Schlüssel %08lX.%lu: Gültiger Schlüsselwiderruf\n"
 
-#: g10/trustdb.c:945
+#: g10/trustdb.c:949
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "Schlüssel %08lX.%lu: Ungültiger Schlüsselwiderruf: %s\n"
 
-#: g10/trustdb.c:956
+#: g10/trustdb.c:960
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "Schlüssel %08lX.%lu: Gültiger Unterschlüsselwiderruf\n"
 
-#: g10/trustdb.c:1067
+#: g10/trustdb.c:1071
 msgid "Good self-signature"
 msgstr "Korrekte Eigenbeglaubigung"
 
-#: g10/trustdb.c:1077
+#: g10/trustdb.c:1081
 msgid "Invalid self-signature"
 msgstr "Ungültige Eigenbeglaubigung"
 
-#: g10/trustdb.c:1104
+#: g10/trustdb.c:1108
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Gültiger User-ID-Widerruf ignoriert, da eine neuere Eigenbeglaubigung "
 "vorliegt"
 
-#: g10/trustdb.c:1110
+#: g10/trustdb.c:1114
 msgid "Valid user ID revocation"
 msgstr "Gültiger User-ID-Widerruf"
 
-#: g10/trustdb.c:1115
+#: g10/trustdb.c:1119
 msgid "Invalid user ID revocation"
 msgstr "Ungültiger User-ID-Widerruf"
 
-#: g10/trustdb.c:1157
+#: g10/trustdb.c:1161
 msgid "Valid certificate revocation"
 msgstr "Gültiger Zerifikat-Widerruf"
 
-#: g10/trustdb.c:1158
+#: g10/trustdb.c:1162
 msgid "Good certificate"
 msgstr "Korrektes Zertifikat"
 
-#: g10/trustdb.c:1186
+#: g10/trustdb.c:1190
 msgid "Invalid certificate revocation"
 msgstr "Ungültiger Zertifikatswiderruf"
 
-#: g10/trustdb.c:1187
+#: g10/trustdb.c:1191
 msgid "Invalid certificate"
 msgstr "Ungültiges Zertifikat"
 
-#: g10/trustdb.c:1204 g10/trustdb.c:1208
+#: g10/trustdb.c:1208 g10/trustdb.c:1212
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "Signatursatz %lu[%d] zeigt auf falschen Satz.\n"
 
-#: g10/trustdb.c:1267
+#: g10/trustdb.c:1271
 msgid "duplicated certificate - deleted"
 msgstr "Doppelte Zertifikate - entfernt"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1592
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1718
+#: g10/trustdb.c:1726
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: Einfügen fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1723
+#: g10/trustdb.c:1731
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: Einfügen fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1729
+#: g10/trustdb.c:1737
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: eingefügt\n"
 
-#: g10/trustdb.c:1734
+#: g10/trustdb.c:1742
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "Fehler beim Lesen des Verz.Satzes: %s\n"
 
-#: g10/trustdb.c:1742 g10/trustdb.c:1805
+#: g10/trustdb.c:1750 g10/trustdb.c:1813
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu Schlüssel bearbeitet\n"
 
-#: g10/trustdb.c:1744 g10/trustdb.c:1811
+#: g10/trustdb.c:1752 g10/trustdb.c:1819
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu Schlüssel mit Fehlern\n"
 
-#: g10/trustdb.c:1746
+#: g10/trustdb.c:1754
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu Schlüssel eingefügt\n"
 
-#: g10/trustdb.c:1749
+#: g10/trustdb.c:1757
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enumerate Schlüsselblock fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1797
+#: g10/trustdb.c:1805
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: Dir-Satz ohne Schlüssel - übergangen\n"
 
-#: g10/trustdb.c:1807
+#: g10/trustdb.c:1815
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu wegen neuer Schlüssel\n"
 
-#: g10/trustdb.c:1809
+#: g10/trustdb.c:1817
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu Schlüssel übersprungen\n"
 
-#: g10/trustdb.c:1813
+#: g10/trustdb.c:1821
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu Schlüssel geändert\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2166
 msgid "Ooops, no keys\n"
 msgstr "Huch, keine Schlüssel\n"
 
-#: g10/trustdb.c:2162
+#: g10/trustdb.c:2170
 msgid "Ooops, no user IDs\n"
 msgstr "Huch, keine User-IDs\n"
 
-#: g10/trustdb.c:2320
+#: g10/trustdb.c:2328
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: Suche nach Dir-Satz fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2337
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "Schlüssel %08lX: 'trust record' einfügen fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:2333
+#: g10/trustdb.c:2341
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "Schlüssel %08lX.%lu: in \"trustdb\" eingefügt\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2349
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "Schlüssel %08lX.%lu: wurde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht überein)\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2364
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "Schlüssel %08lX.%lu: verfallen am %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2372
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "Schlüssel %08lX.%lu: Vertrauensprüfung fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2523
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "Benutzer '%s' nicht gefunden: %s\n"
 
-#: g10/trustdb.c:2517
+#: g10/trustdb.c:2525
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "Problem, '%s' in der Trust-DB zu finden: %s\n"
 
-#: g10/trustdb.c:2520
+#: g10/trustdb.c:2528
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "User '%s' ist nicht in der 'Trust'-Datenbank - wird eingefügt\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2531
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "konnte '%s' nicht in die 'Trust'-Datenbank hineintun: %s\n"
 
-#: g10/trustdb.c:2709 g10/trustdb.c:2739
+#: g10/trustdb.c:2717 g10/trustdb.c:2747
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "WARNUNG: Lange 'Pref'-Records können noch nicht benutzt werden\n"
 
@@ -3340,46 +3347,40 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "Eingabezeile %u ist zu lang oder es fehlt ein LF\n"
 
-#: g10/ringedit.c:302
+#: g10/ringedit.c:324
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: Schlüsselbund kann nicht erzeugt werden: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1368
+#: g10/ringedit.c:341 g10/ringedit.c:1412 g10/ringedit.c:1883
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: Schlüsselbund erstellt\n"
 
-#: g10/ringedit.c:1545
+#: g10/ringedit.c:1589 g10/ringedit.c:2060
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "Warnung: Zwei Dateien mit vertraulichem Inhalt vorhanden.\n"
 
-#: g10/ringedit.c:1546
+#: g10/ringedit.c:1590 g10/ringedit.c:2061
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ist der Unveränderte\n"
 
-#: g10/ringedit.c:1547
+#: g10/ringedit.c:1591 g10/ringedit.c:2062
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s ist der Neue\n"
 
-#: g10/ringedit.c:1548
+#: g10/ringedit.c:1592 g10/ringedit.c:2063
 msgid "Please fix this possible security flaw\n"
 msgstr "Bitte diesen potentiellen Sicherheitsmangel beseitigen\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
-msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr ""
-"Schlüssel ist nicht als unsicher gekennzeichnet - er ist nur mit einem\n"
-"echten Zufallsgenerator verwendbar\n"
-
-#: g10/skclist.c:113
+#: g10/skclist.c:96
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "übersprungen '%s': %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:102
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3436,27 +3437,27 @@ msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 "Sie müssen GnuPG noch einmal starten, damit es die neue Optionsdatei liest\n"
 
-#: g10/encr-data.c:66
-#, c-format
-msgid "%s encrypted data\n"
-msgstr "%s verschlüsselte Daten\n"
-
-#: g10/encr-data.c:68
+#: g10/encr-data.c:64
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Mit unbekanntem Verfahren verschlüsselt %d\n"
 
-#: g10/encr-data.c:90
+#: g10/encr-data.c:69
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s verschlüsselte Daten\n"
+
+#: g10/encr-data.c:99
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "Warnung: Botschaft wurde mit einem unsicheren Schlüssel verschlüsselt.\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:61
 msgid "weak key created - retrying\n"
 msgstr "Unsicherer Schlüssel erzeugt - neuer Versuch\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:66
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
@@ -3732,13 +3733,14 @@ msgstr ""
 "verwendet."
 
 #: g10/helptext.c:229
+#, fuzzy
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
 "  \"Key has been compromised\"\n"
 "      Use this if you have a reason to believe that unauthorized persons\n"
 "      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
+"  \"Key is superseeded\"\n"
 "      Use this if you have replaced this key with a newer one.\n"
 "  \"Key is no longer used\"\n"
 "      Use this if you have retired this key.\n"
@@ -3778,6 +3780,19 @@ msgstr "Keine Hilfe vorhanden."
 msgid "No help available for `%s'"
 msgstr "Keine Hilfe für '%s' vorhanden."
 
+#~ msgid "not processed"
+#~ msgstr "nicht bearbeitet"
+
+#~ msgid "assuming bad MDC due to an unknown critical bit\n"
+#~ msgstr ""
+#~ "Vermutlich ist das Siegel (MDC) BESCHÄDIGT (wegen unbekanntem \"critical "
+#~ "bit\")\n"
+
+#~ msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
+#~ msgstr ""
+#~ "Schlüssel ist nicht als unsicher gekennzeichnet - er ist nur mit einem\n"
+#~ "echten Zufallsgenerator verwendbar\n"
+
 #~ msgid "   (%d) ElGamal in a v3 packet\n"
 #~ msgstr "   (%d) ElGamal in einem v3-Paket\n"
 
diff --git a/po/eo.po b/po/eo.po
index db2b5ebe6..ee481d205 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.1e\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-07-30 20:02+0200\n"
 "PO-Revision-Date: 2000-06-02 21:04+01:00\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -13,305 +13,289 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-3\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:79
-msgid "Warning: using insecure memory!\n"
-msgstr "Averto: uzas malsekuran memoron!\n"
-
-#: util/secmem.c:289
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "operacio ne eblas sen sekura memoro kun komenca valoro\n"
-
-#: util/secmem.c:290
-msgid "(you may have used the wrong program for this task)\n"
-msgstr "(eble vi uzis la maløustan programon por æi tiu tasko)\n"
-
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:278 util/miscutil.c:307
 msgid "yes"
 msgstr "jes"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:279 util/miscutil.c:310
 msgid "yY"
 msgstr "jJ"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:280 util/miscutil.c:308
 msgid "no"
 msgstr "ne"
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:281 util/miscutil.c:311
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:580 util/miscutil.c:309
 msgid "quit"
 msgstr "fini"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:312
 msgid "qQ"
 msgstr "fF"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "øenerala eraro"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "nekonata paketo-speco"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "nekonata versio"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "nekonata publikþlosila metodo"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "nekonata kompendi-metodo"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "malbona publika þlosilo"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "malbona sekreta þlosilo"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "malbona subskribo"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "eraro en kontrolsumo"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "malbona pasfrazo"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "publika þlosilo ne trovita"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "nekonata æifrad-metodo"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "ne povas malfermi la þlosilaron"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "nevalida paketo"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "nevalida kiraso"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "uzantidentigilo ne ekzistas"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "sekreta þlosilo ne havebla"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "maløusta sekreta þlosilo uzata"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "ne realigita"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "malbona þlosilo"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "legeraro æe dosiero"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "skriberaro æe dosiero"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "nekonata densig-metodo"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "eraro æe malfermo de dosiero"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "eraro æe kreo de dosiero"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "nevalida pasfrazo"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "nerealigita publikþlosila metodo"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "nerealigita æifrad-metodo"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "nekonata klaso de subskribo"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "eraro en fido-datenaro"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "malbona MPI"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "trafis rimedolimon"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "nevalida þlosilaro"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "malbona atestilo"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "misformita uzantidentigilo"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "eraro æe fermo de dosiero"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "eraro æe renomado de dosiero"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "eraro æe forviþo de dosiero"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "neatendita dateno"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "malkongruo de tempostampoj"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "neuzebla publikþlosila metodo"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "dosiero ekzistas"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "malforta þlosilo"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "nevalida argumento"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "malbona URI"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "nerealigita URI"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "reteraro"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "ne æifrita"
 
-#: util/errors.c:103
-msgid "not processed"
-msgstr "ne traktita"
-
-#: util/logger.c:224
+#: util/logger.c:225
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... æi tio estas cimo (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:231
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vi trovis cimon ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:321 g10/import.c:127 g10/keygen.c:1348
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:325
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "ne povas stat-i '%s': %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:330
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' ne estas normala dosiero - ignorita\n"
 
-#: cipher/random.c:325
+#: cipher/random.c:335
 msgid "note: random_seed file is empty\n"
 msgstr "noto: dosiero random_seed estas malplena\n"
 
-#: cipher/random.c:331
+#: cipher/random.c:341
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr "averto: nevalida grando de la dosiero random_seen - ne uzita\n"
 
-#: cipher/random.c:339
+#: cipher/random.c:349
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "ne povas legi '%s': %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:387
 msgid "note: random_seed file not updated\n"
 msgstr "noto: dosiero random_seed ne aktualigita\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:407
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:414
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "ne povas skribi '%s': %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:417
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:428
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr "tro da stokastaj bitoj petitaj; la limo estas %d\n"
 
-#: cipher/random.c:647
+#: cipher/random.c:657
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVERTO: uzas malsekuran stokastilon!!\n"
 
-#: cipher/random.c:648
+#: cipher/random.c:663
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -325,7 +309,7 @@ msgstr ""
 "NE UZU DATENOJN KREITAJN DE ÆI TIU PROGRAMO!!\n"
 "\n"
 
-#: cipher/rndlinux.c:141
+#: cipher/rndlinux.c:125
 #, c-format
 msgid ""
 "\n"
@@ -336,7 +320,19 @@ 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:197
+#: gcrypt/secmem.c:77
+msgid "Warning: using insecure memory!\n"
+msgstr "Averto: uzas malsekuran memoron!\n"
+
+#: gcrypt/secmem.c:287
+msgid "operation is not possible without initialized secure memory\n"
+msgstr "operacio ne eblas sen sekura memoro kun komenca valoro\n"
+
+#: gcrypt/secmem.c:288
+msgid "(you may have used the wrong program for this task)\n"
+msgstr "(eble vi uzis la maløustan programon por æi tiu tasko)\n"
+
+#: g10/gpg.c:197
 msgid ""
 "@Commands:\n"
 " "
@@ -344,139 +340,139 @@ msgstr ""
 "@Komandoj:\n"
 " "
 
-#: g10/g10.c:199
+#: g10/gpg.c:199
 msgid "|[file]|make a signature"
 msgstr "|[dosiero]|fari subskribon"
 
-#: g10/g10.c:200
+#: g10/gpg.c:200
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/g10.c:201
+#: g10/gpg.c:201
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/g10.c:202
+#: g10/gpg.c:202
 msgid "encrypt data"
 msgstr "æifri datenojn"
 
-#: g10/g10.c:203
+#: g10/gpg.c:203
 msgid "encryption only with symmetric cipher"
 msgstr "æifri nur kun simetria æifro"
 
-#: g10/g10.c:204
+#: g10/gpg.c:204
 msgid "store only"
 msgstr "nur skribi"
 
-#: g10/g10.c:205
+#: g10/gpg.c:205
 msgid "decrypt data (default)"
 msgstr "malæifri datenojn (implicita elekto)"
 
-#: g10/g10.c:206
+#: g10/gpg.c:206
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/g10.c:208
+#: g10/gpg.c:208
 msgid "list keys"
 msgstr "listigi þlosilojn"
 
-#: g10/g10.c:210
+#: g10/gpg.c:210
 msgid "list keys and signatures"
 msgstr "listigi þlosilojn kaj subskribojn"
 
-#: g10/g10.c:211
+#: g10/gpg.c:211
 msgid "check key signatures"
 msgstr "kontroli þlosilsubskribojn"
 
-#: g10/g10.c:212
+#: g10/gpg.c:212
 msgid "list keys and fingerprints"
 msgstr "listigi þlosilojn kaj fingroþpurojn"
 
-#: g10/g10.c:213
+#: g10/gpg.c:213
 msgid "list secret keys"
 msgstr "listigi sekretajn þlosilojn"
 
-#: g10/g10.c:214
+#: g10/gpg.c:214
 msgid "generate a new key pair"
 msgstr "krei novan þlosilparon"
 
-#: g10/g10.c:215
+#: g10/gpg.c:215
 msgid "remove key from the public keyring"
 msgstr "forigi þlosilon de la publika þlosilaro"
 
-#: g10/g10.c:217
+#: g10/gpg.c:217
 msgid "remove key from the secret keyring"
 msgstr "forigi þlosilon de la sekreta þlosilaro"
 
-#: g10/g10.c:218
+#: g10/gpg.c:218
 msgid "sign a key"
 msgstr "subskribi þlosilon"
 
-#: g10/g10.c:219
+#: g10/gpg.c:219
 msgid "sign a key locally"
 msgstr "subskribi þlosilon loke"
 
-#: g10/g10.c:220
+#: g10/gpg.c:220
 msgid "sign or edit a key"
 msgstr "subskribi aý redakti þlosilon"
 
-#: g10/g10.c:221
+#: g10/gpg.c:221
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/g10.c:222
+#: g10/gpg.c:222
 msgid "export keys"
 msgstr "eksporti þlosilojn"
 
-#: g10/g10.c:223
+#: g10/gpg.c:223
 msgid "export keys to a key server"
 msgstr "eksporti þlosilojn al þlosilservilo"
 
-#: g10/g10.c:224
+#: g10/gpg.c:224
 msgid "import keys from a key server"
 msgstr "importi þlosilojn de þlosilservilo"
 
-#: g10/g10.c:228
+#: g10/gpg.c:228
 msgid "import/merge keys"
 msgstr "importi/kunfandi þlosilojn"
 
-#: g10/g10.c:230
+#: g10/gpg.c:230
 msgid "list only the sequence of packets"
 msgstr "listigi nur la sinsekvon de paketoj"
 
-#: g10/g10.c:232
+#: g10/gpg.c:232
 msgid "export the ownertrust values"
 msgstr "eksporti la posedantofido-valorojn"
 
-#: g10/g10.c:234
+#: g10/gpg.c:234
 msgid "import ownertrust values"
 msgstr "importi posedantofido-valorojn"
 
-#: g10/g10.c:236
+#: g10/gpg.c:236
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/g10.c:238
+#: g10/gpg.c:238
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMOJ]|kontroli la fido-datenaron"
 
-#: g10/g10.c:239
+#: g10/gpg.c:239
 msgid "fix a corrupted trust database"
 msgstr "ripari fuþitan fido-datenaron"
 
-#: g10/g10.c:240
+#: g10/gpg.c:240
 msgid "De-Armor a file or stdin"
 msgstr "elkirasigi dosieron aý la normalan enigon"
 
-#: g10/g10.c:242
+#: g10/gpg.c:242
 msgid "En-Armor a file or stdin"
 msgstr "enkirasigi dosieron aý la normalan enigon"
 
-#: g10/g10.c:244
+#: g10/gpg.c:244
 msgid "|algo [files]|print message digests"
 msgstr "|metodo [dosieroj]|presi mesaøo-kompendiojn"
 
-#: g10/g10.c:248
+#: g10/gpg.c:249
 msgid ""
 "@\n"
 "Options:\n"
@@ -486,148 +482,148 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: g10/g10.c:250
+#: g10/gpg.c:251
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/g10.c:252
+#: g10/gpg.c:253
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMO|æifri por NOMO"
 
-#: g10/g10.c:255
+#: g10/gpg.c:256
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: g10/g10.c:257
+#: g10/gpg.c:258
 msgid "use the default key as default recipient"
 msgstr "uzi la implicitan þlosilon kiel implicitan ricevonton"
 
-#: g10/g10.c:261
+#: g10/gpg.c:262
 msgid "use this user-id to sign or decrypt"
 msgstr "uzi æi tiun uzantidentigilon por subskribi aý malæifri"
 
-#: g10/g10.c:262
+#: g10/gpg.c:263
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/g10.c:264
+#: g10/gpg.c:265
 msgid "use canonical text mode"
 msgstr "uzi tekstan reøimon"
 
-#: g10/g10.c:265
+#: g10/gpg.c:266
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: g10/g10.c:266
+#: g10/gpg.c:267
 msgid "verbose"
 msgstr "detala eligo"
 
-#: g10/g10.c:267
+#: g10/gpg.c:268
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: g10/g10.c:268
+#: g10/gpg.c:269
 msgid "don't use the terminal at all"
 msgstr "tute ne uzi la terminalon"
 
-#: g10/g10.c:269
+#: g10/gpg.c:270
 msgid "force v3 signatures"
 msgstr "devigi v3-subskribojn"
 
-#: g10/g10.c:270
+#: g10/gpg.c:271
 msgid "always use a MDC for encryption"
 msgstr "æiam uzi sigelon (MDC) por æifrado"
 
-#: g10/g10.c:271
+#: g10/gpg.c:272
 msgid "do not make any changes"
 msgstr "fari neniajn þanøojn"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/gpg.c:274
 msgid "batch mode: never ask"
 msgstr "neinteraga reøimo: neniam demandi"
 
-#: g10/g10.c:274
+#: g10/gpg.c:275
 msgid "assume yes on most questions"
 msgstr "supozi \"jes\" æe la plej multaj demandoj"
 
-#: g10/g10.c:275
+#: g10/gpg.c:276
 msgid "assume no on most questions"
 msgstr "supozi \"ne\" æe la plej multaj demandoj"
 
-#: g10/g10.c:276
+#: g10/gpg.c:277
 msgid "add this keyring to the list of keyrings"
 msgstr "aldoni æi tiun þlosilaron al la listo de þlosilaroj"
 
-#: g10/g10.c:277
+#: g10/gpg.c:278
 msgid "add this secret keyring to the list"
 msgstr "aldoni æi tiun sekretan þlosilaron al la listo"
 
-#: g10/g10.c:278
+#: g10/gpg.c:279
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan þlosilon"
 
-#: g10/g10.c:279
+#: g10/gpg.c:280
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVILO|uzi æi tiun þlosilservilon por seræi þlosilojn"
 
-#: g10/g10.c:280
+#: g10/gpg.c:281
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
 
-#: g10/g10.c:281
+#: g10/gpg.c:282
 msgid "read options from file"
 msgstr "legi la opciojn el dosiero"
 
-#: g10/g10.c:285
+#: g10/gpg.c:286
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
-#: g10/g10.c:290
+#: g10/gpg.c:291
 msgid "|FILE|load extension module FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: g10/g10.c:291
+#: g10/gpg.c:292
 msgid "emulate the mode described in RFC1991"
 msgstr "imiti la reøimon priskribitan en RFC 1991"
 
-#: g10/g10.c:292
+#: g10/gpg.c:293
 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:293
+#: g10/gpg.c:294
 msgid "|N|use passphrase mode N"
 msgstr "|N|uzi pasfraz-reøimon N"
 
-#: g10/g10.c:295
+#: g10/gpg.c:296
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOMO|uzi kompendi-metodon NOMO por pasfrazoj"
 
-#: g10/g10.c:297
+#: g10/gpg.c:298
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOMO|uzi æifrad-metodon NOMO por pasfrazoj"
 
-#: g10/g10.c:298
+#: g10/gpg.c:299
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMO|uzi æifrad-metodon NOMO"
 
-#: g10/g10.c:299
+#: g10/gpg.c:300
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMO|uzi kompendi-metodon NOMO"
 
-#: g10/g10.c:300
+#: g10/gpg.c:301
 msgid "|N|use compress algorithm N"
 msgstr "|N|uzi densig-metodon N"
 
-#: g10/g10.c:301
+#: g10/gpg.c:302
 msgid "throw keyid field of encrypted packets"
 msgstr "forigi la þlosilidentigilon de æifritaj paketoj"
 
-#: g10/g10.c:302
+#: g10/gpg.c:303
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOMO=VALORO|uzi æi tiun notacian datenon"
 
-#: g10/g10.c:305
+#: g10/gpg.c:306
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -635,7 +631,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpaøon por kompleta listo de æiuj komandoj kaj opcioj)\n"
 
-#: g10/g10.c:308
+#: g10/gpg.c:309
 msgid ""
 "@\n"
 "Examples:\n"
@@ -655,15 +651,15 @@ msgstr ""
 " --list-keys [nomoj]        montri þlosilojn\n"
 " --fingerprint [nomoj]      montri fingroþpurojn\n"
 
-#: g10/g10.c:403
+#: g10/gpg.c:409
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Bonvolu raporti cimojn al <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:407
+#: g10/gpg.c:413
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/g10.c:410
+#: g10/gpg.c:416
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -673,7 +669,7 @@ msgstr ""
 "subskribi, kontroli, æifri aý malæifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/g10.c:417
+#: g10/gpg.c:423
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -681,182 +677,187 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/g10.c:496
+#: g10/gpg.c:525
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/g10.c:549
+#: g10/gpg.c:583
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/g10.c:692
+#: g10/gpg.c:638
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
+#: g10/gpg.c:734
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/g10.c:696
+#: g10/gpg.c:738
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: g10/g10.c:703
+#: g10/gpg.c:745
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/g10.c:893
+#: g10/gpg.c:937
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/gpg.c:1002 g10/gpg.c:1011
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/g10.c:951
+#: g10/gpg.c:1004
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/g10.c:954
+#: g10/gpg.c:1007
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/gpg.c:1027 g10/gpg.c:1039
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita æifrad-metodo ne validas\n"
 
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/gpg.c:1033 g10/gpg.c:1045
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:995
+#: g10/gpg.c:1049
 msgid "the given policy URL is invalid\n"
 msgstr "la donita gvidlinia URL ne validas\n"
 
-#: g10/g10.c:998
+#: g10/gpg.c:1052
 #, 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:1000
+#: g10/gpg.c:1054
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/g10.c:1002
+#: g10/gpg.c:1056
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/g10.c:1004
+#: g10/gpg.c:1058
 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:1007
+#: g10/gpg.c:1061
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-reøimo (0) estas forte malrekomendata\n"
 
-#: g10/g10.c:1011
+#: g10/gpg.c:1065
 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:1096
+#: g10/gpg.c:1154
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/g10.c:1102
+#: g10/gpg.c:1160
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/g10.c:1109
+#: g10/gpg.c:1167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/g10.c:1117
+#: g10/gpg.c:1175
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/g10.c:1130
+#: g10/gpg.c:1188
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/g10.c:1143
+#: g10/gpg.c:1201
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:1157
+#: g10/gpg.c:1215
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/g10.c:1174
+#: g10/gpg.c:1232
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/g10.c:1182
+#: g10/gpg.c:1240
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/g10.c:1190
+#: g10/gpg.c:1248
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/g10.c:1198
+#: g10/gpg.c:1256
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/g10.c:1214
+#: g10/gpg.c:1272
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key uzantidentigilo"
 
-#: g10/g10.c:1217
+#: g10/gpg.c:1275
 msgid "--delete-key user-id"
 msgstr "--delete-key uzantidentigilo"
 
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:311 g10/gpg.c:1312 g10/sign.c:449
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/g10.c:1269
+#: g10/gpg.c:1327
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [uzantidentigilo] [þlosilaro]"
 
-#: g10/g10.c:1335
+#: g10/gpg.c:1393
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:1343
+#: g10/gpg.c:1401
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:1411
+#: g10/gpg.c:1474 g10/gpg.c:1495
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/g10.c:1492
+#: g10/gpg.c:1580
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/g10.c:1496
+#: g10/gpg.c:1584
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesaøon ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/gpg.c:1587 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/g10.c:1669
+#: g10/gpg.c:1765
 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:1675
+#: g10/gpg.c:1771
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -864,11 +865,11 @@ msgstr ""
 "notacia nomo devas enhavi nur literojn, ciferojn, punktojn aý substrekojn "
 "kaj fini per '='\n"
 
-#: g10/g10.c:1681
+#: g10/gpg.c:1777
 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:1689
+#: g10/gpg.c:1785
 msgid "a notation value must not use any control characters\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
@@ -953,49 +954,50 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1188 g10/pkclist.c:53
+#: g10/keyedit.c:1191 g10/pkclist.c:54
 msgid "             Fingerprint:"
 msgstr "             Fingrospuro:"
 
-#: g10/pkclist.c:80
+#: g10/pkclist.c:81
 msgid "Fingerprint:"
 msgstr "Fingrospuro:"
 
-#: g10/pkclist.c:116
+#: g10/pkclist.c:117
 msgid "No reason specified"
 msgstr "Nenia kialo specifita"
 
-#: g10/pkclist.c:118
-msgid "Key is superseded"
+#: g10/pkclist.c:119
+#, fuzzy
+msgid "Key is superseeded"
 msgstr "Þlosilo estas anstataýigita."
 
-#: g10/pkclist.c:120
+#: g10/pkclist.c:121
 msgid "Key has been compromised"
 msgstr "Þlosilo estas kompromitita"
 
-#: g10/pkclist.c:122
+#: g10/pkclist.c:123
 msgid "Key is no longer used"
 msgstr "Þlosilo estas ne plu uzata"
 
-#: g10/pkclist.c:124
+#: g10/pkclist.c:125
 #, fuzzy
 msgid "User ID is no longer valid"
 msgstr "Uzantidentigilo ne plu validas"
 
-#: g10/pkclist.c:128
+#: g10/pkclist.c:129
 msgid "Reason for revocation: "
 msgstr "Kialo por revoko: "
 
-#: g10/pkclist.c:145
+#: g10/pkclist.c:146
 msgid "Revocation comment: "
 msgstr "Komento pri revoko: "
 
 #. a string with valid answers
-#: g10/pkclist.c:303
+#: g10/pkclist.c:304
 msgid "sSmMqQ"
 msgstr "iImMfF"
 
-#: g10/pkclist.c:307
+#: g10/pkclist.c:308
 #, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -1004,7 +1006,7 @@ msgstr ""
 "Nenia fidovaloro atribuita al %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1026,23 +1028,23 @@ msgstr ""
 " 4 = Mi plene fidas\n"
 " i = Montru pli da informoj\n"
 
-#: g10/pkclist.c:328
+#: g10/pkclist.c:329
 msgid " m = back to the main menu\n"
 msgstr " m = reen al la æefmenuo\n"
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:331
 msgid " q = quit\n"
 msgstr " f = fini\n"
 
-#: g10/pkclist.c:336
+#: g10/pkclist.c:337
 msgid "Your decision? "
 msgstr "Via decido? "
 
-#: g10/pkclist.c:358
+#: g10/pkclist.c:359
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Atestiloj, kiuj kondukas fine al fidata þlosilo:\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 msgid ""
 "Could not find a valid trust path to the key.  Let's see whether we\n"
 "can assign some missing owner trust values.\n"
@@ -1052,7 +1054,7 @@ msgstr ""
 "atribui iujn mankantajn posedantofido-valorojn.\n"
 "\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
@@ -1060,7 +1062,7 @@ msgstr ""
 "Nenia vojo trovita, kiu kondukas al unu el niaj þlosiloj.\n"
 "\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:438
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
@@ -1068,7 +1070,7 @@ msgstr ""
 "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
 "\n"
 
-#: g10/pkclist.c:439
+#: g10/pkclist.c:440
 msgid ""
 "No trust values changed.\n"
 "\n"
@@ -1076,36 +1078,36 @@ msgstr ""
 "Neniuj fidovaloroj þanøitaj.\n"
 "\n"
 
-#: g10/pkclist.c:457
+#: g10/pkclist.c:458
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "þlosilo %08lX: þlosilo estas revokita!\n"
 
-#: g10/pkclist.c:464 g10/pkclist.c:476 g10/pkclist.c:598
+#: g10/pkclist.c:465 g10/pkclist.c:477 g10/pkclist.c:599
 msgid "Use this key anyway? "
 msgstr "Æu tamen uzi æi tiun þlosilon? "
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "þlosilo %08lX: subþlosilo estas revokita!\n"
 
-#: g10/pkclist.c:512
+#: g10/pkclist.c:513
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: þlosilo eksvalidiøis\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr "%08lX: mankas informoj por kalkuli fidovaloron\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: Ni NE fidas æi tiun þlosilon\n"
 
-#: g10/pkclist.c:539
+#: g10/pkclist.c:540
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -1114,15 +1116,15 @@ msgstr ""
 "%08lX: Ne estas certe, ke æi tiu þlosilo vere apartenas al la posedanto,\n"
 "sed øi tamen estas akceptita\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:546
 msgid "This key probably belongs to the owner\n"
 msgstr "Æi tiu þlosilo verþajne apartenas al la posedanto\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid "This key belongs to us\n"
 msgstr "Æi tiu þlosilo apartenas al ni\n"
 
-#: g10/pkclist.c:593
+#: g10/pkclist.c:594
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -1134,65 +1136,65 @@ msgstr ""
 "la sekva demando per \"jes\"\n"
 "\n"
 
-#: g10/pkclist.c:607 g10/pkclist.c:630
+#: g10/pkclist.c:608 g10/pkclist.c:631
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVERTO: Uzas nefidatan þlosilon!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:652
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVERTO: Æi tiu þlosilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:652
+#: g10/pkclist.c:653
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Tio povas signifi, ke la subskribo estas falsa.\n"
 
-#: g10/pkclist.c:657
+#: g10/pkclist.c:658
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVERTO: Æi tiu subþlosilo estas revokita de sia posedanto!\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:680
 msgid "Note: This key has expired!\n"
 msgstr "Noto: Æi tiu þlosilo eksvalidiøis!\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:688
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVERTO: Æi tiu þlosilo ne estas atestita kun fidata subskribo!\n"
 
-#: g10/pkclist.c:689
+#: g10/pkclist.c:690
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Estas nenia indiko, ke la subskribo apartenas al la posedanto.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:707
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVERTO: Ni NE fidas æi tiun þlosilon!\n"
 
-#: g10/pkclist.c:707
+#: g10/pkclist.c:708
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         La subskribo verþajne estas FALSA.\n"
 
-#: g10/pkclist.c:714
+#: g10/pkclist.c:715
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVERTO: Æi tiu þlosilo ne estas atestita kun sufiæe fidataj subskriboj!\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:718
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Ne estas certe, ke la subskribo apartenas al la posedanto.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:968 g10/pkclist.c:1013
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorita: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:828 g10/pkclist.c:995
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorita: publika þlosilo jam æeestas\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:855
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1200,42 +1202,42 @@ msgstr ""
 "Vi ne specifis uzantidentigilon. (Vi povas uzi \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:865
 msgid "Enter the user ID: "
 msgstr "Donu la uzantidentigilon: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:877
 msgid "No such user ID.\n"
 msgstr "Uzantidentigilo ne ekzistas.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:882
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorita: publika þlosilo jam difinita kiel implicita ricevonto\n"
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:905
 msgid "Public key is disabled.\n"
 msgstr "Publika þlosilo estas malþaltita.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:912
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "ignorita: publika þlosilo jam difinita per --encrypt-to\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:943
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:976
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: eraro dum kontrolo de þlosilo: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:981
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorita: publika þlosilo estas malþaltita\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1019
 msgid "no valid addressees\n"
 msgstr "mankas validaj adresitoj\n"
 
@@ -1247,58 +1249,58 @@ msgstr "skribas mem-subskribon\n"
 msgid "writing key binding signature\n"
 msgstr "skribas þlosilbindan subskribon\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
+#: g10/keygen.c:308 g10/keygen.c:419 g10/keygen.c:529
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "þlosilgrando nevalida; uzas %u bitojn\n"
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:438
+#: g10/keygen.c:313 g10/keygen.c:424 g10/keygen.c:534
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "þlosilgrando rondigita øis %u bitoj\n"
 
-#: g10/keygen.c:537
+#: g10/keygen.c:633
 msgid "Please select what kind of key you want:\n"
 msgstr "Bonvolu elekti, kian þlosilon vi deziras:\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:635
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:636
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur subskribi)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:638
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur æifri)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:639
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (subskribi kaj æifri)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:641
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (subskribi kaj æifri)\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:645
 msgid "Your selection? "
 msgstr "Via elekto? "
 
-#: g10/keygen.c:560 g10/keygen.c:568
+#: g10/keygen.c:656 g10/keygen.c:664
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Æu vi vere volas krei subskriban kaj æifran þlosilon? "
 
-#: g10/keygen.c:582
+#: g10/keygen.c:678
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:690
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1311,19 +1313,19 @@ msgstr ""
 "               implicita þlosilgrando estas 1024 bitoj\n"
 " plej granda rekomendata þlosilgrando estas 2048 bitoj\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:697
 msgid "What keysize do you want? (1024) "
 msgstr "Kiun þlosilgrandon vi deziras? (1024) "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:702
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permesas þlosilgrandon nur inter 512 kaj 1024\n"
 
-#: g10/keygen.c:608
+#: g10/keygen.c:704
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "þlosilgrando tro malgranda; 768 estas plej eta permesata valoro.\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:706
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "þlosilgrando tro malgranda; 768 estas plej eta permesata valoro.\n"
@@ -1336,12 +1338,12 @@ msgstr "
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:621
+#: g10/keygen.c:717
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "þlosilgrando tro granda; %d estas plej granda permesata valoro.\n"
 
-#: g10/keygen.c:626
+#: g10/keygen.c:722
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1349,11 +1351,11 @@ msgstr ""
 "Þlosilgrandoj pli grandaj ol 2048 ne estas rekomendataj,\n"
 "æar la komputado daýras TRE longe!\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:725
 msgid "Are you sure that you want this keysize? "
 msgstr "Æu vi estas certa, ke vi deziras æi tiun þlosilgrandon? "
 
-#: g10/keygen.c:630
+#: g10/keygen.c:726
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1361,21 +1363,21 @@ msgstr ""
 "Bone, sed pripensu, ke la elradiado de viaj ekrano kaj klavaro estas tre "
 "facile kaptebla!\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:734
 msgid "Do you really need such a large keysize? "
 msgstr "Æu vi vere bezonas tiom grandan þlosilgrandon? "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:740
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Petita þlosilgrando estas %u bitoj\n"
 
-#: g10/keygen.c:647 g10/keygen.c:651
+#: g10/keygen.c:743 g10/keygen.c:747
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rondigita øis %u bitoj\n"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:795
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1391,25 +1393,25 @@ msgstr ""
 "      <n>m = þlosilo eksvalidiøos post n monatoj\n"
 "      <n>y = þlosilo eksvalidiøos post n jaroj\n"
 
-#: g10/keygen.c:714
+#: g10/keygen.c:810
 msgid "Key is valid for? (0) "
 msgstr "Þlosilo validu ...? (0) "
 
-#: g10/keygen.c:719
+#: g10/keygen.c:815
 msgid "invalid value\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keygen.c:724
+#: g10/keygen.c:820
 msgid "Key does not expire at all\n"
 msgstr "Þlosilo neniam eksvalidiøos\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:730
+#: g10/keygen.c:826
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Þlosilo eksvalidiøos je %s\n"
 
-#: g10/keygen.c:733
+#: g10/keygen.c:829
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1417,11 +1419,11 @@ msgstr ""
 "Via sistemo ne povas montri datojn post 2038.\n"
 "Tamen, øi estos øuste traktata øis 2106.\n"
 
-#: g10/keygen.c:738
+#: g10/keygen.c:834
 msgid "Is this correct (y/n)? "
 msgstr "Æu tio estas øusta (j/n)? "
 
-#: g10/keygen.c:781
+#: g10/keygen.c:877
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1436,44 +1438,44 @@ msgstr ""
 "    \"Heinrich Heine (la poeto) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:793
+#: g10/keygen.c:889
 msgid "Real name: "
 msgstr "Vera nomo: "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:893
 msgid "Invalid character in name\n"
 msgstr "Nevalida signo en nomo\n"
 
-#: g10/keygen.c:799
+#: g10/keygen.c:895
 msgid "Name may not start with a digit\n"
 msgstr "Nomo ne povas komenciøi per cifero\n"
 
-#: g10/keygen.c:801
+#: g10/keygen.c:897
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nomo devas havi almenaý 5 signojn\n"
 
-#: g10/keygen.c:809
+#: g10/keygen.c:905
 msgid "Email address: "
 msgstr "Retadreso: "
 
-#: g10/keygen.c:820
+#: g10/keygen.c:916
 msgid "Not a valid email address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/keygen.c:828
+#: g10/keygen.c:924
 msgid "Comment: "
 msgstr "Komento: "
 
-#: g10/keygen.c:834
+#: g10/keygen.c:930
 msgid "Invalid character in comment\n"
 msgstr "Nevalida signo en komento\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:956
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vi uzas la signaron '%s'.\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:962
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1484,27 +1486,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:867
+#: g10/keygen.c:966
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Bonvolu ne meti la retadreson en la veran nomon aý la komenton\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:971
 msgid "NnCcEeOoQq"
 msgstr "NnKkAaBbFf"
 
-#: g10/keygen.c:882
+#: g10/keygen.c:981
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Þanøu (N)omon, (K)omenton, (A)adreson, aý (F)ini? "
 
-#: g10/keygen.c:883
+#: g10/keygen.c:982
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Þanøu (N)omon, (K)omenton, (A)adreson, aý (B)one/(F)ini? "
 
-#: g10/keygen.c:902
+#: g10/keygen.c:1001
 msgid "Please correct the error first\n"
 msgstr "Bonvolu korekti la eraron unue\n"
 
-#: g10/keygen.c:940
+#: g10/keygen.c:1039
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1512,11 +1514,11 @@ msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan þlosilon.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:948
+#: g10/keyedit.c:468 g10/keygen.c:1047
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "la pasfrazo ne estis øuste ripetita; provu denove.\n"
 
-#: g10/keygen.c:954
+#: g10/keygen.c:1053
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1528,7 +1530,7 @@ msgstr ""
 "uzante æi tiun programon kun la opcio \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1074
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1540,29 +1542,29 @@ msgstr ""
 "kreado de la primoj; tio donas al la stokastilo pli bonan þancon\n"
 "akiri sufiæe da entropio.\n"
 
-#: g10/keygen.c:1424
+#: g10/keygen.c:1523
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA-þlosilparo havos 1024 bitojn.\n"
 
-#: g10/keygen.c:1467
+#: g10/keygen.c:1566
 msgid "Key generation canceled.\n"
 msgstr "Kreado de þlosiloj nuligita.\n"
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1663
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skribas publikan þlosilon al '%s'\n"
 
-#: g10/keygen.c:1565
+#: g10/keygen.c:1664
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skribas sekretan þlosilon al '%s'\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1760
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta þlosiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1765
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1570,12 +1572,12 @@ msgstr ""
 "Notu, ke æi tiu þlosilo ne estas uzebla por æifrado. Vi eble volos\n"
 "uzi la komandon \"--edit-key\" por krei flankan þlosilon por tiu celo.\n"
 
-#: g10/keygen.c:1683 g10/keygen.c:1784
+#: g10/keygen.c:1782 g10/keygen.c:1883
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de þlosiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1826 g10/sig-check.c:300 g10/sign.c:167
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1583,7 +1585,7 @@ msgstr ""
 "þlosilo estis kreita %lu sekundon en la estonteco (tempotordo aý "
 "horloøeraro)\n"
 
-#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1828 g10/sig-check.c:302 g10/sign.c:169
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1591,32 +1593,32 @@ msgstr ""
 "þlosilo estis kreita %lu sekundojn en la estonteco (tempotordo aý "
 "horloøeraro)\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1861
 msgid "Really create? "
 msgstr "Æu vere krei? "
 
-#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:142 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: ne povas malfermi: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:164
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:222 g10/encode.c:370
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVERTO: malplena dosiero\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:317
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "legas el '%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:534
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s-æifrita por: %s\n"
@@ -1645,32 +1647,32 @@ msgstr "
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:212
 msgid "too many entries in pk cache - disabled\n"
 msgstr "tro da registroj en pk-staplo - malþaltas\n"
 
-#: g10/getkey.c:350
+#: g10/getkey.c:351
 msgid "too many entries in unk cache - disabled\n"
 msgstr "tro da registroj en unk-staplo - malþaltas\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
+#: g10/getkey.c:1311 g10/getkey.c:1350
 msgid "RSA key cannot be used in this version\n"
 msgstr "RSA-þlosilo ne estas uzebla kun æi tiu versio\n"
 
-#: g10/getkey.c:1310 g10/getkey.c:1349
+#: g10/getkey.c:1313 g10/getkey.c:1352
 msgid "No key for user ID\n"
 msgstr "Mankas þlosilo por uzantidentigilo\n"
 
-#: g10/getkey.c:1388 g10/getkey.c:1428
+#: g10/getkey.c:1391 g10/getkey.c:1431
 msgid "No user ID for key\n"
 msgstr "Mankas uzantidentigilo por þlosilo\n"
 
-#: g10/getkey.c:1642 g10/getkey.c:1698
+#: g10/getkey.c:1645 g10/getkey.c:1701
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "uzas flankan þlosilon %08lX anstataý la æefa þlosilo %08lX\n"
 
-#: g10/getkey.c:2017
+#: g10/getkey.c:2020
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: uzanto ne trovita\n"
@@ -1680,7 +1682,7 @@ msgstr "%s: uzanto ne trovita\n"
 msgid "skipping block of type %d\n"
 msgstr "ignoras blokon de speco %d\n"
 
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:188 g10/trustdb.c:1748 g10/trustdb.c:1789
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu þlosiloj jam traktitaj\n"
@@ -1768,7 +1770,7 @@ msgstr "
 msgid "no default public keyring\n"
 msgstr "mankas implicita publika þlosilaro\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:350 g10/sign.c:669
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skribas al '%s'\n"
@@ -2025,7 +2027,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "Æu vere subskribi? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1870 g10/keyedit.c:1932 g10/sign.c:136
+#: g10/keyedit.c:373 g10/keyedit.c:1873 g10/keyedit.c:1935 g10/sign.c:191
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
@@ -2380,104 +2382,104 @@ msgstr "
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
-#: g10/keyedit.c:1080 g10/keyedit.c:1106
+#: g10/keyedit.c:1083 g10/keyedit.c:1109
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1089
+#: g10/keyedit.c:1092
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1093
+#: g10/keyedit.c:1096
 msgid "This key has been disabled"
 msgstr "Æi tiu þlosilo estas malþaltita"
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1125
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "þlosilo %08lX: subþlosilo estas revokita!\n"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1128
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "         novaj þlosilrevokoj: %lu\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1130
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1368
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Æu forviþi æi tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1372
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Æu forviþi æi tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1376
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Æu forviþi æi tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1382
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Æu vere forviþi æi tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1396
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Forviþis %d subskribon.\n"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1397
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Forviþis %d subskribojn.\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1400
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forviþita.\n"
 
-#: g10/keyedit.c:1466
+#: g10/keyedit.c:1469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bonvolu malelekti la sekretajn þlosilojn.\n"
 
-#: g10/keyedit.c:1472
+#: g10/keyedit.c:1475
 msgid "Please select at most one secondary key.\n"
 msgstr "Bonvolu elekti maksimume unu flankan þlosilon.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1479
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Þanøas la daton de eksvalidiøo de flanka þlosilo.\n"
 
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1481
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Þanøas la daton de eksvalidiøo de la æefa þlosilo.\n"
 
-#: g10/keyedit.c:1520
+#: g10/keyedit.c:1523
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vi ne povas þanøi la daton de eksvalidiøo de v3-þlosilo\n"
 
-#: g10/keyedit.c:1536
+#: g10/keyedit.c:1539
 msgid "No corresponding signature in secret ring\n"
 msgstr "Mankas responda subskribo en sekreta þlosilaro\n"
 
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1600
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1646
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Mankas flanka þlosilo kun indekso %d\n"
 
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1744
 msgid "user ID: \""
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1747
 #, c-format
 msgid ""
 "\"\n"
@@ -2486,163 +2488,173 @@ msgstr ""
 "\"\n"
 "subskribita per via þlosilo %08lX je %s\n"
 
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:1751
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Æu krei revokatestilon por æi tiu subskribo? (j/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1775
 msgid "You have signed these user IDs:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:1786 g10/keyedit.c:1821
+#: g10/keyedit.c:1789 g10/keyedit.c:1824
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   subskribita per %08lX je %s\n"
 
-#: g10/keyedit.c:1791
+#: g10/keyedit.c:1794
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:1811
+#: g10/keyedit.c:1814
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:1829
+#: g10/keyedit.c:1832
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Æu vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1861
 msgid "no secret key\n"
 msgstr "mankas sekreta þlosilo\n"
 
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "nevalida kiraso"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "rev"
+
 #. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:401 g10/mainproc.c:754
 #, c-format
 msgid " [expires: %s]"
 msgstr " [eksvalidiøos: %s]"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:212
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "publika þlosilo estas %08lX\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:247
 msgid "public key encrypted data: good DEK\n"
 msgstr "publikþlosile æifritaj datenoj: bona DEK\n"
 
-#: g10/mainproc.c:281
+#: g10/mainproc.c:280
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "æifrita per %u-bita %s-þlosilo, %08lX, kreita je %s\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "æifrita per %s-þlosilo, %08lX\n"
 
-#: g10/mainproc.c:297
+#: g10/mainproc.c:296
 msgid "no secret key for decryption available\n"
 msgstr "mankas sekreta þlosilo por malæifrado\n"
 
-#: g10/mainproc.c:306
+#: g10/mainproc.c:305
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "publikþlosila malæifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:343
+#: g10/mainproc.c:342
 msgid "decryption okay\n"
 msgstr "malæifrado sukcesis\n"
 
-#: g10/mainproc.c:348
+#: g10/mainproc.c:347
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTO: æifrita mesaøo estis manipulita!\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:352
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "malæifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:372
+#: g10/mainproc.c:371
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:374
+#: g10/mainproc.c:373
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originala dosiernomo='%.*s'\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:538
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "memstara revoko - uzu \"gpg --import\" por apliki øin\n"
 
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:625 g10/mainproc.c:634
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVERTO: nevalida notacia dateno trovita\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:637
 msgid "Notation: "
 msgstr "Notacio: "
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:644
 msgid "Policy: "
 msgstr "Gvidlinio: "
 
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1074
 msgid "signature verification suppressed\n"
 msgstr "kontrolo de subskribo estas malþaltita\n"
 
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1080
 #, 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:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1106 g10/mainproc.c:1117
 msgid "BAD signature from \""
 msgstr "MALBONA subskribo de \""
 
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1107 g10/mainproc.c:1118
 msgid "Good signature from \""
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1109
 msgid "                aka \""
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1165
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1230
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1282
 msgid "old style (PGP 2.x) signature\n"
 msgstr "malnovstila subskribo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1287
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nevalida radikpaketo trovita en proc_tree()\n"
 
-#: g10/misc.c:94
+#: g10/misc.c:83
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ne povas malþalti kreadon de core-dosieroj: %s\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:86
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/misc.c:205
+#: g10/misc.c:312
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Eksperimentaj metodoj ne estu uzataj!\n"
 
-#: g10/misc.c:219
+#: g10/misc.c:326
 msgid ""
 "RSA keys are deprecated; please consider creating a new key and use this key "
 "in the future\n"
@@ -2650,16 +2662,16 @@ msgstr ""
 "RSA-þlosiloj estas malrekomendataj; bonvolu pripensi krei novan þlosilon kaj "
 "uzi tiun en la estonteco\n"
 
-#: g10/misc.c:241
+#: g10/misc.c:348
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr "æi tiu æifrad-metodo estas malrekomendata; bonvolu uzi pli normalan!\n"
 
-#: g10/parse-packet.c:117
+#: g10/parse-packet.c:115
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "ne povas trakti publikþlosilan metodon %d\n"
 
-#: g10/parse-packet.c:965
+#: g10/parse-packet.c:963
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas þaltitan \"critical bit\"\n"
@@ -2696,51 +2708,51 @@ msgstr "Donu pasfrazon: "
 msgid "Repeat passphrase: "
 msgstr "Ripetu pasfrazon: "
 
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "datenoj ne savitaj; uzu la opcion \"--output\" por savi ilin\n"
 
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
 msgid "Detached signature.\n"
 msgstr "Aparta subskribo.\n"
 
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
 msgid "Please enter name of data file: "
 msgstr "Bonvolu doni la nomon de la dosiero: "
 
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
 msgid "reading stdin ...\n"
 msgstr "legas la normalan enigon ...\n"
 
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
 
-#: g10/pubkey-enc.c:79
+#: g10/pubkey-enc.c:138
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "nenomita ricevonto; provas per sekreta þlosilo %08lX ...\n"
 
-#: g10/pubkey-enc.c:85
+#: g10/pubkey-enc.c:144
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "bone; ni estas la nenomita ricevonto.\n"
 
-#: g10/pubkey-enc.c:137
+#: g10/pubkey-enc.c:200
 msgid "old encoding of the DEK is not supported\n"
 msgstr "malnova kodado de DEK ne estas realigita\n"
 
-#: g10/pubkey-enc.c:156
+#: g10/pubkey-enc.c:219
 #, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "æifrad-metodo %d estas nekonata aý malþaltita\n"
 
-#: g10/pubkey-enc.c:195
+#: g10/pubkey-enc.c:258
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "NOTO: æifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/pubkey-enc.c:201
+#: g10/pubkey-enc.c:264
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTO: sekreta þlosilo %08lX eksvalidiøis je %s\n"
@@ -2784,69 +2796,65 @@ msgstr "sukceso dum sendo al '%s' (statuso=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "malsukceso dum sendo al '%s': statuso=%u\n"
 
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:90
 msgid "secret key parts are not available\n"
 msgstr "sekretaj þlosilpartoj ne estas disponataj\n"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:96
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "protekto-metodo %d ne estas realigita\n"
 
-#: g10/seckey-cert.c:175
+#: g10/seckey-cert.c:239
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Nevalida pasfrazo; bonvolu provi denove ...\n"
 
-#: g10/seckey-cert.c:231
+#: g10/seckey-cert.c:302
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVERTO: Malforta þlosilo trovita - bonvolu þanøi la pasfrazon denove.\n"
 
-#: g10/sig-check.c:202
-msgid "assuming bad MDC due to an unknown critical bit\n"
-msgstr "supozas malbonan sigelon (MDC) pro nekonata \"critical bit\"\n"
-
-#: g10/sig-check.c:300
+#: g10/sig-check.c:282
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "æi tio estas PGP-kreita ElGamal-þlosilo, kiu NE estas sekura por "
 "subskribado!\n"
 
-#: g10/sig-check.c:308
+#: g10/sig-check.c:290
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "la publika þlosilo estas %lu sekundon pli nova ol la subskribo\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:291
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "la publika þlosilo estas %lu sekundojn pli nova ol la subskribo\n"
 
-#: g10/sig-check.c:327
+#: g10/sig-check.c:309
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTO: subskribo-þlosilo eksvalidiøis je %s\n"
 
-#: g10/sig-check.c:396
+#: g10/sig-check.c:378
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "supozas malbonan subskribon pro nekonata \"critical bit\"\n"
 
-#: g10/sign.c:140
+#: g10/sign.c:195
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:606
+#: g10/sign.c:345 g10/sign.c:664
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/sign.c:388
+#: g10/sign.c:444
 msgid "signing:"
 msgstr "subskribas:"
 
-#: g10/sign.c:431
+#: g10/sign.c:487
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
@@ -2885,7 +2893,8 @@ msgstr "%s: ne povas aliri: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: dosierujo ne ekzistas!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1363 g10/tdbio.c:444
+#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1407
+#: g10/ringedit.c:1878 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: ne povas krei: %s\n"
@@ -3070,201 +3079,201 @@ msgstr "
 msgid "enumerate secret keys failed: %s\n"
 msgstr "listigo de sekretaj þlosiloj malsukcesis: %s\n"
 
-#: g10/trustdb.c:921
+#: g10/trustdb.c:925
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "þlosilo %08lX.%lu: Bona subþlosila bindado\n"
 
-#: g10/trustdb.c:927 g10/trustdb.c:962
+#: g10/trustdb.c:931 g10/trustdb.c:966
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "þlosilo %08lX.%lu: Nevalida subþlosila bindado: %s\n"
 
-#: g10/trustdb.c:939
+#: g10/trustdb.c:943
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "þlosilo %08lX.%lu: Valida þlosilrevoko\n"
 
-#: g10/trustdb.c:945
+#: g10/trustdb.c:949
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "þlosilo %08lX.%lu: Nevalida þlosilrevoko: %s\n"
 
-#: g10/trustdb.c:956
+#: g10/trustdb.c:960
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "þlosilo %08lX.%lu: Valida subþlosilrevoko\n"
 
-#: g10/trustdb.c:1067
+#: g10/trustdb.c:1071
 msgid "Good self-signature"
 msgstr "Bona mem-subskribo"
 
-#: g10/trustdb.c:1077
+#: g10/trustdb.c:1081
 msgid "Invalid self-signature"
 msgstr "Nevalida mem-subskribo"
 
-#: g10/trustdb.c:1104
+#: g10/trustdb.c:1108
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr "Valida uzantidentigil-revoko ignorita pro pli nova mem-subskribo"
 
-#: g10/trustdb.c:1110
+#: g10/trustdb.c:1114
 msgid "Valid user ID revocation"
 msgstr "Valida uzantidentigil-revoko"
 
-#: g10/trustdb.c:1115
+#: g10/trustdb.c:1119
 msgid "Invalid user ID revocation"
 msgstr "Nevalida uzantidentigil-revoko"
 
-#: g10/trustdb.c:1157
+#: g10/trustdb.c:1161
 msgid "Valid certificate revocation"
 msgstr "Valida atestilrevoko"
 
-#: g10/trustdb.c:1158
+#: g10/trustdb.c:1162
 msgid "Good certificate"
 msgstr "Bona atestilo"
 
-#: g10/trustdb.c:1186
+#: g10/trustdb.c:1190
 msgid "Invalid certificate revocation"
 msgstr "Nevalida atestilrevoko"
 
-#: g10/trustdb.c:1187
+#: g10/trustdb.c:1191
 msgid "Invalid certificate"
 msgstr "Nevalida atestilo"
 
-#: g10/trustdb.c:1204 g10/trustdb.c:1208
+#: g10/trustdb.c:1208 g10/trustdb.c:1212
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "subskribo-registro %lu[%d] montras al maløusta registro.\n"
 
-#: g10/trustdb.c:1267
+#: g10/trustdb.c:1271
 msgid "duplicated certificate - deleted"
 msgstr "ripetita atestilo - forviþita"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1592
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir malsukcesis: %s\n"
 
-#: g10/trustdb.c:1718
+#: g10/trustdb.c:1726
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: enþovo malsukcesis: %s\n"
 
-#: g10/trustdb.c:1723
+#: g10/trustdb.c:1731
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: enþovo malsukcesis: %s\n"
 
-#: g10/trustdb.c:1729
+#: g10/trustdb.c:1737
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: enþovita\n"
 
-#: g10/trustdb.c:1734
+#: g10/trustdb.c:1742
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "eraro dum legado de dosieruja registro: %s\n"
 
-#: g10/trustdb.c:1742 g10/trustdb.c:1805
+#: g10/trustdb.c:1750 g10/trustdb.c:1813
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu þlosiloj traktitaj\n"
 
-#: g10/trustdb.c:1744 g10/trustdb.c:1811
+#: g10/trustdb.c:1752 g10/trustdb.c:1819
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu þlosiloj kun eraroj\n"
 
-#: g10/trustdb.c:1746
+#: g10/trustdb.c:1754
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu þlosiloj enþovitaj\n"
 
-#: g10/trustdb.c:1749
+#: g10/trustdb.c:1757
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "listigo de þlosilblokoj malsukcesis: %s\n"
 
-#: g10/trustdb.c:1797
+#: g10/trustdb.c:1805
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: dosieruja registro sen þlosilo - ignorita\n"
 
-#: g10/trustdb.c:1807
+#: g10/trustdb.c:1815
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu pro novaj publikaj þlosiloj\n"
 
-#: g10/trustdb.c:1809
+#: g10/trustdb.c:1817
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu þlosiloj ignoritaj\n"
 
-#: g10/trustdb.c:1813
+#: g10/trustdb.c:1821
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu þlosiloj aktualigitaj\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2166
 msgid "Ooops, no keys\n"
 msgstr "Hu, mankas þlosiloj\n"
 
-#: g10/trustdb.c:2162
+#: g10/trustdb.c:2170
 msgid "Ooops, no user IDs\n"
 msgstr "Hu, mankas uzantidentigiloj\n"
 
-#: g10/trustdb.c:2320
+#: g10/trustdb.c:2328
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: seræo pri dosieruja registro malsukcesis: %s\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2337
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "þlosilo %08lX: enþovo de fidoregistro malsukcesis: %s\n"
 
-#: g10/trustdb.c:2333
+#: g10/trustdb.c:2341
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "þlosilo %08lX.%lu: enþovis en fido-datenaron\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2349
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "þlosilo %08lX.%lu: kreita en la estonteco (tempotordo aý horloøeraro)\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2364
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "þlosilo %08lX.%lu: eksvalidiøis je %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2372
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "þlosilo %08lX.%lu: fido-kontrolo malsukcesis: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2523
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "uzanto '%s' ne trovita: %s\n"
 
-#: g10/trustdb.c:2517
+#: g10/trustdb.c:2525
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problemo dum trovo de '%s' en fido-datenaro: %s\n"
 
-#: g10/trustdb.c:2520
+#: g10/trustdb.c:2528
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "uzanto '%s' ne estas en fido-datenaro - enþovas\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2531
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "malsukcesis meti '%s' en fido-datenaron: %s\n"
 
-#: g10/trustdb.c:2709 g10/trustdb.c:2739
+#: g10/trustdb.c:2717 g10/trustdb.c:2747
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "AVERTO: ne povas trakti longajn preferoregistrojn\n"
 
@@ -3283,46 +3292,40 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "enigata linio %u tro longa, aý mankas linifino\n"
 
-#: g10/ringedit.c:302
+#: g10/ringedit.c:324
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: ne povas krei þlosilaron: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1368
+#: g10/ringedit.c:341 g10/ringedit.c:1412 g10/ringedit.c:1883
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: þlosilaro kreita\n"
 
-#: g10/ringedit.c:1545
+#: g10/ringedit.c:1589 g10/ringedit.c:2060
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVERTO: ekzistas 2 dosieroj kun sekretaj informoj.\n"
 
-#: g10/ringedit.c:1546
+#: g10/ringedit.c:1590 g10/ringedit.c:2061
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s estas la neþanøita\n"
 
-#: g10/ringedit.c:1547
+#: g10/ringedit.c:1591 g10/ringedit.c:2062
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s estas la nova\n"
 
-#: g10/ringedit.c:1548
+#: g10/ringedit.c:1592 g10/ringedit.c:2063
 msgid "Please fix this possible security flaw\n"
 msgstr "Bonvolu ripari æi tiun eblan sekurecproblemon\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
-msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr ""
-"þlosilo ne estas markita kiel malsekura - ne povas uzi øin kun falsa "
-"stokastilo!\n"
-
-#: g10/skclist.c:113
+#: g10/skclist.c:96
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "ignoris '%s': %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:102
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3379,27 +3382,27 @@ msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 "vi devas restartigi GnuPG, por ke øi povu legi la novan opcio-dosieron\n"
 
-#: g10/encr-data.c:66
-#, c-format
-msgid "%s encrypted data\n"
-msgstr "%s-æifritaj datenoj\n"
-
-#: g10/encr-data.c:68
+#: g10/encr-data.c:64
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "æifrita per nekonata metodo %d\n"
 
-#: g10/encr-data.c:90
+#: g10/encr-data.c:69
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s-æifritaj datenoj\n"
+
+#: g10/encr-data.c:99
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVERTO: mesaøo estis æifrita per malforta þlosilo en la simetria æifro.\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:61
 msgid "weak key created - retrying\n"
 msgstr "malforta þlosilo kreita - provas denove\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:66
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
@@ -3645,7 +3648,7 @@ msgid ""
 "  \"Key has been compromised\"\n"
 "      Use this if you have a reason to believe that unauthorized persons\n"
 "      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
+"  \"Key is superseeded\"\n"
 "      Use this if you have replaced this key with a newer one.\n"
 "  \"Key is no longer used\"\n"
 "      Use this if you have retired this key.\n"
@@ -3684,3 +3687,14 @@ msgstr "Nenia helpo disponata"
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nenia helpo disponata por '%s'"
+
+#~ msgid "not processed"
+#~ msgstr "ne traktita"
+
+#~ msgid "assuming bad MDC due to an unknown critical bit\n"
+#~ msgstr "supozas malbonan sigelon (MDC) pro nekonata \"critical bit\"\n"
+
+#~ msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
+#~ msgstr ""
+#~ "þlosilo ne estas markita kiel malsekura - ne povas uzi øin kun falsa "
+#~ "stokastilo!\n"
diff --git a/po/es_ES.po b/po/es_ES.po
index 57017d453..6c3e77af9 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@
 # GPG version: 1.0.0
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-07-30 20:02+0200\n"
 "PO-Revision-Date: 1999-10-27 06:35+0200\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-13 10:49:25+0100\n"
@@ -22,307 +22,290 @@ msgstr ""
 "g10/mainproc.c g10/passphrase.c g10/plaintext.c g10/pref.c g10/seckey-cert.c "
 "g10/sig-check.c g10/sign.c g10/trustdb.c g10/verify.c\n"
 
-#: util/secmem.c:79
-msgid "Warning: using insecure memory!\n"
-msgstr "ATENCIÓN: ¡se está usando memoria insegura!\n"
-
-#: util/secmem.c:289
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "operación imposible sin memoria segura inicializada\n"
-
-#: util/secmem.c:290
-msgid "(you may have used the wrong program for this task)\n"
-msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
-
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:278 util/miscutil.c:307
 msgid "yes"
 msgstr "sí"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:279 util/miscutil.c:310
 msgid "yY"
 msgstr "sS"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:280 util/miscutil.c:308
 msgid "no"
 msgstr ""
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:281 util/miscutil.c:311
 msgid "nN"
 msgstr ""
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:580 util/miscutil.c:309
 msgid "quit"
 msgstr ""
 
-#: util/miscutil.c:311
+#: util/miscutil.c:312
 msgid "qQ"
 msgstr ""
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "Error general"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "Formato desconocido"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "Versión desconocida"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "Algoritmo de clave pública desconocido"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "Algoritmo desconocido de resumen de mensaje"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "Clave pública incorrecta"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "Clave secreta incorrecta"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "Firma incorrecta"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "Error en suma de comprobación"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "Contraseña incorrecta"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "Clave pública no encontrada"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "Algoritmo de cifrado desconocido"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "No se puede abrir el anillo"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "Valor no válido"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "Armadura no válida"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "No existe el ID de usuario"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "Clave secreta no disponible"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "Clave secreta incorrecta"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "No soportado"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "Clave incorrecta"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "Error de lectura"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "error de escritura"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "Algoritmo de compresión desconocido"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "Error al abrir fichero"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "Error al crear fichero"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "Contraseña incorrecta"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "Algoritmo de clave pública no implementado"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "Algoritmo de cifrado no implementado"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "Clase de firma desconocida"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "Error en la base de datos de confianza"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "MPI incorrecto"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "Límite de recurso"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "Anillo no válido"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "Certificado incorrecto"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "ID de usuario mal formado"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "Error al cerrar fichero"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "Error al renombrar fichero"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "Error al borrar fichero"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "Datos inesperados"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "Conflicto con sello de fecha"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "Algoritmo de clave pública no utilizable"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "El fichero existe."
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "Clave débil"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "Argumento no válido"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "URI incorrecto"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "URI no soportado"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "Error de red"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "No cifrado"
 
-#: util/errors.c:103
-#, fuzzy
-msgid "not processed"
-msgstr "se han procesado %lu claves\n"
-
-#: util/logger.c:224
+#: util/logger.c:225
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... esto es un bug (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:231
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Ha encontrado Vd. un bug... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:321 g10/import.c:127 g10/keygen.c:1348
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:325
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:330
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:325
+#: cipher/random.c:335
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:331
+#: cipher/random.c:341
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:339
+#: cipher/random.c:349
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:387
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:397
+#: cipher/random.c:407
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no puede crearse %s: %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:414
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:417
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:428
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:647
+#: cipher/random.c:657
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ATENCIÓN: ¡se está usando un generador de números aleatorios inseguro!\n"
 
-#: cipher/random.c:648
+#: cipher/random.c:663
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -336,7 +319,7 @@ msgstr ""
 "¡NO USE NINGÚN DATO GENERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:141
+#: cipher/rndlinux.c:125
 #, c-format
 msgid ""
 "\n"
@@ -348,7 +331,19 @@ msgstr ""
 "otro trabajo para que el sistema pueda recolectar más entropía\n"
 "(se necesitan %d bytes más).\n"
 
-#: g10/g10.c:197
+#: gcrypt/secmem.c:77
+msgid "Warning: using insecure memory!\n"
+msgstr "ATENCIÓN: ¡se está usando memoria insegura!\n"
+
+#: gcrypt/secmem.c:287
+msgid "operation is not possible without initialized secure memory\n"
+msgstr "operación imposible sin memoria segura inicializada\n"
+
+#: gcrypt/secmem.c:288
+msgid "(you may have used the wrong program for this task)\n"
+msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
+
+#: g10/gpg.c:197
 msgid ""
 "@Commands:\n"
 " "
@@ -356,140 +351,140 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:199
+#: g10/gpg.c:199
 msgid "|[file]|make a signature"
 msgstr "|[file]|hace una firma"
 
-#: g10/g10.c:200
+#: g10/gpg.c:200
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|hace una firma en texto claro"
 
-#: g10/g10.c:201
+#: g10/gpg.c:201
 msgid "make a detached signature"
 msgstr "hace una firma separada"
 
-#: g10/g10.c:202
+#: g10/gpg.c:202
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/g10.c:203
+#: g10/gpg.c:203
 msgid "encryption only with symmetric cipher"
 msgstr "cifra sólo con un cifrado simétrico"
 
-#: g10/g10.c:204
+#: g10/gpg.c:204
 msgid "store only"
 msgstr "sólo almacenar"
 
-#: g10/g10.c:205
+#: g10/gpg.c:205
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/g10.c:206
+#: g10/gpg.c:206
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:208
+#: g10/gpg.c:208
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/g10.c:210
+#: g10/gpg.c:210
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/g10.c:211
+#: g10/gpg.c:211
 msgid "check key signatures"
 msgstr "comprueba las firmas de las claves"
 
-#: g10/g10.c:212
+#: g10/gpg.c:212
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/g10.c:213
+#: g10/gpg.c:213
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/g10.c:214
+#: g10/gpg.c:214
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/g10.c:215
+#: g10/gpg.c:215
 msgid "remove key from the public keyring"
 msgstr "elimina la clave del anillo público"
 
-#: g10/g10.c:217
+#: g10/gpg.c:217
 #, fuzzy
 msgid "remove key from the secret keyring"
 msgstr "elimina la clave del anillo público"
 
-#: g10/g10.c:218
+#: g10/gpg.c:218
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/g10.c:219
+#: g10/gpg.c:219
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/g10.c:220
+#: g10/gpg.c:220
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/g10.c:221
+#: g10/gpg.c:221
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocación"
 
-#: g10/g10.c:222
+#: g10/gpg.c:222
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/g10.c:223
+#: g10/gpg.c:223
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/g10.c:224
+#: g10/gpg.c:224
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/g10.c:228
+#: g10/gpg.c:228
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/g10.c:230
+#: g10/gpg.c:230
 msgid "list only the sequence of packets"
 msgstr "lista sólo la secuencia de paquetes"
 
-#: g10/g10.c:232
+#: g10/gpg.c:232
 msgid "export the ownertrust values"
 msgstr "exporta los valores de confianza"
 
-#: g10/g10.c:234
+#: g10/gpg.c:234
 msgid "import ownertrust values"
 msgstr "importa los valores de confianza"
 
-#: g10/g10.c:236
+#: g10/gpg.c:236
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/g10.c:238
+#: g10/gpg.c:238
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMBRES]|comprueba la base de datos de confianza"
 
-#: g10/g10.c:239
+#: g10/gpg.c:239
 msgid "fix a corrupted trust database"
 msgstr "arregla una base de datos de confianza dañada"
 
-#: g10/g10.c:240
+#: g10/gpg.c:240
 msgid "De-Armor a file or stdin"
 msgstr "quita la armadura de un fichero o stdin"
 
-#: g10/g10.c:242
+#: g10/gpg.c:242
 msgid "En-Armor a file or stdin"
 msgstr "crea la armadura a un fichero o stdin"
 
-#: g10/g10.c:244
+#: g10/gpg.c:244
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime resúmenes de mensaje"
 
-#: g10/g10.c:248
+#: g10/gpg.c:249
 msgid ""
 "@\n"
 "Options:\n"
@@ -499,160 +494,160 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/g10.c:250
+#: g10/gpg.c:251
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/g10.c:252
+#: g10/gpg.c:253
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/g10.c:255
+#: g10/gpg.c:256
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
 
-#: g10/g10.c:257
+#: g10/gpg.c:258
 msgid "use the default key as default recipient"
 msgstr "usa la clave por defecto como destinatario"
 
-#: g10/g10.c:261
+#: g10/gpg.c:262
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/g10.c:262
+#: g10/gpg.c:263
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivel de compresión N (0 no comprime)"
 
-#: g10/g10.c:264
+#: g10/gpg.c:265
 msgid "use canonical text mode"
 msgstr "usa modo de texto canónico"
 
-#: g10/g10.c:265
+#: g10/gpg.c:266
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/g10.c:266
+#: g10/gpg.c:267
 msgid "verbose"
 msgstr "prolijo"
 
-#: g10/g10.c:267
+#: g10/gpg.c:268
 msgid "be somewhat more quiet"
 msgstr "algo más discreto"
 
-#: g10/g10.c:268
+#: g10/gpg.c:269
 msgid "don't use the terminal at all"
 msgstr "no usa la terminal en absoluto"
 
-#: g10/g10.c:269
+#: g10/gpg.c:270
 msgid "force v3 signatures"
 msgstr "fuerza firmas v3"
 
-#: g10/g10.c:270
+#: g10/gpg.c:271
 msgid "always use a MDC for encryption"
 msgstr "siempre usa un MCD para cifrar"
 
-#: g10/g10.c:271
+#: g10/gpg.c:272
 msgid "do not make any changes"
 msgstr "no hace ningún cambio"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/gpg.c:274
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
-#: g10/g10.c:274
+#: g10/gpg.c:275
 msgid "assume yes on most questions"
 msgstr "asume \"sí\" en casi todas las preguntas"
 
-#: g10/g10.c:275
+#: g10/gpg.c:276
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: g10/g10.c:276
+#: g10/gpg.c:277
 msgid "add this keyring to the list of keyrings"
 msgstr "añade este anillo a la lista de anillos"
 
-#: g10/g10.c:277
+#: g10/gpg.c:278
 msgid "add this secret keyring to the list"
 msgstr "añade este anillo secreto a la lista"
 
-#: g10/g10.c:278
+#: g10/gpg.c:279
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
-#: g10/g10.c:279
+#: g10/gpg.c:280
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVIDOR|usa este servidor de claves"
 
-#: g10/g10.c:280
+#: g10/gpg.c:281
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
 
-#: g10/g10.c:281
+#: g10/gpg.c:282
 msgid "read options from file"
 msgstr "lee opciones del fichero"
 
-#: g10/g10.c:285
+#: g10/gpg.c:286
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe información de estado en descriptor DF"
 
-#: g10/g10.c:290
+#: g10/gpg.c:291
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHERO|carga módulo de extensiones FICHERO"
 
-#: g10/g10.c:291
+#: g10/gpg.c:292
 msgid "emulate the mode described in RFC1991"
 msgstr "emula el modo descrito en la RFC1991"
 
-#: g10/g10.c:292
+#: g10/gpg.c:293
 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:293
+#: g10/gpg.c:294
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa modo de contraseña N"
 
-#: g10/g10.c:295
+#: g10/gpg.c:296
 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:297
+#: g10/gpg.c:298
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las\n"
 "contraseñas"
 
-#: g10/g10.c:298
+#: g10/gpg.c:299
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
 
-#: g10/g10.c:299
+#: g10/gpg.c:300
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: g10/g10.c:300
+#: g10/gpg.c:301
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa el algoritmo de compresión N"
 
-#: g10/g10.c:301
+#: g10/gpg.c:302
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina campo keyid de los paquetes cifrados"
 
-#: g10/g10.c:302
+#: g10/gpg.c:303
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOMBRE=VALOR|usa estos datos de notación"
 
-#: g10/g10.c:305
+#: g10/gpg.c:306
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:308
+#: g10/gpg.c:309
 msgid ""
 "@\n"
 "Examples:\n"
@@ -672,15 +667,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/g10.c:403
+#: g10/gpg.c:409
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:407
+#: g10/gpg.c:413
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/g10.c:410
+#: g10/gpg.c:416
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -690,7 +685,7 @@ msgstr ""
 "Firma, comprueba, cifra o descifra.\n"
 "La operación por defecto depende del tipo de datos de entrada.\n"
 
-#: g10/g10.c:417
+#: g10/gpg.c:423
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -698,182 +693,187 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/g10.c:496
+#: g10/gpg.c:525
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/g10.c:549
+#: g10/gpg.c:583
 msgid "conflicting commands\n"
 msgstr "comandos incompatibles\n"
 
-#: g10/g10.c:692
+#: g10/gpg.c:638
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
+#: g10/gpg.c:734
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/g10.c:696
+#: g10/gpg.c:738
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/g10.c:703
+#: g10/gpg.c:745
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/g10.c:893
+#: g10/gpg.c:937
 #, 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:949 g10/g10.c:958
+#: g10/gpg.c:1002 g10/gpg.c:1011
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: ¡%s no es para uso normal!\n"
 
-#: g10/g10.c:951
+#: g10/gpg.c:1004
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "¡%s no permitido con %s!\n"
 
-#: g10/g10.c:954
+#: g10/gpg.c:1007
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "¡%s no tiene sentido con %s!\n"
 
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/gpg.c:1027 g10/gpg.c:1039
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado no es válido\n"
 
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/gpg.c:1033 g10/gpg.c:1045
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no es válido\n"
 
-#: g10/g10.c:995
+#: g10/gpg.c:1049
 msgid "the given policy URL is invalid\n"
 msgstr "URL de política no válida\n"
 
-#: g10/g10.c:998
+#: g10/gpg.c:1052
 #, 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:1000
+#: g10/gpg.c:1054
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/g10.c:1002
+#: g10/gpg.c:1056
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/g10.c:1004
+#: g10/gpg.c:1058
 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:1007
+#: g10/gpg.c:1061
 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:1011
+#: g10/gpg.c:1065
 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:1096
+#: g10/gpg.c:1154
 #, 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:1102
+#: g10/gpg.c:1160
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/g10.c:1109
+#: g10/gpg.c:1167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:1117
+#: g10/gpg.c:1175
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/g10.c:1130
+#: g10/gpg.c:1188
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/g10.c:1143
+#: g10/gpg.c:1201
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:1157
+#: g10/gpg.c:1215
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/g10.c:1174
+#: g10/gpg.c:1232
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/g10.c:1182
+#: g10/gpg.c:1240
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/g10.c:1190
+#: g10/gpg.c:1248
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/g10.c:1198
+#: g10/gpg.c:1256
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [comandos]"
 
-#: g10/g10.c:1214
+#: g10/gpg.c:1272
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-usuario"
 
-#: g10/g10.c:1217
+#: g10/gpg.c:1275
 msgid "--delete-key user-id"
 msgstr "--delete-key id-usuario"
 
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:311 g10/gpg.c:1312 g10/sign.c:449
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: g10/g10.c:1269
+#: g10/gpg.c:1327
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/g10.c:1335
+#: g10/gpg.c:1393
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminación de armadura fallida: %s\n"
 
-#: g10/g10.c:1343
+#: g10/gpg.c:1401
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creación de armadura fallida: %s\n"
 
-#: g10/g10.c:1411
+#: g10/gpg.c:1474 g10/gpg.c:1495
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribución no válido `%s'\n"
 
-#: g10/g10.c:1492
+#: g10/gpg.c:1580
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
-#: g10/g10.c:1496
+#: g10/gpg.c:1584
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/gpg.c:1587 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no puede abrirse `%s'\n"
 
-#: g10/g10.c:1669
+#: g10/gpg.c:1765
 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:1675
+#: g10/gpg.c:1771
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -881,11 +881,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:1681
+#: g10/gpg.c:1777
 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:1689
+#: g10/gpg.c:1785
 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"
 
@@ -970,50 +970,50 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1188 g10/pkclist.c:53
+#: g10/keyedit.c:1191 g10/pkclist.c:54
 msgid "             Fingerprint:"
 msgstr "         Huella dactilar:"
 
-#: g10/pkclist.c:80
+#: g10/pkclist.c:81
 msgid "Fingerprint:"
 msgstr "Huella dactilar:"
 
-#: g10/pkclist.c:116
+#: g10/pkclist.c:117
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:118
+#: g10/pkclist.c:119
 #, fuzzy
-msgid "Key is superseded"
+msgid "Key is superseeded"
 msgstr "La clave está protegida.\n"
 
-#: g10/pkclist.c:120
+#: g10/pkclist.c:121
 #, fuzzy
 msgid "Key has been compromised"
 msgstr "Esta clave está deshabilitada"
 
-#: g10/pkclist.c:122
+#: g10/pkclist.c:123
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:124
+#: g10/pkclist.c:125
 msgid "User ID is no longer valid"
 msgstr ""
 
-#: g10/pkclist.c:128
+#: g10/pkclist.c:129
 msgid "Reason for revocation: "
 msgstr ""
 
-#: g10/pkclist.c:145
+#: g10/pkclist.c:146
 msgid "Revocation comment: "
 msgstr ""
 
 #. a string with valid answers
-#: g10/pkclist.c:303
+#: g10/pkclist.c:304
 msgid "sSmMqQ"
 msgstr "iImMqQ"
 
-#: g10/pkclist.c:307
+#: g10/pkclist.c:308
 #, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -1022,7 +1022,7 @@ msgstr ""
 "No hay confianza definida para %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1044,23 +1044,23 @@ msgstr ""
 " 4 = Me fío completamente\n"
 " i = Mostrar más información\n"
 
-#: g10/pkclist.c:328
+#: g10/pkclist.c:329
 msgid " m = back to the main menu\n"
 msgstr " m = volver al menú principal\n"
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:331
 msgid " q = quit\n"
 msgstr " q = salir\n"
 
-#: g10/pkclist.c:336
+#: g10/pkclist.c:337
 msgid "Your decision? "
 msgstr "Su decisión: "
 
-#: g10/pkclist.c:358
+#: g10/pkclist.c:359
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que llevan a una clave de confianza absoluta:\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 msgid ""
 "Could not find a valid trust path to the key.  Let's see whether we\n"
 "can assign some missing owner trust values.\n"
@@ -1070,7 +1070,7 @@ msgstr ""
 "si es posible asignar algunos valores de confianza perdidos.\n"
 "\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
@@ -1078,7 +1078,7 @@ msgstr ""
 "No se ha encontrado ninguna ruta con una de nuestras claves.\n"
 "\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:438
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
@@ -1086,7 +1086,7 @@ msgstr ""
 "No se ha encontrado ningún certificado sin valor de confianza.\n"
 "\n"
 
-#: g10/pkclist.c:439
+#: g10/pkclist.c:440
 msgid ""
 "No trust values changed.\n"
 "\n"
@@ -1094,36 +1094,36 @@ msgstr ""
 "No se cambió ningún valor de confianza.\n"
 "\n"
 
-#: g10/pkclist.c:457
+#: g10/pkclist.c:458
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "clave %08lX: ¡esta clave ha sido revocada!\n"
 
-#: g10/pkclist.c:464 g10/pkclist.c:476 g10/pkclist.c:598
+#: g10/pkclist.c:465 g10/pkclist.c:477 g10/pkclist.c:599
 msgid "Use this key anyway? "
 msgstr "¿Usar esta clave de todas formas? "
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "clave %08lX: ¡esta subclave ha sido revocada!\n"
 
-#: g10/pkclist.c:512
+#: g10/pkclist.c:513
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: clave caducada\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr "%08lX: no hay información para calcular la probabilidad de confianza\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: ¡Esta clave NO es de confianza!\n"
 
-#: g10/pkclist.c:539
+#: g10/pkclist.c:540
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -1133,15 +1133,15 @@ msgstr ""
 "proprietario\n"
 "pero se acepta igualmente\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:546
 msgid "This key probably belongs to the owner\n"
 msgstr "Esta clave probablemente pertenece a su proprietario\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid "This key belongs to us\n"
 msgstr "Esta clave nos pertenece\n"
 
-#: g10/pkclist.c:593
+#: g10/pkclist.c:594
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -1153,66 +1153,66 @@ msgstr ""
 "\"sí\" a la siguiente pregunta.\n"
 "\n"
 
-#: g10/pkclist.c:607 g10/pkclist.c:630
+#: g10/pkclist.c:608 g10/pkclist.c:631
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATENCIÓN: ¡Usando una clave no fiable!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:652
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATENCIÓN: ¡Esta clave ha sido revocada por su propietario!\n"
 
-#: g10/pkclist.c:652
+#: g10/pkclist.c:653
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "          Esto puede significar que la firma está falsificada.\n"
 
-#: g10/pkclist.c:657
+#: g10/pkclist.c:658
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATENCIÓN: ¡Esta clave ha sido revocada por su propietario!\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:680
 msgid "Note: This key has expired!\n"
 msgstr "Nota: ¡Esta clave está caducada!\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:688
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ATENCIÓN: ¡Esta clave no está certificada por una firma de confianza!\n"
 
-#: g10/pkclist.c:689
+#: g10/pkclist.c:690
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "          No hay indicios de que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:707
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATENCIÓN: ¡Esta clave NO es de confianza!\n"
 
-#: g10/pkclist.c:707
+#: g10/pkclist.c:708
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          La firma es probablemente una FALSIFICACIÓN.\n"
 
-#: g10/pkclist.c:714
+#: g10/pkclist.c:715
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATENCIÓN: ¡Esta clave no está certificada con suficientes firmas de "
 "confianza!\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:718
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "          No es seguro que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:968 g10/pkclist.c:1013
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:828 g10/pkclist.c:995
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: clave pública ya presente\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:855
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1220,42 +1220,42 @@ msgstr ""
 "No se ha especificado un ID de usuario (puede usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:865
 msgid "Enter the user ID: "
 msgstr "Introduzca el ID de usuario: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:877
 msgid "No such user ID.\n"
 msgstr "ID de usuario inexistente.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:882
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorado: clave pública ya designada como destinataria por defecto\n"
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:905
 msgid "Public key is disabled.\n"
 msgstr "Clave pública deshabilitada.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:912
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "ignorado: clave pública ya designada con --encrypt-to\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:943
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "desconocido el destinatario predefinido `%s'\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:976
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: error comprobando la clave: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:981
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: clave pública deshabilitada\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1019
 msgid "no valid addressees\n"
 msgstr "no hay direcciones válidas\n"
 
@@ -1267,58 +1267,58 @@ msgstr "escribiendo autofirma\n"
 msgid "writing key binding signature\n"
 msgstr "escribiendo la firma de comprobación de clave\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
+#: g10/keygen.c:308 g10/keygen.c:419 g10/keygen.c:529
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "El tamaño requerido es de %u bits\n"
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:438
+#: g10/keygen.c:313 g10/keygen.c:424 g10/keygen.c:534
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:537
+#: g10/keygen.c:633
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor seleccione tipo de clave deseado:\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:635
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA y ElGamal (por defecto)\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:636
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (sólo firma)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:638
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (sólo cifrado)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:639
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firma y cifrado)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:641
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firma y cifrado)\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:645
 msgid "Your selection? "
 msgstr "Su elección: "
 
-#: g10/keygen.c:560 g10/keygen.c:568
+#: g10/keygen.c:656 g10/keygen.c:664
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "¿De verdad quiere crear una clave de firma y cifrado? "
 
-#: g10/keygen.c:582
+#: g10/keygen.c:678
 msgid "Invalid selection.\n"
 msgstr "Elección no válida.\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:690
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1331,19 +1331,19 @@ msgstr ""
 "        el tamaño por defecto es 1024 bits\n"
 " el tamaño máximo recomendado es 2048 bits\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:697
 msgid "What keysize do you want? (1024) "
 msgstr "¿De qué tamaño quiere la clave (1024)? "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:702
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA sólo permite tamaños desde 512 a 1024\n"
 
-#: g10/keygen.c:608
+#: g10/keygen.c:704
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamaño insuficiente; 768 es el valor mínimo permitido\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:706
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "tamaño insuficiente; 768 es el valor mínimo permitido\n"
@@ -1356,12 +1356,12 @@ msgstr "tama
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:621
+#: g10/keygen.c:717
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "tamaño excesivo; %d es el máximo valor permitido.\n"
 
-#: g10/keygen.c:626
+#: g10/keygen.c:722
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1369,11 +1369,11 @@ msgstr ""
 "No se recomiendan claves de más de 2048 bits porque\n"
 "el tiempo de computación es REALMENTE largo.\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:725
 msgid "Are you sure that you want this keysize? "
 msgstr "¿Seguro que quiere una clave de este tamaño? "
 
-#: g10/keygen.c:630
+#: g10/keygen.c:726
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1382,21 +1382,21 @@ msgstr ""
 "teclado\n"
 "también son vulnerables a un ataque!\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:734
 msgid "Do you really need such a large keysize? "
 msgstr "¿De verdad necesita una clave tan grande? "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:740
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "El tamaño requerido es de %u bits\n"
 
-#: g10/keygen.c:647 g10/keygen.c:651
+#: g10/keygen.c:743 g10/keygen.c:747
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:795
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1412,35 +1412,35 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n años\n"
 
-#: g10/keygen.c:714
+#: g10/keygen.c:810
 msgid "Key is valid for? (0) "
 msgstr "¿Validez de la clave (0)? "
 
-#: g10/keygen.c:719
+#: g10/keygen.c:815
 msgid "invalid value\n"
 msgstr "valor no válido\n"
 
-#: g10/keygen.c:724
+#: g10/keygen.c:820
 msgid "Key does not expire at all\n"
 msgstr "La clave nunca caduca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:730
+#: g10/keygen.c:826
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clave caduca el %s\n"
 
-#: g10/keygen.c:733
+#: g10/keygen.c:829
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:738
+#: g10/keygen.c:834
 msgid "Is this correct (y/n)? "
 msgstr "¿Es correcto (s/n)? "
 
-#: g10/keygen.c:781
+#: g10/keygen.c:877
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1458,44 +1458,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:793
+#: g10/keygen.c:889
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:893
 msgid "Invalid character in name\n"
 msgstr "Caracter no válido en el nombre\n"
 
-#: g10/keygen.c:799
+#: g10/keygen.c:895
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un número\n"
 
-#: g10/keygen.c:801
+#: g10/keygen.c:897
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:809
+#: g10/keygen.c:905
 msgid "Email address: "
 msgstr "Dirección de correo electrónico: "
 
-#: g10/keygen.c:820
+#: g10/keygen.c:916
 msgid "Not a valid email address\n"
 msgstr "Dirección no válida\n"
 
-#: g10/keygen.c:828
+#: g10/keygen.c:924
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:834
+#: g10/keygen.c:930
 msgid "Invalid character in comment\n"
 msgstr "Caracter no válido en el comentario\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:956
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Está usando el juego de caracteres `%s'.\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:962
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1506,28 +1506,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:867
+#: g10/keygen.c:966
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:872
+#: g10/keygen.c:971
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:882
+#: g10/keygen.c:981
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "¿Cambia (N)ombre, (C)omentario, (D)irección o (V)ale/(S)alir? "
 
-#: g10/keygen.c:883
+#: g10/keygen.c:982
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "¿Cambia (N)ombre, (C)omentario, (D)irección o (V)ale/(S)alir? "
 
-#: g10/keygen.c:902
+#: g10/keygen.c:1001
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:940
+#: g10/keygen.c:1039
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1535,11 +1535,11 @@ msgstr ""
 "Necesita una contraseña para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:948
+#: g10/keyedit.c:468 g10/keygen.c:1047
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "contraseña repetida incorrecta, inténtelo de nuevo.\n"
 
-#: g10/keygen.c:954
+#: g10/keygen.c:1053
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1551,7 +1551,7 @@ msgstr ""
 "la opción \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1074
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1564,29 +1564,29 @@ msgstr ""
 "generador de números aleatorios mayor oportunidad de recoger suficiente\n"
 "entropía.\n"
 
-#: g10/keygen.c:1424
+#: g10/keygen.c:1523
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "El par de claves DSA tendrá 1024 bits.\n"
 
-#: g10/keygen.c:1467
+#: g10/keygen.c:1566
 msgid "Key generation canceled.\n"
 msgstr "Creación de claves cancelada.\n"
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1663
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escribiendo certificado público en `%s'\n"
 
-#: g10/keygen.c:1565
+#: g10/keygen.c:1664
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escribiendo certificado privado en `%s'\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1760
 msgid "public and secret key created and signed.\n"
 msgstr "Claves pública y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1765
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1595,12 +1595,12 @@ msgstr ""
 "el comando \"--edit-key\" para crear una clave secundaria con este "
 "propósito.\n"
 
-#: g10/keygen.c:1683 g10/keygen.c:1784
+#: g10/keygen.c:1782 g10/keygen.c:1883
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creación de la clave fallida: %s\n"
 
-#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1826 g10/sig-check.c:300 g10/sign.c:167
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1608,7 +1608,7 @@ msgstr ""
 "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1828 g10/sig-check.c:302 g10/sign.c:169
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1616,32 +1616,32 @@ msgstr ""
 "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1861
 msgid "Really create? "
 msgstr "¿Crear de verdad? "
 
-#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:142 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: no puede abrirse: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:164
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creando contraseña: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:222 g10/encode.c:370
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATENCIÓN: fichero vacío\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:317
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "leyendo desde `%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:534
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s cifrado para: %s\n"
@@ -1670,32 +1670,32 @@ msgstr "clave %08lX: no es conforme a rfc2440 - ignorada\n"
 msgid "WARNING: nothing exported\n"
 msgstr "ATENCIÓN: no se ha exportado nada\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:212
 msgid "too many entries in pk cache - disabled\n"
 msgstr "demasiados registros en la cache pk - anulada\n"
 
-#: g10/getkey.c:350
+#: g10/getkey.c:351
 msgid "too many entries in unk cache - disabled\n"
 msgstr "demasiados registros en la cache unk - anulada\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
+#: g10/getkey.c:1311 g10/getkey.c:1350
 msgid "RSA key cannot be used in this version\n"
 msgstr "No puede usarse clave RSA en esta versión\n"
 
-#: g10/getkey.c:1310 g10/getkey.c:1349
+#: g10/getkey.c:1313 g10/getkey.c:1352
 msgid "No key for user ID\n"
 msgstr "No hay clave para tal usuario\n"
 
-#: g10/getkey.c:1388 g10/getkey.c:1428
+#: g10/getkey.c:1391 g10/getkey.c:1431
 msgid "No user ID for key\n"
 msgstr "No hay clave secreta para tal usuario\n"
 
-#: g10/getkey.c:1642 g10/getkey.c:1698
+#: g10/getkey.c:1645 g10/getkey.c:1701
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "usando clave secundaria %08lX en vez de clave primaria %08lX\n"
 
-#: g10/getkey.c:2017
+#: g10/getkey.c:2020
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: usuario no encontrado\n"
@@ -1705,7 +1705,7 @@ msgstr "%s: usuario no encontrado\n"
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloque de tipo %d\n"
 
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:188 g10/trustdb.c:1748 g10/trustdb.c:1789
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "hasta ahora se han procesado %lu claves\n"
@@ -1793,7 +1793,7 @@ msgstr "clave %08lX: clave p
 msgid "no default public keyring\n"
 msgstr "no hay anillo público por defecto\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:350 g10/sign.c:669
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
@@ -2052,7 +2052,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "¿Firmar de verdad? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1870 g10/keyedit.c:1932 g10/sign.c:136
+#: g10/keyedit.c:373 g10/keyedit.c:1873 g10/keyedit.c:1935 g10/sign.c:191
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
@@ -2408,104 +2408,104 @@ msgstr "Clave sin cambios, no se necesita actualizaci
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando no válido (pruebe \"help\")\n"
 
-#: g10/keyedit.c:1080 g10/keyedit.c:1106
+#: g10/keyedit.c:1083 g10/keyedit.c:1109
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1089
+#: g10/keyedit.c:1092
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1093
+#: g10/keyedit.c:1096
 msgid "This key has been disabled"
 msgstr "Esta clave está deshabilitada"
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1125
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "clave %08lX: ¡esta subclave ha sido revocada!\n"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1128
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "        nuevas revocaciones: %lu\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1130
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1368
 msgid "Delete this good signature? (y/N/q)"
 msgstr "¿Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1372
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "¿Borrar esta firma no válida? (s/N/q)"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1376
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "¿Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1382
 msgid "Really delete this self-signature? (y/N)"
 msgstr "¿Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1396
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1397
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas borradas\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1400
 msgid "Nothing deleted.\n"
 msgstr "No se borró nada\n"
 
-#: g10/keyedit.c:1466
+#: g10/keyedit.c:1469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite la selección de las claves secretas.\n"
 
-#: g10/keyedit.c:1472
+#: g10/keyedit.c:1475
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor, seleccione como máximo una clave secundaria.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1479
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambiando caducidad de clave secundaria.\n"
 
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1481
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:1520
+#: g10/keyedit.c:1523
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "No puede cambiar la fecha de caducidad de una clave v3\n"
 
-#: g10/keyedit.c:1536
+#: g10/keyedit.c:1539
 msgid "No corresponding signature in secret ring\n"
 msgstr "No hay firma correspondiente en anillo secreto\n"
 
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1600
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hay ningún identificativo de usuario con el índice %d\n"
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1646
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "No hay ninguna clave secundaria con el índice %d\n"
 
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1744
 msgid "user ID: \""
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1747
 #, c-format
 msgid ""
 "\"\n"
@@ -2514,163 +2514,172 @@ msgstr ""
 "\"\n"
 "firmada con su clave %08lX el %s\n"
 
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:1751
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "¿Crear un certificado de revocación para esta clave (s/N)?"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1775
 msgid "You have signed these user IDs:\n"
 msgstr "Ha firmado los siguientes IDs de usuario:\n"
 
-#: g10/keyedit.c:1786 g10/keyedit.c:1821
+#: g10/keyedit.c:1789 g10/keyedit.c:1824
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   firmada por %08lX el %s\n"
 
-#: g10/keyedit.c:1791
+#: g10/keyedit.c:1794
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revocada por %08lX el %s\n"
 
-#: g10/keyedit.c:1811
+#: g10/keyedit.c:1814
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va Vd. a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:1829
+#: g10/keyedit.c:1832
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "¿Crear los certificados de revocación realmente? (s/N)"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1861
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "Armadura no válida"
+
+#: g10/keylist.c:178
+msgid "revoked"
+msgstr ""
+
 #. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:401 g10/mainproc.c:754
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "La clave caduca el %s\n"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:212
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la clave pública es %08lX\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:247
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados de la clave pública: DEK bueno\n"
 
-#: g10/mainproc.c:281
+#: g10/mainproc.c:280
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "cifrado con clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "cifrado con clave %s, ID %08lX\n"
 
-#: g10/mainproc.c:297
+#: g10/mainproc.c:296
 msgid "no secret key for decryption available\n"
 msgstr "clave secreta para descifrado no disponible\n"
 
-#: g10/mainproc.c:306
+#: g10/mainproc.c:305
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave pública fallido: %s\n"
 
-#: g10/mainproc.c:343
+#: g10/mainproc.c:342
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:348
+#: g10/mainproc.c:347
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCIÓN: ¡el mensaje cifrado ha sido manipulado!\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:352
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:372
+#: g10/mainproc.c:371
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitente solicitó \"sólo-para-tus-ojos\"\n"
 
-#: g10/mainproc.c:374
+#: g10/mainproc.c:373
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:538
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:625 g10/mainproc.c:634
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATENCIÓN: encontrados datos de notación no válidos\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:637
 msgid "Notation: "
 msgstr "Notación: "
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:644
 msgid "Policy: "
 msgstr "Política: "
 
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1074
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificación de la firma\n"
 
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1080
 #, 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:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1106 g10/mainproc.c:1117
 msgid "BAD signature from \""
 msgstr "Firma INCORRECTA de \""
 
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1107 g10/mainproc.c:1118
 msgid "Good signature from \""
 msgstr "Firma correcta de \""
 
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1109
 msgid "                aka \""
 msgstr "también conocido como \""
 
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1165
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1230
 #, fuzzy, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Clase de firma desconocida"
 
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1282
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1287
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete raíz no válido detectado en proc_tree()\n"
 
-#: g10/misc.c:94
+#: g10/misc.c:83
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "no se pueden desactivar los core dumps: %s\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:86
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCIÓN: ¡el programa podría crear un fichero core dump!\n"
 
-#: g10/misc.c:205
+#: g10/misc.c:312
 msgid "Experimental algorithms should not be used!\n"
 msgstr "¡No se deberían usar algoritmos experimentales!\n"
 
-#: g10/misc.c:219
+#: g10/misc.c:326
 msgid ""
 "RSA keys are deprecated; please consider creating a new key and use this key "
 "in the future\n"
@@ -2678,18 +2687,18 @@ msgstr ""
 "Las claves RSA están en desuso, considere la creación de una nueva clave "
 "para futuros usos\n"
 
-#: g10/misc.c:241
+#: g10/misc.c:348
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "este algoritmo de cifrado está en desuso, considere el uso de uno más "
 "estándar.\n"
 
-#: g10/parse-packet.c:117
+#: g10/parse-packet.c:115
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "no puedo manejar el algoritmo de clave pública %d\n"
 
-#: g10/parse-packet.c:965
+#: g10/parse-packet.c:963
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquete de tipo %d tiene el bit crítico activado\n"
@@ -2726,52 +2735,52 @@ msgstr "Introduzca contrase
 msgid "Repeat passphrase: "
 msgstr "Repita contraseña: "
 
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "datos no grabados; use la opción \"--output\" para grabarlos\n"
 
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
 #, fuzzy
 msgid "Detached signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
 msgid "Please enter name of data file: "
 msgstr "Introduzca el nombre del fichero de datos: "
 
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
 msgid "reading stdin ...\n"
 msgstr "leyendo stdin...\n"
 
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposible abrir datos firmados `%s'\n"
 
-#: g10/pubkey-enc.c:79
+#: g10/pubkey-enc.c:138
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "destinatario anónimo, probando clave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:85
+#: g10/pubkey-enc.c:144
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "de acuerdo, somos el destinatario anónimo.\n"
 
-#: g10/pubkey-enc.c:137
+#: g10/pubkey-enc.c:200
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la codificación vieja de DEK no está soportada\n"
 
-#: g10/pubkey-enc.c:156
+#: g10/pubkey-enc.c:219
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "el algoritmo de protección %d no está soportado\n"
 
-#: g10/pubkey-enc.c:195
+#: g10/pubkey-enc.c:258
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "NOTA: algoritmo de cifrado %d no encontrado en las preferencias\n"
 
-#: g10/pubkey-enc.c:201
+#: g10/pubkey-enc.c:264
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: clave de la firma caducada el %s\n"
@@ -2815,69 +2824,65 @@ msgstr ""
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
 
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:90
 #, fuzzy
 msgid "secret key parts are not available\n"
 msgstr "Clave secreta no disponible"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:96
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "el algoritmo de protección %d no está soportado\n"
 
-#: g10/seckey-cert.c:175
+#: g10/seckey-cert.c:239
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Contraseña incorrecta, inténtelo de nuevo...\n"
 
-#: g10/seckey-cert.c:231
+#: g10/seckey-cert.c:302
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "ATENCIÓN: detectada clave débil - por favor cambie la contraseña.\n"
 
-#: g10/sig-check.c:202
-msgid "assuming bad MDC due to an unknown critical bit\n"
-msgstr "asumiendo MDC incorrecto debido a un bit crítico desconocido\n"
-
-#: g10/sig-check.c:300
+#: g10/sig-check.c:282
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "¡esto es una clave ElGamal generada por PGP que NO es segura para las "
 "firmas!\n"
 
-#: g10/sig-check.c:308
+#: g10/sig-check.c:290
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "la clave pública es %lu segundos más nueva que la firma\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:291
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "la clave pública es %lu segundos más nueva que la firma\n"
 
-#: g10/sig-check.c:327
+#: g10/sig-check.c:309
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTA: clave de la firma caducada el %s\n"
 
-#: g10/sig-check.c:396
+#: g10/sig-check.c:378
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "asumiendo firma incorrecta debido a un bit crítico desconocido\n"
 
-#: g10/sign.c:140
+#: g10/sign.c:195
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "firma %s de: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:606
+#: g10/sign.c:345 g10/sign.c:664
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "no puede crearse %s: %s\n"
 
-#: g10/sign.c:388
+#: g10/sign.c:444
 msgid "signing:"
 msgstr "firmando:"
 
-#: g10/sign.c:431
+#: g10/sign.c:487
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATENCIÓN `%s' es un fichero vacío\n"
@@ -2917,7 +2922,8 @@ msgstr "%s: no puede abrirse: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: ¡el directorio no existe!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1363 g10/tdbio.c:444
+#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1407
+#: g10/ringedit.c:1878 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: no puede crearse: %s\n"
@@ -3104,203 +3110,203 @@ msgstr "clave %08lX: aceptada como clave de confianza.\n"
 msgid "enumerate secret keys failed: %s\n"
 msgstr "enumeración de claves secretas fallida: %s\n"
 
-#: g10/trustdb.c:921
+#: g10/trustdb.c:925
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "clave %08lX.%lu: unión de subclave válida\n"
 
-#: g10/trustdb.c:927 g10/trustdb.c:962
+#: g10/trustdb.c:931 g10/trustdb.c:966
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "clave %08lX.%lu: unión de subclave no válida: %s\n"
 
-#: g10/trustdb.c:939
+#: g10/trustdb.c:943
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "clave %08lX.%lu: revocación de clave válida\n"
 
-#: g10/trustdb.c:945
+#: g10/trustdb.c:949
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "clave %08lX.%lu: revocación de clave no válida: %s\n"
 
-#: g10/trustdb.c:956
+#: g10/trustdb.c:960
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "clave %08lX.%lu: revocación de subclave válida\n"
 
-#: g10/trustdb.c:1067
+#: g10/trustdb.c:1071
 msgid "Good self-signature"
 msgstr "Autofirma válida"
 
-#: g10/trustdb.c:1077
+#: g10/trustdb.c:1081
 msgid "Invalid self-signature"
 msgstr "Autofirma no válida"
 
-#: g10/trustdb.c:1104
+#: g10/trustdb.c:1108
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Revocación válida de ID de usuario ignorada debido a autofirma más reciente"
 
-#: g10/trustdb.c:1110
+#: g10/trustdb.c:1114
 msgid "Valid user ID revocation"
 msgstr "Revocación de ID de usuario válida"
 
-#: g10/trustdb.c:1115
+#: g10/trustdb.c:1119
 msgid "Invalid user ID revocation"
 msgstr "Revocación de ID de usuario no válida."
 
-#: g10/trustdb.c:1157
+#: g10/trustdb.c:1161
 msgid "Valid certificate revocation"
 msgstr "Revocación de certificado válida"
 
-#: g10/trustdb.c:1158
+#: g10/trustdb.c:1162
 msgid "Good certificate"
 msgstr "Certificado correcto"
 
-#: g10/trustdb.c:1186
+#: g10/trustdb.c:1190
 msgid "Invalid certificate revocation"
 msgstr "Certificado de revocación incorrecto"
 
-#: g10/trustdb.c:1187
+#: g10/trustdb.c:1191
 msgid "Invalid certificate"
 msgstr "Certificado incorrecto"
 
-#: g10/trustdb.c:1204 g10/trustdb.c:1208
+#: g10/trustdb.c:1208 g10/trustdb.c:1212
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "registro de firma %lu[%d] apunta al registro equivocado.\n"
 
-#: g10/trustdb.c:1267
+#: g10/trustdb.c:1271
 msgid "duplicated certificate - deleted"
 msgstr "certificado duplicado - eliminado"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1592
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir fallida: %s\n"
 
-#: g10/trustdb.c:1718
+#: g10/trustdb.c:1726
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: inserción fallida: %s\n"
 
-#: g10/trustdb.c:1723
+#: g10/trustdb.c:1731
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: inserción fallida: %s\n"
 
-#: g10/trustdb.c:1729
+#: g10/trustdb.c:1737
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: insertada\n"
 
-#: g10/trustdb.c:1734
+#: g10/trustdb.c:1742
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "error leyendo registro de directorio: %s\n"
 
-#: g10/trustdb.c:1742 g10/trustdb.c:1805
+#: g10/trustdb.c:1750 g10/trustdb.c:1813
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "se han procesado %lu claves\n"
 
-#: g10/trustdb.c:1744 g10/trustdb.c:1811
+#: g10/trustdb.c:1752 g10/trustdb.c:1819
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu claves con errores\n"
 
-#: g10/trustdb.c:1746
+#: g10/trustdb.c:1754
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu claves insertadas\n"
 
-#: g10/trustdb.c:1749
+#: g10/trustdb.c:1757
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enumeración bloques de clave fallido: %s\n"
 
-#: g10/trustdb.c:1797
+#: g10/trustdb.c:1805
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: registro de directiorio sin clave - ignorado\n"
 
-#: g10/trustdb.c:1807
+#: g10/trustdb.c:1815
 #, fuzzy, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "clave %08lX: %d nuevas subclaves\n"
 
-#: g10/trustdb.c:1809
+#: g10/trustdb.c:1817
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu claves ignoradas\n"
 
-#: g10/trustdb.c:1813
+#: g10/trustdb.c:1821
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu claves actualizadas\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2166
 msgid "Ooops, no keys\n"
 msgstr "Oh oh, no hay claves\n"
 
-#: g10/trustdb.c:2162
+#: g10/trustdb.c:2170
 msgid "Ooops, no user IDs\n"
 msgstr "Oh oh, no hay ningún ID de usuario\n"
 
-#: g10/trustdb.c:2320
+#: g10/trustdb.c:2328
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: búsqueda registro directorio fallida: %s\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2337
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "clave %08lX: inserción del registro de confianza fallida: %s\n"
 
-#: g10/trustdb.c:2333
+#: g10/trustdb.c:2341
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "clave %08lX.%lu: incluida en la base de datos de confianza\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2349
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "clave %08lX.%lu: creada en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2364
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "clave %08lX.%lu: caducada el %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2372
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "clave %08lX.%lu: comprobación de confianza fallida: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2523
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "usuario '%s' no encontrado: %s\n"
 
-#: g10/trustdb.c:2517
+#: g10/trustdb.c:2525
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problema buscando '%s' en la tabla de confianza: %s\n"
 
-#: g10/trustdb.c:2520
+#: g10/trustdb.c:2528
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "usuario '%s' no está en la tabla de confianza - insertando\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2531
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "fallo al poner '%s' en la tabla de confianza: %s\n"
 
-#: g10/trustdb.c:2709 g10/trustdb.c:2739
+#: g10/trustdb.c:2717 g10/trustdb.c:2747
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "ATENCÍON: todavía no puedo tratar registros de preferencias largos\n"
 
@@ -3316,44 +3322,40 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: g10/ringedit.c:302
+#: g10/ringedit.c:324
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: no se puede crear el anillo: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1368
+#: g10/ringedit.c:341 g10/ringedit.c:1412 g10/ringedit.c:1883
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anillo creado\n"
 
-#: g10/ringedit.c:1545
+#: g10/ringedit.c:1589 g10/ringedit.c:2060
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATENCIÓN: existen 2 ficheros con información confidencial.\n"
 
-#: g10/ringedit.c:1546
+#: g10/ringedit.c:1590 g10/ringedit.c:2061
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s es el que no se ha modificado\n"
 
-#: g10/ringedit.c:1547
+#: g10/ringedit.c:1591 g10/ringedit.c:2062
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s es el nuevo\n"
 
-#: g10/ringedit.c:1548
+#: g10/ringedit.c:1592 g10/ringedit.c:2063
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor arregle este posible fallo de seguridad\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
-msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr "clave no marcada como insegura - no puede usarse con el pseudo RNG\n"
-
-#: g10/skclist.c:113
+#: g10/skclist.c:96
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s' ignorado: %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:102
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3409,27 +3411,27 @@ msgstr "%s: directorio creado\n"
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 
-#: g10/encr-data.c:66
-#, c-format
-msgid "%s encrypted data\n"
-msgstr "datos cifrados %s\n"
-
-#: g10/encr-data.c:68
+#: g10/encr-data.c:64
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado con algoritmo desconocido %d\n"
 
-#: g10/encr-data.c:90
+#: g10/encr-data.c:69
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "datos cifrados %s\n"
+
+#: g10/encr-data.c:99
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATENCIÓN: mensaje cifrado con una clave débil en el cifrado simétrico.\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:61
 msgid "weak key created - retrying\n"
 msgstr "creada clave débil - reintentando\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:66
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
@@ -3675,7 +3677,7 @@ msgid ""
 "  \"Key has been compromised\"\n"
 "      Use this if you have a reason to believe that unauthorized persons\n"
 "      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
+"  \"Key is superseeded\"\n"
 "      Use this if you have replaced this key with a newer one.\n"
 "  \"Key is no longer used\"\n"
 "      Use this if you have retired this key.\n"
@@ -3700,6 +3702,17 @@ msgstr "Ayuda no disponible"
 msgid "No help available for `%s'"
 msgstr "Ayuda no disponible para `%s'"
 
+#, fuzzy
+#~ msgid "not processed"
+#~ msgstr "se han procesado %lu claves\n"
+
+#~ msgid "assuming bad MDC due to an unknown critical bit\n"
+#~ msgstr "asumiendo MDC incorrecto debido a un bit crítico desconocido\n"
+
+#~ msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
+#~ msgstr ""
+#~ "clave no marcada como insegura - no puede usarse con el pseudo RNG\n"
+
 #~ msgid "set debugging flags"
 #~ msgstr "establece los parámetros de depuración"
 
diff --git a/po/fr.po b/po/fr.po
index 922228c9c..7e372a398 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.1h\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-07-30 20:02+0200\n"
 "PO-Revision-Date: 2000-06-28 18:41+02:00\n"
 "Last-Translator: Gaël Quéri <gqueri@mail.dotcom.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -18,312 +18,294 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: util/secmem.c:79
-msgid "Warning: using insecure memory!\n"
-msgstr "Avertissement: l'utilisation de la mémoire n'est pas sûre !\n"
-
-#: util/secmem.c:289
-msgid "operation is not possible without initialized secure memory\n"
-msgstr ""
-"l'opération n'est pas possible tant que la mémoire sûre n'est pas\n"
-"initialisée\n"
-
-#: util/secmem.c:290
-msgid "(you may have used the wrong program for this task)\n"
-msgstr "(vous avez peut-être utilisé un programme non adapté à cette fin)\n"
-
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:278 util/miscutil.c:307
 msgid "yes"
 msgstr "oui"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:279 util/miscutil.c:310
 msgid "yY"
 msgstr "oO"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:280 util/miscutil.c:308
 msgid "no"
 msgstr "non"
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:281 util/miscutil.c:311
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:580 util/miscutil.c:309
 msgid "quit"
 msgstr "quitter"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:312
 msgid "qQ"
 msgstr "qQ"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "erreur générale"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "type de paquet inconnu"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "version inconnue"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "algorithme à clé publique inconnu"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "algorithme de hachage inconnu"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "mauvaise clé publique"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "mauvaise clé secrète"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "mauvaise signature"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "somme de contrôle erronée"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "mauvais mot de passe"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "clé publique non trouvée"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "algorithme de chiffrement inconnu"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "impossible d'ouvrir le porte-clés"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "paquet invalide"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "armure invalide"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "pas d'utilisateur de ce nom"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "la clé secrète n'est pas disponible"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "mauvaise clé secrète utilisée"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "non supporté"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "mauvaise clé"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "erreur de lecture"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "erreur d'écriture"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "algorithme de compression inconnu"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "erreur d'ouverture de fichier"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "erreur de création de fichier"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "mot de passe invalide"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "algorithme à clé publique non implanté"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "algorithme de chiffrement non implanté"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "classe de signature inconnue"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "erreur dans la base de confiance"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "mauvais entier en précision multiple (MPI)"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "limite de ressources atteinte"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "porte-clés invalide"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "mauvais certificat"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "nom d'utilisateur malformé"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "erreur de fermeture de fichier"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "erreur pendant le changement de nom du fichier"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "erreur pendant la suppression du fichier"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "données inattendues"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "conflit de dates"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "algorithme de clés publiques inutilisable"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "le fichier existe"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "clé faible"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "argument invalide"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "mauvaise adresse (URI)"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "URI non supportée"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "erreur de réseau"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "non chiffré"
 
-#: util/errors.c:103
-msgid "not processed"
-msgstr "non traité"
-
-#: util/logger.c:224
+#: util/logger.c:225
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... c'est un bug (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:231
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vous avez trouvé un bug... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:321 g10/import.c:127 g10/keygen.c:1348
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:325
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "impossible d'accéder à `%s': %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:330
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' n'est pas un fichier régulier - ignoré\n"
 
-#: cipher/random.c:325
+#: cipher/random.c:335
 msgid "note: random_seed file is empty\n"
 msgstr "note: le fichier `random_seed' est vide\n"
 
-#: cipher/random.c:331
+#: cipher/random.c:341
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 "avertissement: la taille du fichier `random_seed' est invalide.\n"
 "Celui-ci ne sera pas utilisé.\n"
 
-#: cipher/random.c:339
+#: cipher/random.c:349
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "impossible de lire `%s': %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:387
 msgid "note: random_seed file not updated\n"
 msgstr "note: le fichier `random_seed' n'a pas été mis à jour\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:407
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossible de créer `%s': %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:414
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "impossible d'écrire `%s': %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:417
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "impossible de fermer `%s': %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:428
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 "une quantité de données aléatoires trop importante a été demandée.\n"
 "La limite est %d bits.\n"
 
-#: cipher/random.c:647
+#: cipher/random.c:657
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ATTENTION: utilisation d'un générateur de nombres aléatoires peu sûr !!\n"
 
-#: cipher/random.c:648
+#: cipher/random.c:663
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -337,7 +319,7 @@ msgstr ""
 "N'UTILISEZ PAS LES DONNÉES GÉNÉRÉES PAR CE PROGRAMME !!\n"
 "\n"
 
-#: cipher/rndlinux.c:141
+#: cipher/rndlinux.c:125
 #, c-format
 msgid ""
 "\n"
@@ -348,7 +330,21 @@ 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:197
+#: gcrypt/secmem.c:77
+msgid "Warning: using insecure memory!\n"
+msgstr "Avertissement: l'utilisation de la mémoire n'est pas sûre !\n"
+
+#: gcrypt/secmem.c:287
+msgid "operation is not possible without initialized secure memory\n"
+msgstr ""
+"l'opération n'est pas possible tant que la mémoire sûre n'est pas\n"
+"initialisée\n"
+
+#: gcrypt/secmem.c:288
+msgid "(you may have used the wrong program for this task)\n"
+msgstr "(vous avez peut-être utilisé un programme non adapté à cette fin)\n"
+
+#: g10/gpg.c:197
 msgid ""
 "@Commands:\n"
 " "
@@ -356,139 +352,139 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: g10/g10.c:199
+#: g10/gpg.c:199
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/g10.c:200
+#: g10/gpg.c:200
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/g10.c:201
+#: g10/gpg.c:201
 msgid "make a detached signature"
 msgstr "faire une signature détachée"
 
-#: g10/g10.c:202
+#: g10/gpg.c:202
 msgid "encrypt data"
 msgstr "chiffrer les données"
 
-#: g10/g10.c:203
+#: g10/gpg.c:203
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement symétrique seulement"
 
-#: g10/g10.c:204
+#: g10/gpg.c:204
 msgid "store only"
 msgstr "pas d'action"
 
-#: g10/g10.c:205
+#: g10/gpg.c:205
 msgid "decrypt data (default)"
 msgstr "déchiffrer les données (défaut)"
 
-#: g10/g10.c:206
+#: g10/gpg.c:206
 msgid "verify a signature"
 msgstr "vérifier une signature"
 
-#: g10/g10.c:208
+#: g10/gpg.c:208
 msgid "list keys"
 msgstr "lister les clés"
 
-#: g10/g10.c:210
+#: g10/gpg.c:210
 msgid "list keys and signatures"
 msgstr "lister les clés et les signatures"
 
-#: g10/g10.c:211
+#: g10/gpg.c:211
 msgid "check key signatures"
 msgstr "vérifier les signatures des clés"
 
-#: g10/g10.c:212
+#: g10/gpg.c:212
 msgid "list keys and fingerprints"
 msgstr "lister les clés et les empreintes"
 
-#: g10/g10.c:213
+#: g10/gpg.c:213
 msgid "list secret keys"
 msgstr "lister les clés secrètes"
 
-#: g10/g10.c:214
+#: g10/gpg.c:214
 msgid "generate a new key pair"
 msgstr "générer une nouvelle paire de clés"
 
-#: g10/g10.c:215
+#: g10/gpg.c:215
 msgid "remove key from the public keyring"
 msgstr "enlever la clé du porte-clés public"
 
-#: g10/g10.c:217
+#: g10/gpg.c:217
 msgid "remove key from the secret keyring"
 msgstr "enlever la clé du porte-clés secret"
 
-#: g10/g10.c:218
+#: g10/gpg.c:218
 msgid "sign a key"
 msgstr "signer une clé"
 
-#: g10/g10.c:219
+#: g10/gpg.c:219
 msgid "sign a key locally"
 msgstr "signer une clé localement"
 
-#: g10/g10.c:220
+#: g10/gpg.c:220
 msgid "sign or edit a key"
 msgstr "signer ou éditer une clé"
 
-#: g10/g10.c:221
+#: g10/gpg.c:221
 msgid "generate a revocation certificate"
 msgstr "générer un certificat de révocation"
 
-#: g10/g10.c:222
+#: g10/gpg.c:222
 msgid "export keys"
 msgstr "exporter les clés"
 
-#: g10/g10.c:223
+#: g10/gpg.c:223
 msgid "export keys to a key server"
 msgstr "exporter les clés vers un serveur de clés"
 
-#: g10/g10.c:224
+#: g10/gpg.c:224
 msgid "import keys from a key server"
 msgstr "importer les clés d'un serveur de clés"
 
-#: g10/g10.c:228
+#: g10/gpg.c:228
 msgid "import/merge keys"
 msgstr "importer/fusionner les clés"
 
-#: g10/g10.c:230
+#: g10/gpg.c:230
 msgid "list only the sequence of packets"
 msgstr "ne lister que les paquets"
 
-#: g10/g10.c:232
+#: g10/gpg.c:232
 msgid "export the ownertrust values"
 msgstr "exporter les indices de confiance"
 
-#: g10/g10.c:234
+#: g10/gpg.c:234
 msgid "import ownertrust values"
 msgstr "importer les indices de confiance"
 
-#: g10/g10.c:236
+#: g10/gpg.c:236
 msgid "update the trust database"
 msgstr "mettre la base de confiance à jour"
 
-#: g10/g10.c:238
+#: g10/gpg.c:238
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMS]|vérifier la base de confiance"
 
-#: g10/g10.c:239
+#: g10/gpg.c:239
 msgid "fix a corrupted trust database"
 msgstr "réparer une base de confiance corrompue"
 
-#: g10/g10.c:240
+#: g10/gpg.c:240
 msgid "De-Armor a file or stdin"
 msgstr "Enlever l'armure d'un fichier ou de stdin"
 
-#: g10/g10.c:242
+#: g10/gpg.c:242
 msgid "En-Armor a file or stdin"
 msgstr "Mettre une armure à un fichier ou à stdin"
 
-#: g10/g10.c:244
+#: g10/gpg.c:244
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/g10.c:248
+#: g10/gpg.c:249
 msgid ""
 "@\n"
 "Options:\n"
@@ -498,148 +494,148 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/g10.c:250
+#: g10/gpg.c:251
 msgid "create ascii armored output"
 msgstr "créer une sortie ascii avec armure"
 
-#: g10/g10.c:252
+#: g10/gpg.c:253
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/g10.c:255
+#: g10/gpg.c:256
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOM|utiliser NOM comme récipient par défaut"
 
-#: g10/g10.c:257
+#: g10/gpg.c:258
 msgid "use the default key as default recipient"
 msgstr "utiliser la clé par déf. comme récipient"
 
-#: g10/g10.c:261
+#: g10/gpg.c:262
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou déchiffrer"
 
-#: g10/g10.c:262
+#: g10/gpg.c:263
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 désactive)"
 
-#: g10/g10.c:264
+#: g10/gpg.c:265
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/g10.c:265
+#: g10/gpg.c:266
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/g10.c:266
+#: g10/gpg.c:267
 msgid "verbose"
 msgstr "bavard"
 
-#: g10/g10.c:267
+#: g10/gpg.c:268
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: g10/g10.c:268
+#: g10/gpg.c:269
 msgid "don't use the terminal at all"
 msgstr "ne pas utiliser du tout le terminal"
 
-#: g10/g10.c:269
+#: g10/gpg.c:270
 msgid "force v3 signatures"
 msgstr "forcer les signatures en v3"
 
-#: g10/g10.c:270
+#: g10/gpg.c:271
 msgid "always use a MDC for encryption"
 msgstr "toujours utiliser un sceau pour le chiffrement"
 
-#: g10/g10.c:271
+#: g10/gpg.c:272
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/gpg.c:274
 msgid "batch mode: never ask"
 msgstr "mode automatique: ne jamais rien demander"
 
-#: g10/g10.c:274
+#: g10/gpg.c:275
 msgid "assume yes on most questions"
 msgstr "répondre oui à la plupart des questions"
 
-#: g10/g10.c:275
+#: g10/gpg.c:276
 msgid "assume no on most questions"
 msgstr "répondre non à la plupart des questions"
 
-#: g10/g10.c:276
+#: g10/gpg.c:277
 msgid "add this keyring to the list of keyrings"
 msgstr "ajouter ce porte-clés à la liste"
 
-#: g10/g10.c:277
+#: g10/gpg.c:278
 msgid "add this secret keyring to the list"
 msgstr "ajouter ce porte-clés secret à la liste"
 
-#: g10/g10.c:278
+#: g10/gpg.c:279
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|utiliser NOM comme clé secrète par défaut"
 
-#: g10/g10.c:279
+#: g10/gpg.c:280
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HÔTE|utiliser ce serveur pour chercher des clés"
 
-#: g10/g10.c:280
+#: g10/gpg.c:281
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|le terminal utilise la table de caractères NOM"
 
-#: g10/g10.c:281
+#: g10/gpg.c:282
 msgid "read options from file"
 msgstr "lire les options du fichier"
 
-#: g10/g10.c:285
+#: g10/gpg.c:286
 msgid "|FD|write status info to this FD"
 msgstr "|FD|écrire l'état sur ce descripteur"
 
-#: g10/g10.c:290
+#: g10/gpg.c:291
 msgid "|FILE|load extension module FILE"
 msgstr "|FICH|charger le module d'extension FICH"
 
-#: g10/g10.c:291
+#: g10/gpg.c:292
 msgid "emulate the mode described in RFC1991"
 msgstr "imiter le mode décrit dans la RFC1991"
 
-#: g10/g10.c:292
+#: g10/gpg.c:293
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "utiliser le comportement défini par OpenPGP"
 
-#: g10/g10.c:293
+#: g10/gpg.c:294
 msgid "|N|use passphrase mode N"
 msgstr "|N|coder les mots de passe suivant le mode N"
 
-#: g10/g10.c:295
+#: g10/gpg.c:296
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le hachage NOM pour les mots de passe"
 
-#: g10/g10.c:297
+#: g10/gpg.c:298
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe"
 
-#: g10/g10.c:298
+#: g10/gpg.c:299
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
 
-#: g10/g10.c:299
+#: g10/gpg.c:300
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|utiliser la fonction de hachage NOM"
 
-#: g10/g10.c:300
+#: g10/gpg.c:301
 msgid "|N|use compress algorithm N"
 msgstr "|N|utiliser l'algorithme de compression N"
 
-#: g10/g10.c:301
+#: g10/gpg.c:302
 msgid "throw keyid field of encrypted packets"
 msgstr "supprimer l'ident. des paquets chiffrés"
 
-#: g10/g10.c:302
+#: g10/gpg.c:303
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOM=VALEUR|utiliser ces données de notation"
 
-#: g10/g10.c:305
+#: g10/gpg.c:306
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -647,7 +643,7 @@ msgstr ""
 "@\n"
 "(Voir la page de manuel pour une liste complète des commandes et options)\n"
 
-#: g10/g10.c:308
+#: g10/gpg.c:309
 msgid ""
 "@\n"
 "Examples:\n"
@@ -667,17 +663,17 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les clés\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/g10.c:403
+#: g10/gpg.c:409
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Signaler toutes anomalies à <gnupg-bugs@gnu.org> (en anglais)\n"
 "et tout problème de traduction à <traduc@traduc.org>.\n"
 
-#: g10/g10.c:407
+#: g10/gpg.c:413
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/g10.c:410
+#: g10/gpg.c:416
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -687,7 +683,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:417
+#: g10/gpg.c:423
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -695,184 +691,189 @@ msgstr ""
 "\n"
 "Algorithmes supportés:\n"
 
-#: g10/g10.c:496
+#: g10/gpg.c:525
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/g10.c:549
+#: g10/gpg.c:583
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/g10.c:692
+#: g10/gpg.c:638
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
+#: g10/gpg.c:734
 #, 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:696
+#: g10/gpg.c:738
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: g10/g10.c:703
+#: g10/gpg.c:745
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/g10.c:893
+#: g10/gpg.c:937
 #, 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:949 g10/g10.c:958
+#: g10/gpg.c:1002 g10/gpg.c:1011
 #, 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:951
+#: g10/gpg.c:1004
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/g10.c:954
+#: g10/gpg.c:1007
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/gpg.c:1027 g10/gpg.c:1039
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement sélectionné est invalide\n"
 
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/gpg.c:1033 g10/gpg.c:1045
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage sélectionnée est invalide\n"
 
-#: g10/g10.c:995
+#: g10/gpg.c:1049
 msgid "the given policy URL is invalid\n"
 msgstr "l'URL de politique donnée est invalide\n"
 
-#: g10/g10.c:998
+#: g10/gpg.c:1052
 #, 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:1000
+#: g10/gpg.c:1054
 msgid "completes-needed must be greater than 0\n"
 msgstr "«completes-needed» doit être supérieur à 0\n"
 
-#: g10/g10.c:1002
+#: g10/gpg.c:1056
 msgid "marginals-needed must be greater than 1\n"
 msgstr "«marginals-needed» doit être supérieur à 1\n"
 
-#: g10/g10.c:1004
+#: g10/gpg.c:1058
 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:1007
+#: g10/gpg.c:1061
 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:1011
+#: g10/gpg.c:1065
 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:1096
+#: g10/gpg.c:1154
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/g10.c:1102
+#: g10/gpg.c:1160
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/g10.c:1109
+#: g10/gpg.c:1167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/g10.c:1117
+#: g10/gpg.c:1175
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/g10.c:1130
+#: g10/gpg.c:1188
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/g10.c:1143
+#: g10/gpg.c:1201
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:1157
+#: g10/gpg.c:1215
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/g10.c:1174
+#: g10/gpg.c:1232
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/g10.c:1182
+#: g10/gpg.c:1240
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/g10.c:1190
+#: g10/gpg.c:1248
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/g10.c:1198
+#: g10/gpg.c:1256
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/g10.c:1214
+#: g10/gpg.c:1272
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key utilisateur"
 
-#: g10/g10.c:1217
+#: g10/gpg.c:1275
 msgid "--delete-key user-id"
 msgstr "--delete-key utilisateur"
 
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:311 g10/gpg.c:1312 g10/sign.c:449
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossible d'ouvrir %s: %s\n"
 
-#: g10/g10.c:1269
+#: g10/gpg.c:1327
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-clés]"
 
-#: g10/g10.c:1335
+#: g10/gpg.c:1393
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a échoué: %s\n"
 
-#: g10/g10.c:1343
+#: g10/gpg.c:1401
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a échoué: %s \n"
 
-#: g10/g10.c:1411
+#: g10/gpg.c:1474 g10/gpg.c:1495
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/g10.c:1492
+#: g10/gpg.c:1580
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/g10.c:1496
+#: g10/gpg.c:1584
 msgid "Go ahead and type your message ...\n"
 msgstr "Continuez et tapez votre message...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/gpg.c:1587 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir `%s'\n"
 
-#: g10/g10.c:1669
+#: g10/gpg.c:1765
 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:1675
+#: g10/gpg.c:1771
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -881,13 +882,13 @@ msgstr ""
 "des points ou des traits de soulignement et doit se terminer par un signe "
 "égal\n"
 
-#: g10/g10.c:1681
+#: g10/gpg.c:1777
 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:1689
+#: g10/gpg.c:1785
 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"
 
@@ -972,48 +973,49 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1188 g10/pkclist.c:53
+#: g10/keyedit.c:1191 g10/pkclist.c:54
 msgid "             Fingerprint:"
 msgstr "               Empreinte:"
 
-#: g10/pkclist.c:80
+#: g10/pkclist.c:81
 msgid "Fingerprint:"
 msgstr "Empreinte:"
 
-#: g10/pkclist.c:116
+#: g10/pkclist.c:117
 msgid "No reason specified"
 msgstr "Aucune raison spécifiée"
 
-#: g10/pkclist.c:118
-msgid "Key is superseded"
+#: g10/pkclist.c:119
+#, fuzzy
+msgid "Key is superseeded"
 msgstr "La clé a été remplacée"
 
-#: g10/pkclist.c:120
+#: g10/pkclist.c:121
 msgid "Key has been compromised"
 msgstr "La clé a été compromise"
 
-#: g10/pkclist.c:122
+#: g10/pkclist.c:123
 msgid "Key is no longer used"
 msgstr "La clé n'est plus utilisée"
 
-#: g10/pkclist.c:124
+#: g10/pkclist.c:125
 msgid "User ID is no longer valid"
 msgstr "Le nom d'utilisateur n'est plus valide"
 
-#: g10/pkclist.c:128
+#: g10/pkclist.c:129
 msgid "Reason for revocation: "
 msgstr "Cause de révocation: "
 
-#: g10/pkclist.c:145
+#: g10/pkclist.c:146
 msgid "Revocation comment: "
 msgstr "Commentaire de révocation: "
 
 #. a string with valid answers
-#: g10/pkclist.c:303
+#: g10/pkclist.c:304
 msgid "sSmMqQ"
 msgstr "sSmMqQ"
 
-#: g10/pkclist.c:307
+#: g10/pkclist.c:308
 #, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -1022,7 +1024,7 @@ msgstr ""
 "Pas de confiance définie pour %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1046,23 +1048,23 @@ msgstr ""
 " 4 = je le crois totalement\n"
 " s = montrez-moi plus d'informations\n"
 
-#: g10/pkclist.c:328
+#: g10/pkclist.c:329
 msgid " m = back to the main menu\n"
 msgstr " m = retour au menu principal\n"
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:331
 msgid " q = quit\n"
 msgstr " q = quitter\n"
 
-#: g10/pkclist.c:336
+#: g10/pkclist.c:337
 msgid "Your decision? "
 msgstr "Votre décision ? "
 
-#: g10/pkclist.c:358
+#: g10/pkclist.c:359
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificats conduisant vers une clé à confiance ultime:\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 msgid ""
 "Could not find a valid trust path to the key.  Let's see whether we\n"
 "can assign some missing owner trust values.\n"
@@ -1071,7 +1073,7 @@ msgstr ""
 "Impossible de trouver un chemin de confiance valide jusqu'à la clé. Voyons\n"
 "si nous ne pouvons pas assigner quelques indices de confiance manquants.\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
@@ -1079,7 +1081,7 @@ msgstr ""
 "Aucun chemin menant vers une de nos clés n'a été trouvé.\n"
 "\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:438
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
@@ -1087,7 +1089,7 @@ msgstr ""
 "Aucun certificat à confiance indéfinie n'a été trouvé.\n"
 "\n"
 
-#: g10/pkclist.c:439
+#: g10/pkclist.c:440
 msgid ""
 "No trust values changed.\n"
 "\n"
@@ -1095,36 +1097,36 @@ msgstr ""
 "Pas d'indice de confiance changé.\n"
 "\n"
 
-#: g10/pkclist.c:457
+#: g10/pkclist.c:458
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "clé %08lX: la clé a été révoquée !\n"
 
-#: g10/pkclist.c:464 g10/pkclist.c:476 g10/pkclist.c:598
+#: g10/pkclist.c:465 g10/pkclist.c:477 g10/pkclist.c:599
 msgid "Use this key anyway? "
 msgstr "Utiliser cette clé quand même ? "
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "clé %08lX: la sous-clé a été révoquée !\n"
 
-#: g10/pkclist.c:512
+#: g10/pkclist.c:513
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: la clé a expiré\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr "%08lX: pas d'information pour calculer une probabilité de confiance\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: Nous ne faisons PAS confiance à cette clé\n"
 
-#: g10/pkclist.c:539
+#: g10/pkclist.c:540
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -1133,15 +1135,15 @@ msgstr ""
 "%08lX: Il n'est pas sûr que cette clé appartient vraiment à son\n"
 "propriétaire mais elle est quand même acceptée\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:546
 msgid "This key probably belongs to the owner\n"
 msgstr "Cette clé appartient probablement à son propriétaire\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid "This key belongs to us\n"
 msgstr "Cette clé nous appartient\n"
 
-#: g10/pkclist.c:593
+#: g10/pkclist.c:594
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -1153,68 +1155,68 @@ msgstr ""
 "oui à la prochaine question\n"
 "\n"
 
-#: g10/pkclist.c:607 g10/pkclist.c:630
+#: g10/pkclist.c:608 g10/pkclist.c:631
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATTENTION: Utilisation d'une clé sans confiance !\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:652
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATTENTION: Cette clé à été révoquée par son propriétaire !\n"
 
-#: g10/pkclist.c:652
+#: g10/pkclist.c:653
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "           Cela pourrait signifier que la signature est fausse.\n"
 
-#: g10/pkclist.c:657
+#: g10/pkclist.c:658
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATTENTION: Cette sous-clé à été révoquée par son propriétaire !\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:680
 msgid "Note: This key has expired!\n"
 msgstr "Note: Cette clé a expiré !\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:688
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ATTENTION: Cette clé n'est pas certifiée avec une signature de confiance !\n"
 
-#: g10/pkclist.c:689
+#: g10/pkclist.c:690
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "           Rien ne dit que la signature appartient à son propriétaire.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:707
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATTENTION: Nous ne faisons PAS confiance à cette clé !\n"
 
-#: g10/pkclist.c:707
+#: g10/pkclist.c:708
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "           La signature est certainement FAUSSE.\n"
 
-#: g10/pkclist.c:714
+#: g10/pkclist.c:715
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATTENTION: Les signatures de cette clé n'ont pas une confiance suffisante !\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:718
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "            Il n'est pas sûr que la signature appartient à son "
 "propriétaire.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:968 g10/pkclist.c:1013
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignoré: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:828 g10/pkclist.c:995
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignoré: clé publique déjà présente\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:855
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1222,42 +1224,42 @@ msgstr ""
 "Vous n'avez pas spécifié de nom d'utilisateur. (vous pouvez utiliser «-r»)\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:865
 msgid "Enter the user ID: "
 msgstr "Entrez le nom d'utilisateur: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:877
 msgid "No such user ID.\n"
 msgstr "Pas d'utilisateur de ce nom.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:882
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignoré: la clé publique est déjà le récipient par défaut\n"
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:905
 msgid "Public key is disabled.\n"
 msgstr "La clé publique est désactivée.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:912
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "ignoré: clé publique configurée par --encrypt-to\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:943
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "récipient par défaut `%s' inconnu\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:976
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: erreur pendant la vérification de la clé: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:981
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignoré: la clé publique est désactivée\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1019
 msgid "no valid addressees\n"
 msgstr "pas de destinataire valide\n"
 
@@ -1271,58 +1273,58 @@ msgstr "
 msgid "writing key binding signature\n"
 msgstr "écriture de la signature de liaison\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
+#: g10/keygen.c:308 g10/keygen.c:419 g10/keygen.c:529
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Taille invalide; utilisation de %u bits\n"
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:438
+#: g10/keygen.c:313 g10/keygen.c:424 g10/keygen.c:534
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "taille arrondie à %u bits\n"
 
-#: g10/keygen.c:537
+#: g10/keygen.c:633
 msgid "Please select what kind of key you want:\n"
 msgstr "Sélectionnez le type de clé désiré:\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:635
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA et ElGamal (par défaut)\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:636
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (signature seule)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:638
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (chiffrement seul)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:639
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signature et chiffrement)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:641
 #, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) RSA (signature et chiffrement)\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:645
 msgid "Your selection? "
 msgstr "Votre choix ? "
 
-#: g10/keygen.c:560 g10/keygen.c:568
+#: g10/keygen.c:656 g10/keygen.c:664
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Voulez-vous vraiment créer une clé de signature et de chiffrement ? "
 
-#: g10/keygen.c:582
+#: g10/keygen.c:678
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:690
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1335,19 +1337,19 @@ msgstr ""
 "          la taille par défaut est 1024 bits\n"
 " la taille maximale conseillée est 2048 bits\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:697
 msgid "What keysize do you want? (1024) "
 msgstr "Quelle taille de clé désirez-vous ? (1024) "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:702
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permet seulement des tailles comprises entre 512 et 1024\n"
 
-#: g10/keygen.c:608
+#: g10/keygen.c:704
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "taille trop petite; 768 est la plus petite valeur permise.\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:706
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "taille trop petite; 1024 est la plus petite valeur permise pour RSA.\n"
 
@@ -1359,12 +1361,12 @@ msgstr "taille trop petite; 1024 est la plus petite valeur permise pour RSA.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:621
+#: g10/keygen.c:717
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "taille trop importante; %d est la plus grande valeur permise.\n"
 
-#: g10/keygen.c:626
+#: g10/keygen.c:722
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1372,11 +1374,11 @@ msgstr ""
 "Les tailles supérieures à 2048 ne sont pas conseillées car\n"
 "les calculs prennent VRAIMENT beaucoup de temps !\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:725
 msgid "Are you sure that you want this keysize? "
 msgstr "Etes-vous sûr de vouloir cette taille ? "
 
-#: g10/keygen.c:630
+#: g10/keygen.c:726
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1384,21 +1386,21 @@ msgstr ""
 "D'accord, mais n'oubliez pas que les radiations de votre écran et de votre\n"
 "clavier sont aussi très vulnérables aux attaques !\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:734
 msgid "Do you really need such a large keysize? "
 msgstr "Avez-vous réellement besoin d'une taille aussi grande ? "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:740
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La taille demandée est %u bits\n"
 
-#: g10/keygen.c:647 g10/keygen.c:651
+#: g10/keygen.c:743 g10/keygen.c:747
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrondie à %u bits\n"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:795
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1414,25 +1416,25 @@ msgstr ""
 "      <n>m = la clé expire dans n mois\n"
 "      <n>y = la clé expire dans n ans\n"
 
-#: g10/keygen.c:714
+#: g10/keygen.c:810
 msgid "Key is valid for? (0) "
 msgstr "La clé est valide pour ? (0) "
 
-#: g10/keygen.c:719
+#: g10/keygen.c:815
 msgid "invalid value\n"
 msgstr "valeur invalide\n"
 
-#: g10/keygen.c:724
+#: g10/keygen.c:820
 msgid "Key does not expire at all\n"
 msgstr "La clé n'expire pas du tout\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:730
+#: g10/keygen.c:826
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clé expire le %s\n"
 
-#: g10/keygen.c:733
+#: g10/keygen.c:829
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1440,11 +1442,11 @@ msgstr ""
 "Votre système ne sait pas afficher les dates au-delà de 2038.\n"
 "Cependant la gestion des dates sera correcte jusqu'à 2106.\n"
 
-#: g10/keygen.c:738
+#: g10/keygen.c:834
 msgid "Is this correct (y/n)? "
 msgstr "Est-ce correct (o/n) ? "
 
-#: g10/keygen.c:781
+#: g10/keygen.c:877
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1460,44 +1462,44 @@ msgstr ""
 "   « Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de> »\n"
 "\n"
 
-#: g10/keygen.c:793
+#: g10/keygen.c:889
 msgid "Real name: "
 msgstr "Nom réel: "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:893
 msgid "Invalid character in name\n"
 msgstr "Caractère invalide dans le nom\n"
 
-#: g10/keygen.c:799
+#: g10/keygen.c:895
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
-#: g10/keygen.c:801
+#: g10/keygen.c:897
 msgid "Name must be at least 5 characters long\n"
 msgstr "Le nom doit faire au moins 5 caractères de long\n"
 
-#: g10/keygen.c:809
+#: g10/keygen.c:905
 msgid "Email address: "
 msgstr "Adresse e-mail: "
 
-#: g10/keygen.c:820
+#: g10/keygen.c:916
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse e-mail valide\n"
 
-#: g10/keygen.c:828
+#: g10/keygen.c:924
 msgid "Comment: "
 msgstr "Commentaire: "
 
-#: g10/keygen.c:834
+#: g10/keygen.c:930
 msgid "Invalid character in comment\n"
 msgstr "Caractère invalide dans le commentaire\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:956
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vous utilisez le jeu de caractères '%s'.\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:962
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1508,28 +1510,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:867
+#: g10/keygen.c:966
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Ne mettez pas d'adresse e-mail dans le nom réel ou dans le commentaire\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:971
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:882
+#: g10/keygen.c:981
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (Q)uitter ? "
 
-#: g10/keygen.c:883
+#: g10/keygen.c:982
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (O)K/(Q)uitter ? "
 
-#: g10/keygen.c:902
+#: g10/keygen.c:1001
 msgid "Please correct the error first\n"
 msgstr "Corrigez l'erreur d'abord\n"
 
-#: g10/keygen.c:940
+#: g10/keygen.c:1039
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1537,11 +1539,11 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour protéger votre clé secrète.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:948
+#: g10/keyedit.c:468 g10/keygen.c:1047
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "le mot de passe n'a pas été répété à l'identique; recommencez.\n"
 
-#: g10/keygen.c:954
+#: g10/keygen.c:1053
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1553,7 +1555,7 @@ msgstr ""
 "le désirez, en utilisant ce programme avec l'option « --edit-key ».\n"
 "\n"
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1074
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1565,29 +1567,29 @@ msgstr ""
 "pendant la génération de nombres premiers; cela donne au générateur de\n"
 "nombres aléatoires une meilleure chance d'avoir assez d'entropie.\n"
 
-#: g10/keygen.c:1424
+#: g10/keygen.c:1523
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La paire de clés DSA fera 1024 bits.\n"
 
-#: g10/keygen.c:1467
+#: g10/keygen.c:1566
 msgid "Key generation canceled.\n"
 msgstr "La génération de clé a été annulée.\n"
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1663
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "écriture de la clé publique vers `%s'\n"
 
-#: g10/keygen.c:1565
+#: g10/keygen.c:1664
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "écriture de la clé secrète vers `%s'\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1760
 msgid "public and secret key created and signed.\n"
 msgstr "les clés publique et secrète ont été créées et signées.\n"
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1765
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1596,13 +1598,13 @@ msgstr ""
 "utiliser la commande «--edit-key» pour générer une clé secondaire à\n"
 "cette fin.\n"
 
-#: g10/keygen.c:1683 g10/keygen.c:1784
+#: g10/keygen.c:1782 g10/keygen.c:1883
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "La génération de clé a échoué: %s\n"
 
 # on s'amuse comme on peut...
-#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1826 g10/sig-check.c:300 g10/sign.c:167
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1610,7 +1612,7 @@ msgstr ""
 "la clé a été créée %lu seconde dans le futur (rupture spatio-temporelle ou\n"
 "problème d'horloge)\n"
 
-#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1828 g10/sig-check.c:302 g10/sign.c:169
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1618,32 +1620,32 @@ msgstr ""
 "la clé a été créée %lu secondes dans le futur (rupture spatio-temporelle ou\n"
 "problème d'horloge\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1861
 msgid "Really create? "
 msgstr "Créer vraiment ? "
 
-#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:142 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: impossible d'ouvrir: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:164
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erreur pendant la création du mot de passe: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:222 g10/encode.c:370
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATTENTION: fichier vide\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:317
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lecture de `%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:534
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s chiffré pour: %s\n"
@@ -1672,34 +1674,34 @@ msgstr "cl
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENTION: rien n'a été exporté\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:212
 msgid "too many entries in pk cache - disabled\n"
 msgstr "trop d'entrées dans le cache pk - désactivé\n"
 
-#: g10/getkey.c:350
+#: g10/getkey.c:351
 msgid "too many entries in unk cache - disabled\n"
 msgstr "trop d'entrées dans le cache unk - désactivé\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
+#: g10/getkey.c:1311 g10/getkey.c:1350
 msgid "RSA key cannot be used in this version\n"
 msgstr "les clés RSA ne peuvent être utilisées dans cette version\n"
 
-#: g10/getkey.c:1310 g10/getkey.c:1349
+#: g10/getkey.c:1313 g10/getkey.c:1352
 msgid "No key for user ID\n"
 msgstr "Pas de clé pour l'utilisateur\n"
 
-#: g10/getkey.c:1388 g10/getkey.c:1428
+#: g10/getkey.c:1391 g10/getkey.c:1431
 msgid "No user ID for key\n"
 msgstr "Pas d'utilisateur pour la clé\n"
 
-#: g10/getkey.c:1642 g10/getkey.c:1698
+#: g10/getkey.c:1645 g10/getkey.c:1701
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr ""
 "utilisation de la clé secondaire %08lX à la place de la clé\n"
 "principale %08lX\n"
 
-#: g10/getkey.c:2017
+#: g10/getkey.c:2020
 msgid "[User id not found]"
 msgstr "[Nom utilisateur introuvable]"
 
@@ -1708,7 +1710,7 @@ msgstr "[Nom utilisateur introuvable]"
 msgid "skipping block of type %d\n"
 msgstr "un bloc de type %d a été ignoré\n"
 
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:188 g10/trustdb.c:1748 g10/trustdb.c:1789
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu clés traitées jusqu'ici\n"
@@ -1796,7 +1798,7 @@ msgstr "cl
 msgid "no default public keyring\n"
 msgstr "pas de porte-clés public par défaut\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:350 g10/sign.c:669
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "écriture de `%s'\n"
@@ -2054,7 +2056,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "Signer réellement ? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1870 g10/keyedit.c:1932 g10/sign.c:136
+#: g10/keyedit.c:373 g10/keyedit.c:1873 g10/keyedit.c:1935 g10/sign.c:191
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a échoué: %s\n"
@@ -2409,104 +2411,104 @@ msgstr "La cl
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez «help»)\n"
 
-#: g10/keyedit.c:1080 g10/keyedit.c:1106
+#: g10/keyedit.c:1083 g10/keyedit.c:1109
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1089
+#: g10/keyedit.c:1092
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1093
+#: g10/keyedit.c:1096
 msgid "This key has been disabled"
 msgstr "Cette clé a été désactivée"
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1125
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "clé %08lX: la sous-clé a été révoquée !\n"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1128
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr " nouvelles révocations de clés: %lu\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1130
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1368
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1372
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature invalide ? (o/N/q)"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1376
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1382
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1396
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d signature supprimée.\n"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1397
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d signatures supprimées\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1400
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a été supprimé.\n"
 
-#: g10/keyedit.c:1466
+#: g10/keyedit.c:1469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les sélections des clés secrètes.\n"
 
-#: g10/keyedit.c:1472
+#: g10/keyedit.c:1475
 msgid "Please select at most one secondary key.\n"
 msgstr "Vous devez sélectionner au plus une clé secondaire.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1479
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Changer la date d'expiration d'une clé secondaire.\n"
 
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1481
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la clé principale.\n"
 
-#: g10/keyedit.c:1520
+#: g10/keyedit.c:1523
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vous ne pouvez pas changer la date d'expiration d'une clé v3\n"
 
-#: g10/keyedit.c:1536
+#: g10/keyedit.c:1539
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-clés secret\n"
 
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1600
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1646
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Pas de clé secondaire avec l'index %d\n"
 
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1744
 msgid "user ID: \""
 msgstr "nom d'utilisateur: «"
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1747
 #, c-format
 msgid ""
 "\"\n"
@@ -2515,163 +2517,173 @@ msgstr ""
 "»\n"
 "signé avec votre clé %08lX à %s\n"
 
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:1751
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Générer un certificat de révocation pour cette signature ? (o/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1775
 msgid "You have signed these user IDs:\n"
 msgstr "Vous avez signé ces noms d'utilisateurs:\n"
 
-#: g10/keyedit.c:1786 g10/keyedit.c:1821
+#: g10/keyedit.c:1789 g10/keyedit.c:1824
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   signé par %08lX à %s\n"
 
-#: g10/keyedit.c:1791
+#: g10/keyedit.c:1794
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   révoqué par %08lX à %s\n"
 
-#: g10/keyedit.c:1811
+#: g10/keyedit.c:1814
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous êtes sur le point de révoquer ces signatures:\n"
 
-#: g10/keyedit.c:1829
+#: g10/keyedit.c:1832
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Faut-il vraiment générer les certificats de révocation ? (o/N)"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1861
 msgid "no secret key\n"
 msgstr "pas de clé secrète\n"
 
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "armure invalide"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "revclé"
+
 #. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:401 g10/mainproc.c:754
 #, c-format
 msgid " [expires: %s]"
 msgstr " [expire: %s]"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:212
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la clé publique est %08lX\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:247
 msgid "public key encrypted data: good DEK\n"
 msgstr "données chiffrées par clé publique: bonne clé de chiffrement (DEK)\n"
 
-#: g10/mainproc.c:281
+#: g10/mainproc.c:280
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "chiffré avec une clé de %u bits %s, ID %08lX, créée le %s\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "chiffré avec une clé %s, %08lX\n"
 
-#: g10/mainproc.c:297
+#: g10/mainproc.c:296
 msgid "no secret key for decryption available\n"
 msgstr "aucune clé secrète n'est disponible pour le déchiffrement\n"
 
-#: g10/mainproc.c:306
+#: g10/mainproc.c:305
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "le déchiffrement par clé publique a échoué: %s\n"
 
-#: g10/mainproc.c:343
+#: g10/mainproc.c:342
 msgid "decryption okay\n"
 msgstr "le déchiffrement a réussi\n"
 
-#: g10/mainproc.c:348
+#: g10/mainproc.c:347
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENTION: le message chiffré a été manipulé !\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:352
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "le déchiffrement a échoué: %s\n"
 
-#: g10/mainproc.c:372
+#: g10/mainproc.c:371
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTE: l'expéditeur a demandé «pour vos yeux seulement»\n"
 
-#: g10/mainproc.c:374
+#: g10/mainproc.c:373
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original: '%.*s'\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:538
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "révocation autonome - utilisez «gpg --import» pour l'appliquer\n"
 
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:625 g10/mainproc.c:634
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENTION: des données de notation invalides ont été détectées\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:637
 msgid "Notation: "
 msgstr "Notation: "
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:644
 msgid "Policy: "
 msgstr "Politique: "
 
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1074
 msgid "signature verification suppressed\n"
 msgstr "vérification de signature supprimée\n"
 
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1080
 #, 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:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1106 g10/mainproc.c:1117
 msgid "BAD signature from \""
 msgstr "MAUVAISE signature de \""
 
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1107 g10/mainproc.c:1118
 msgid "Good signature from \""
 msgstr "Bonne signature de \""
 
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1109
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1165
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de vérifier la signature: %s\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1230
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1282
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1287
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide détecté dans proc_tree()\n"
 
-#: g10/misc.c:94
+#: g10/misc.c:83
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossible d'empêcher la génération de fichiers «core»: %s\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:86
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut créer un fichier «core» !\n"
 
-#: g10/misc.c:205
+#: g10/misc.c:312
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Les algorithmes expérimentaux ne devraient pas être utilisés !\n"
 
-#: g10/misc.c:219
+#: g10/misc.c:326
 msgid ""
 "RSA keys are deprecated; please consider creating a new key and use this key "
 "in the future\n"
@@ -2679,18 +2691,18 @@ msgstr ""
 "Les clés RSA sont déconseillées: considérez créer une nouvelle clé\n"
 "et l'utiliser dans l'avenir\n"
 
-#: g10/misc.c:241
+#: g10/misc.c:348
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "Cet algorithme de chiffrement est déconseillé; utilisez-en un\n"
 "plus standard !\n"
 
-#: g10/parse-packet.c:117
+#: g10/parse-packet.c:115
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossible de gérer l'algorithme à clé publique %d\n"
 
-#: g10/parse-packet.c:965
+#: g10/parse-packet.c:963
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un sous-paquet de type %d possède un bit critique\n"
@@ -2727,55 +2739,55 @@ msgstr "Entrez le mot de passe: "
 msgid "Repeat passphrase: "
 msgstr "Répétez le mot de passe: "
 
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "les données ne sont pas enregistrées; utilisez l'option «--output» pour\n"
 "les enregistrer\n"
 
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
 msgid "Detached signature.\n"
 msgstr "Signature détachée.\n"
 
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
 msgid "Please enter name of data file: "
 msgstr "Entrez le nom du fichier de données: "
 
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
 msgid "reading stdin ...\n"
 msgstr "lecture de l'entrée standard...\n"
 
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossible d'ouvir les données signées `%s'\n"
 
-#: g10/pubkey-enc.c:79
+#: g10/pubkey-enc.c:138
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "destinataire anonyme; essai de la clé secrète %08lX...\n"
 
-#: g10/pubkey-enc.c:85
+#: g10/pubkey-enc.c:144
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "d'accord, nous sommes le récipient anonyme.\n"
 
-#: g10/pubkey-enc.c:137
+#: g10/pubkey-enc.c:200
 msgid "old encoding of the DEK is not supported\n"
 msgstr "l'ancien codage de la clé de chiffrement (DEK) n'est pas supporté\n"
 
-#: g10/pubkey-enc.c:156
+#: g10/pubkey-enc.c:219
 #, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "l'algorithme de chiffrement %d est inconnu ou désactivé\n"
 
-#: g10/pubkey-enc.c:195
+#: g10/pubkey-enc.c:258
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr ""
 "NOTE: l'algorithme de chiffrement %d n'a pas été trouvé dans les "
 "préférences\n"
 
-#: g10/pubkey-enc.c:201
+#: g10/pubkey-enc.c:264
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTE: la clé secrète %08lX a expiré le %s\n"
@@ -2819,70 +2831,66 @@ msgstr "l'envoi 
 msgid "failed sending to `%s': status=%u\n"
 msgstr "l'envoi à `%s' a échoué: le résultat est %u\n"
 
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:90
 msgid "secret key parts are not available\n"
 msgstr "les parties secrètes ne sont pas disponibles\n"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:96
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "l'algorithme de protection %d n'est pas supporté\n"
 
-#: g10/seckey-cert.c:175
+#: g10/seckey-cert.c:239
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Mot de passe invalide; réessayez...\n"
 
-#: g10/seckey-cert.c:231
+#: g10/seckey-cert.c:302
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "ATTENTION: Clé faible détectée - changez encore le mot de passe.\n"
 
-#: g10/sig-check.c:202
-msgid "assuming bad MDC due to an unknown critical bit\n"
-msgstr "le sceau (MDC) est supposé être faux car un bit critique est inconnu\n"
-
-#: g10/sig-check.c:300
+#: g10/sig-check.c:282
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "Ceci est une clé ElGamal générée par PGP qui n'est PAS sûre pour les\n"
 "signatures !\n"
 
-#: g10/sig-check.c:308
+#: g10/sig-check.c:290
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "la clé publique est plus récente de %lu seconde que la signature\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:291
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "la clé publique est plus récente de %lu secondes que la signature\n"
 
-#: g10/sig-check.c:327
+#: g10/sig-check.c:309
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTE: la clé de signature a expiré le %s\n"
 
-#: g10/sig-check.c:396
+#: g10/sig-check.c:378
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "la signature est supposée être fausse car un bit critique est\n"
 "inconnu\n"
 
-#: g10/sign.c:140
+#: g10/sign.c:195
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "Signature %s de: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:606
+#: g10/sign.c:345 g10/sign.c:664
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossible de créer %s: %s\n"
 
-#: g10/sign.c:388
+#: g10/sign.c:444
 msgid "signing:"
 msgstr "signature:"
 
-#: g10/sign.c:431
+#: g10/sign.c:487
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATTENTION: `%s' est un fichier vide\n"
@@ -2922,7 +2930,8 @@ msgstr "%s: impossible d'acc
 msgid "%s: directory does not exist!\n"
 msgstr "%s: le répertoire n'existe pas !\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1363 g10/tdbio.c:444
+#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1407
+#: g10/ringedit.c:1878 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: impossible de créer: %s\n"
@@ -3113,207 +3122,207 @@ msgstr "cl
 msgid "enumerate secret keys failed: %s\n"
 msgstr "l'énumération des clés secrètes a échoué: %s\n"
 
-#: g10/trustdb.c:921
+#: g10/trustdb.c:925
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "clé %08lX.%lu: bonne liaison avec la sous-clé\n"
 
-#: g10/trustdb.c:927 g10/trustdb.c:962
+#: g10/trustdb.c:931 g10/trustdb.c:966
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "clé %08lX.%lu: liaison avec la sous-clé invalide: %s\n"
 
-#: g10/trustdb.c:939
+#: g10/trustdb.c:943
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "clé %08lX.%lu: révocation de clé valide\n"
 
-#: g10/trustdb.c:945
+#: g10/trustdb.c:949
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "clé %08lX.%lu: révocation de sous-clé invalide: %s\n"
 
-#: g10/trustdb.c:956
+#: g10/trustdb.c:960
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "clé %08lX.%lu: révocation de sous-clé valide\n"
 
-#: g10/trustdb.c:1067
+#: g10/trustdb.c:1071
 msgid "Good self-signature"
 msgstr "Bonne auto-signature"
 
-#: g10/trustdb.c:1077
+#: g10/trustdb.c:1081
 msgid "Invalid self-signature"
 msgstr "Auto-signature invalide"
 
-#: g10/trustdb.c:1104
+#: g10/trustdb.c:1108
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "La révocation valide de nom d'utilisateur a été ignorée car l'auto-\n"
 "signature est plus récente"
 
-#: g10/trustdb.c:1110
+#: g10/trustdb.c:1114
 msgid "Valid user ID revocation"
 msgstr "Révocation de nom d'utilisateur valide"
 
-#: g10/trustdb.c:1115
+#: g10/trustdb.c:1119
 msgid "Invalid user ID revocation"
 msgstr "Révocation de nom d'utilisateur invalide"
 
-#: g10/trustdb.c:1157
+#: g10/trustdb.c:1161
 msgid "Valid certificate revocation"
 msgstr "Certificat de révocation valide"
 
-#: g10/trustdb.c:1158
+#: g10/trustdb.c:1162
 msgid "Good certificate"
 msgstr "Bon certificat"
 
-#: g10/trustdb.c:1186
+#: g10/trustdb.c:1190
 msgid "Invalid certificate revocation"
 msgstr "Révocation de certificat invalide"
 
-#: g10/trustdb.c:1187
+#: g10/trustdb.c:1191
 msgid "Invalid certificate"
 msgstr "Certificat invalide"
 
-#: g10/trustdb.c:1204 g10/trustdb.c:1208
+#: g10/trustdb.c:1208 g10/trustdb.c:1212
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr ""
 "l'enregistrement de signature %lu[%d] pointe vers un mauvais\n"
 "enregistrement de répertoire\n"
 
-#: g10/trustdb.c:1267
+#: g10/trustdb.c:1271
 msgid "duplicated certificate - deleted"
 msgstr "certificat dupliqué - supprimé"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1592
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir a échoué: %s\n"
 
-#: g10/trustdb.c:1718
+#: g10/trustdb.c:1726
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: l'insertion a échoué: %s\n"
 
-#: g10/trustdb.c:1723
+#: g10/trustdb.c:1731
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: l'insertion a échoué: %s\n"
 
-#: g10/trustdb.c:1729
+#: g10/trustdb.c:1737
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: inséré\n"
 
-#: g10/trustdb.c:1734
+#: g10/trustdb.c:1742
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "erreur pendant la lecture de l'enregistrement de répertoire: %s\n"
 
-#: g10/trustdb.c:1742 g10/trustdb.c:1805
+#: g10/trustdb.c:1750 g10/trustdb.c:1813
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu clés traitées\n"
 
-#: g10/trustdb.c:1744 g10/trustdb.c:1811
+#: g10/trustdb.c:1752 g10/trustdb.c:1819
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu clés avec erreurs\n"
 
-#: g10/trustdb.c:1746
+#: g10/trustdb.c:1754
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu clés insérées\n"
 
-#: g10/trustdb.c:1749
+#: g10/trustdb.c:1757
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "l'énumération des blocs de clés a échoué: %s\n"
 
-#: g10/trustdb.c:1797
+#: g10/trustdb.c:1805
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: enregistrement de répertoire sans clé - ignoré\n"
 
-#: g10/trustdb.c:1807
+#: g10/trustdb.c:1815
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu à cause de nouvelles clés publiques\n"
 
-#: g10/trustdb.c:1809
+#: g10/trustdb.c:1817
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu clés ignorées\n"
 
-#: g10/trustdb.c:1813
+#: g10/trustdb.c:1821
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu clés mises à jour\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2166
 msgid "Ooops, no keys\n"
 msgstr "Ooops, pas de clé\n"
 
-#: g10/trustdb.c:2162
+#: g10/trustdb.c:2170
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, pas de nom d'utilisateur\n"
 
-#: g10/trustdb.c:2320
+#: g10/trustdb.c:2328
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr ""
 "check_trust: la recherche d'enregistrement de répertoire a échoué: %s\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2337
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "clé %08lX: l'insertion d'enregistrement de confiance a échoué: %s\n"
 
-#: g10/trustdb.c:2333
+#: g10/trustdb.c:2341
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "clé %08lX.%lu: insérée dans la base de confiance\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2349
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "clé %08lX.%lu: créée dans le futur (voyage temporel ou\n"
 "problème d'horloge)\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2364
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "clé %08lX.%lu: a expiré le %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2372
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "clé %08lX.%lu: la vérification de confiance a échoué: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2523
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "l'utilisateur '%s' n'a pas été trouvé: %s\n"
 
-#: g10/trustdb.c:2517
+#: g10/trustdb.c:2525
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problème de recherche de '%s' dans la base de confiance: %s\n"
 
-#: g10/trustdb.c:2520
+#: g10/trustdb.c:2528
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "l'utilisateur '%s' n'est pas dans la base de confiance - insertion\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2531
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "impossible d'insérer '%s' dans la base de confiance: %s\n"
 
-#: g10/trustdb.c:2709 g10/trustdb.c:2739
+#: g10/trustdb.c:2717 g10/trustdb.c:2747
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr ""
 "ATTENTION: les enregistrements de préférences longs ne sont pas encore\n"
@@ -3336,47 +3345,41 @@ msgstr ""
 "la ligne d'entrée %u est trop longue ou il manque un caractère de saut\n"
 "de ligne\n"
 
-#: g10/ringedit.c:302
+#: g10/ringedit.c:324
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: impossible de créer le porte-clés: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1368
+#: g10/ringedit.c:341 g10/ringedit.c:1412 g10/ringedit.c:1883
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: porte-clés créé\n"
 
-#: g10/ringedit.c:1545
+#: g10/ringedit.c:1589 g10/ringedit.c:2060
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 "ATTENTION: 2 fichiers avec des informations confidentielles existent.\n"
 
-#: g10/ringedit.c:1546
+#: g10/ringedit.c:1590 g10/ringedit.c:2061
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s est le fichier original\n"
 
-#: g10/ringedit.c:1547
+#: g10/ringedit.c:1591 g10/ringedit.c:2062
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s est le nouveau\n"
 
-#: g10/ringedit.c:1548
+#: g10/ringedit.c:1592 g10/ringedit.c:2063
 msgid "Please fix this possible security flaw\n"
 msgstr "Réparez ce problème de sécurité possible\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
-msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr ""
-"la clé n'est pas marquée comme non-sûre; on ne peut pas l'utiliser avec le\n"
-"pseudo-générateur de nombres aléatiores !\n"
-
-#: g10/skclist.c:113
+#: g10/skclist.c:96
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s' a été ignoré: %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:102
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3434,28 +3437,28 @@ msgstr ""
 "vous devez redémarrer GnuPG pour qu'il puisse lire le nouveau\n"
 "fichier «options»\n"
 
-#: g10/encr-data.c:66
-#, c-format
-msgid "%s encrypted data\n"
-msgstr "données chiffrées avec %s\n"
-
-#: g10/encr-data.c:68
+#: g10/encr-data.c:64
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "chiffré avec l'algorithme inconnu %d\n"
 
-#: g10/encr-data.c:90
+#: g10/encr-data.c:69
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "données chiffrées avec %s\n"
+
+#: g10/encr-data.c:99
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATTENTION: Le message a été chiffré avec une clé faible pendant le\n"
 "chiffrement symétrique.\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:61
 msgid "weak key created - retrying\n"
 msgstr "clé faible générée - nouvel essai\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:66
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
@@ -3698,13 +3701,14 @@ msgstr ""
 "fichier par défaut (indiqué entre crochets) sera utilisé."
 
 #: g10/helptext.c:229
+#, fuzzy
 msgid ""
 "You should specify a reason for the certification.  Depending on the\n"
 "context you have the ability to choose from this list:\n"
 "  \"Key has been compromised\"\n"
 "      Use this if you have a reason to believe that unauthorized persons\n"
 "      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
+"  \"Key is superseeded\"\n"
 "      Use this if you have replaced this key with a newer one.\n"
 "  \"Key is no longer used\"\n"
 "      Use this if you have retired this key.\n"
@@ -3744,3 +3748,15 @@ msgstr "Pas d'aide disponible"
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Pas d'aide disponible pour `%s'"
+
+#~ msgid "not processed"
+#~ msgstr "non traité"
+
+#~ msgid "assuming bad MDC due to an unknown critical bit\n"
+#~ msgstr ""
+#~ "le sceau (MDC) est supposé être faux car un bit critique est inconnu\n"
+
+#~ msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
+#~ msgstr ""
+#~ "la clé n'est pas marquée comme non-sûre; on ne peut pas l'utiliser avec le\n"
+#~ "pseudo-générateur de nombres aléatiores !\n"
diff --git a/po/id.po b/po/id.po
index 92210149b..7dddda126 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU Privacy Guard 1.0.1\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-07-30 20:02+0200\n"
 "PO-Revision-Date: 2000-02-06 18:04+07:00\n"
 "Last-Translator: Tedi Heriyanto <tedi-h@usa.net>\n"
 "Language-Team: Indonesia <id@li.org>\n"
@@ -13,306 +13,289 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:79
-msgid "Warning: using insecure memory!\n"
-msgstr "Peringatan: menggunakan memori yang tidak aman!\n"
-
-#: util/secmem.c:289
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "operasi tidak mungkin tanpa menginisialisasi memori yang aman\n"
-
-#: util/secmem.c:290
-msgid "(you may have used the wrong program for this task)\n"
-msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
-
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:278 util/miscutil.c:307
 msgid "yes"
 msgstr "ya"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:279 util/miscutil.c:310
 msgid "yY"
 msgstr "yY"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:280 util/miscutil.c:308
 msgid "no"
 msgstr "tidak"
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:281 util/miscutil.c:311
 msgid "nN"
 msgstr "tT"
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:580 util/miscutil.c:309
 msgid "quit"
 msgstr "keluar"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:312
 msgid "qQ"
 msgstr "kK"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "Kesalahan umum"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "tipe paket tidak dikenal"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "versi tidak dikenal"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "algoritma pubkey tidak dikenal"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "algoritma digest tidak dikenal"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "kunci publik yang buruk"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "kunci rahasia yang buruk"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "signature yang buruk"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "kesalahan checksum"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "passphrase yang buruk"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "kunci publik tidak ditemukan"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "algoritma cipher tidak dikenal"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "tidak dapat membuka keyring"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "paket tidak valid"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "armor tidak valid"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "tidak ada user id tsb"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "kunci rahasia tidak ada"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "digunakan kunci rahasia yang salah"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "tidak didukung"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "kunci yang buruk"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "kesalahan baca file"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "kesalahan tulis file"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "algoritma kompresi tidak dikenal"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "kesalahan buka file"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "kesalahan buat file"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "passphrase tidak valid"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "algoritma pubkey belum diimplementasikan"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "algoritma cipher belum diimplementasikan"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "kelas signature tidak dikenal"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "kesalahan database trust"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "MPI yang buruk"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "batasan sumber daya"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "keyring tidak valid"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "sertifikat yang buruk"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "user id yang tidak benar"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "kesalahan tutup file"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "kesalahan ganti nama file"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "kesalahan hapus file"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "data tidak terduga"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "konflik timestamp"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "algoritma pubkey tidak dapat digunakan"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "file ada"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "kunci lemah"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "argumen tidak valid"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "URI yang buruk"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "URI tidak didukung"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "kesalahan jaringan"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "tidak dienkripsi"
 
-#: util/errors.c:103
-#, fuzzy
-msgid "not processed"
-msgstr "%lu kunci diproses\n"
-
-#: util/logger.c:224
+#: util/logger.c:225
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... kesalahan (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:231
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "anda menemukan kesalahan ...(%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:321 g10/import.c:127 g10/keygen.c:1348
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:325
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:330
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:325
+#: cipher/random.c:335
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:331
+#: cipher/random.c:341
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:339
+#: cipher/random.c:349
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:387
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:397
+#: cipher/random.c:407
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:414
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:417
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:428
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:647
+#: cipher/random.c:657
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "PERINGATAN: menggunakan random number generator yang tidak aman!!\n"
 
-#: cipher/random.c:648
+#: cipher/random.c:663
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -326,7 +309,7 @@ msgstr ""
 "JANGAN MENGGUNAKAN DATA YANG DIHASILKAN PROGRAM INI!!\n"
 "\n"
 
-#: cipher/rndlinux.c:141
+#: cipher/rndlinux.c:125
 #, c-format
 msgid ""
 "\n"
@@ -337,7 +320,19 @@ 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:197
+#: gcrypt/secmem.c:77
+msgid "Warning: using insecure memory!\n"
+msgstr "Peringatan: menggunakan memori yang tidak aman!\n"
+
+#: gcrypt/secmem.c:287
+msgid "operation is not possible without initialized secure memory\n"
+msgstr "operasi tidak mungkin tanpa menginisialisasi memori yang aman\n"
+
+#: gcrypt/secmem.c:288
+msgid "(you may have used the wrong program for this task)\n"
+msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
+
+#: g10/gpg.c:197
 msgid ""
 "@Commands:\n"
 " "
@@ -345,140 +340,140 @@ msgstr ""
 "@Perintah:\n"
 "  "
 
-#: g10/g10.c:199
+#: g10/gpg.c:199
 msgid "|[file]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: g10/g10.c:200
+#: g10/gpg.c:200
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/g10.c:201
+#: g10/gpg.c:201
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/g10.c:202
+#: g10/gpg.c:202
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/g10.c:203
+#: g10/gpg.c:203
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/g10.c:204
+#: g10/gpg.c:204
 msgid "store only"
 msgstr "hanya disimpan"
 
-#: g10/g10.c:205
+#: g10/gpg.c:205
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/g10.c:206
+#: g10/gpg.c:206
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/g10.c:208
+#: g10/gpg.c:208
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/g10.c:210
+#: g10/gpg.c:210
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/g10.c:211
+#: g10/gpg.c:211
 msgid "check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/g10.c:212
+#: g10/gpg.c:212
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/g10.c:213
+#: g10/gpg.c:213
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/g10.c:214
+#: g10/gpg.c:214
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/g10.c:215
+#: g10/gpg.c:215
 msgid "remove key from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/g10.c:217
+#: g10/gpg.c:217
 #, fuzzy
 msgid "remove key from the secret keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/g10.c:218
+#: g10/gpg.c:218
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/g10.c:219
+#: g10/gpg.c:219
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/g10.c:220
+#: g10/gpg.c:220
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/g10.c:221
+#: g10/gpg.c:221
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/g10.c:222
+#: g10/gpg.c:222
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/g10.c:223
+#: g10/gpg.c:223
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/g10.c:224
+#: g10/gpg.c:224
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
-#: g10/g10.c:228
+#: g10/gpg.c:228
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/g10.c:230
+#: g10/gpg.c:230
 msgid "list only the sequence of packets"
 msgstr "tampilkan hanya urutan paket"
 
-#: g10/g10.c:232
+#: g10/gpg.c:232
 msgid "export the ownertrust values"
 msgstr "ekspor nilai ownertrust"
 
-#: g10/g10.c:234
+#: g10/gpg.c:234
 msgid "import ownertrust values"
 msgstr "impor nilai ownertrust"
 
-#: g10/g10.c:236
+#: g10/gpg.c:236
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/g10.c:238
+#: g10/gpg.c:238
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMA]|periksa database trust"
 
-#: g10/g10.c:239
+#: g10/gpg.c:239
 msgid "fix a corrupted trust database"
 msgstr "perbaiki database trust yang terkorupsi"
 
-#: g10/g10.c:240
+#: g10/gpg.c:240
 msgid "De-Armor a file or stdin"
 msgstr "De-Armor file atau stdin"
 
-#: g10/g10.c:242
+#: g10/gpg.c:242
 msgid "En-Armor a file or stdin"
 msgstr "En-Armor file atau stdin"
 
-#: g10/g10.c:244
+#: g10/gpg.c:244
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/g10.c:248
+#: g10/gpg.c:249
 msgid ""
 "@\n"
 "Options:\n"
@@ -488,154 +483,154 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: g10/g10.c:250
+#: g10/gpg.c:251
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/g10.c:252
+#: g10/gpg.c:253
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/g10.c:255
+#: g10/gpg.c:256
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: g10/g10.c:257
+#: g10/gpg.c:258
 msgid "use the default key as default recipient"
 msgstr "gunakan kunci baku sebagai penerima baku"
 
-#: g10/g10.c:261
+#: g10/gpg.c:262
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/g10.c:262
+#: g10/gpg.c:263
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/g10.c:264
+#: g10/gpg.c:265
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/g10.c:265
+#: g10/gpg.c:266
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/g10.c:266
+#: g10/gpg.c:267
 msgid "verbose"
 msgstr "detil"
 
-#: g10/g10.c:267
+#: g10/gpg.c:268
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: g10/g10.c:268
+#: g10/gpg.c:269
 msgid "don't use the terminal at all"
 msgstr "jangan menggunakan terminal"
 
-#: g10/g10.c:269
+#: g10/gpg.c:270
 msgid "force v3 signatures"
 msgstr "paksa signature v3"
 
-#: g10/g10.c:270
+#: g10/gpg.c:271
 msgid "always use a MDC for encryption"
 msgstr "selalu gunakan MDC untuk enkripsi"
 
-#: g10/g10.c:271
+#: g10/gpg.c:272
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/gpg.c:274
 msgid "batch mode: never ask"
 msgstr "mode batch: tanpa tanya"
 
-#: g10/g10.c:274
+#: g10/gpg.c:275
 msgid "assume yes on most questions"
 msgstr "asumsikan ya untuk seluruh pertanyaan"
 
-#: g10/g10.c:275
+#: g10/gpg.c:276
 msgid "assume no on most questions"
 msgstr "asumsikan tidak untuk seluruh pertanyaan"
 
-#: g10/g10.c:276
+#: g10/gpg.c:277
 msgid "add this keyring to the list of keyrings"
 msgstr "tambah keyring ini ke daftar keyring"
 
-#: g10/g10.c:277
+#: g10/gpg.c:278
 msgid "add this secret keyring to the list"
 msgstr "tambah keyring rahasia ini ke daftar"
 
-#: g10/g10.c:278
+#: g10/gpg.c:279
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: g10/g10.c:279
+#: g10/gpg.c:280
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
 
-#: g10/g10.c:280
+#: g10/gpg.c:281
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMA|set charset terminal ke NAMA"
 
-#: g10/g10.c:281
+#: g10/gpg.c:282
 msgid "read options from file"
 msgstr "baca pilihan dari file"
 
-#: g10/g10.c:285
+#: g10/gpg.c:286
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
-#: g10/g10.c:290
+#: g10/gpg.c:291
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: g10/g10.c:291
+#: g10/gpg.c:292
 msgid "emulate the mode described in RFC1991"
 msgstr "emulasikan mode seperti dalam RFC1991"
 
-#: g10/g10.c:292
+#: g10/gpg.c:293
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "set pilihan paket, cipher, digest ke OpenPGP"
 
-#: g10/g10.c:293
+#: g10/gpg.c:294
 msgid "|N|use passphrase mode N"
 msgstr "|N|gunakan passphrase mode N"
 
-#: g10/g10.c:295
+#: g10/gpg.c:296
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma digest NAMA utk passphrase"
 
-#: g10/g10.c:297
+#: g10/gpg.c:298
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
 
-#: g10/g10.c:298
+#: g10/gpg.c:299
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMA|gunakan algoritma cipher NAMA"
 
-#: g10/g10.c:299
+#: g10/gpg.c:300
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
 
-#: g10/g10.c:300
+#: g10/gpg.c:301
 msgid "|N|use compress algorithm N"
 msgstr "|N|gunakan algoritma kompresi N"
 
-#: g10/g10.c:301
+#: g10/gpg.c:302
 msgid "throw keyid field of encrypted packets"
 msgstr "buang field keyid paket terenkripsi"
 
-#: g10/g10.c:302
+#: g10/gpg.c:303
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAMA=NILAI|gunakan notasi data ini"
 
-#: g10/g10.c:305
+#: g10/gpg.c:306
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:308
+#: g10/gpg.c:309
 msgid ""
 "@\n"
 "Examples:\n"
@@ -655,15 +650,15 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/g10.c:403
+#: g10/gpg.c:409
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Silakan laporkan kesalahan ke <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:407
+#: g10/gpg.c:413
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/g10.c:410
+#: g10/gpg.c:416
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -673,7 +668,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/g10.c:417
+#: g10/gpg.c:423
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -681,182 +676,187 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/g10.c:496
+#: g10/gpg.c:525
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/g10.c:549
+#: g10/gpg.c:583
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/g10.c:692
+#: g10/gpg.c:638
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
+#: g10/gpg.c:734
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: g10/g10.c:696
+#: g10/gpg.c:738
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: g10/g10.c:703
+#: g10/gpg.c:745
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/g10.c:893
+#: g10/gpg.c:937
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/gpg.c:1002 g10/gpg.c:1011
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/g10.c:951
+#: g10/gpg.c:1004
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/g10.c:954
+#: g10/gpg.c:1007
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/gpg.c:1027 g10/gpg.c:1039
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/gpg.c:1033 g10/gpg.c:1045
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:995
+#: g10/gpg.c:1049
 msgid "the given policy URL is invalid\n"
 msgstr "kebijakan URL yang diberikan tidak valid\n"
 
-#: g10/g10.c:998
+#: g10/gpg.c:1052
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "algoritma kompresi harus di antara %d..%d\n"
 
-#: g10/g10.c:1000
+#: g10/gpg.c:1054
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/g10.c:1002
+#: g10/gpg.c:1056
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/g10.c:1004
+#: g10/gpg.c:1058
 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:1007
+#: g10/gpg.c:1061
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/g10.c:1011
+#: g10/gpg.c:1065
 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:1096
+#: g10/gpg.c:1154
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/g10.c:1102
+#: g10/gpg.c:1160
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/g10.c:1109
+#: g10/gpg.c:1167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/g10.c:1117
+#: g10/gpg.c:1175
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/g10.c:1130
+#: g10/gpg.c:1188
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/g10.c:1143
+#: g10/gpg.c:1201
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:1157
+#: g10/gpg.c:1215
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/g10.c:1174
+#: g10/gpg.c:1232
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/g10.c:1182
+#: g10/gpg.c:1240
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/g10.c:1190
+#: g10/gpg.c:1248
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/g10.c:1198
+#: g10/gpg.c:1256
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/g10.c:1214
+#: g10/gpg.c:1272
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-user"
 
-#: g10/g10.c:1217
+#: g10/gpg.c:1275
 msgid "--delete-key user-id"
 msgstr "--delete-key id-user"
 
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:311 g10/gpg.c:1312 g10/sign.c:449
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "tidak dapat membuka %s: %s\n"
 
-#: g10/g10.c:1269
+#: g10/gpg.c:1327
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/g10.c:1335
+#: g10/gpg.c:1393
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/g10.c:1343
+#: g10/gpg.c:1401
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/g10.c:1411
+#: g10/gpg.c:1474 g10/gpg.c:1495
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/g10.c:1492
+#: g10/gpg.c:1580
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/g10.c:1496
+#: g10/gpg.c:1584
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/gpg.c:1587 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/g10.c:1669
+#: g10/gpg.c:1765
 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:1675
+#: g10/gpg.c:1771
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -864,11 +864,11 @@ msgstr ""
 "nama notasi hanya terdiri dari huruf, digit, titik atau garis bawah dan "
 "diakhiri dengan sebuah '='\n"
 
-#: g10/g10.c:1681
+#: g10/gpg.c:1777
 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:1689
+#: g10/gpg.c:1785
 msgid "a notation value must not use any control characters\n"
 msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
@@ -953,50 +953,50 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1188 g10/pkclist.c:53
+#: g10/keyedit.c:1191 g10/pkclist.c:54
 msgid "             Fingerprint:"
 msgstr "            Fingerprint:"
 
-#: g10/pkclist.c:80
+#: g10/pkclist.c:81
 msgid "Fingerprint:"
 msgstr "Fingerprint:"
 
-#: g10/pkclist.c:116
+#: g10/pkclist.c:117
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:118
+#: g10/pkclist.c:119
 #, fuzzy
-msgid "Key is superseded"
+msgid "Key is superseeded"
 msgstr "Kunci diproteksi.\n"
 
-#: g10/pkclist.c:120
+#: g10/pkclist.c:121
 #, fuzzy
 msgid "Key has been compromised"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/pkclist.c:122
+#: g10/pkclist.c:123
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:124
+#: g10/pkclist.c:125
 msgid "User ID is no longer valid"
 msgstr ""
 
-#: g10/pkclist.c:128
+#: g10/pkclist.c:129
 msgid "Reason for revocation: "
 msgstr ""
 
-#: g10/pkclist.c:145
+#: g10/pkclist.c:146
 msgid "Revocation comment: "
 msgstr ""
 
 #. a string with valid answers
-#: g10/pkclist.c:303
+#: g10/pkclist.c:304
 msgid "sSmMqQ"
 msgstr "sSmMqQ"
 
-#: g10/pkclist.c:307
+#: g10/pkclist.c:308
 #, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -1005,7 +1005,7 @@ msgstr ""
 "Tidak ada nilai trust untuk %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1027,23 +1027,23 @@ msgstr ""
 " s = tampilkan lebih banyak informasi\n"
 " \n"
 
-#: g10/pkclist.c:328
+#: g10/pkclist.c:329
 msgid " m = back to the main menu\n"
 msgstr " m = kembali ke menu utama\n"
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:331
 msgid " q = quit\n"
 msgstr " q = berhenti\n"
 
-#: g10/pkclist.c:336
+#: g10/pkclist.c:337
 msgid "Your decision? "
 msgstr "Keputusan anda? "
 
-#: g10/pkclist.c:358
+#: g10/pkclist.c:359
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Sertifikat mengarahkan ke kunci terpercaya:\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 msgid ""
 "Could not find a valid trust path to the key.  Let's see whether we\n"
 "can assign some missing owner trust values.\n"
@@ -1052,7 +1052,7 @@ msgstr ""
 "Tidak dapat menemukan jalur trust yang valid ke kunci. Mari kita coba\n"
 "apakah dapat mengisi nilai trust pemilik yang hilang.\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
@@ -1060,7 +1060,7 @@ msgstr ""
 "Tidak ditemukan jalur ke salah satu kunci.\n"
 "\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:438
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
@@ -1068,7 +1068,7 @@ msgstr ""
 "Tidak ditemukan sertifikat dengan trust tak terdefinisi.\n"
 "\n"
 
-#: g10/pkclist.c:439
+#: g10/pkclist.c:440
 msgid ""
 "No trust values changed.\n"
 "\n"
@@ -1076,36 +1076,36 @@ msgstr ""
 "Tidak ada perubahan nilai trust.\n"
 "\n"
 
-#: g10/pkclist.c:457
+#: g10/pkclist.c:458
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "kunci %08lX: kunci telah dibatalkan!\n"
 
-#: g10/pkclist.c:464 g10/pkclist.c:476 g10/pkclist.c:598
+#: g10/pkclist.c:465 g10/pkclist.c:477 g10/pkclist.c:599
 msgid "Use this key anyway? "
 msgstr "Tetap gunakan kunci ini? "
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "kunci %08lX: subkey telah dibatalkan!\n"
 
-#: g10/pkclist.c:512
+#: g10/pkclist.c:513
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: kunci telah berakhir\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr "%08lX: tidak ada info untuk menghitung probabilitas trust\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: Kita tidak percaya kunci ini\n"
 
-#: g10/pkclist.c:539
+#: g10/pkclist.c:540
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -1114,15 +1114,15 @@ msgstr ""
 "%08lX: Tidak pasti kunci ini milik pemiliknya\n"
 "tapi tetap diterima\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:546
 msgid "This key probably belongs to the owner\n"
 msgstr "Kunci ini mungkin milik pemiliknya\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid "This key belongs to us\n"
 msgstr "Kunci ini milik kita\n"
 
-#: g10/pkclist.c:593
+#: g10/pkclist.c:594
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -1133,106 +1133,106 @@ msgstr ""
 "Jika anda yakin tahu apa yang sedang anda lakukan, anda boleh menjawab\n"
 "pertanyaan berikut dengan ya\n"
 
-#: g10/pkclist.c:607 g10/pkclist.c:630
+#: g10/pkclist.c:608 g10/pkclist.c:631
 msgid "WARNING: Using untrusted key!\n"
 msgstr "PERINGATAN: Menggunakan kunci tidak dipercaya!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:652
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pemiliknya!\n"
 
-#: g10/pkclist.c:652
+#: g10/pkclist.c:653
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "        Mungkin signature adalah palsu.\n"
 
-#: g10/pkclist.c:657
+#: g10/pkclist.c:658
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "PERINGATAN: Subkey ini telah dibatalkan oleh pemiliknya!\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:680
 msgid "Note: This key has expired!\n"
 msgstr "Catatan: Kunci ini telah berakhir!\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:688
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "PERINGATAN: Kunci ini tidak disertifikasi dengan sig yang terpercaya!\n"
 
-#: g10/pkclist.c:689
+#: g10/pkclist.c:690
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "  Tidak ada indikasi signature milik pemilik.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:707
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "PERINGATAN: Kita tidak percaya kunci ini!\n"
 
-#: g10/pkclist.c:707
+#: g10/pkclist.c:708
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "        Signature mungkin palsu.\n"
 
-#: g10/pkclist.c:714
+#: g10/pkclist.c:715
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "PERINGATAN: Kunci tdk disertifikasi dg signature terpercaya yg cukup!\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:718
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "        Tidak pasti signature milik pemilik.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:968 g10/pkclist.c:1013
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: dilewati: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:828 g10/pkclist.c:995
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: dilewati: kunci publik telah ada\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:855
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
 msgstr "Anda tidak menspesifikasikan ID user. (anda dapat gunakan \"-r\")\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:865
 msgid "Enter the user ID: "
 msgstr "Masukkan ID user: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:877
 msgid "No such user ID.\n"
 msgstr "Tidak ada ID user tersebut.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:882
 msgid "skipped: public key already set as default recipient\n"
 msgstr "dilewati: kunci publik telah diset sebagai penerima baku\n"
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:905
 msgid "Public key is disabled.\n"
 msgstr "Kunci publik dimatikan.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:912
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "dilewati: kunci publik telah diset dengan --encrypt-to\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:943
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:976
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: kesalahan memeriksa kunci: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:981
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: dilewati: kunci publik dimatikan\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1019
 msgid "no valid addressees\n"
 msgstr "tidak ada alamat yang valid\n"
 
@@ -1244,58 +1244,58 @@ msgstr "menulis self signature\n"
 msgid "writing key binding signature\n"
 msgstr "menulis key binding signature\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
+#: g10/keygen.c:308 g10/keygen.c:419 g10/keygen.c:529
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:438
+#: g10/keygen.c:313 g10/keygen.c:424 g10/keygen.c:534
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:537
+#: g10/keygen.c:633
 msgid "Please select what kind of key you want:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:635
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:636
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "  (%d) DSA (hanya menandai)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:638
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:639
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "  (%d) ElGamal (tandai dan enkripsi)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:641
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "  (%d) ElGamal (tandai dan enkripsi)\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:645
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
-#: g10/keygen.c:560 g10/keygen.c:568
+#: g10/keygen.c:656 g10/keygen.c:664
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Anda ingin membuat kunci sign dan enkripsi? "
 
-#: g10/keygen.c:582
+#: g10/keygen.c:678
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:690
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1308,19 +1308,19 @@ msgstr ""
 "       keysize default adalah 1024 bit\n"
 " keysize tertinggi dianjurkan 2048 bit\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:697
 msgid "What keysize do you want? (1024) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:702
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA hanya membolehkan keysize dari 512 hingga 1024\n"
 
-#: g10/keygen.c:608
+#: g10/keygen.c:704
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:706
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
@@ -1333,12 +1333,12 @@ msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:621
+#: g10/keygen.c:717
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "keysize terlalu besar; %d adalah nilai tertinggi yang diijinkan.\n"
 
-#: g10/keygen.c:626
+#: g10/keygen.c:722
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1346,11 +1346,11 @@ msgstr ""
 "Keysize lebih besar dari 2048 tidak dianjurkan karena\n"
 "komputasi akan sangat lama!\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:725
 msgid "Are you sure that you want this keysize? "
 msgstr "Apakah anda yakin memerlukan keysize ini? "
 
-#: g10/keygen.c:630
+#: g10/keygen.c:726
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1358,21 +1358,21 @@ msgstr ""
 "Oke, tetapi ingat bahwa radiasi monitor dan keyboard anda juga sangat mudah "
 "diserang!\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:734
 msgid "Do you really need such a large keysize? "
 msgstr "Apakah anda perlu keysize berukuran besar tersebut? "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:740
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#: g10/keygen.c:647 g10/keygen.c:651
+#: g10/keygen.c:743 g10/keygen.c:747
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:795
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1388,35 +1388,35 @@ msgstr ""
 "     <n>m = kunci berakhir dalam n bulan\n"
 "     <n>y = kunci berakhir dalam n tahun\n"
 
-#: g10/keygen.c:714
+#: g10/keygen.c:810
 msgid "Key is valid for? (0) "
 msgstr "Kunci valid untuk? (0) "
 
-#: g10/keygen.c:719
+#: g10/keygen.c:815
 msgid "invalid value\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keygen.c:724
+#: g10/keygen.c:820
 msgid "Key does not expire at all\n"
 msgstr "Kunci tidak pernah berakhir\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:730
+#: g10/keygen.c:826
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Kunci berakhir pada %s\n"
 
-#: g10/keygen.c:733
+#: g10/keygen.c:829
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:738
+#: g10/keygen.c:834
 msgid "Is this correct (y/n)? "
 msgstr "Benar (y/t)? "
 
-#: g10/keygen.c:781
+#: g10/keygen.c:877
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1431,44 +1431,44 @@ msgstr ""
 "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
 "  \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 
-#: g10/keygen.c:793
+#: g10/keygen.c:889
 msgid "Real name: "
 msgstr "Nama sebenarnya: "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:893
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: g10/keygen.c:799
+#: g10/keygen.c:895
 msgid "Name may not start with a digit\n"
 msgstr "Nama tidak boleh dimulai dengan digit\n"
 
-#: g10/keygen.c:801
+#: g10/keygen.c:897
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nama harus berukuran minimum 5 karakter\n"
 
-#: g10/keygen.c:809
+#: g10/keygen.c:905
 msgid "Email address: "
 msgstr "Alamat email: "
 
-#: g10/keygen.c:820
+#: g10/keygen.c:916
 msgid "Not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/keygen.c:828
+#: g10/keygen.c:924
 msgid "Comment: "
 msgstr "Komentar: "
 
-#: g10/keygen.c:834
+#: g10/keygen.c:930
 msgid "Invalid character in comment\n"
 msgstr "Karakter tidak valid dalam komentar\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:956
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Anda menggunakan set karakter `%s'.\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:962
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1478,28 +1478,28 @@ msgstr ""
 "Anda memilih USER-ID ini:\n"
 "   \"%s\"\n"
 
-#: g10/keygen.c:867
+#: g10/keygen.c:966
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:872
+#: g10/keygen.c:971
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:882
+#: g10/keygen.c:981
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
 
-#: g10/keygen.c:883
+#: g10/keygen.c:982
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
 
-#: g10/keygen.c:902
+#: g10/keygen.c:1001
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:940
+#: g10/keygen.c:1039
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1507,11 +1507,11 @@ msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:948
+#: g10/keyedit.c:468 g10/keygen.c:1047
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "passphrase tidak diulang dengan benar; coba lagi.\n"
 
-#: g10/keygen.c:954
+#: g10/keygen.c:1053
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1523,7 +1523,7 @@ msgstr ""
 "saat,\n"
 "menggunakan program ini dengan pilihan \"--edit-key\".\n"
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1074
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1535,29 +1535,29 @@ msgstr ""
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:1424
+#: g10/keygen.c:1523
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Keypair DSA akan memiliki 1024 bit.\n"
 
-#: g10/keygen.c:1467
+#: g10/keygen.c:1566
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1663
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "menulis sertifikat publik ke `%s'\n"
 
-#: g10/keygen.c:1565
+#: g10/keygen.c:1664
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "menulis sertifikat rahasia ke `%s'\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1760
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1765
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1566,51 +1566,51 @@ msgstr ""
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuk tujuan ini.\n"
 
-#: g10/keygen.c:1683 g10/keygen.c:1784
+#: g10/keygen.c:1782 g10/keygen.c:1883
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1826 g10/sig-check.c:300 g10/sign.c:167
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1828 g10/sig-check.c:302 g10/sign.c:169
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1861
 msgid "Really create? "
 msgstr "Ingin diciptakan? "
 
-#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:142 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: tidak dapat dibuka: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:164
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:222 g10/encode.c:370
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: PERINGATAN: file kosong\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:317
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Membaca dari `%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:534
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s dienkripsi untuk: %s\n"
@@ -1639,32 +1639,32 @@ msgstr "kunci %08lX: bukan kunci rfc2440 - dilewati\n"
 msgid "WARNING: nothing exported\n"
 msgstr "PERINGATAN: tidak ada yang diekspor\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:212
 msgid "too many entries in pk cache - disabled\n"
 msgstr "terlalu banyak masukan dalam pk cache - ditiadakan\n"
 
-#: g10/getkey.c:350
+#: g10/getkey.c:351
 msgid "too many entries in unk cache - disabled\n"
 msgstr "terlalu banyak masukan di unk cache - ditiadakan\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
+#: g10/getkey.c:1311 g10/getkey.c:1350
 msgid "RSA key cannot be used in this version\n"
 msgstr "Kunci RSA tidak dapat digunakan pada versi ini\n"
 
-#: g10/getkey.c:1310 g10/getkey.c:1349
+#: g10/getkey.c:1313 g10/getkey.c:1352
 msgid "No key for user ID\n"
 msgstr "Tidak ada kunci untuk ID user\n"
 
-#: g10/getkey.c:1388 g10/getkey.c:1428
+#: g10/getkey.c:1391 g10/getkey.c:1431
 msgid "No user ID for key\n"
 msgstr "Tidak ada ID user untuk kunci\n"
 
-#: g10/getkey.c:1642 g10/getkey.c:1698
+#: g10/getkey.c:1645 g10/getkey.c:1701
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "menggunakan kunci sekunder %08lX selain kunci primer %08lX\n"
 
-#: g10/getkey.c:2017
+#: g10/getkey.c:2020
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: user tidak ditemukan\n"
@@ -1674,7 +1674,7 @@ msgstr "%s: user tidak ditemukan\n"
 msgid "skipping block of type %d\n"
 msgstr "melewati blok tipe %d\n"
 
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:188 g10/trustdb.c:1748 g10/trustdb.c:1789
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu kunci telah diproses\n"
@@ -1762,7 +1762,7 @@ msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
 msgid "no default public keyring\n"
 msgstr "tidak ada keyring publik baku\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:350 g10/sign.c:669
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
@@ -2020,7 +2020,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1870 g10/keyedit.c:1932 g10/sign.c:136
+#: g10/keyedit.c:373 g10/keyedit.c:1873 g10/keyedit.c:1935 g10/sign.c:191
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
@@ -2376,267 +2376,277 @@ msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
-#: g10/keyedit.c:1080 g10/keyedit.c:1106
+#: g10/keyedit.c:1083 g10/keyedit.c:1109
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1089
+#: g10/keyedit.c:1092
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1093
+#: g10/keyedit.c:1096
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1125
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "kunci %08lX: subkey telah dibatalkan!\n"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1128
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "  pembatalan kunci baru: %lu\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1130
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1368
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1372
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1376
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1382
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1396
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1397
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1400
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:1466
+#: g10/keyedit.c:1469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:1472
+#: g10/keyedit.c:1475
 msgid "Please select at most one secondary key.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1479
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1481
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:1520
+#: g10/keyedit.c:1523
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
 
-#: g10/keyedit.c:1536
+#: g10/keyedit.c:1539
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1600
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1646
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Tidak ada kunci sekunder dengan index %d\n"
 
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1744
 msgid "user ID: \""
 msgstr "ID user: "
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1747
 #, c-format
 msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 msgstr "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:1751
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1775
 msgid "You have signed these user IDs:\n"
 msgstr "Anda telah menandai ID user ini:\n"
 
-#: g10/keyedit.c:1786 g10/keyedit.c:1821
+#: g10/keyedit.c:1789 g10/keyedit.c:1824
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   ditandai oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:1791
+#: g10/keyedit.c:1794
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:1811
+#: g10/keyedit.c:1814
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:1829
+#: g10/keyedit.c:1832
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1861
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "armor tidak valid"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "revkey"
+
 #. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:401 g10/mainproc.c:754
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "Kunci berakhir pada %s\n"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:212
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "kunci publik adalah %08lX\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:247
 msgid "public key encrypted data: good DEK\n"
 msgstr "data terenkripsi dengan kunci publik: DEK baik\n"
 
-#: g10/mainproc.c:281
+#: g10/mainproc.c:280
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "dienkripsi dengan %u-bit kunci %s, ID %08lX, tercipta %s\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
 
-#: g10/mainproc.c:297
+#: g10/mainproc.c:296
 msgid "no secret key for decryption available\n"
 msgstr "tidak tersedia kunci rahasia untuk dekripsi\n"
 
-#: g10/mainproc.c:306
+#: g10/mainproc.c:305
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "gagal dekripsi kunci publik: %s\n"
 
-#: g10/mainproc.c:343
+#: g10/mainproc.c:342
 msgid "decryption okay\n"
 msgstr "dekripsi lancar\n"
 
-#: g10/mainproc.c:348
+#: g10/mainproc.c:347
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:352
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "gagal dekripsi: %s\n"
 
-#: g10/mainproc.c:372
+#: g10/mainproc.c:371
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:374
+#: g10/mainproc.c:373
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nama file asli='%.*s'\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:538
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:625 g10/mainproc.c:634
 msgid "WARNING: invalid notation data found\n"
 msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:637
 msgid "Notation: "
 msgstr "Notasi: "
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:644
 msgid "Policy: "
 msgstr "Kebijakan: "
 
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1074
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak optimal\n"
 
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1080
 #, 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:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1106 g10/mainproc.c:1117
 msgid "BAD signature from \""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1107 g10/mainproc.c:1118
 msgid "Good signature from \""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1109
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1165
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1230
 #, fuzzy, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature tidak dikenal"
 
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1282
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
 
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1287
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
-#: g10/misc.c:94
+#: g10/misc.c:83
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "tidak dapat meniadakan core dump: %s\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:86
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/misc.c:205
+#: g10/misc.c:312
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Algoritma eksperimental sebaiknya tidak dipakai!\n"
 
-#: g10/misc.c:219
+#: g10/misc.c:326
 msgid ""
 "RSA keys are deprecated; please consider creating a new key and use this key "
 "in the future\n"
@@ -2644,17 +2654,17 @@ msgstr ""
 "Kunci RSA didepresiasi; silakan membuat kunci baru dan menggunakannya di "
 "masa depan\n"
 
-#: g10/misc.c:241
+#: g10/misc.c:348
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "algoritma cipher ini didepresiasi; silakan gunakan yang lebih standar!\n"
 
-#: g10/parse-packet.c:117
+#: g10/parse-packet.c:115
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/parse-packet.c:965
+#: g10/parse-packet.c:963
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
@@ -2691,52 +2701,52 @@ msgstr "Masukkan passphrase: "
 msgid "Repeat passphrase: "
 msgstr "Ulangi passphrase: "
 
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data tidak disimpan; gunakan pilihan \"--output\" untuk menyimpannya\n"
 
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
 #, fuzzy
 msgid "Detached signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
 msgid "Please enter name of data file: "
 msgstr "Silakan masukkan nama file data: "
 
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
 msgid "reading stdin ...\n"
 msgstr "membaca stdin ...\n"
 
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "tidak dapat membuka data tertandai `%s'\n"
 
-#: g10/pubkey-enc.c:79
+#: g10/pubkey-enc.c:138
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "penerima anonim; mencoba kunci rahasia %08lX ...\n"
 
-#: g10/pubkey-enc.c:85
+#: g10/pubkey-enc.c:144
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "baik, kita adalah penerima anonim.\n"
 
-#: g10/pubkey-enc.c:137
+#: g10/pubkey-enc.c:200
 msgid "old encoding of the DEK is not supported\n"
 msgstr "encoding lama DEK tidak didukung\n"
 
-#: g10/pubkey-enc.c:156
+#: g10/pubkey-enc.c:219
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "algoritma proteksi %d tidak didukung\n"
 
-#: g10/pubkey-enc.c:195
+#: g10/pubkey-enc.c:258
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "CATATAN: algoritma cipher %d tidak ditemukan dalam preferensi\n"
 
-#: g10/pubkey-enc.c:201
+#: g10/pubkey-enc.c:264
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "CATATAN: kunci signature berakhir %s\n"
@@ -2780,68 +2790,64 @@ msgstr ""
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
 
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:90
 #, fuzzy
 msgid "secret key parts are not available\n"
 msgstr "kunci rahasia tidak ada"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:96
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "algoritma proteksi %d tidak didukung\n"
 
-#: g10/seckey-cert.c:175
+#: g10/seckey-cert.c:239
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Passphrase tidak valid; silakan coba lagi ...\n"
 
-#: g10/seckey-cert.c:231
+#: g10/seckey-cert.c:302
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "PERINGATAN: terdeteksi kunci lemah - silakan rubah passphrase lagi.\n"
 
-#: g10/sig-check.c:202
-msgid "assuming bad MDC due to an unknown critical bit\n"
-msgstr "mengasumsikan MDC buruk karena ada bit kritis tidak dikenal\n"
-
-#: g10/sig-check.c:300
+#: g10/sig-check.c:282
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "ini adalah kunci ElGamal ciptaan PGP yang tidak aman untuk signature!\n"
 
-#: g10/sig-check.c:308
+#: g10/sig-check.c:290
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "kunci publik adalah %lu detik lebih baru daripada signature\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:291
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "kunci publik adalah %lu detik lebih baru daripada signature\n"
 
-#: g10/sig-check.c:327
+#: g10/sig-check.c:309
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "CATATAN: kunci signature berakhir %s\n"
 
-#: g10/sig-check.c:396
+#: g10/sig-check.c:378
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "mengasumsikan signature buruk karena ada bit kritik tidak dikenal\n"
 
-#: g10/sign.c:140
+#: g10/sign.c:195
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s signature dari: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:606
+#: g10/sign.c:345 g10/sign.c:664
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/sign.c:388
+#: g10/sign.c:444
 msgid "signing:"
 msgstr "menandai:"
 
-#: g10/sign.c:431
+#: g10/sign.c:487
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "PERINGATAN: `%s' adalah file kosong\n"
@@ -2880,7 +2886,8 @@ msgstr "%s: tidak dapat akses: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: direktori tidak ada!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1363 g10/tdbio.c:444
+#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1407
+#: g10/ringedit.c:1878 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: tidak dapat membuat: %s\n"
@@ -3065,201 +3072,201 @@ msgstr "kunci %08lX: diterima sebagai kunci terpercaya.\n"
 msgid "enumerate secret keys failed: %s\n"
 msgstr "gagal enumerasi kunci rahasia: %s\n"
 
-#: g10/trustdb.c:921
+#: g10/trustdb.c:925
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "kunci %08lX.%lu: binding subkey baik\n"
 
-#: g10/trustdb.c:927 g10/trustdb.c:962
+#: g10/trustdb.c:931 g10/trustdb.c:966
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "kunci %08lX.%lu: binding subkey tidak valid: %s\n"
 
-#: g10/trustdb.c:939
+#: g10/trustdb.c:943
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "kunci %08lX.%lu: pembatalan kunci valid\n"
 
-#: g10/trustdb.c:945
+#: g10/trustdb.c:949
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "kunci %08lX.%lu: pembatalan kunci tidak valid: %s\n"
 
-#: g10/trustdb.c:956
+#: g10/trustdb.c:960
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "kunci %08lX.%lu: pembatalan subkey valid\n"
 
-#: g10/trustdb.c:1067
+#: g10/trustdb.c:1071
 msgid "Good self-signature"
 msgstr "Self-signature yang baik"
 
-#: g10/trustdb.c:1077
+#: g10/trustdb.c:1081
 msgid "Invalid self-signature"
 msgstr "Self-signature tidak valid"
 
-#: g10/trustdb.c:1104
+#: g10/trustdb.c:1108
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Pembatalan ID user valid dilewati karena ada self signature yang lebih baru"
 
-#: g10/trustdb.c:1110
+#: g10/trustdb.c:1114
 msgid "Valid user ID revocation"
 msgstr "Pembatalan ID user valid"
 
-#: g10/trustdb.c:1115
+#: g10/trustdb.c:1119
 msgid "Invalid user ID revocation"
 msgstr "Pembatalan ID user tidak valid"
 
-#: g10/trustdb.c:1157
+#: g10/trustdb.c:1161
 msgid "Valid certificate revocation"
 msgstr "Pembatalan sertifikat valid"
 
-#: g10/trustdb.c:1158
+#: g10/trustdb.c:1162
 msgid "Good certificate"
 msgstr "Sertifikat yang baik"
 
-#: g10/trustdb.c:1186
+#: g10/trustdb.c:1190
 msgid "Invalid certificate revocation"
 msgstr "Pembatalan sertifikat tidak valid"
 
-#: g10/trustdb.c:1187
+#: g10/trustdb.c:1191
 msgid "Invalid certificate"
 msgstr "Sertifikat tidak valid"
 
-#: g10/trustdb.c:1204 g10/trustdb.c:1208
+#: g10/trustdb.c:1208 g10/trustdb.c:1212
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "sig record %lu[%d] menunjuk ke record yang salah.\n"
 
-#: g10/trustdb.c:1267
+#: g10/trustdb.c:1271
 msgid "duplicated certificate - deleted"
 msgstr "sertifikat ganda - dihapus"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1592
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir gagal: %s\n"
 
-#: g10/trustdb.c:1718
+#: g10/trustdb.c:1726
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: gagal menyisipkan: %s\n"
 
-#: g10/trustdb.c:1723
+#: g10/trustdb.c:1731
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: gagal menyisipkan: %s\n"
 
-#: g10/trustdb.c:1729
+#: g10/trustdb.c:1737
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: menyisipkan\n"
 
-#: g10/trustdb.c:1734
+#: g10/trustdb.c:1742
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "kesalahan membaca dir record: %s\n"
 
-#: g10/trustdb.c:1742 g10/trustdb.c:1805
+#: g10/trustdb.c:1750 g10/trustdb.c:1813
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu kunci diproses\n"
 
-#: g10/trustdb.c:1744 g10/trustdb.c:1811
+#: g10/trustdb.c:1752 g10/trustdb.c:1819
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu kunci dengan kesalahan\n"
 
-#: g10/trustdb.c:1746
+#: g10/trustdb.c:1754
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "%lu kunci disisipkan\n"
 
-#: g10/trustdb.c:1749
+#: g10/trustdb.c:1757
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "gagal enumerasi keyblok: %s\n"
 
-#: g10/trustdb.c:1797
+#: g10/trustdb.c:1805
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: dir record tanpa kunci - dilewati\n"
 
-#: g10/trustdb.c:1807
+#: g10/trustdb.c:1815
 #, fuzzy, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "kunci %08lX: %d subkey baru\n"
 
-#: g10/trustdb.c:1809
+#: g10/trustdb.c:1817
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "%lu kunci dilewati\n"
 
-#: g10/trustdb.c:1813
+#: g10/trustdb.c:1821
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "%lu kunci diperbaharui\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2166
 msgid "Ooops, no keys\n"
 msgstr "Ooops, tanpa kunci\n"
 
-#: g10/trustdb.c:2162
+#: g10/trustdb.c:2170
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, tanpa ID user\n"
 
-#: g10/trustdb.c:2320
+#: g10/trustdb.c:2328
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: gagal mencari di record: %s\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2337
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "kunci %08lX: gagal menyisipkan record trust: %s\n"
 
-#: g10/trustdb.c:2333
+#: g10/trustdb.c:2341
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "kunci %08lX.%lu: menyisipkan ke trustdb\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2349
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr "kunci %08lX.%lu: tercipta di masa datang (masalah waktu atau jam)\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2364
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "kunci %08lX.%lu: berakhir pada %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2372
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "kunci %08lX.%lu: gagal periksa trust: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2523
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "user '%s' tidak ditemukan: %s\n"
 
-#: g10/trustdb.c:2517
+#: g10/trustdb.c:2525
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "masalah menemukan '%s' dalam trustdb: %s\n"
 
-#: g10/trustdb.c:2520
+#: g10/trustdb.c:2528
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "pemakai '%s' tidak ada di trustdb - menyisipkan\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2531
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "gagal menaruh '%s' ke dalam trustdb: %s\n"
 
-#: g10/trustdb.c:2709 g10/trustdb.c:2739
+#: g10/trustdb.c:2717 g10/trustdb.c:2747
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "PERINGATAN: belum dapat menangani record pref panjang\n"
 
@@ -3275,46 +3282,40 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: g10/ringedit.c:302
+#: g10/ringedit.c:324
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: tidak dapat membuat keyring: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1368
+#: g10/ringedit.c:341 g10/ringedit.c:1412 g10/ringedit.c:1883
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: keyring tercipta\n"
 
-#: g10/ringedit.c:1545
+#: g10/ringedit.c:1589 g10/ringedit.c:2060
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "PERINGATAN: terdapat 2 file dengan informasi penting.\n"
 
-#: g10/ringedit.c:1546
+#: g10/ringedit.c:1590 g10/ringedit.c:2061
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s adalah yang tidak berubah\n"
 
-#: g10/ringedit.c:1547
+#: g10/ringedit.c:1591 g10/ringedit.c:2062
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s adalah yang baru\n"
 
-#: g10/ringedit.c:1548
+#: g10/ringedit.c:1592 g10/ringedit.c:2063
 msgid "Please fix this possible security flaw\n"
 msgstr "Silakan perbaikan kemungkinan lubang keamanan\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
-msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr ""
-"kunci tidak dianggap sebagai tidak aman - tidak dapat digunakan dengan RNG "
-"palsu!\n"
-
-#: g10/skclist.c:113
+#: g10/skclist.c:96
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "melewati `%s': %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:102
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3370,27 +3371,27 @@ msgstr "%s: direktori tercipta\n"
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 
-#: g10/encr-data.c:66
-#, c-format
-msgid "%s encrypted data\n"
-msgstr "%s data terenkripsi\n"
-
-#: g10/encr-data.c:68
+#: g10/encr-data.c:64
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 
-#: g10/encr-data.c:90
+#: g10/encr-data.c:69
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s data terenkripsi\n"
+
+#: g10/encr-data.c:99
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "PERINGATAN: pesan dienkripsi dengan kunci lemah dalam cipher simetrik.\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:61
 msgid "weak key created - retrying\n"
 msgstr "kunci lemah tercipta - mengulang\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:66
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
@@ -3635,7 +3636,7 @@ msgid ""
 "  \"Key has been compromised\"\n"
 "      Use this if you have a reason to believe that unauthorized persons\n"
 "      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
+"  \"Key is superseeded\"\n"
 "      Use this if you have replaced this key with a newer one.\n"
 "  \"Key is no longer used\"\n"
 "      Use this if you have retired this key.\n"
@@ -3660,6 +3661,18 @@ msgstr "Tidak tersedia bantuan"
 msgid "No help available for `%s'"
 msgstr "Tidak tersedia bantuan untuk `%s'"
 
+#, fuzzy
+#~ msgid "not processed"
+#~ msgstr "%lu kunci diproses\n"
+
+#~ msgid "assuming bad MDC due to an unknown critical bit\n"
+#~ msgstr "mengasumsikan MDC buruk karena ada bit kritis tidak dikenal\n"
+
+#~ msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
+#~ msgstr ""
+#~ "kunci tidak dianggap sebagai tidak aman - tidak dapat digunakan dengan RNG "
+#~ "palsu!\n"
+
 #~ msgid "set debugging flags"
 #~ msgstr "set flag debugging"
 
diff --git a/po/it.po b/po/it.po
index f798ee8ca..582358118 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.0h\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-07-30 20:02+0200\n"
 "PO-Revision-Date: 1999-12-08 15:51+02:00\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -13,307 +13,290 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:79
-msgid "Warning: using insecure memory!\n"
-msgstr "Attenzione: si sta usando memoria insicura!\n"
-
-#: util/secmem.c:289
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "l'operazione non è possibile senza memoria sicura inizializzata\n"
-
-#: util/secmem.c:290
-msgid "(you may have used the wrong program for this task)\n"
-msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
-
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:278 util/miscutil.c:307
 msgid "yes"
 msgstr "sì"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:279 util/miscutil.c:310
 msgid "yY"
 msgstr "sS"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:280 util/miscutil.c:308
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:281 util/miscutil.c:311
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:580 util/miscutil.c:309
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:312
 msgid "qQ"
 msgstr "qQ"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "errore generale"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "pacchetto di tipo sconosciuto"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "versione sconosciuta"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "algoritmo della chiave pubblica sconosciuto"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "algoritmo del digest sconosciuto"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "chiave pubblica errata"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "chiave segreta errata"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "firma errata"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "codice di controllo errato"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "passphrase errata"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "chiave pubblica non trovata"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "algoritmo di cifratura sconosciuto"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "impossibile aprire il portachiavi"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "pacchetto non valido"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "armatura non valida"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "l'user id non esiste"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "la chiave segreta non è disponibile"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "è stata usata la chiave segreta sbagliata"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "non gestito"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "chiave sbagliata"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "errore durante la lettura del file"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "errore durante la scrittura del file"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "algoritmo di compressione sconosciuto"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "errore durante l'apertura del file"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "errore durante la creazione del file"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "passphrase non valida"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "algoritmo della chiave pubblica non implementato"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "algoritmo di cifratura non implementato"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "classe della firma sconosciuta"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "errore nel database della fiducia"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "MPI danneggiato"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "limite della risorsa"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "portachiavi non valido"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "certificato danneggiato"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "user id malformato"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "errore durante la chiusura del file"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "errore durante la rinominazione del file"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "errore durante la cancellazione del file"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "dati inattesi"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "date in conflitto"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "algoritmo della chiave pubblica non utilizzabile"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "il file esiste"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "chiave debole"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "argomento non valido"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "URI non valida"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "URI non gestito"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "errore di rete"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "non cifrato"
 
-# ??? (Md)
-#: util/errors.c:103
-msgid "not processed"
-msgstr "non esaminato"
-
-#: util/logger.c:224
+#: util/logger.c:225
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... questo è un bug (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:231
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Hai trovato un bug... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:321 g10/import.c:127 g10/keygen.c:1348
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:325
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:330
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:325
+#: cipher/random.c:335
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:331
+#: cipher/random.c:341
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:339
+#: cipher/random.c:349
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:387
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:397
+#: cipher/random.c:407
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:414
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:417
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:428
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:647
+#: cipher/random.c:657
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ATTENZIONE: si sta usando un generatore di numeri casuali non sicuro!!\n"
 
-#: cipher/random.c:648
+#: cipher/random.c:663
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -327,7 +310,7 @@ msgstr ""
 "NON USARE ALCUN DATO GENERATO DA QUESTO PROGRAMMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:141
+#: cipher/rndlinux.c:125
 #, c-format
 msgid ""
 "\n"
@@ -339,7 +322,19 @@ msgstr ""
 "altra cosa per dare all'OS la possibilità di raccogliere altra entropia!\n"
 "(Servono altri %d byte)\n"
 
-#: g10/g10.c:197
+#: gcrypt/secmem.c:77
+msgid "Warning: using insecure memory!\n"
+msgstr "Attenzione: si sta usando memoria insicura!\n"
+
+#: gcrypt/secmem.c:287
+msgid "operation is not possible without initialized secure memory\n"
+msgstr "l'operazione non è possibile senza memoria sicura inizializzata\n"
+
+#: gcrypt/secmem.c:288
+msgid "(you may have used the wrong program for this task)\n"
+msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
+
+#: g10/gpg.c:197
 msgid ""
 "@Commands:\n"
 " "
@@ -347,139 +342,139 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/g10.c:199
+#: g10/gpg.c:199
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/g10.c:200
+#: g10/gpg.c:200
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/g10.c:201
+#: g10/gpg.c:201
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/g10.c:202
+#: g10/gpg.c:202
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/g10.c:203
+#: g10/gpg.c:203
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/g10.c:204
+#: g10/gpg.c:204
 msgid "store only"
 msgstr "immagazzina soltanto"
 
-#: g10/g10.c:205
+#: g10/gpg.c:205
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/g10.c:206
+#: g10/gpg.c:206
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:208
+#: g10/gpg.c:208
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/g10.c:210
+#: g10/gpg.c:210
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/g10.c:211
+#: g10/gpg.c:211
 msgid "check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/g10.c:212
+#: g10/gpg.c:212
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/g10.c:213
+#: g10/gpg.c:213
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/g10.c:214
+#: g10/gpg.c:214
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/g10.c:215
+#: g10/gpg.c:215
 msgid "remove key from the public keyring"
 msgstr "rimuove una chiave dal portachiavi pubblico"
 
-#: g10/g10.c:217
+#: g10/gpg.c:217
 msgid "remove key from the secret keyring"
 msgstr "rimuove una chiave dal portachiavi privato"
 
-#: g10/g10.c:218
+#: g10/gpg.c:218
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/g10.c:219
+#: g10/gpg.c:219
 msgid "sign a key locally"
 msgstr "firma localmente una chiave"
 
-#: g10/g10.c:220
+#: g10/gpg.c:220
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/g10.c:221
+#: g10/gpg.c:221
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/g10.c:222
+#: g10/gpg.c:222
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/g10.c:223
+#: g10/gpg.c:223
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/g10.c:224
+#: g10/gpg.c:224
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/g10.c:228
+#: g10/gpg.c:228
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/g10.c:230
+#: g10/gpg.c:230
 msgid "list only the sequence of packets"
 msgstr "elenca solo la sequenza dei pacchetti"
 
-#: g10/g10.c:232
+#: g10/gpg.c:232
 msgid "export the ownertrust values"
 msgstr "esporta i valori di fiducia"
 
-#: g10/g10.c:234
+#: g10/gpg.c:234
 msgid "import ownertrust values"
 msgstr "importa i valori di fiducia"
 
-#: g10/g10.c:236
+#: g10/gpg.c:236
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/g10.c:238
+#: g10/gpg.c:238
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMI]|controlla il database della fiducia"
 
-#: g10/g10.c:239
+#: g10/gpg.c:239
 msgid "fix a corrupted trust database"
 msgstr "ripara un database della fiducia rovinato"
 
-#: g10/g10.c:240
+#: g10/gpg.c:240
 msgid "De-Armor a file or stdin"
 msgstr "rimuovi l'armatura a un file o a stdin"
 
-#: g10/g10.c:242
+#: g10/gpg.c:242
 msgid "En-Armor a file or stdin"
 msgstr "crea l'armatura a un file o a stdin"
 
-#: g10/g10.c:244
+#: g10/gpg.c:244
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/g10.c:248
+#: g10/gpg.c:249
 msgid ""
 "@\n"
 "Options:\n"
@@ -489,156 +484,156 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/g10.c:250
+#: g10/gpg.c:251
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/g10.c:252
+#: g10/gpg.c:253
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/g10.c:255
+#: g10/gpg.c:256
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: g10/g10.c:257
+#: g10/gpg.c:258
 msgid "use the default key as default recipient"
 msgstr "usa la chiave predefinita come destinatario predefinito"
 
-#: g10/g10.c:261
+#: g10/gpg.c:262
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/g10.c:262
+#: g10/gpg.c:263
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/g10.c:264
+#: g10/gpg.c:265
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/g10.c:265
+#: g10/gpg.c:266
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/g10.c:266
+#: g10/gpg.c:267
 msgid "verbose"
 msgstr "prolisso"
 
-#: g10/g10.c:267
+#: g10/gpg.c:268
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: g10/g10.c:268
+#: g10/gpg.c:269
 msgid "don't use the terminal at all"
 msgstr "non usa per niente il terminale"
 
-#: g10/g10.c:269
+#: g10/gpg.c:270
 msgid "force v3 signatures"
 msgstr "forza l'uso di firme v3"
 
-#: g10/g10.c:270
+#: g10/gpg.c:271
 msgid "always use a MDC for encryption"
 msgstr "usa sempre un MDC per cifrare"
 
-#: g10/g10.c:271
+#: g10/gpg.c:272
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/gpg.c:274
 msgid "batch mode: never ask"
 msgstr "modo batch: non fa domande"
 
-#: g10/g10.c:274
+#: g10/gpg.c:275
 msgid "assume yes on most questions"
 msgstr "assumi \"sì\" per quasi tutte le domande"
 
-#: g10/g10.c:275
+#: g10/gpg.c:276
 msgid "assume no on most questions"
 msgstr "assumi \"no\" per quasi tutte le domande"
 
-#: g10/g10.c:276
+#: g10/gpg.c:277
 msgid "add this keyring to the list of keyrings"
 msgstr "aggiungi questo portachiavi alla lista"
 
-#: g10/g10.c:277
+#: g10/gpg.c:278
 msgid "add this secret keyring to the list"
 msgstr "aggiungi questo portachiavi segreto alla lista"
 
-#: g10/g10.c:278
+#: g10/gpg.c:279
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usa NOME come chiave segreta predefinita"
 
-#: g10/g10.c:279
+#: g10/gpg.c:280
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|cerca le chiavi in questo keyserver"
 
-#: g10/g10.c:280
+#: g10/gpg.c:281
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOME|imposta il set di caratteri del terminale NOME"
 
-#: g10/g10.c:281
+#: g10/gpg.c:282
 msgid "read options from file"
 msgstr "leggi le opzioni dal file"
 
-#: g10/g10.c:285
+#: g10/gpg.c:286
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato su questo FD"
 
-#: g10/g10.c:290
+#: g10/gpg.c:291
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: g10/g10.c:291
+#: g10/gpg.c:292
 msgid "emulate the mode described in RFC1991"
 msgstr "emula il modo descritto in RFC 1991"
 
-#: g10/g10.c:292
+#: g10/gpg.c:293
 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:293
+#: g10/gpg.c:294
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa il modo N per la passphrase"
 
-#: g10/g10.c:295
+#: g10/gpg.c:296
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOME|usa l'algoritmo di message digest NOME per le passphrase"
 
-#: g10/g10.c:297
+#: g10/gpg.c:298
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
 
-#: g10/g10.c:298
+#: g10/gpg.c:299
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di cifratura NOME"
 
-#: g10/g10.c:299
+#: g10/gpg.c:300
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di message digest NOME"
 
-#: g10/g10.c:300
+#: g10/gpg.c:301
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritmo di compressione N"
 
-#: g10/g10.c:301
+#: g10/gpg.c:302
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina il campo keyid dei pacchetti cifrati"
 
-#: g10/g10.c:302
+#: g10/gpg.c:303
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALORE|usa questi dati per una nota"
 
-#: g10/g10.c:305
+#: g10/gpg.c:306
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:308
+#: g10/gpg.c:309
 msgid ""
 "@\n"
 "Examples:\n"
@@ -658,15 +653,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/g10.c:403
+#: g10/gpg.c:409
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Per favore segnala i bug a <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:407
+#: g10/gpg.c:413
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/g10.c:410
+#: g10/gpg.c:416
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -676,7 +671,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/g10.c:417
+#: g10/gpg.c:423
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -684,184 +679,189 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/g10.c:496
+#: g10/gpg.c:525
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/g10.c:549
+#: g10/gpg.c:583
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/g10.c:692
+#: g10/gpg.c:638
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
+#: g10/gpg.c:734
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/g10.c:696
+#: g10/gpg.c:738
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/g10.c:703
+#: g10/gpg.c:745
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/g10.c:893
+#: g10/gpg.c:937
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s non è un set di caratteri valido\n"
 
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/gpg.c:1002 g10/gpg.c:1011
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/g10.c:951
+#: g10/gpg.c:1004
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non è permesso usare %s con %s!\n"
 
-#: g10/g10.c:954
+#: g10/gpg.c:1007
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/gpg.c:1027 g10/gpg.c:1039
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non è valido\n"
 
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/gpg.c:1033 g10/gpg.c:1045
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non è valido\n"
 
-#: g10/g10.c:995
+#: g10/gpg.c:1049
 msgid "the given policy URL is invalid\n"
 msgstr "L'URL della policy indicato non è valido\n"
 
-#: g10/g10.c:998
+#: g10/gpg.c:1052
 #, 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:1000
+#: g10/gpg.c:1054
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/g10.c:1002
+#: g10/gpg.c:1056
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/g10.c:1004
+#: g10/gpg.c:1058
 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:1007
+#: g10/gpg.c:1061
 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:1011
+#: g10/gpg.c:1065
 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:1096
+#: g10/gpg.c:1154
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/g10.c:1102
+#: g10/gpg.c:1160
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/g10.c:1109
+#: g10/gpg.c:1167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:1117
+#: g10/gpg.c:1175
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/g10.c:1130
+#: g10/gpg.c:1188
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/g10.c:1143
+#: g10/gpg.c:1201
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:1157
+#: g10/gpg.c:1215
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/g10.c:1174
+#: g10/gpg.c:1232
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/g10.c:1182
+#: g10/gpg.c:1240
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:1190
+#: g10/gpg.c:1248
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:1198
+#: g10/gpg.c:1256
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/g10.c:1214
+#: g10/gpg.c:1272
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key user-id"
 
-#: g10/g10.c:1217
+#: g10/gpg.c:1275
 msgid "--delete-key user-id"
 msgstr "--delete-key user-id"
 
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:311 g10/gpg.c:1312 g10/sign.c:449
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/g10.c:1269
+#: g10/gpg.c:1327
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/g10.c:1335
+#: g10/gpg.c:1393
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1343
+#: g10/gpg.c:1401
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1411
+#: g10/gpg.c:1474 g10/gpg.c:1495
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/g10.c:1492
+#: g10/gpg.c:1580
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/g10.c:1496
+#: g10/gpg.c:1584
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/gpg.c:1587 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/g10.c:1669
+#: g10/gpg.c:1765
 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:1675
+#: g10/gpg.c:1771
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -869,11 +869,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:1681
+#: g10/gpg.c:1777
 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:1689
+#: g10/gpg.c:1785
 msgid "a notation value must not use any control characters\n"
 msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 
@@ -958,52 +958,52 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1188 g10/pkclist.c:53
+#: g10/keyedit.c:1191 g10/pkclist.c:54
 msgid "             Fingerprint:"
 msgstr "       Impronta digitale:"
 
-#: g10/pkclist.c:80
+#: g10/pkclist.c:81
 msgid "Fingerprint:"
 msgstr "Impronta digitale:"
 
-#: g10/pkclist.c:116
+#: g10/pkclist.c:117
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:118
+#: g10/pkclist.c:119
 #, fuzzy
-msgid "Key is superseded"
+msgid "Key is superseeded"
 msgstr "La chiave è protetta.\n"
 
-#: g10/pkclist.c:120
+#: g10/pkclist.c:121
 #, fuzzy
 msgid "Key has been compromised"
 msgstr "Questa chiave è stata disabilitata"
 
-#: g10/pkclist.c:122
+#: g10/pkclist.c:123
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:124
+#: g10/pkclist.c:125
 msgid "User ID is no longer valid"
 msgstr ""
 
-#: g10/pkclist.c:128
+#: g10/pkclist.c:129
 msgid "Reason for revocation: "
 msgstr ""
 
-#: g10/pkclist.c:145
+#: g10/pkclist.c:146
 msgid "Revocation comment: "
 msgstr ""
 
 # valid user replies (not including 1..4)
 # [Marco, you can change 'm' and 's' to whatever letters you like]
 #. a string with valid answers
-#: g10/pkclist.c:303
+#: g10/pkclist.c:304
 msgid "sSmMqQ"
 msgstr "sSmMqQ"
 
-#: g10/pkclist.c:307
+#: g10/pkclist.c:308
 #, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -1012,7 +1012,7 @@ msgstr ""
 "Nessun valore di fiducia assegnato a %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1034,23 +1034,23 @@ msgstr ""
 " 4 = Mi fido completamente\n"
 " s = mostrami ulteriori informazioni\n"
 
-#: g10/pkclist.c:328
+#: g10/pkclist.c:329
 msgid " m = back to the main menu\n"
 msgstr " m = torna al menù principale\n"
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:331
 msgid " q = quit\n"
 msgstr " q = abbandona\n"
 
-#: g10/pkclist.c:336
+#: g10/pkclist.c:337
 msgid "Your decision? "
 msgstr "Cosa hai deciso? "
 
-#: g10/pkclist.c:358
+#: g10/pkclist.c:359
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificati che portano a chiavi definitivamente affidabili:\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 msgid ""
 "Could not find a valid trust path to the key.  Let's see whether we\n"
 "can assign some missing owner trust values.\n"
@@ -1060,20 +1060,20 @@ msgstr ""
 "se possiamo assegnare qualche valore di fiducia del proprietario mancante.\n"
 "\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
 msgstr ""
 "Non è stato trovato alcun percorso che porti a una delle nostre chiavi.\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:438
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
 msgstr "Non è stato trovato alcun certificato con fiducia non definita.\n"
 
-#: g10/pkclist.c:439
+#: g10/pkclist.c:440
 msgid ""
 "No trust values changed.\n"
 "\n"
@@ -1081,36 +1081,36 @@ msgstr ""
 "Nessun valore di fiducia modificato.\n"
 "\n"
 
-#: g10/pkclist.c:457
+#: g10/pkclist.c:458
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "chiave %08lX: la chiave è stata revocata!\n"
 
-#: g10/pkclist.c:464 g10/pkclist.c:476 g10/pkclist.c:598
+#: g10/pkclist.c:465 g10/pkclist.c:477 g10/pkclist.c:599
 msgid "Use this key anyway? "
 msgstr "Uso lo stesso questa chiave? "
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "chiave %08lX: la subchiave è stata revocata!\n"
 
-#: g10/pkclist.c:512
+#: g10/pkclist.c:513
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: la chiave è scaduta\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr "%08lX: mancano informazioni per calcolare una probabilità di fiducia\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: NON ci fidiamo di questa chiave!\n"
 
-#: g10/pkclist.c:539
+#: g10/pkclist.c:540
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -1119,15 +1119,15 @@ msgstr ""
 "%08lX: Non è sicuro che questa chiave appartenga veramente al proprietario\n"
 "ma è accettata comunque\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:546
 msgid "This key probably belongs to the owner\n"
 msgstr "Questa chiave probabilmente appartiene al proprietario\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid "This key belongs to us\n"
 msgstr "Questa chiave ci appartiene\n"
 
-#: g10/pkclist.c:593
+#: g10/pkclist.c:594
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -1139,65 +1139,65 @@ msgstr ""
 "prossima domanda.\n"
 "\n"
 
-#: g10/pkclist.c:607 g10/pkclist.c:630
+#: g10/pkclist.c:608 g10/pkclist.c:631
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATTENZIONE: uso di una chiave non fidata!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:652
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATTENZIONE: questa chiave è stata revocata dal suo proprietario!\n"
 
-#: g10/pkclist.c:652
+#: g10/pkclist.c:653
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Questo può significare che la firma è stata falsificata.\n"
 
-#: g10/pkclist.c:657
+#: g10/pkclist.c:658
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATTENZIONE: questa subchiave è stata revocata dal proprietario!\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:680
 msgid "Note: This key has expired!\n"
 msgstr "Nota: questa chiave è scaduta!\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:688
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "ATTENZIONE: questa chiave non è certificata con una firma fidata!\n"
 
-#: g10/pkclist.c:689
+#: g10/pkclist.c:690
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Non ci sono indicazioni che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:707
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n"
 
-#: g10/pkclist.c:707
+#: g10/pkclist.c:708
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          La firma è probabilmente un FALSO.\n"
 
-#: g10/pkclist.c:714
+#: g10/pkclist.c:715
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATTENZIONE: questa chiave non è certificata con firme abbastanza fidate!\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:718
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Non è sicuro che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:968 g10/pkclist.c:1013
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: saltata: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:828 g10/pkclist.c:995
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: saltato: chiave pubblica già presente\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:855
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1205,42 +1205,42 @@ msgstr ""
 "Non hai specificato un user ID. (puoi usare \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:865
 msgid "Enter the user ID: "
 msgstr "Inserisci l'user ID: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:877
 msgid "No such user ID.\n"
 msgstr "User ID inesistente.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:882
 msgid "skipped: public key already set as default recipient\n"
 msgstr "saltato: chiave pubblica già impostata come destinatario predefinito\n"
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:905
 msgid "Public key is disabled.\n"
 msgstr "La chiave pubblica è disabilitata.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:912
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "saltato: chiave pubblica già impostata con --encrypt-to\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:943
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:976
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: errore nel controllare la chiave: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:981
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: saltato: chiave pubblica disabilitata\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1019
 msgid "no valid addressees\n"
 msgstr "nessun indirizzo valido\n"
 
@@ -1252,58 +1252,58 @@ msgstr "scrittura della autofirma\n"
 msgid "writing key binding signature\n"
 msgstr "scrittura della firma di collegamento alla chiave\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
+#: g10/keygen.c:308 g10/keygen.c:419 g10/keygen.c:529
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "La dimensione richiesta della chiave è %u bit\n"
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:438
+#: g10/keygen.c:313 g10/keygen.c:424 g10/keygen.c:534
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:537
+#: g10/keygen.c:633
 msgid "Please select what kind of key you want:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:635
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (default)\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:636
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (firma solo)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:638
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:639
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firma e cifra)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:641
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firma e cifra)\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:645
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
-#: g10/keygen.c:560 g10/keygen.c:568
+#: g10/keygen.c:656 g10/keygen.c:664
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Vuoi davvero creare una chiave di firma e cifratura? "
 
-#: g10/keygen.c:582
+#: g10/keygen.c:678
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:690
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1316,19 +1316,19 @@ msgstr ""
 "          la dimensione predefinita è 1024 bit\n"
 "  la dimensione massima consigliata è 2048 bit\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:697
 msgid "What keysize do you want? (1024) "
 msgstr "Di che dimensioni vuoi la chiave? (1024) "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:702
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permette solo chiavi di dimensioni tra 512 e 1024\n"
 
-#: g10/keygen.c:608
+#: g10/keygen.c:704
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "la chiave è troppo corta; 768 è il minimo valore permesso.\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:706
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "la chiave è troppo corta; 768 è il minimo valore permesso.\n"
@@ -1341,12 +1341,12 @@ msgstr "la chiave 
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:621
+#: g10/keygen.c:717
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "la chiave è troppo lunga; %d è il massimo valore permesso.\n"
 
-#: g10/keygen.c:626
+#: g10/keygen.c:722
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1354,11 +1354,11 @@ msgstr ""
 "Chiavi più lunghe di 2048 non sono consigliate perchè i calcoli sono\n"
 "VERAMENTE lunghi!\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:725
 msgid "Are you sure that you want this keysize? "
 msgstr "Sei sicuro di volere una chiave di queste dimensioni? "
 
-#: g10/keygen.c:630
+#: g10/keygen.c:726
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1366,21 +1366,21 @@ msgstr ""
 "Va bene, ma ricordati che anche le radiazioni emesse dal tuo monitor e dalla "
 "tua tastiera sono molto vulnerabili ad attacchi!\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:734
 msgid "Do you really need such a large keysize? "
 msgstr "Ti serve davvero una chiave così lunga? "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:740
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La dimensione richiesta della chiave è %u bit\n"
 
-#: g10/keygen.c:647 g10/keygen.c:651
+#: g10/keygen.c:743 g10/keygen.c:747
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:795
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1396,25 +1396,25 @@ msgstr ""
 "      <n>m = la chiave scadrà dopo n mesi\n"
 "      <n>y = la chiave scadrà dopo n anni\n"
 
-#: g10/keygen.c:714
+#: g10/keygen.c:810
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:719
+#: g10/keygen.c:815
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:724
+#: g10/keygen.c:820
 msgid "Key does not expire at all\n"
 msgstr "La chiave non scade\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:730
+#: g10/keygen.c:826
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La chiave scadrà il %s\n"
 
-#: g10/keygen.c:733
+#: g10/keygen.c:829
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1422,11 +1422,11 @@ msgstr ""
 "Il tuo sistema non può mostrare date oltre il 2038.\n"
 "Comunque, sarà gestita correttamente fino al 2106.\n"
 
-#: g10/keygen.c:738
+#: g10/keygen.c:834
 msgid "Is this correct (y/n)? "
 msgstr "È giusto (s/n)? "
 
-#: g10/keygen.c:781
+#: g10/keygen.c:877
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1442,44 +1442,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:793
+#: g10/keygen.c:889
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:893
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:799
+#: g10/keygen.c:895
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non può iniziare con una cifra\n"
 
-#: g10/keygen.c:801
+#: g10/keygen.c:897
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:809
+#: g10/keygen.c:905
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:820
+#: g10/keygen.c:916
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non è valido\n"
 
-#: g10/keygen.c:828
+#: g10/keygen.c:924
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:834
+#: g10/keygen.c:930
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:956
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Stai usando il set di caratteri `%s'.\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:962
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1490,28 +1490,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:867
+#: g10/keygen.c:966
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:872
+#: g10/keygen.c:971
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:882
+#: g10/keygen.c:981
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
 
-#: g10/keygen.c:883
+#: g10/keygen.c:982
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
 
-#: g10/keygen.c:902
+#: g10/keygen.c:1001
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:940
+#: g10/keygen.c:1039
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1519,11 +1519,11 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:948
+#: g10/keyedit.c:468 g10/keygen.c:1047
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "passphrase non ripetuta correttamente; riprova.\n"
 
-#: g10/keygen.c:954
+#: g10/keygen.c:1053
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1535,7 +1535,7 @@ msgstr ""
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1074
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1547,29 +1547,29 @@ msgstr ""
 "dischi) durante la generazione dei numeri primi; questo da al generatore di\n"
 "numeri casuali migliori possibilità di raccogliere abbastanza entropia.\n"
 
-#: g10/keygen.c:1424
+#: g10/keygen.c:1523
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La coppia DSA avrà 1024 bit.\n"
 
-#: g10/keygen.c:1467
+#: g10/keygen.c:1566
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1663
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scrittura del certificato pubblico in `%s'\n"
 
-#: g10/keygen.c:1565
+#: g10/keygen.c:1664
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scrittura del certificato segreto in `%s'\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1760
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1765
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1578,12 +1578,12 @@ msgstr ""
 "il comando \"--edit-key\" per generare una chiave secondaria per questo "
 "scopo.\n"
 
-#: g10/keygen.c:1683 g10/keygen.c:1784
+#: g10/keygen.c:1782 g10/keygen.c:1883
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1826 g10/sig-check.c:300 g10/sign.c:167
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1591,7 +1591,7 @@ msgstr ""
 "la chiave è stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1828 g10/sig-check.c:302 g10/sign.c:169
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1599,32 +1599,32 @@ msgstr ""
 "la chiave è stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1861
 msgid "Really create? "
 msgstr "Crea davvero? "
 
-#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:142 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: impossibile aprire: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:164
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:222 g10/encode.c:370
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATTENZIONE: file vuoto\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:317
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lettura da `%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:534
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s cifrato per: %s\n"
@@ -1653,32 +1653,32 @@ msgstr "chiave %08lX: chiave non rfc2440 - saltata\n"
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENZIONE: non è stato esportato nulla\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:212
 msgid "too many entries in pk cache - disabled\n"
 msgstr "troppe voci nella pk cache - disabilitata\n"
 
-#: g10/getkey.c:350
+#: g10/getkey.c:351
 msgid "too many entries in unk cache - disabled\n"
 msgstr "troppe voci nella unk cache - disabilitata\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
+#: g10/getkey.c:1311 g10/getkey.c:1350
 msgid "RSA key cannot be used in this version\n"
 msgstr "In questa versione non possono essere usate chiavi RSA\n"
 
-#: g10/getkey.c:1310 g10/getkey.c:1349
+#: g10/getkey.c:1313 g10/getkey.c:1352
 msgid "No key for user ID\n"
 msgstr "Non ci sono chiavi per questo user ID\n"
 
-#: g10/getkey.c:1388 g10/getkey.c:1428
+#: g10/getkey.c:1391 g10/getkey.c:1431
 msgid "No user ID for key\n"
 msgstr "Non ci sono user ID per questa chiave\n"
 
-#: g10/getkey.c:1642 g10/getkey.c:1698
+#: g10/getkey.c:1645 g10/getkey.c:1701
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
 
-#: g10/getkey.c:2017
+#: g10/getkey.c:2020
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: utente non trovato\n"
@@ -1688,7 +1688,7 @@ msgstr "%s: utente non trovato\n"
 msgid "skipping block of type %d\n"
 msgstr "salto un blocco di tipo %d\n"
 
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:188 g10/trustdb.c:1748 g10/trustdb.c:1789
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "Per ora sono state esaminate %lu chiavi\n"
@@ -1776,7 +1776,7 @@ msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 msgid "no default public keyring\n"
 msgstr "nessun portachiavi pubblico predefinito\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:350 g10/sign.c:669
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
@@ -2034,7 +2034,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1870 g10/keyedit.c:1932 g10/sign.c:136
+#: g10/keyedit.c:373 g10/keyedit.c:1873 g10/keyedit.c:1935 g10/sign.c:191
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
@@ -2390,104 +2390,104 @@ msgstr "La chiave non 
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
-#: g10/keyedit.c:1080 g10/keyedit.c:1106
+#: g10/keyedit.c:1083 g10/keyedit.c:1109
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1089
+#: g10/keyedit.c:1092
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1093
+#: g10/keyedit.c:1096
 msgid "This key has been disabled"
 msgstr "Questa chiave è stata disabilitata"
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1125
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "chiave %08lX: la subchiave è stata revocata!\n"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1128
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "nuove revoche di chiavi: %lu\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1130
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1368
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1372
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1376
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1382
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1396
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1397
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1400
 msgid "Nothing deleted.\n"
 msgstr "Non è stato cancellato nulla.\n"
 
-#: g10/keyedit.c:1466
+#: g10/keyedit.c:1469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:1472
+#: g10/keyedit.c:1475
 msgid "Please select at most one secondary key.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1479
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1481
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:1520
+#: g10/keyedit.c:1523
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Non è possibile cambiare la data di scadenza di una chiave v3\n"
 
-#: g10/keyedit.c:1536
+#: g10/keyedit.c:1539
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1600
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1646
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nessuna chiave secondaria con l'indice %d\n"
 
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1744
 msgid "user ID: \""
 msgstr "user ID: \""
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1747
 #, c-format
 msgid ""
 "\"\n"
@@ -2497,163 +2497,173 @@ msgstr ""
 "firmata con la tua chiave %08lX a %s\n"
 "\n"
 
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:1751
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Creare un certificato di revoca per questa firma? (s/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1775
 msgid "You have signed these user IDs:\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:1786 g10/keyedit.c:1821
+#: g10/keyedit.c:1789 g10/keyedit.c:1824
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   firmata da %08lX il %s\n"
 
-#: g10/keyedit.c:1791
+#: g10/keyedit.c:1794
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:1811
+#: g10/keyedit.c:1814
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:1829
+#: g10/keyedit.c:1832
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Creare davvero i certificati di revoca? (s/N)"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1861
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "armatura non valida"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "revkey"
+
 #. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:401 g10/mainproc.c:754
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "La chiave scadrà il %s\n"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:212
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la chiave pubblica è %08lX\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:247
 msgid "public key encrypted data: good DEK\n"
 msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
 
-#: g10/mainproc.c:281
+#: g10/mainproc.c:280
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "cifrato con la chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "Cifrato con la chiave %s con ID %08lX\n"
 
-#: g10/mainproc.c:297
+#: g10/mainproc.c:296
 msgid "no secret key for decryption available\n"
 msgstr "nessuna chiave disponibile per decifrare\n"
 
-#: g10/mainproc.c:306
+#: g10/mainproc.c:305
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:343
+#: g10/mainproc.c:342
 msgid "decryption okay\n"
 msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:348
+#: g10/mainproc.c:347
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato è stato manipolato!\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:352
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:372
+#: g10/mainproc.c:371
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
 
-#: g10/mainproc.c:374
+#: g10/mainproc.c:373
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:538
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
 
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:625 g10/mainproc.c:634
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:637
 msgid "Notation: "
 msgstr "Nota: "
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:644
 msgid "Policy: "
 msgstr "Policy: "
 
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1074
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1080
 #, 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:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1106 g10/mainproc.c:1117
 msgid "BAD signature from \""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1107 g10/mainproc.c:1118
 msgid "Good signature from \""
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1109
 msgid "                aka \""
 msgstr "    anche noto come \""
 
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1165
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1230
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1282
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1287
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
-#: g10/misc.c:94
+#: g10/misc.c:83
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossibile disabilitare i core dump: %s\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:86
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/misc.c:205
+#: g10/misc.c:312
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Gli algoritmi sperimentali non dovrebbero essere usati!\n"
 
-#: g10/misc.c:219
+#: g10/misc.c:326
 msgid ""
 "RSA keys are deprecated; please consider creating a new key and use this key "
 "in the future\n"
@@ -2662,16 +2672,16 @@ msgstr ""
 "chiave\n"
 "e usarla in futuro\n"
 
-#: g10/misc.c:241
+#: g10/misc.c:348
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr "questo algoritmo di cifratura è deprecato; usane uno più standard!\n"
 
-#: g10/parse-packet.c:117
+#: g10/parse-packet.c:115
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
 
-#: g10/parse-packet.c:965
+#: g10/parse-packet.c:963
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
@@ -2708,53 +2718,53 @@ msgstr "Inserisci la passphrase: "
 msgid "Repeat passphrase: "
 msgstr "Ripeti la passphrase: "
 
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "i dati non sono stati salvati; usa l'opzione \"--output\" per salvarli\n"
 
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
 msgid "Detached signature.\n"
 msgstr "Firma separata.\n"
 
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
 msgid "Please enter name of data file: "
 msgstr "Inserisci il nome del file di dati: "
 
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
 msgid "reading stdin ...\n"
 msgstr "viene letto stdin...\n"
 
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossibile aprire i dati firmati `%s'\n"
 
-#: g10/pubkey-enc.c:79
+#: g10/pubkey-enc.c:138
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "destinatario anonimo; provo la chiave segreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:85
+#: g10/pubkey-enc.c:144
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "bene, siamo il destinatario anonimo.\n"
 
-#: g10/pubkey-enc.c:137
+#: g10/pubkey-enc.c:200
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la vecchia codifica del DEK non è gestita\n"
 
-#: g10/pubkey-enc.c:156
+#: g10/pubkey-enc.c:219
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "l'algoritmo di protezione %d non è gestito\n"
 
-#: g10/pubkey-enc.c:195
+#: g10/pubkey-enc.c:258
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr ""
 "NOTA: l'algoritmo di cifratura %d non è stato trovato nelle impostazioni\n"
 
-#: g10/pubkey-enc.c:201
+#: g10/pubkey-enc.c:264
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: chiave per firmare scaduta il %s\n"
@@ -2798,71 +2808,67 @@ msgstr ""
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
 
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:90
 #, fuzzy
 msgid "secret key parts are not available\n"
 msgstr "la chiave segreta non è disponibile"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:96
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "l'algoritmo di protezione %d non è gestito\n"
 
-#: g10/seckey-cert.c:175
+#: g10/seckey-cert.c:239
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Passphrase non valida; riprova...\n"
 
-#: g10/seckey-cert.c:231
+#: g10/seckey-cert.c:302
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "ATTENZIONE: Individuata una chiave debole - per favore cambia ancora la\n"
 "passphrase.\n"
 
-#: g10/sig-check.c:202
-msgid "assuming bad MDC due to an unknown critical bit\n"
-msgstr "si suppone un MDC non valido a causa di un bit critico sconosciuto\n"
-
-#: g10/sig-check.c:300
+#: g10/sig-check.c:282
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "questa è una chiave ElGamal generata da PGP e NON è sicura per le firme!\n"
 
-#: g10/sig-check.c:308
+#: g10/sig-check.c:290
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "la chiave pubblica è %lu secondo più recente della firma\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:291
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "la chiave pubblica è %lu secondi più recente della firma\n"
 
-#: g10/sig-check.c:327
+#: g10/sig-check.c:309
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTA: chiave per firmare scaduta il %s\n"
 
-#: g10/sig-check.c:396
+#: g10/sig-check.c:378
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "si suppone una firma non valida a causa di un bit critico sconosciuto\n"
 
-#: g10/sign.c:140
+#: g10/sign.c:195
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "Firma %s da: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:606
+#: g10/sign.c:345 g10/sign.c:664
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: g10/sign.c:388
+#: g10/sign.c:444
 msgid "signing:"
 msgstr "firma:"
 
-#: g10/sign.c:431
+#: g10/sign.c:487
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATTENZIONE: `%s' è un file vuoto\n"
@@ -2901,7 +2907,8 @@ msgstr "%s: impossibile acedere a: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: la directory non esiste!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1363 g10/tdbio.c:444
+#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1407
+#: g10/ringedit.c:1878 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: impossibile creare: %s\n"
@@ -3088,203 +3095,203 @@ msgstr "chiave %08lX: accettata come chiave affidabile\n"
 msgid "enumerate secret keys failed: %s\n"
 msgstr "enumerate secret keys fallito: %s\n"
 
-#: g10/trustdb.c:921
+#: g10/trustdb.c:925
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "chiave %08lX.%lu: Legame con la subchiave corretto\n"
 
-#: g10/trustdb.c:927 g10/trustdb.c:962
+#: g10/trustdb.c:931 g10/trustdb.c:966
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "chiave %08lX.%lu: Legame con la subchiave non valido: %s\n"
 
-#: g10/trustdb.c:939
+#: g10/trustdb.c:943
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "chiave %08lX.%lu: Revoca della chiave valida\n"
 
-#: g10/trustdb.c:945
+#: g10/trustdb.c:949
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "chiave %08lX.%lu: Revoca della chiave non valida: %s\n"
 
-#: g10/trustdb.c:956
+#: g10/trustdb.c:960
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "chiave %08lX.%lu: Revoca della subchiave valida\n"
 
-#: g10/trustdb.c:1067
+#: g10/trustdb.c:1071
 msgid "Good self-signature"
 msgstr "Autofirma corretta"
 
-#: g10/trustdb.c:1077
+#: g10/trustdb.c:1081
 msgid "Invalid self-signature"
 msgstr "Autofirma non valida"
 
-#: g10/trustdb.c:1104
+#: g10/trustdb.c:1108
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Saltata una revoca dell'user ID valida a causa di una autofirma più recente"
 
-#: g10/trustdb.c:1110
+#: g10/trustdb.c:1114
 msgid "Valid user ID revocation"
 msgstr "Revoca dell'user ID valida"
 
-#: g10/trustdb.c:1115
+#: g10/trustdb.c:1119
 msgid "Invalid user ID revocation"
 msgstr "Revoca dell'user ID non valida"
 
-#: g10/trustdb.c:1157
+#: g10/trustdb.c:1161
 msgid "Valid certificate revocation"
 msgstr "Revoca del certificato valida"
 
-#: g10/trustdb.c:1158
+#: g10/trustdb.c:1162
 msgid "Good certificate"
 msgstr "Certificato corretto"
 
-#: g10/trustdb.c:1186
+#: g10/trustdb.c:1190
 msgid "Invalid certificate revocation"
 msgstr "Certificato di revoca non valido"
 
-#: g10/trustdb.c:1187
+#: g10/trustdb.c:1191
 msgid "Invalid certificate"
 msgstr "Certificato non valido"
 
-#: g10/trustdb.c:1204 g10/trustdb.c:1208
+#: g10/trustdb.c:1208 g10/trustdb.c:1212
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "il sig recor di %lu[%d] punta al record sbagliato.\n"
 
-#: g10/trustdb.c:1267
+#: g10/trustdb.c:1271
 msgid "duplicated certificate - deleted"
 msgstr "certificato doppio - cancellato"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1592
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir fallita: %s\n"
 
-#: g10/trustdb.c:1718
+#: g10/trustdb.c:1726
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: inserimento fallito: %s\n"
 
-#: g10/trustdb.c:1723
+#: g10/trustdb.c:1731
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: inserimento fallito: %s\n"
 
-#: g10/trustdb.c:1729
+#: g10/trustdb.c:1737
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: inserito\n"
 
-#: g10/trustdb.c:1734
+#: g10/trustdb.c:1742
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "errore durante la lettura del dir record: %s\n"
 
-#: g10/trustdb.c:1742 g10/trustdb.c:1805
+#: g10/trustdb.c:1750 g10/trustdb.c:1813
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu chiavi esaminate\n"
 
-#: g10/trustdb.c:1744 g10/trustdb.c:1811
+#: g10/trustdb.c:1752 g10/trustdb.c:1819
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu chiavi con errori\n"
 
-#: g10/trustdb.c:1746
+#: g10/trustdb.c:1754
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu chiavi inserite\n"
 
-#: g10/trustdb.c:1749
+#: g10/trustdb.c:1757
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enumerate keyblocks fallito: %s\n"
 
-#: g10/trustdb.c:1797
+#: g10/trustdb.c:1805
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: dir record senza chiave - saltato\n"
 
-#: g10/trustdb.c:1807
+#: g10/trustdb.c:1815
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu a causa di nuove chiavi pubbliche\n"
 
-#: g10/trustdb.c:1809
+#: g10/trustdb.c:1817
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu chiavi saltate\n"
 
-#: g10/trustdb.c:1813
+#: g10/trustdb.c:1821
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu chiavi aggiornate\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2166
 msgid "Ooops, no keys\n"
 msgstr "Ooops, mancano le chiavi\n"
 
-#: g10/trustdb.c:2162
+#: g10/trustdb.c:2170
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, mancano gli user ID\n"
 
-#: g10/trustdb.c:2320
+#: g10/trustdb.c:2328
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: ricerca del dir record fallita: %s\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2337
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n"
 
-#: g10/trustdb.c:2333
+#: g10/trustdb.c:2341
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "chiave %08lX.%lu: inserita nel trustdb\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2349
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "chiave %08lX.%lu: creata nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2364
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "chiave %08lX.%lu: scaduta il %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2372
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "chiave %08lX.%lu: controllo della fiducia fallito: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2523
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "utente `%s' non trovato: %s\n"
 
-#: g10/trustdb.c:2517
+#: g10/trustdb.c:2525
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problema cercando `%s' nel trustdb: %s\n"
 
-#: g10/trustdb.c:2520
+#: g10/trustdb.c:2528
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "l'utente `%s' non è nel trustdb - viene inserito\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2531
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "impossibile mettere `%s' nel trustdb: %s\n"
 
-#: g10/trustdb.c:2709 g10/trustdb.c:2739
+#: g10/trustdb.c:2717 g10/trustdb.c:2747
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "ATTENZIONE: non è ancora possibile gestire record pref lunghi\n"
 
@@ -3303,46 +3310,40 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "linea di input %u troppo lunga o LF mancante\n"
 
-#: g10/ringedit.c:302
+#: g10/ringedit.c:324
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: impossibile creare il portachiavi: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1368
+#: g10/ringedit.c:341 g10/ringedit.c:1412 g10/ringedit.c:1883
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: portachiavi creato\n"
 
-#: g10/ringedit.c:1545
+#: g10/ringedit.c:1589 g10/ringedit.c:2060
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATTENZIONE: esistono due file con informazioni confidenziali.\n"
 
-#: g10/ringedit.c:1546
+#: g10/ringedit.c:1590 g10/ringedit.c:2061
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s è quello non modificato\n"
 
-#: g10/ringedit.c:1547
+#: g10/ringedit.c:1591 g10/ringedit.c:2062
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s è quello nuovo\n"
 
-#: g10/ringedit.c:1548
+#: g10/ringedit.c:1592 g10/ringedit.c:2063
 msgid "Please fix this possible security flaw\n"
 msgstr "Per favore risolvete questo possibile problema di sicurezza\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
-msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr ""
-"la chiave non è indicata come insicura - impossibile usarla con il RNG "
-"finto!\n"
-
-#: g10/skclist.c:113
+#: g10/skclist.c:96
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "saltata `%s': %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:102
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3400,28 +3401,28 @@ msgstr ""
 "è necessario eseguire di nuovo GnuPG in modo che possa leggere il nuovo\n"
 "file delle opzioni\n"
 
-#: g10/encr-data.c:66
-#, c-format
-msgid "%s encrypted data\n"
-msgstr "dati cifrati con %s\n"
-
-#: g10/encr-data.c:68
+#: g10/encr-data.c:64
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrato con l'algoritmo sconosciuto %d\n"
 
-#: g10/encr-data.c:90
+#: g10/encr-data.c:69
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "dati cifrati con %s\n"
+
+#: g10/encr-data.c:99
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATTENZIONE: il messaggio era stato cifrato usando una chiave debole\n"
 "per il cifrario simmetrico\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:61
 msgid "weak key created - retrying\n"
 msgstr "creata una chiave debole - riprovo\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:66
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
@@ -3670,7 +3671,7 @@ msgid ""
 "  \"Key has been compromised\"\n"
 "      Use this if you have a reason to believe that unauthorized persons\n"
 "      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
+"  \"Key is superseeded\"\n"
 "      Use this if you have replaced this key with a newer one.\n"
 "  \"Key is no longer used\"\n"
 "      Use this if you have retired this key.\n"
@@ -3695,6 +3696,19 @@ msgstr "Non 
 msgid "No help available for `%s'"
 msgstr "Non è disponibile un aiuto per `%s'"
 
+# ??? (Md)
+#~ msgid "not processed"
+#~ msgstr "non esaminato"
+
+#~ msgid "assuming bad MDC due to an unknown critical bit\n"
+#~ msgstr ""
+#~ "si suppone un MDC non valido a causa di un bit critico sconosciuto\n"
+
+#~ msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
+#~ msgstr ""
+#~ "la chiave non è indicata come insicura - impossibile usarla con il RNG "
+#~ "finto!\n"
+
 #~ msgid "set debugging flags"
 #~ msgstr "imposta i flag di debugging"
 
diff --git a/po/ja.po b/po/ja.po
index e2653d9cf..a64f03ff6 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-07-30 20:02+0200\n"
 "PO-Revision-Date: 2000-02-16 20:10+09:00\n"
 "Last-Translator: IIDA Yosiaki <iida@secom.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -15,305 +15,289 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:79
-msgid "Warning: using insecure memory!\n"
-msgstr "·Ù¹ð: °ÂÁ´¤Ç¤Ê¤¤¥á¥â¥ê¡¼¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤¹!\n"
-
-#: util/secmem.c:289
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "½é´ü²½¤µ¤ì¤¿°ÂÁ´¤Ê¥á¥â¥ê¡¼¤¬Ìµ¤¤¾ì¹ç¤Ë¤Ï¼Â¹Ô¤Ç¤­¤Þ¤»¤ó\n"
-
-#: util/secmem.c:290
-msgid "(you may have used the wrong program for this task)\n"
-msgstr "(¤³¤ÎÌÜŪ¤Ë¤ÏÉÔŬÀÚ¤Ê¥×¥í¥°¥é¥à¤òÍѤ¤¤¿¤Î¤Ç¤·¤ç¤¦)\n"
-
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:278 util/miscutil.c:307
 msgid "yes"
 msgstr "yes"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:279 util/miscutil.c:310
 msgid "yY"
 msgstr "yY"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:280 util/miscutil.c:308
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:281 util/miscutil.c:311
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:580 util/miscutil.c:309
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:312
 msgid "qQ"
 msgstr "qQ"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "°ìÈÌŪ¤Ê¥¨¥é¡¼"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "¥Ñ¥±¥Ã¥È¥¿¥¤¥×¤¬ÉÔÌÀ¤Ç¤¹"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "¥Ð¡¼¥¸¥ç¥ó¤¬ÉÔÌÀ¤Ç¤¹"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "¸ø³«¸°¤Î¥¢¥ë¥´¥ê¥º¥à¤¬ÉÔÌÀ¤Ç¤¹"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "Í×Ìó¤Î¥¢¥ë¥´¥ê¥º¥à¤¬ÉÔÌÀ¤Ç¤¹"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "¸ø³«¸°¤¬ÉÔÀµ¤Ç¤¹"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "ÈëÌ©¸°¤¬ÉÔÀµ¤Ç¤¹"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "½ð̾¤¬ÉÔÀµ¤Ç¤¹"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "¥Á¥§¥Ã¥¯¥µ¥à¥¨¥é¡¼"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "¸ø³«¸°¤¬¤ß¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤¬ÉÔÌÀ¤Ç¤¹"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "¸°¥ê¥ó¥°¤¬³«¤±¤Þ¤»¤ó"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "̵¸ú¤Ê¥Ñ¥±¥Ã¥È¤Ç¤¹"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "̵¸ú¤ÊÁõ¹Ã¤Ç¤¹"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "¤½¤Î¥æ¡¼¥¶ ID ¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "ÈëÌ©¸°¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "ÉÔÀµ¤ÊÈëÌ©¸°¤¬ÍѤ¤¤é¤ì¤Æ¤¤¤Þ¤¹"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "¸°¤¬ÉÔÀµ¤Ç¤¹"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "¥Õ¥¡¥¤¥ë¤ÎÆɤ߽Ф·¥¨¥é¡¼"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "¥Õ¥¡¥¤¥ë¤Ø¤Î½ñ¤­¹þ¤ß¥¨¥é¡¼"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "°µ½Ì¥¢¥ë¥´¥ê¥º¥à¤¬ÉÔÌÀ¤Ç¤¹"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "¥Õ¥¡¥¤¥ë¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "¸ø³«¸°¤Î¥¢¥ë¥´¥ê¥º¥à¤¬¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤¬¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "½ð̾¤Î¥¯¥é¥¹¤¬ÉÔÌÀ¤Ç¤¹"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î¥¨¥é¡¼¤Ç¤¹"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "MPI ¤¬ÉÔÀµ¤Ç¤¹"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "¥ê¥½¡¼¥¹¤¬¸Â³¦¤Ç¤¹"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "¸°¥ê¥ó¥°¤¬Ìµ¸ú¤Ç¤¹"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "¾ÚÌÀ½ñ¤¬ÉÔÀµ¤Ç¤¹"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "¥æ¡¼¥¶ ID ¤Î½ñ¼°¤¬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "¥Õ¥¡¥¤¥ë¤¬ÊĤ¸¤é¤ì¤Þ¤»¤ó"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "¥Õ¥¡¥¤¥ë̾¤ÎÊѹ¹¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "¥Õ¥¡¥¤¥ë¤Îºï½ü¤¬¤Ç¤­¤Þ¤»¤ó"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "ͽ´ü¤µ¤ì¤Æ¤¤¤Ê¤¤¥Ç¡¼¥¿¤Ç¤¹"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "ÆüÉÕ¤¬¾×Æͤ·¤Æ¤¤¤Þ¤¹"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "»ÈÍѤǤ­¤Ê¤¤¸ø³«¸°¥¢¥ë¥´¥ê¥º¥à¤Ç¤¹"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "¥Õ¥¡¥¤¥ë¤¬´û¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "¼å¤¤¸°¤Ç¤¹"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "̵¸ú¤Ê»ØÄê¤Ç¤¹"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "URI ¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "¤½¤Î URI ¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥¨¥é¡¼"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "°Å¹æ²½¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: util/errors.c:103
-msgid "not processed"
-msgstr "̤½èÍý"
-
-#: util/logger.c:224
+#: util/logger.c:225
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... ¥Ð¥°¤Ç¤¹ (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:231
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "¥Ð¥°¤ò¸«¤Ä¤±¤¿¤è¤¦¤Ç¤¹ ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:321 g10/import.c:127 g10/keygen.c:1348
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ¤¬³«¤±¤Þ¤»¤ó: %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:325
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "`%s' ¤¬³«¤±¤Þ¤»¤ó: %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:330
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:325
+#: cipher/random.c:335
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:331
+#: cipher/random.c:341
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:339
+#: cipher/random.c:349
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "`%s' ¤¬³«¤±¤Þ¤»¤ó: %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:387
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:397
+#: cipher/random.c:407
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "%s ¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:414
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "`%s' ¤¬³«¤±¤Þ¤»¤ó: %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:417
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "`%s' ¤¬³«¤±¤Þ¤»¤ó: %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:428
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:647
+#: cipher/random.c:657
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "·Ù¹ð: °ÂÁ´¤Ç¤Ê¤¤Íð¿ôÀ¸À®ÁõÃÖ¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹!!\n"
 
-#: cipher/random.c:648
+#: cipher/random.c:663
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -327,7 +311,7 @@ msgstr ""
 "¤³¤Î¥×¥í¥°¥é¥à¤Ë¤è¤êÀ¸À®¤µ¤ì¤¿¥Ç¡¼¥¿¤Ï°ìÀÚ»ÈÍѤ·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó!!\n"
 "\n"
 
-#: cipher/rndlinux.c:141
+#: cipher/rndlinux.c:125
 #, c-format
 msgid ""
 "\n"
@@ -338,7 +322,19 @@ msgstr ""
 "½½Ê¬¤ÊŤµ¤ÎÍð¿ô¤¬ÆÀ¤é¤ì¤Þ¤»¤ó¡£¥¨¥ó¥È¥í¥Ô¡¼¤òÁý²Ã¤µ¤»¤ë¤è¤¦¤Ë\n"
 "OS ¤ÎÀßÄê¤òÊѹ¹¤·¤Æ¤¯¤À¤µ¤¤¡£(%d bytes °Ê¾å¤Î¼þ´ü¤¬É¬ÍפǤ¹)\n"
 
-#: g10/g10.c:197
+#: gcrypt/secmem.c:77
+msgid "Warning: using insecure memory!\n"
+msgstr "·Ù¹ð: °ÂÁ´¤Ç¤Ê¤¤¥á¥â¥ê¡¼¤ò»ÈÍѤ·¤Æ¤¤¤Þ¤¹!\n"
+
+#: gcrypt/secmem.c:287
+msgid "operation is not possible without initialized secure memory\n"
+msgstr "½é´ü²½¤µ¤ì¤¿°ÂÁ´¤Ê¥á¥â¥ê¡¼¤¬Ìµ¤¤¾ì¹ç¤Ë¤Ï¼Â¹Ô¤Ç¤­¤Þ¤»¤ó\n"
+
+#: gcrypt/secmem.c:288
+msgid "(you may have used the wrong program for this task)\n"
+msgstr "(¤³¤ÎÌÜŪ¤Ë¤ÏÉÔŬÀÚ¤Ê¥×¥í¥°¥é¥à¤òÍѤ¤¤¿¤Î¤Ç¤·¤ç¤¦)\n"
+
+#: g10/gpg.c:197
 msgid ""
 "@Commands:\n"
 " "
@@ -346,139 +342,139 @@ msgstr ""
 "@¥³¥Þ¥ó¥É:\n"
 " "
 
-#: g10/g10.c:199
+#: g10/gpg.c:199
 msgid "|[file]|make a signature"
 msgstr "|[file]|½ð̾¤òºîÀ®"
 
-#: g10/g10.c:200
+#: g10/gpg.c:200
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|¥¯¥ê¥¢½ð̾¤òºîÀ®"
 
-#: g10/g10.c:201
+#: g10/gpg.c:201
 msgid "make a detached signature"
 msgstr "ʬΥ½ð̾¤òºîÀ®"
 
-#: g10/g10.c:202
+#: g10/gpg.c:202
 msgid "encrypt data"
 msgstr "¥Ç¡¼¥¿¤ò°Å¹æ²½"
 
-#: g10/g10.c:203
+#: g10/gpg.c:203
 msgid "encryption only with symmetric cipher"
 msgstr "°Å¹æ²½¤Ë¤ÏÂоΰŹæË¡¤Î¤ß¤ò»ÈÍÑ"
 
-#: g10/g10.c:204
+#: g10/gpg.c:204
 msgid "store only"
 msgstr "Êݸ¤Î¤ß"
 
-#: g10/g10.c:205
+#: g10/gpg.c:205
 msgid "decrypt data (default)"
 msgstr "¥Ç¡¼¥¿¤òÉü¹æ (¥Ç¥Õ¥©¥ë¥È)"
 
-#: g10/g10.c:206
+#: g10/gpg.c:206
 msgid "verify a signature"
 msgstr "½ð̾¤ò¸¡¾Ú"
 
-#: g10/g10.c:208
+#: g10/gpg.c:208
 msgid "list keys"
 msgstr "¸°¤Î°ìÍ÷"
 
-#: g10/g10.c:210
+#: g10/gpg.c:210
 msgid "list keys and signatures"
 msgstr "¸°¤È½ð̾¤Î°ìÍ÷"
 
-#: g10/g10.c:211
+#: g10/gpg.c:211
 msgid "check key signatures"
 msgstr "¸°¤Î½ð̾¤ò¸¡¾Ú"
 
-#: g10/g10.c:212
+#: g10/gpg.c:212
 msgid "list keys and fingerprints"
 msgstr "¸°¤È»ØÌæ¤Î°ìÍ÷"
 
-#: g10/g10.c:213
+#: g10/gpg.c:213
 msgid "list secret keys"
 msgstr "ÈëÌ©¸°¤Î°ìÍ÷"
 
-#: g10/g10.c:214
+#: g10/gpg.c:214
 msgid "generate a new key pair"
 msgstr "¿·¤·¤¤¸°¥Ú¥¢¤òºîÀ®"
 
-#: g10/g10.c:215
+#: g10/gpg.c:215
 msgid "remove key from the public keyring"
 msgstr "¸ø³«¸°¥ê¥ó¥°¤«¤é¸°¤òºï½ü"
 
-#: g10/g10.c:217
+#: g10/gpg.c:217
 msgid "remove key from the secret keyring"
 msgstr "ÈëÌ©¸°¥ê¥ó¥°¤«¤é¸°¤òºï½ü"
 
-#: g10/g10.c:218
+#: g10/gpg.c:218
 msgid "sign a key"
 msgstr "¸°¤Ë½ð̾"
 
-#: g10/g10.c:219
+#: g10/gpg.c:219
 msgid "sign a key locally"
 msgstr "¥í¡¼¥«¥ë¤Ë¤Æ¸°¤Ë½ð̾"
 
-#: g10/g10.c:220
+#: g10/gpg.c:220
 msgid "sign or edit a key"
 msgstr "¸°¤Ø¤Î½ð̾¤Þ¤¿¤ÏÊÔ½¸"
 
-#: g10/g10.c:221
+#: g10/gpg.c:221
 msgid "generate a revocation certificate"
 msgstr "ÇË´þ¾ÚÌÀ½ñ¤òºîÀ®"
 
-#: g10/g10.c:222
+#: g10/gpg.c:222
 msgid "export keys"
 msgstr "¸°¤ò½ñ¤­½Ð¤¹"
 
-#: g10/g10.c:223
+#: g10/gpg.c:223
 msgid "export keys to a key server"
 msgstr "¸°¥µ¡¼¥Ð¤Ë¸°¤òÅÐÏ¿"
 
-#: g10/g10.c:224
+#: g10/gpg.c:224
 msgid "import keys from a key server"
 msgstr "¸°¥µ¡¼¥Ð¡¼¤«¤é¸°¤òÆɤ߹þ¤à"
 
-#: g10/g10.c:228
+#: g10/gpg.c:228
 msgid "import/merge keys"
 msgstr "¸°¤ÎÆɤ߹þ¤ß/¥Þ¡¼¥¸"
 
-#: g10/g10.c:230
+#: g10/gpg.c:230
 msgid "list only the sequence of packets"
 msgstr "¥Ñ¥±¥Ã¥ÈÎó¤Î¤ß¤Î°ìÍ÷"
 
-#: g10/g10.c:232
+#: g10/gpg.c:232
 msgid "export the ownertrust values"
 msgstr "½êÍ­¼Ô¤ò¿®ÍѤ·¤¿Ãͤò½ñ¤­½Ð¤¹"
 
-#: g10/g10.c:234
+#: g10/gpg.c:234
 msgid "import ownertrust values"
 msgstr "½êÍ­¼Ô¤ò¿®ÍѤ·¤¿ÃͤòÆɤ߹þ¤à"
 
-#: g10/g10.c:236
+#: g10/gpg.c:236
 msgid "update the trust database"
 msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ò¹¹¿·"
 
-#: g10/g10.c:238
+#: g10/gpg.c:238
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMES]|¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ò¥Á¥§¥Ã¥¯"
 
-#: g10/g10.c:239
+#: g10/gpg.c:239
 msgid "fix a corrupted trust database"
 msgstr "²õ¤ì¤¿¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ò½¤Éü"
 
-#: g10/g10.c:240
+#: g10/gpg.c:240
 msgid "De-Armor a file or stdin"
 msgstr "¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ïɸ½àÆþÎϤÎÁõ¹Ã½üµî"
 
-#: g10/g10.c:242
+#: g10/gpg.c:242
 msgid "En-Armor a file or stdin"
 msgstr "¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ïɸ½àÆþÎϤÎÁõ¹Ã²½"
 
-#: g10/g10.c:244
+#: g10/gpg.c:244
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|¥á¥Ã¥»¡¼¥¸Í×Ìó¤ò½ÐÎÏ"
 
-#: g10/g10.c:248
+#: g10/gpg.c:249
 msgid ""
 "@\n"
 "Options:\n"
@@ -488,154 +484,154 @@ msgstr ""
 "¥ª¥×¥·¥ç¥ó:\n"
 " "
 
-#: g10/g10.c:250
+#: g10/gpg.c:251
 msgid "create ascii armored output"
 msgstr "¥¢¥¹¥­¡¼·Á¼°¤ÎÁõ¹Ã¤òÀ¸À®"
 
-#: g10/g10.c:252
+#: g10/gpg.c:253
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|NAME ÍѤ˰Ź沽"
 
-#: g10/g10.c:255
+#: g10/gpg.c:256
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|¥Ç¥Õ¥©¥ë¥È¤Î¼õ¿®¼Ô¤È¤·¤Æ NAME ¤òÍѤ¤¤ë"
 
-#: g10/g10.c:257
+#: g10/gpg.c:258
 msgid "use the default key as default recipient"
 msgstr "¥Ç¥Õ¥©¥ë¥È¤Î¼õ¿®¼Ô¤È¤·¤Æ¥Ç¥Õ¥©¥ë¥È¤Î¸°¤òÍѤ¤¤ë"
 
-#: g10/g10.c:261
+#: g10/gpg.c:262
 msgid "use this user-id to sign or decrypt"
 msgstr "½ð̾¤äÉü¹æ¤Ë ¤³¤Î user-id ¤òÍѤ¤¤ë"
 
-#: g10/g10.c:262
+#: g10/gpg.c:263
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|°µ½Ì¥ì¥Ù¥ë¤ò N ¤ËÀßÄꤹ¤ë (0 ¤ÏÈó°µ½Ì)"
 
-#: g10/g10.c:264
+#: g10/gpg.c:265
 msgid "use canonical text mode"
 msgstr "ɸ½à¥Æ¥­¥¹¥È¥â¡¼¥É¤òÍѤ¤¤ë"
 
-#: g10/g10.c:265
+#: g10/gpg.c:266
 msgid "use as output file"
 msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë¤È¤·¤ÆÍѤ¤¤ë"
 
-#: g10/g10.c:266
+#: g10/gpg.c:267
 msgid "verbose"
 msgstr "¾éĹ"
 
-#: g10/g10.c:267
+#: g10/gpg.c:268
 msgid "be somewhat more quiet"
 msgstr "¤ä¤äÀŤ«"
 
-#: g10/g10.c:268
+#: g10/gpg.c:269
 msgid "don't use the terminal at all"
 msgstr "üËö¤ò»ÈÍѤ·¤Ê¤¤"
 
-#: g10/g10.c:269
+#: g10/gpg.c:270
 msgid "force v3 signatures"
 msgstr "¶¯À©Åª¤Ë v3 ½ð̾¤¹¤ë"
 
-#: g10/g10.c:270
+#: g10/gpg.c:271
 msgid "always use a MDC for encryption"
 msgstr "°Å¹æ²½¤Ë¤Ï¾ï¤Ë MDC ¤ò»ÈÍÑ"
 
-#: g10/g10.c:271
+#: g10/gpg.c:272
 msgid "do not make any changes"
 msgstr "Á´¤Æ¤ÎÊѹ¹¤òÍѤ¤¤Ê¤¤"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/gpg.c:274
 msgid "batch mode: never ask"
 msgstr "¥Ð¥Ã¥Á¥â¡¼¥É: Ì䤤¹ç¤ï¤»¤ò¹Ô¤ï¤Ê¤¤"
 
-#: g10/g10.c:274
+#: g10/gpg.c:275
 msgid "assume yes on most questions"
 msgstr "Á´¤Æ¤Î¼ÁÌä¤Ë yes ¤È¸«¤Ê¤¹"
 
-#: g10/g10.c:275
+#: g10/gpg.c:276
 msgid "assume no on most questions"
 msgstr "Á´¤Æ¤Î¼ÁÌä¤Ë no ¤È¸«¤Ê¤¹"
 
-#: g10/g10.c:276
+#: g10/gpg.c:277
 msgid "add this keyring to the list of keyrings"
 msgstr "¸°¥ê¥ó¥°¤Î°ìÍ÷¤Ë ¤³¤Î¸°¤ò²Ã¤¨¤ë"
 
-#: g10/g10.c:277
+#: g10/gpg.c:278
 msgid "add this secret keyring to the list"
 msgstr "°ìÍ÷¤Ë ¤³¤ÎÈëÌ©¸°¥ê¥ó¥°¤ò²Ã¤¨¤ë"
 
-#: g10/g10.c:278
+#: g10/gpg.c:279
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|¥Ç¥Õ¥©¥ë¥È¤ÎÈëÌ©¸°¤È¤·¤Æ NAME ¤òÍѤ¤¤ë"
 
-#: g10/g10.c:279
+#: g10/gpg.c:280
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|¸°¤Î¸¡º÷¤Ë ¤³¤Î¸°¥µ¡¼¥Ð¤òÍѤ¤¤ë"
 
-#: g10/g10.c:280
+#: g10/gpg.c:281
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|üËö¤Îʸ»ú¥³¡¼¥É¤ò NAME ¤ËÀßÄꤹ¤ë"
 
-#: g10/g10.c:281
+#: g10/gpg.c:282
 msgid "read options from file"
 msgstr "¥Õ¥¡¥¤¥ë¤«¤é¥ª¥×¥·¥ç¥ó¤òÆɤ߹þ¤à"
 
-#: g10/g10.c:285
+#: g10/gpg.c:286
 msgid "|FD|write status info to this FD"
 msgstr "|FD|¤³¤Î FD ¤Ë¾õÂÖ¤ò½ñ¤­½Ð¤¹"
 
-#: g10/g10.c:290
+#: g10/gpg.c:291
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|³ÈÄ¥¥â¥¸¥å¡¼¥ë FILE ¤òÆɤߤ³¤à"
 
-#: g10/g10.c:291
+#: g10/gpg.c:292
 msgid "emulate the mode described in RFC1991"
 msgstr "RFC1991 ¤Ëµ­½Ò¤µ¤ì¤¿¥â¡¼¥É¤òÍѤ¤¤ë"
 
-#: g10/g10.c:292
+#: g10/gpg.c:293
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "Á´¤Æ¤Î¥Ñ¥±¥Ã¥È¤È°Å¹æ¤È½ð̾¤Î¥ª¥×¥·¥ç¥ó¤ò OpenPGP ¤Î¿¶Éñ¤ËÀßÄê"
 
-#: g10/g10.c:293
+#: g10/gpg.c:294
 msgid "|N|use passphrase mode N"
 msgstr "|N|¥Ñ¥¹¥Õ¥ì¡¼¥º¥â¡¼¥É N ¤òÍѤ¤¤ë"
 
-#: g10/g10.c:295
+#: g10/gpg.c:296
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ë¥á¥Ã¥»¡¼¥¸Í×Ì󥢥르¥ê¥º¥à NAME ¤òÍѤ¤¤ë"
 
-#: g10/g10.c:297
+#: g10/gpg.c:298
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ë°Å¹æ¥¢¥ë¥´¥ê¥º¥à NAME ¤òÍѤ¤¤ë"
 
-#: g10/g10.c:298
+#: g10/gpg.c:299
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|°Å¹æ¥¢¥ë¥´¥ê¥º¥à NAME ¤òÍѤ¤¤ë"
 
-#: g10/g10.c:299
+#: g10/gpg.c:300
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|¥á¥Ã¥»¡¼¥¸Í×Ì󥢥르¥ê¥º¥à NAME ¤òÍѤ¤¤ë"
 
-#: g10/g10.c:300
+#: g10/gpg.c:301
 msgid "|N|use compress algorithm N"
 msgstr "|NAME|°µ½Ì¥¢¥ë¥´¥ê¥º¥à NAME ¤òÍѤ¤¤ë"
 
-#: g10/g10.c:301
+#: g10/gpg.c:302
 msgid "throw keyid field of encrypted packets"
 msgstr "°Å¹æ¥Ñ¥±¥Ã¥È¤Î¸° ID ¥Õ¥£¡¼¥ë¥É¤òÁ÷½Ð¤¹¤ë"
 
-#: g10/g10.c:302
+#: g10/gpg.c:303
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=VALUE|¤³¤ÎÃí¼á¥Ç¡¼¥¿¤òÍѤ¤¤ë"
 
-#: g10/g10.c:305
+#: g10/gpg.c:306
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:308
+#: g10/gpg.c:309
 msgid ""
 "@\n"
 "Examples:\n"
@@ -655,15 +651,15 @@ msgstr ""
 " --list-keys [names]        ¸°¤òɽ¼¨\n"
 " --fingerprint [names]      »ØÌæ¤òɽ¼¨\n"
 
-#: g10/g10.c:403
+#: g10/gpg.c:409
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "¥Ð¥°¤ò¸«¤Ä¤±¤¿¤é <gnupg-bugs@gnu.org> ¤Þ¤Ç¥ì¥Ý¡¼¥È¤òÁ÷¤Ã¤Æ²¼¤µ¤¤¡£\n"
 
-#: g10/g10.c:407
+#: g10/gpg.c:413
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "»È¤¤Êý: gpg [¥ª¥×¥·¥ç¥ó] [¥Õ¥¡¥¤¥ë] (¥Ø¥ë¥×¤Ï -h)"
 
-#: g10/g10.c:410
+#: g10/gpg.c:416
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -673,7 +669,7 @@ msgstr ""
 "½ð̾¡¢¸¡¾Ú¡¢°Å¹æ²½¡¢¤Þ¤¿¤Ï Éü¹æ\n"
 "¥Ç¥Õ¥©¥ë¥È¤ÎÆ°ºî¤ÏÆþÎϥǡ¼¥¿¤Ë°Í¸\n"
 
-#: g10/g10.c:417
+#: g10/gpg.c:423
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -681,182 +677,187 @@ msgstr ""
 "\n"
 "¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤ë¥¢¥ë¥´¥ê¥º¥à:\n"
 
-#: g10/g10.c:496
+#: g10/gpg.c:525
 msgid "usage: gpg [options] "
 msgstr "»È¤¤Êý: gpg [options] "
 
-#: g10/g10.c:549
+#: g10/gpg.c:583
 msgid "conflicting commands\n"
 msgstr "¥³¥Þ¥ó¥É¤Î¾×ÆÍ\n"
 
-#: g10/g10.c:692
+#: g10/gpg.c:638
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
+#: g10/gpg.c:734
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Ãí°Õ: ¥Ç¥Õ¥©¥ë¥È¥ª¥×¥·¥ç¥ó¥Õ¥¡¥¤¥ë `%s' ¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:696
+#: g10/gpg.c:738
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "¥ª¥×¥·¥ç¥ó¥Õ¥¡¥¤¥ë `%s': %s\n"
 
-#: g10/g10.c:703
+#: g10/gpg.c:745
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "`%s' ¤«¤é¥ª¥×¥·¥ç¥ó¤òÆɤ߹þ¤ß¤Þ¤¹\n"
 
-#: g10/g10.c:893
+#: g10/gpg.c:937
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ¤ÏÀµ¤·¤¤Ê¸»ú¥³¡¼¥É¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/gpg.c:1002 g10/gpg.c:1011
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Ãí°Õ: %s ¤ÏÄ̾ï¤ÏÍѤ¤¤Þ¤»¤ó!\n"
 
-#: g10/g10.c:951
+#: g10/gpg.c:1004
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ¤Ï %s ¤È¶¦¤ËÍѤ¤¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó!\n"
 
-#: g10/g10.c:954
+#: g10/gpg.c:1007
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ¤Ï %s ¤È¶¦¤ËÍѤ¤¤Æ¤â°ÕÌ£¤¬¤¢¤ê¤Þ¤»¤ó!\n"
 
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/gpg.c:1027 g10/gpg.c:1039
 msgid "selected cipher algorithm is invalid\n"
 msgstr "ÁªÂò¤µ¤ì¤¿°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤Ï̵¸ú¤Ç¤¹\n"
 
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/gpg.c:1033 g10/gpg.c:1045
 msgid "selected digest algorithm is invalid\n"
 msgstr "ÁªÂò¤µ¤ì¤¿Í×Ì󥢥르¥ê¥º¥à¤Ï̵¸ú¤Ç¤¹\n"
 
-#: g10/g10.c:995
+#: g10/gpg.c:1049
 msgid "the given policy URL is invalid\n"
 msgstr "Í¿¤¨¤é¤ì¤¿¥Ý¥ê¥·¡¼ URL ¤Ï̵¸ú¤Ç¤¹\n"
 
-#: g10/g10.c:998
+#: g10/gpg.c:1052
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "°µ½Ì¥¢¥ë¥´¥ê¥º¥à¤Ï %d..%d ¤ÎÈϰϤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1000
+#: g10/gpg.c:1054
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ¤Ï 0 ¤è¤êÂ礭¤ÊÃͤ¬É¬ÍפǤ¹\n"
 
-#: g10/g10.c:1002
+#: g10/gpg.c:1056
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ¤Ï 1 ¤è¤êÂ礭¤ÊÃͤ¬É¬ÍפǤ¹\n"
 
-#: g10/g10.c:1004
+#: g10/gpg.c:1058
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth ¤Ï 1 ¤«¤é 255 ¤ÎÈϰϤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1007
+#: g10/gpg.c:1061
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Ãí°Õ: ñ½ã¤Ê S2K ¥â¡¼¥É (0) ¤Î»ÈÍѤˤ϶¯¤¯È¿ÂФ·¤Þ¤¹\n"
 
-#: g10/g10.c:1011
+#: g10/gpg.c:1065
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵¸ú¤Ê S2K ¥â¡¼¥É¡£0, 1 ¤Þ¤¿¤Ï 3 ¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1096
+#: g10/gpg.c:1154
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Î½é´ü²½¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: g10/g10.c:1102
+#: g10/gpg.c:1160
 msgid "--store [filename]"
 msgstr "--store [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1109
+#: g10/gpg.c:1167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1117
+#: g10/gpg.c:1175
 msgid "--encrypt [filename]"
 msgstr "--encrypt [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1130
+#: g10/gpg.c:1188
 msgid "--sign [filename]"
 msgstr "--sign [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1143
+#: g10/gpg.c:1201
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1157
+#: g10/gpg.c:1215
 msgid "--clearsign [filename]"
 msgstr "--clearsign [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1174
+#: g10/gpg.c:1232
 msgid "--decrypt [filename]"
 msgstr "--decrypt [¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1182
+#: g10/gpg.c:1240
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:1190
+#: g10/gpg.c:1248
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:1198
+#: g10/gpg.c:1256
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [¥³¥Þ¥ó¥É]"
 
-#: g10/g10.c:1214
+#: g10/gpg.c:1272
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key user-id"
 
-#: g10/g10.c:1217
+#: g10/gpg.c:1275
 msgid "--delete-key user-id"
 msgstr "--delete-key user-id"
 
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:311 g10/gpg.c:1312 g10/sign.c:449
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s ¤¬³«¤±¤Þ¤»¤ó: %s\n"
 
-#: g10/g10.c:1269
+#: g10/gpg.c:1327
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [¸°¥ê¥ó¥°]"
 
-#: g10/g10.c:1335
+#: g10/gpg.c:1393
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Áõ¹Ã½üµî¤Ë¼ºÇÔ: %s\n"
 
-#: g10/g10.c:1343
+#: g10/gpg.c:1401
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Áõ¹Ã²½¤Ë¼ºÇÔ: %s\n"
 
-#: g10/g10.c:1411
+#: g10/gpg.c:1474 g10/gpg.c:1495
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "¥Ï¥Ã¥·¥å¥¢¥ë¥´¥ê¥º¥à `%s' ¤Ï̵¸ú¤Ç¤¹\n"
 
-#: g10/g10.c:1492
+#: g10/gpg.c:1580
 msgid "[filename]"
 msgstr "[¥Õ¥¡¥¤¥ë̾]"
 
-#: g10/g10.c:1496
+#: g10/gpg.c:1584
 msgid "Go ahead and type your message ...\n"
 msgstr "³«»Ï¤·¤Þ¤¹¡£¥á¥Ã¥»¡¼¥¸¤ò¥¿¥¤¥×¤·¤Æ²¼¤µ¤¤ ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/gpg.c:1587 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' ¤¬³«¤±¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1669
+#: g10/gpg.c:1765
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "Ãí¼á̾¤ÎÀèƬ¤Ïʸ»ú¤«¥¢¥ó¥À¡¼¥¹¥³¥¢(_)¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1675
+#: g10/gpg.c:1771
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -864,11 +865,11 @@ msgstr ""
 "Ãí¼á̾¤Ë¤Ïʸ»ú¡¢¿ô»ú¡¢¥É¥Ã¥È¡¢¥¢¥ó¥À¡¼¥¹¥³¥¢(_)¤Î¤ß¤òÍѤ¤¡¢'=' "
 "¤òȼ¤ï¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1681
+#: g10/gpg.c:1777
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "Ãí¼á̾¤Î¥É¥Ã¥È¤Ï¾¤Îʸ»ú¤Ç°Ï¤Þ¤ì¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/g10.c:1689
+#: g10/gpg.c:1785
 msgid "a notation value must not use any control characters\n"
 msgstr "Ãí¼á̾¤ÎÃͤËÀ©¸æʸ»ú¤òÍѤ¤¤Æ¤Ï¤¤¤±¤Þ¤»¤ó\n"
 
@@ -953,50 +954,50 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1188 g10/pkclist.c:53
+#: g10/keyedit.c:1191 g10/pkclist.c:54
 msgid "             Fingerprint:"
 msgstr "             »ØÌæ:"
 
-#: g10/pkclist.c:80
+#: g10/pkclist.c:81
 msgid "Fingerprint:"
 msgstr "»ØÌæ:"
 
-#: g10/pkclist.c:116
+#: g10/pkclist.c:117
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:118
+#: g10/pkclist.c:119
 #, fuzzy
-msgid "Key is superseded"
+msgid "Key is superseeded"
 msgstr "¸°¤ÏÊݸ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: g10/pkclist.c:120
+#: g10/pkclist.c:121
 #, fuzzy
 msgid "Key has been compromised"
 msgstr "¤³¤Î¸°¤Ï»ÈÍÑÉԲĤËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: g10/pkclist.c:122
+#: g10/pkclist.c:123
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:124
+#: g10/pkclist.c:125
 msgid "User ID is no longer valid"
 msgstr ""
 
-#: g10/pkclist.c:128
+#: g10/pkclist.c:129
 msgid "Reason for revocation: "
 msgstr ""
 
-#: g10/pkclist.c:145
+#: g10/pkclist.c:146
 msgid "Revocation comment: "
 msgstr ""
 
 #. a string with valid answers
-#: g10/pkclist.c:303
+#: g10/pkclist.c:304
 msgid "sSmMqQ"
 msgstr "sSmMqQ"
 
-#: g10/pkclist.c:307
+#: g10/pkclist.c:308
 #, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -1005,7 +1006,7 @@ msgstr ""
 "%lu ¤Ë¿®ÍÑÅÙ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1026,23 +1027,23 @@ msgstr ""
 " 4 = ´°Á´¤Ë¿®ÍѤ¹¤ë\n"
 " s = ¤è¤ê¾Ü¤·¤¤¾ðÊó¤ò¸«¤ë\n"
 
-#: g10/pkclist.c:328
+#: g10/pkclist.c:329
 msgid " m = back to the main menu\n"
 msgstr " m = ¥á¥¤¥ó¥á¥Ë¥å¡¼¤ËÌá¤ë\n"
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:331
 msgid " q = quit\n"
 msgstr " q = ½ªÎ»\n"
 
-#: g10/pkclist.c:336
+#: g10/pkclist.c:337
 msgid "Your decision? "
 msgstr "¤¢¤Ê¤¿¤Î·èÄê¤Ï? "
 
-#: g10/pkclist.c:358
+#: g10/pkclist.c:359
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "ÀäÂÐŪ¤Ë¿®ÍѤ·¤¿¸°¤Ø¤Î¾ÚÌÀ½ñ:\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 msgid ""
 "Could not find a valid trust path to the key.  Let's see whether we\n"
 "can assign some missing owner trust values.\n"
@@ -1052,7 +1053,7 @@ msgstr ""
 "ÀßÄê¤Ç¤­¤Ê¤¤¤«¤É¤¦¤«¡¢Ä´¤Ù¤Þ¤·¤ç¤¦¡£\n"
 "\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
@@ -1060,7 +1061,7 @@ msgstr ""
 "²æ¡¹¤Î¸°¤Ø»ê¤ë¥Ñ¥¹¤¬¤¢¤ê¤Þ¤»¤ó¡£\n"
 "\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:438
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
@@ -1068,7 +1069,7 @@ msgstr ""
 "¿®ÍÑÅÙ¤¬Ì¤ÄêµÁ¤Î¾ÚÌÀ½ñ¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
 "\n"
 
-#: g10/pkclist.c:439
+#: g10/pkclist.c:440
 msgid ""
 "No trust values changed.\n"
 "\n"
@@ -1076,51 +1077,51 @@ msgstr ""
 "¿®ÍÑÅÙ¤ÎÊѹ¹¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
 "\n"
 
-#: g10/pkclist.c:457
+#: g10/pkclist.c:458
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "¸° %08lX: ¸°¤ÏÇË´þºÑ¤ß¤Ç¤¹!\n"
 
-#: g10/pkclist.c:464 g10/pkclist.c:476 g10/pkclist.c:598
+#: g10/pkclist.c:465 g10/pkclist.c:477 g10/pkclist.c:599
 msgid "Use this key anyway? "
 msgstr "¤½¤ì¤Ç¤â ¤³¤Î¸°¤ò»È¤¤¤Þ¤¹¤«? "
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "¸° %08lX: Éû¸°¤ÏÇË´þºÑ¤ß¤Ç¤¹!\n"
 
-#: g10/pkclist.c:512
+#: g10/pkclist.c:513
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "¸° %08lX: ¸°¤Ï´ü¸ÂÀÚ¤ì¤Ç¤¹!\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr "%08lX: ¿®ÍÑÅÙ¤ò·×»»¤¹¤ë¾ðÊ󤬤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: ¤³¤Î¸°¤Ï¿®ÍѤǤ­¤Þ¤»¤ó\n"
 
-#: g10/pkclist.c:539
+#: g10/pkclist.c:540
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
 "but it is accepted anyway\n"
 msgstr "%08lX: ¤³¤Î¸°¤Ï¼ÂºÝ¤ËËܿͤΤâ¤Î¤«¤ÏÉÔÌÀ¤Ç¤¹¤¬¡¢¤½¤ì¤Ç¤â¼õ¤±Æþ¤ì¤Þ¤¹\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:546
 msgid "This key probably belongs to the owner\n"
 msgstr "¤³¤Î¸°¤Ï¤¿¤Ö¤óËܿͤΤâ¤Î¤Ç¤¹\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid "This key belongs to us\n"
 msgstr "¤³¤Î¸°¤Ï²æ¡¹¤Î¤â¤Î¤Ç¤¹\n"
 
-#: g10/pkclist.c:593
+#: g10/pkclist.c:594
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -1132,104 +1133,104 @@ msgstr ""
 "¼¡¤Î¼ÁÌä¤Ë¤Ï no ¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£\n"
 "\n"
 
-#: g10/pkclist.c:607 g10/pkclist.c:630
+#: g10/pkclist.c:608 g10/pkclist.c:631
 msgid "WARNING: Using untrusted key!\n"
 msgstr "·Ù¹ð: ¿®ÍѤǤ­¤Ê¤¤¸°¤òÍѤ¤¤Æ¤¤¤Þ¤¹!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:652
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "·Ù¹ð: ¤³¤Î¸°¤ÏËܿͤˤè¤Ã¤ÆÇË´þ¤µ¤ì¤Æ¤¤¤Þ¤¹!\n"
 
-#: g10/pkclist.c:652
+#: g10/pkclist.c:653
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         ½ð̾¤Ïµ¶Êª¤À¤È»×¤ï¤ì¤Þ¤¹¡£\n"
 
-#: g10/pkclist.c:657
+#: g10/pkclist.c:658
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "·Ù¹ð: ¤³¤ÎÉû¸°¤ÏËܿͤˤè¤Ã¤ÆÇË´þ¤µ¤ì¤Æ¤¤¤Þ¤¹!\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:680
 msgid "Note: This key has expired!\n"
 msgstr "Ãí°Õ: ¤³¤Î¸°¤Ï´ü¸ÂÀÚ¤ì¤Ç¤¹!\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:688
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "·Ù¹ð: ¤³¤Î¸°¤Ï¿®ÍѤǤ­¤ë½ð̾¤Ë¤è¤Ã¤Æ¾ÚÌÀ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó!\n"
 
-#: g10/pkclist.c:689
+#: g10/pkclist.c:690
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         ¤³¤Î½ð̾¤¬ËܿͤΤâ¤Î¤«¤É¤¦¤«¤Î¸¡¾Ú¼êÃʤ¬¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:707
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "·Ù¹ð: ¤³¤Î¸°¤Ï¿®ÍѤǤ­¤Þ¤»¤ó!\n"
 
-#: g10/pkclist.c:707
+#: g10/pkclist.c:708
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         ¤³¤Î½ð̾¤Ï¤ª¤½¤é¤¯ µ¶Êª ¤Ç¤¹¡£\n"
 
-#: g10/pkclist.c:714
+#: g10/pkclist.c:715
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "·Ù¹ð: ¤³¤Î¸°¤Ï½½Ê¬¤Ë¿®ÍѤǤ­¤ë½ð̾¤Ë¤è¤Ã¤Æ¾ÚÌÀ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó!\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:718
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         ¤³¤Î½ð̾¤¬ËܿͤΤâ¤Î¤«¤É¤¦¤«³Î¿®¤Ç¤­¤Þ¤»¤ó¡£\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:968 g10/pkclist.c:1013
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ¥¹¥­¥Ã¥×: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:828 g10/pkclist.c:995
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï´û¤Ë¤¢¤ê¤Þ¤¹\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:855
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
 msgstr "¥æ¡¼¥¶ ID ¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó(\"-r\" ¤òÍѤ¤¤¿¤Ç¤·¤ç¤¦)¡£\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:865
 msgid "Enter the user ID: "
 msgstr "¥æ¡¼¥¶ ID ¤òÆþÎÏ: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:877
 msgid "No such user ID.\n"
 msgstr "¤½¤Î¥æ¡¼¥¶ ID ¤Ï¤¢¤ê¤Þ¤»¤ó¡£\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:882
 msgid "skipped: public key already set as default recipient\n"
 msgstr "¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¼õ¿®¼Ô¤ËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:905
 msgid "Public key is disabled.\n"
 msgstr "¸ø³«¸°¤ò̵»ë¤·¤Þ¤·¤¿¡£\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:912
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "¥¹¥­¥Ã¥×: ¸ø³«¸°¤Ï´û¤Ë --encrypt-to ¤Ë¤ÆÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:943
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "¥Ç¥Õ¥©¥ë¥È¤Î¼õ¿®¼Ô `%s' ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:976
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: ¸°¤Î¥¨¥é¡¼: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:981
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ¥¹¥­¥Ã¥×: ¸ø³«¸°¤ò̵»ë¤·¤Þ¤·¤¿\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1019
 msgid "no valid addressees\n"
 msgstr "Í­¸ú¤Ê¥¢¥É¥ì¥¹¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
@@ -1241,58 +1242,58 @@ msgstr "
 msgid "writing key binding signature\n"
 msgstr "½ð̾¤ËÂбþ¤¹¤ë¸°¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
+#: g10/keygen.c:308 g10/keygen.c:419 g10/keygen.c:529
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Í׵ᤵ¤ì¤¿¸°¥µ¥¤¥º¤Ï %u ¥Ó¥Ã¥È\n"
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:438
+#: g10/keygen.c:313 g10/keygen.c:424 g10/keygen.c:534
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "%u ¥Ó¥Ã¥È¤Ë´Ý¤á¤Þ¤¹\n"
 
-#: g10/keygen.c:537
+#: g10/keygen.c:633
 msgid "Please select what kind of key you want:\n"
 msgstr "¸°¤Î¼ïÎà¤òÁªÂò¤·¤Æ²¼¤µ¤¤:\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:635
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA ¤È ElGamal (¥Ç¥Õ¥©¥ë¥È)\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:636
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (½ð̾¤Î¤ß)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:638
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (°Å¹æ²½¤Î¤ß)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:639
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (½ð̾¤È°Å¹æ²½)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:641
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (½ð̾¤È°Å¹æ²½)\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:645
 msgid "Your selection? "
 msgstr "¤É¤ì¤òÁª¤Ó¤Þ¤¹¤«? "
 
-#: g10/keygen.c:560 g10/keygen.c:568
+#: g10/keygen.c:656 g10/keygen.c:664
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "ËÜÅö¤Ë½ð̾¤È°Å¹æÍѤθ°¤òºî¤ê¤Þ¤¹¤«? "
 
-#: g10/keygen.c:582
+#: g10/keygen.c:678
 msgid "Invalid selection.\n"
 msgstr "̵¸ú¤ÊÁªÂò¤Ç¤¹¡£\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:690
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1305,19 +1306,19 @@ msgstr ""
 "          ¥Ç¥Õ¥©¥ë¥È¤Î¸°¥µ¥¤¥º¤Ï 1024 ¥Ó¥Ã¥È\n"
 "                ºÇÂç¤Î¸°¥µ¥¤¥º¤Ï 2048 ¥Ó¥Ã¥È\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:697
 msgid "What keysize do you want? (1024) "
 msgstr "¤É¤Î¸°¥µ¥¤¥º¤òÁªÂò¤·¤Þ¤¹¤«? (1024) "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:702
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA ¤Î¸°¥µ¥¤¥º¤Ï 512 ¤«¤é 1024 ¤Þ¤Ç¤Ç¤¹\n"
 
-#: g10/keygen.c:608
+#: g10/keygen.c:704
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "¸°¥µ¥¤¥º¤¬¾®¤µ¤¹¤®¤Þ¤¹; 768 ¤¬ºÇ¾®¤Ç¤¹¡£\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:706
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "¸°¥µ¥¤¥º¤¬¾®¤µ¤¹¤®¤Þ¤¹; 768 ¤¬ºÇ¾®¤Ç¤¹¡£\n"
@@ -1330,12 +1331,12 @@ msgstr "
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:621
+#: g10/keygen.c:717
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "¸°¥µ¥¤¥º¤¬Â礭¤¹¤®¤Þ¤¹; %d ¤¬ºÇÂç¤Ç¤¹¡£\n"
 
-#: g10/keygen.c:626
+#: g10/keygen.c:722
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1343,11 +1344,11 @@ msgstr ""
 "2048 °Ê¾å¤Î¸°¥µ¥¤¥º¤Ï¡¢·×»»»þ´Ö¤¬ Èó¾ï¤Ë Ť¯¤Ê¤ë¤Î¤Ç\n"
 "¿ä¾©¤·¤Þ¤»¤ó!\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:725
 msgid "Are you sure that you want this keysize? "
 msgstr "¤³¤Î¸°¥µ¥¤¥º¤ÇËÜÅö¤ËÎɤ¤¤Ç¤¹¤«? "
 
-#: g10/keygen.c:630
+#: g10/keygen.c:726
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1355,21 +1356,21 @@ msgstr ""
 "¤ï¤«¤ê¤Þ¤·¤¿¡£¤·¤«¤·¡¢¤¢¤Ê¤¿¤Î¥â¥Ë¥¿¡¼¤ä¥­¡¼¥Ü¡¼¥ÉÆþÎϤϡ¢¹¶·â¤ËÂФ·¤Æ "
 "¤¹¤­¤À¤é¤±¤Ç¤¢¤ë¤³¤È¤ò¿´¤Ëα¤á¤Æ¤ª¤¤¤Æ²¼¤µ¤¤!\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:734
 msgid "Do you really need such a large keysize? "
 msgstr "¤¢¤Ê¤¿¤ÏËÜÅö¤Ë¤³¤Î¤è¤¦¤ÊŤ¤¸°¤¬É¬ÍפǤ¹¤«? "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:740
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Í׵ᤵ¤ì¤¿¸°¥µ¥¤¥º¤Ï %u ¥Ó¥Ã¥È\n"
 
-#: g10/keygen.c:647 g10/keygen.c:651
+#: g10/keygen.c:743 g10/keygen.c:747
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u ¥Ó¥Ã¥È¤Ë´Ý¤á¤Þ¤¹\n"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:795
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1385,25 +1386,25 @@ msgstr ""
 "      <n>m = Í­¸ú´ü¸Â n ·î\n"
 "      <n>y = Í­¸ú´ü¸Â n ǯ\n"
 
-#: g10/keygen.c:714
+#: g10/keygen.c:810
 msgid "Key is valid for? (0) "
 msgstr "¸°¤ÎÍ­¸úÀ­¤Ï? (0)"
 
-#: g10/keygen.c:719
+#: g10/keygen.c:815
 msgid "invalid value\n"
 msgstr "̵¸ú¤ÊÃÍ\n"
 
-#: g10/keygen.c:724
+#: g10/keygen.c:820
 msgid "Key does not expire at all\n"
 msgstr "¸°¤Ï̵´ü¸Â¤Ç¤¹\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:730
+#: g10/keygen.c:826
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "¸°¤Ï %s ¤Ë¤Æ´ü¸ÂÀÚ¤ì¤Ë¤Ê¤ê¤Þ¤¹\n"
 
-#: g10/keygen.c:733
+#: g10/keygen.c:829
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1411,11 +1412,11 @@ msgstr ""
 "¤³¤Î¥·¥¹¥Æ¥à¤Ç¤Ï¡¢2038ǯ°Ê¹ß¤ÎÆüÉÕ¤òɽ¼¨¤Ç¤­¤Þ¤»¤ó¤¬¡¢\n"
 "2106ǯ¤Þ¤Ç¤Ê¤éÀµ¤·¤¯½èÍý¤Ç¤­¤Þ¤¹¡£\n"
 
-#: g10/keygen.c:738
+#: g10/keygen.c:834
 msgid "Is this correct (y/n)? "
 msgstr "¤³¤ì¤ÇÎɤ¤¤Ç¤¹¤« (y/n)? "
 
-#: g10/keygen.c:781
+#: g10/keygen.c:877
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1431,44 +1432,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:793
+#: g10/keygen.c:889
 msgid "Real name: "
 msgstr "ËÜ̾: "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:893
 msgid "Invalid character in name\n"
 msgstr "̾Á°¤Ë̵¸ú¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹\n"
 
-#: g10/keygen.c:799
+#: g10/keygen.c:895
 msgid "Name may not start with a digit\n"
 msgstr "̾Á°¤Ï¿ô»ú¤Ç»Ï¤Þ¤Ã¤Æ¤Ï¤¤¤±¤Þ¤»¤ó\n"
 
-#: g10/keygen.c:801
+#: g10/keygen.c:897
 msgid "Name must be at least 5 characters long\n"
 msgstr "̾Á°¤Ï 5 ʸ»ú°Ê¾å¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó\n"
 
-#: g10/keygen.c:809
+#: g10/keygen.c:905
 msgid "Email address: "
 msgstr "ÅŻҥ᡼¥ë¥¢¥É¥ì¥¹: "
 
-#: g10/keygen.c:820
+#: g10/keygen.c:916
 msgid "Not a valid email address\n"
 msgstr "Í­¸ú¤ÊÅŻҥ᡼¥ë¥¢¥É¥ì¥¹¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keygen.c:828
+#: g10/keygen.c:924
 msgid "Comment: "
 msgstr "Ãí¼á: "
 
-#: g10/keygen.c:834
+#: g10/keygen.c:930
 msgid "Invalid character in comment\n"
 msgstr "Ãí¼á¤Ë̵¸ú¤Êʸ»ú¤¬¤¢¤ê¤Þ¤¹\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:956
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "¤¢¤Ê¤¿¤Ïʸ»ú¥³¡¼¥É `%s' ¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:962
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1479,28 +1480,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:867
+#: g10/keygen.c:966
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:872
+#: g10/keygen.c:971
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:882
+#: g10/keygen.c:981
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 
-#: g10/keygen.c:883
+#: g10/keygen.c:982
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 
-#: g10/keygen.c:902
+#: g10/keygen.c:1001
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:940
+#: g10/keygen.c:1039
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1508,11 +1509,11 @@ msgstr ""
 "ÈëÌ©¸°¤òÊݸ¤ë¤¿¤á¤Ë¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬É¬ÍפǤ¹¡£\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:948
+#: g10/keyedit.c:468 g10/keygen.c:1047
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬°Û¤Ê¤ê¤Þ¤¹¡£¤â¤¦°ìÅÙÀßÄꤷ¤Æ²¼¤µ¤¤¡£\n"
 
-#: g10/keygen.c:954
+#: g10/keygen.c:1053
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1524,7 +1525,7 @@ msgstr ""
 "¥ª¥×¥·¥ç¥ó¤Ë¤è¤Ã¤Æ¡¢¤¤¤Ä¤Ç¤âÊѹ¹¤Ç¤­¤Þ¤¹¡£\n"
 "\n"
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1074
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1535,29 +1536,29 @@ msgstr ""
 "¥Ç¥£¥¹¥¯¤Ë¥¢¥¯¥»¥¹¤¹¤ë¤Ê¤É¤Î¾¤Î¹ÔÆ°¤òƱ»þ¤Ë¹Ô¤¦¤È¡¢Íð¿ôÀ¸À®ÁõÃ֤ˤÆ\n"
 "Í𻨤µ¤ÎÂ礭¤ÊÎɤ¤Íð¿ô¤òÀ¸À®¤·¤ä¤¹¤¯¤Ê¤ê¤Þ¤¹¤Î¤Ç¡¢¤ª´«¤á¤·¤Þ¤¹¡£\n"
 
-#: g10/keygen.c:1424
+#: g10/keygen.c:1523
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA ¸°¥Ú¥¢¤Ï 1024 ¥Ó¥Ã¥È¤Ë¤Ê¤ê¤Þ¤¹\n"
 
-#: g10/keygen.c:1467
+#: g10/keygen.c:1566
 msgid "Key generation canceled.\n"
 msgstr "¸°¤ÎÀ¸À®¤¬Ãæ»ß¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1663
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "`%s' ¤Ø¤Î¸ø³«¾ÚÌÀ½ñ¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n"
 
-#: g10/keygen.c:1565
+#: g10/keygen.c:1664
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "`%s' ¤Ø¤ÎÈëÌ©¾ÚÌÀ½ñ¤ò½ñ¤­¹þ¤ß¤Þ¤¹\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1760
 msgid "public and secret key created and signed.\n"
 msgstr "¸ø³«¸°¤ÈÈëÌ©¸°¤¬ºîÀ®¤µ¤ì¡¢½ð̾¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1765
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1565,49 +1566,49 @@ msgstr ""
 "¤³¤Î¸°¤Ï°Å¹æ²½¤Ë¤Ï»ÈÍѤǤ­¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£°Å¹æ²½¤ò¹Ô¤¦¤Ë¤Ï¡¢\n"
 "\"--edit-key\" ¥³¥Þ¥ó¥É¤òÍѤ¤¤ÆÉû¸°¤òºîÀ®¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: g10/keygen.c:1683 g10/keygen.c:1784
+#: g10/keygen.c:1782 g10/keygen.c:1883
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "¸°¤ÎºîÀ®¤Ë¼ºÇÔ: %s\n"
 
-#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1826 g10/sig-check.c:300 g10/sign.c:167
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "¸°¤Ï %lu ÉÃ̤Íè¤ËºîÀ®¤µ¤ì¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n"
 
-#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1828 g10/sig-check.c:302 g10/sign.c:169
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "¸°¤Ï %lu ÉÃ̤Íè¤ËºîÀ®¤µ¤ì¤Þ¤·¤¿ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1861
 msgid "Really create? "
 msgstr "ËÜÅö¤ËºîÀ®¤·¤Þ¤¹¤«? "
 
-#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:142 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: ³«¤±¤Þ¤»¤ó: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:164
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤ÎÀ¸À®¤Ë¼ºÇÔ: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:222 g10/encode.c:370
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ·Ù¹ð: ¶õ¤Î¥Õ¥¡¥¤¥ë¤Ç¤¹\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:317
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "`%s' ¤«¤éÆɤ߹þ¤ß¤Þ¤¹\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:534
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s °Å¹æ²½ ¼õ¿®¼Ô: %s\n"
@@ -1636,32 +1637,32 @@ msgstr "
 msgid "WARNING: nothing exported\n"
 msgstr "·Ù¹ð: ²¿¤â½ñ¤­½Ð¤·¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:212
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk ¥­¥ã¥Ã¥·¥å¤Î¥¨¥ó¥È¥ê¡¼¤¬Â¿¤¹¤®¤Þ¤¹ - ̵»ë\n"
 
-#: g10/getkey.c:350
+#: g10/getkey.c:351
 msgid "too many entries in unk cache - disabled\n"
 msgstr "unk ¥­¥ã¥Ã¥·¥å¤Î¥¨¥ó¥È¥ê¡¼¤¬Â¿¤¹¤®¤Þ¤¹ - ̵»ë\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
+#: g10/getkey.c:1311 g10/getkey.c:1350
 msgid "RSA key cannot be used in this version\n"
 msgstr "¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï RSA ¥­¡¼¤Ï»È¤¨¤Þ¤»¤ó\n"
 
-#: g10/getkey.c:1310 g10/getkey.c:1349
+#: g10/getkey.c:1313 g10/getkey.c:1352
 msgid "No key for user ID\n"
 msgstr "¥æ¡¼¥¶ ID ¤Î¸°¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/getkey.c:1388 g10/getkey.c:1428
+#: g10/getkey.c:1391 g10/getkey.c:1431
 msgid "No user ID for key\n"
 msgstr "¸°¤Î¥æ¡¼¥¶ ID ¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/getkey.c:1642 g10/getkey.c:1698
+#: g10/getkey.c:1645 g10/getkey.c:1701
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "Éû¸° %08lX ¤ò»ÈÍѤ·¤Þ¤¹ - ¼ç¸° %08lX ¤ÎÂåÍÑ\n"
 
-#: g10/getkey.c:2017
+#: g10/getkey.c:2020
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: ¥æ¡¼¥¶¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
@@ -1671,7 +1672,7 @@ msgstr "%s: 
 msgid "skipping block of type %d\n"
 msgstr "¥¿¥¤¥× %d ¤Î¥Ö¥í¥Ã¥¯¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹\n"
 
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:188 g10/trustdb.c:1748 g10/trustdb.c:1789
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu ¸°¤Þ¤Ç½èÍý\n"
@@ -1759,7 +1760,7 @@ msgstr "
 msgid "no default public keyring\n"
 msgstr "¥Ç¥Õ¥©¥ë¥È¤Î¸ø³«¸°¥ê¥ó¥°¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:350 g10/sign.c:669
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "`%s' ¤Ø¤Î½ñ¤­½Ð¤·\n"
@@ -2013,7 +2014,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "ËÜÅö¤Ë½ð̾¤·¤Þ¤¹¤«? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1870 g10/keyedit.c:1932 g10/sign.c:136
+#: g10/keyedit.c:373 g10/keyedit.c:1873 g10/keyedit.c:1935 g10/sign.c:191
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "½ð̾¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
@@ -2369,104 +2370,104 @@ msgstr "
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵¸ú¤Ê¥³¥Þ¥ó¥É (\"help\" ¤ò¸«¤è)\n"
 
-#: g10/keyedit.c:1080 g10/keyedit.c:1106
+#: g10/keyedit.c:1083 g10/keyedit.c:1109
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1089
+#: g10/keyedit.c:1092
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1093
+#: g10/keyedit.c:1096
 msgid "This key has been disabled"
 msgstr "¤³¤Î¸°¤Ï»ÈÍÑÉԲĤËÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1125
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "¸° %08lX: Éû¸°¤ÏÇË´þºÑ¤ß¤Ç¤¹!\n"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1128
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "        ¿·¤¿¤Ê¸°¤ÎÇË´þ: %lu\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1130
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1368
 msgid "Delete this good signature? (y/N/q)"
 msgstr "¤³¤ÎÀµ¤·¤¤½ð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1372
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "¤³¤Î̵¸ú¤Ê½ð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1376
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "¤³¤ÎÉÔÌÀ¤Ê½ð̾¤òºï½ü¤·¤Þ¤¹¤«? (y/N/q)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1382
 msgid "Really delete this self-signature? (y/N)"
 msgstr "¤³¤Î¼«¸Ê½ð̾¤ò ËÜÅö¤Ë ºï½ü¤·¤Þ¤¹¤«? (y/N)"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1396
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d ¸Ä¤Î½ð̾¤òºï½ü¤·¤Þ¤·¤¿¡£\n"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1397
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d ¸Ä¤Î½ð̾¤òºï½ü¤·¤Þ¤·¤¿¡£\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1400
 msgid "Nothing deleted.\n"
 msgstr "²¿¤âºï½ü¤·¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: g10/keyedit.c:1466
+#: g10/keyedit.c:1469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "ÈëÌ©¸°¤ÎÁªÂò¤òºï½ü¤·¤Æ²¼¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:1472
+#: g10/keyedit.c:1475
 msgid "Please select at most one secondary key.\n"
 msgstr "¿¤¯¤Æ¤â 1 ¸Ä¤ÎÉû¸°¤òÁªÂò¤·¤Æ²¼¤µ¤¤¡£\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1479
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Éû¸°¤ÎÍ­¸ú´ü¸Â¤òÊѹ¹¤·¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1481
 msgid "Changing expiration time for the primary key.\n"
 msgstr "¼ç¸°¤ÎÍ­¸ú´ü¸Â¤òÊѹ¹¤·¤Þ¤¹¡£\n"
 
-#: g10/keyedit.c:1520
+#: g10/keyedit.c:1523
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3 ¸°¤ÎÍ­¸ú´ü¸Â¤òÊѹ¹¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹\n"
 
-#: g10/keyedit.c:1536
+#: g10/keyedit.c:1539
 msgid "No corresponding signature in secret ring\n"
 msgstr "ÈëÌ©¸°¥ê¥ó¥°¤ËÂбþ¤¹¤ë½ð̾¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1600
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d È֤Υ桼¥¶ ID ¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1646
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "%d ÈÖ¤ÎÉû¸°¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1744
 msgid "user ID: \""
 msgstr "¥æ¡¼¥¶ ID: \""
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1747
 #, c-format
 msgid ""
 "\"\n"
@@ -2475,163 +2476,173 @@ msgstr ""
 "\"\n"
 "¤¢¤Ê¤¿¤Î¸° %08lX ¤Ç %s ¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:1751
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "¤³¤Î½ð̾¤ËÂФ¹¤ëÇË´þ¾ÚÌÀ½ñ¤òºîÀ®¤·¤Þ¤¹¤«? (y/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1775
 msgid "You have signed these user IDs:\n"
 msgstr "¤³¤ì¤é¤Î¥æ¡¼¥¶ ID ¤Ë½ð̾¤·¤Þ¤·¤¿:\n"
 
-#: g10/keyedit.c:1786 g10/keyedit.c:1821
+#: g10/keyedit.c:1789 g10/keyedit.c:1824
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   %08lX ¤Ë¤è¤Ã¤Æ %s ¤Ë½ð̾¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/keyedit.c:1791
+#: g10/keyedit.c:1794
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   %08lX ¤Ë¤è¤Ã¤Æ %s ¤ËÇË´þ¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/keyedit.c:1811
+#: g10/keyedit.c:1814
 msgid "You are about to revoke these signatures:\n"
 msgstr "¤¢¤Ê¤¿¤Ï¤³¤ì¤é¤Î½ð̾¤òÇË´þ¤¹¤ë¤«Ì¤äƤ¤¤Þ¤¹:\n"
 
-#: g10/keyedit.c:1829
+#: g10/keyedit.c:1832
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "ÇË´þ¾ÚÌÀ½ñ¤ò ËÜÅö¤Ë ºîÀ®¤·¤Þ¤¹¤«? (y/N)"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1861
 msgid "no secret key\n"
 msgstr "ÈëÌ©¸°¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "̵¸ú¤ÊÁõ¹Ã¤Ç¤¹"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "revkey"
+
 #. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:401 g10/mainproc.c:754
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "¸°¤Ï %s ¤Ë¤Æ´ü¸ÂÀÚ¤ì¤Ë¤Ê¤ê¤Þ¤¹\n"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:212
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "¸ø³«¸°¤Ï %08lX ¤Ç¤¹\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:247
 msgid "public key encrypted data: good DEK\n"
 msgstr "¸ø³«¸°¤Ç°Å¹æ²½¤µ¤ì¤¿¥Ç¡¼¥¿: Àµ¤·¤¤ DEK ¤Ç¤¹\n"
 
-#: g10/mainproc.c:281
+#: g10/mainproc.c:280
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "%u ¥Ó¥Ã¥È %s ¸°, ID %08lX ¤Ë¤è¤Ã¤Æ°Å¹æ²½¤µ¤ì¤Þ¤·¤¿ %s\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "%s ¸°, ID %08lX ¤Ë¤è¤Ã¤Æ°Å¹æ²½¤µ¤ì¤Þ¤·¤¿\n"
 
-#: g10/mainproc.c:297
+#: g10/mainproc.c:296
 msgid "no secret key for decryption available\n"
 msgstr "Éü¹æ¤ËɬÍפÊÈëÌ©¸°¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/mainproc.c:306
+#: g10/mainproc.c:305
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "¸ø³«¸°¤ÎÉü¹æ¤Ë¼ºÇÔ: %s\n"
 
-#: g10/mainproc.c:343
+#: g10/mainproc.c:342
 msgid "decryption okay\n"
 msgstr "Éü¹æ¤ËÀ®¸ù\n"
 
-#: g10/mainproc.c:348
+#: g10/mainproc.c:347
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "·Ù¹ð: °Å¹æ²½¤µ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤Ï²þã⤵¤ì¤Æ¤¤¤Þ¤¹!\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:352
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Éü¹æ¤Ë¼ºÇÔ: %s\n"
 
-#: g10/mainproc.c:372
+#: g10/mainproc.c:371
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "Ãí°Õ: Á÷¿®¼Ô¤Ï¡ÖÆɤ߽ª¤¨¤¿¤éºï½ü¤¹¤ë¡×¤è¤¦¤Ëµá¤á¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/mainproc.c:374
+#: g10/mainproc.c:373
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "¸µ¤Î¥Õ¥¡¥¤¥ë̾='%.*s'\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:538
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "ÆÈΩÇË´þ¡£¡Ögpg --import¡×¤ò»È¤Ã¤ÆŬÍѤ·¤Æ¤¯¤À¤µ¤¤\n"
 
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:625 g10/mainproc.c:634
 msgid "WARNING: invalid notation data found\n"
 msgstr "·Ù¹ð: ̵¸ú¤ÊÃí¼á¥Ç¡¼¥¿¤¬¤¢¤ê¤Þ¤¹\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:637
 msgid "Notation: "
 msgstr "Ãí¼á: "
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:644
 msgid "Policy: "
 msgstr "¥Ý¥ê¥·¡¼: "
 
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1074
 msgid "signature verification suppressed\n"
 msgstr "½ð̾¤Î¸¡¾Ú¤¬¤Ç¤­¤Þ¤»¤ó\n"
 
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1080
 #, 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:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1106 g10/mainproc.c:1117
 msgid "BAD signature from \""
 msgstr "ÉÔÀµ¤Ê½ð̾: \""
 
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1107 g10/mainproc.c:1118
 msgid "Good signature from \""
 msgstr "Àµ¤·¤¤½ð̾: \""
 
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1109
 msgid "                aka \""
 msgstr "                ÊÌ̾ \""
 
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1165
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "½ð̾¤Î¸¡¾Ú¤¬¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1230
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "¥¯¥é¥¹0x%02x¤ÎÆÈΩ½ð̾\n"
 
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1282
 msgid "old style (PGP 2.x) signature\n"
 msgstr "¸Å¤¤·Á¼° (PGP 2.x) ¤Ë¤è¤ë½ð̾\n"
 
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1287
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() ¤ÎÃæ¤Ë̵¸ú¤Ê¥Ñ¥±¥Ã¥È¤¬¸¡½Ð¤µ¤ì¤Þ¤·¤¿\n"
 
-#: g10/misc.c:94
+#: g10/misc.c:83
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "¥³¥¢¥À¥ó¥×¤ò̵¸ú¤Ë¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:86
 msgid "WARNING: program may create a core file!\n"
 msgstr "·Ù¹ð: ¥×¥í¥°¥é¥à¤Ï¥³¥¢¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Þ¤¹!\n"
 
-#: g10/misc.c:205
+#: g10/misc.c:312
 msgid "Experimental algorithms should not be used!\n"
 msgstr "¼Â¸³Ãæ¤Î¥¢¥ë¥´¥ê¥º¥à¤Ï»ÈÍѤ¹¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó!\n"
 
-#: g10/misc.c:219
+#: g10/misc.c:326
 msgid ""
 "RSA keys are deprecated; please consider creating a new key and use this key "
 "in the future\n"
@@ -2640,16 +2651,16 @@ msgstr ""
 "¸°¤ÏÈ¿ÂФµ¤ì¤Æ¤¤¤Þ¤¹¡£¿·¤·¤¤¸°¤òºîÀ®¤·¤Æº£¸å¤Ï¤½¤Î¸°¤òÍѤ¤¤ë¤³¤È¤ò¸¡Æ¤¤·¤Æ¤¯¤"
 "À¤µ¤¤\n"
 
-#: g10/misc.c:241
+#: g10/misc.c:348
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr "¤³¤Î°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤ÏÈ¿ÂФµ¤ì¤Æ¤¤¤Þ¤¹¡£°ìÈÌŪ¤ÊÊýË¡¤òÍѤ¤¤Æ²¼¤µ¤¤!\n"
 
-#: g10/parse-packet.c:117
+#: g10/parse-packet.c:115
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "¸ø³«¸°¤Î¥¢¥ë¥´¥ê¥º¥à %d ¤Ï»ÈÍѤǤ­¤Þ¤»¤ó\n"
 
-#: g10/parse-packet.c:965
+#: g10/parse-packet.c:963
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacket of type %d has critical bit set\n"
@@ -2686,53 +2697,53 @@ msgstr "
 msgid "Repeat passphrase: "
 msgstr "¥Ñ¥¹¥Õ¥ì¡¼¥º¤òºÆÆþÎÏ: "
 
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "¥Ç¡¼¥¿¤ÏÊݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£Êݸ¤¹¤ë¤Ë¤Ï \"--output\" "
 "¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ²¼¤µ¤¤¡£\n"
 
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
 msgid "Detached signature.\n"
 msgstr "ʬΥ½ð̾¡£\n"
 
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
 msgid "Please enter name of data file: "
 msgstr "¥Ç¡¼¥¿¥Õ¥¡¥¤¥ë¤Î̾Á°¤òÆþÎÏ: "
 
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
 msgid "reading stdin ...\n"
 msgstr "ɸ½àÆþÎϤè¤êÆɤ߹þ¤ßÃæ ...\n"
 
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "½ð̾¤µ¤ì¤¿¥Ç¡¼¥¿ `%s' ¤¬³«¤±¤Þ¤»¤ó\n"
 
-#: g10/pubkey-enc.c:79
+#: g10/pubkey-enc.c:138
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "ÉÔÆÃÄê¤Î¼õ¿®¼ÔÍѤǤ¹¡£ÈëÌ©¸° %08lX ¤òÍѤ¤¤Þ¤¹ ...\n"
 
-#: g10/pubkey-enc.c:85
+#: g10/pubkey-enc.c:144
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "½ªÎ»¡£ÉÔÆÃÄê¤Î¼õ¿®¼ÔÍѤǤ¹¡£\n"
 
-#: g10/pubkey-enc.c:137
+#: g10/pubkey-enc.c:200
 msgid "old encoding of the DEK is not supported\n"
 msgstr "DEK ¤Ë¤è¤ëµì¼°¤Î°Å¹æ¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: g10/pubkey-enc.c:156
+#: g10/pubkey-enc.c:219
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "Êݸ¥ë¥´¥ê¥º¥à %d ¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: g10/pubkey-enc.c:195
+#: g10/pubkey-enc.c:258
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "Ãí°Õ: °Å¹æ¥¢¥ë¥´¥ê¥º¥à %d ¤ÏÍ¥Àè½ç¤ËÆþ¤Ã¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: g10/pubkey-enc.c:201
+#: g10/pubkey-enc.c:264
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "Ãí°Õ: ½ð̾¤Î¸°¤Ï´ü¸ÂÀÚ¤ì¤Ç¤¹ %s\n"
@@ -2776,69 +2787,65 @@ msgstr ""
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
 
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:90
 #, fuzzy
 msgid "secret key parts are not available\n"
 msgstr "ÈëÌ©¸°¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:96
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "Êݸ¥ë¥´¥ê¥º¥à %d ¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: g10/seckey-cert.c:175
+#: g10/seckey-cert.c:239
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "̵¸ú¤Ê¥Ñ¥¹¥Õ¥ì¡¼¥º¤Ç¤¹¡£ºÆÆþÎϤ·¤Æ²¼¤µ¤¤ ...\n"
 
-#: g10/seckey-cert.c:231
+#: g10/seckey-cert.c:302
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "·Ù¹ð: ¼å¤¤¸°¤¬¸¡½Ð¤µ¤ì¤Þ¤·¤¿¡£¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÊѹ¹¤·¤Æ²¼¤µ¤¤¡£\n"
 
-#: g10/sig-check.c:202
-msgid "assuming bad MDC due to an unknown critical bit\n"
-msgstr "ÉÔÌÀ¤Ê¥¯¥ê¥Æ¥£¥«¥ë¥Ó¥Ã¥È¤¬¤¢¤Ã¤¿¤Î¤Ç¡¢MDC ¤ÏÉÔÀµ¤À¤È¸«¤Ê¤·¤Þ¤¹\n"
-
-#: g10/sig-check.c:300
+#: g10/sig-check.c:282
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "¤³¤ì¤Ï PGP ¤Ë¤è¤Ã¤ÆºîÀ®¤µ¤ì¤¿ ElGamal "
 "¸°¤Ç¤¹¡£¤³¤Î¸°¤Ï½ð̾¤ËÍѤ¤¤ë¤Ë¤Ï°ÂÁ´¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó!\n"
 
-#: g10/sig-check.c:308
+#: g10/sig-check.c:290
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "¸ø³«¸°¤Ï½ð̾¤è¤ê¤â %lu Éøå¤ËºîÀ®¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:291
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "¸ø³«¸°¤Ï½ð̾¤è¤ê¤â %lu Éøå¤ËºîÀ®¤µ¤ì¤Æ¤¤¤Þ¤¹\n"
 
-#: g10/sig-check.c:327
+#: g10/sig-check.c:309
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "Ãí°Õ: ½ð̾¤Î¸°¤Ï´ü¸ÂÀÚ¤ì¤Ç¤¹ %s\n"
 
-#: g10/sig-check.c:396
+#: g10/sig-check.c:378
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "ÉÔÌÀ¤Ê¥¯¥ê¥Æ¥£¥«¥ë¥Ó¥Ã¥È¤¬¤¢¤Ã¤¿¤Î¤Ç¡¢½ð̾¤ÏÉÔÀµ¤À¤È¸«¤Ê¤·¤Þ¤¹\n"
 
-#: g10/sign.c:140
+#: g10/sign.c:195
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s ½ð̾¡£½ð̾¼Ô: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:606
+#: g10/sign.c:345 g10/sign.c:664
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s ¤¬ºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: g10/sign.c:388
+#: g10/sign.c:444
 msgid "signing:"
 msgstr "½ð̾:"
 
-#: g10/sign.c:431
+#: g10/sign.c:487
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "·Ù¹ð: `%s' ¤Ï¶õ¤Î¥Õ¥¡¥¤¥ë¤Ç¤¹\n"
@@ -2877,7 +2884,8 @@ msgstr "%s: 
 msgid "%s: directory does not exist!\n"
 msgstr "%s: ¼­½ñ¤¬¤¢¤ê¤Þ¤»¤ó!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1363 g10/tdbio.c:444
+#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1407
+#: g10/ringedit.c:1878 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: ºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n"
@@ -3063,201 +3071,201 @@ msgstr "
 msgid "enumerate secret keys failed: %s\n"
 msgstr "ÈëÌ©¸°¤Î°ìÍ÷¤Ë¼ºÇÔ: %s\n"
 
-#: g10/trustdb.c:921
+#: g10/trustdb.c:925
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "¸° %08lX.%lu: Éû¸°¤ÎÂбþ¤ÏÍ­¸ú¤Ç¤¹\n"
 
-#: g10/trustdb.c:927 g10/trustdb.c:962
+#: g10/trustdb.c:931 g10/trustdb.c:966
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "¸° %08lX.%lu: Éû¸°¤ÎÂбþ¤¬Ìµ¸ú¤Ç¤¹: %s\n"
 
-#: g10/trustdb.c:939
+#: g10/trustdb.c:943
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "¸° %08lX.%lu: Í­¸ú¤Ê¸°¤ÎÇÑ»ß\n"
 
-#: g10/trustdb.c:945
+#: g10/trustdb.c:949
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "¸° %08lX.%lu: ̵¸ú¤Ê¸°¤ÎÇË´þ: %s\n"
 
-#: g10/trustdb.c:956
+#: g10/trustdb.c:960
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "¸° %08lX.%lu: Í­¸ú¤ÊÉû¸°¤ÎÇË´þ\n"
 
-#: g10/trustdb.c:1067
+#: g10/trustdb.c:1071
 msgid "Good self-signature"
 msgstr "Í­¸ú¤Ê¼«¸Ê½ð̾"
 
-#: g10/trustdb.c:1077
+#: g10/trustdb.c:1081
 msgid "Invalid self-signature"
 msgstr "̵¸ú¤Ê¼«¸Ê½ð̾"
 
-#: g10/trustdb.c:1104
+#: g10/trustdb.c:1108
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr "¿·¤·¤¯¼«¸Ê½ð̾¤µ¤ì¤Æ¤¤¤ë¤Î¤Ç¡¢Í­¸ú¤Ê¥æ¡¼¥¶ ID ¤ÎÇË´þ¤Ï¹Ô¤¤¤Þ¤»¤ó"
 
-#: g10/trustdb.c:1110
+#: g10/trustdb.c:1114
 msgid "Valid user ID revocation"
 msgstr "Í­¸ú¤Ê¥æ¡¼¥¶ ID ¤ÎÇË´þ"
 
-#: g10/trustdb.c:1115
+#: g10/trustdb.c:1119
 msgid "Invalid user ID revocation"
 msgstr "̵¸ú¤Ê¥æ¡¼¥¶ ID ¤ÎÇË´þ"
 
-#: g10/trustdb.c:1157
+#: g10/trustdb.c:1161
 msgid "Valid certificate revocation"
 msgstr "Í­¸ú¤Ê¾ÚÌÀ½ñ¤ÎÇË´þ"
 
-#: g10/trustdb.c:1158
+#: g10/trustdb.c:1162
 msgid "Good certificate"
 msgstr "Í­¸ú¤Ê¾ÚÌÀ½ñ"
 
-#: g10/trustdb.c:1186
+#: g10/trustdb.c:1190
 msgid "Invalid certificate revocation"
 msgstr "̵¸ú¤Ê¾ÚÌÀ½ñ¤ÎÇË´þ"
 
-#: g10/trustdb.c:1187
+#: g10/trustdb.c:1191
 msgid "Invalid certificate"
 msgstr "̵¸ú¤Ê¾ÚÌÀ½ñ"
 
-#: g10/trustdb.c:1204 g10/trustdb.c:1208
+#: g10/trustdb.c:1208 g10/trustdb.c:1212
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "½ð̾¥ì¥³¡¼¥É %lu[%d] ¤Ï¸í¤Ã¤¿¥ì¥³¡¼¥É¤ò»Ø¤·¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: g10/trustdb.c:1267
+#: g10/trustdb.c:1271
 msgid "duplicated certificate - deleted"
 msgstr "½ÅÊ£¤·¤¿¾ÚÌÀ½ñ - ºï½ü¤·¤Þ¤·¤¿"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1592
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir ¤Ë¼ºÇÔ: %s\n"
 
-#: g10/trustdb.c:1718
+#: g10/trustdb.c:1726
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: ÁÞÆþ¤Ë¼ºÇÔ: %s\n"
 
-#: g10/trustdb.c:1723
+#: g10/trustdb.c:1731
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: ÁÞÆþ¤Ë¼ºÇÔ: %s\n"
 
-#: g10/trustdb.c:1729
+#: g10/trustdb.c:1737
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: ÁÞÆþ¤·¤Þ¤·¤¿\n"
 
-#: g10/trustdb.c:1734
+#: g10/trustdb.c:1742
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¥ì¥³¡¼¥É¤ÎÆɤ߽Ф·¥¨¥é¡¼: %s\n"
 
-#: g10/trustdb.c:1742 g10/trustdb.c:1805
+#: g10/trustdb.c:1750 g10/trustdb.c:1813
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu ¸°¤ò½èÍý¤·¤Þ¤·¤¿\n"
 
-#: g10/trustdb.c:1744 g10/trustdb.c:1811
+#: g10/trustdb.c:1752 g10/trustdb.c:1819
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu ¸°¤Ë¤Ï¥¨¥é¡¼¤¬¤¢¤ê¤Þ¤¹\n"
 
-#: g10/trustdb.c:1746
+#: g10/trustdb.c:1754
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu ¸°¤òÁÞÆþ¤·¤Þ¤·¤¿\n"
 
-#: g10/trustdb.c:1749
+#: g10/trustdb.c:1757
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "¸°¥Ö¥í¥Ã¥¯¤Î°ìÍ÷¤Ë¼ºÇÔ: %s\n"
 
-#: g10/trustdb.c:1797
+#: g10/trustdb.c:1805
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: ¸°¤Ê¤·¤Î¥Ç¥£¥ì¥¯¥È¥ê¥ì¥³¡¼¥É - ¥¹¥­¥Ã¥×\n"
 
-#: g10/trustdb.c:1807
+#: g10/trustdb.c:1815
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu ¿·¤¿¤Ê¸ø³«¸°\n"
 
-#: g10/trustdb.c:1809
+#: g10/trustdb.c:1817
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu ¸°¤ò¥¹¥­¥Ã¥×¤·¤Þ¤·¤¿\n"
 
-#: g10/trustdb.c:1813
+#: g10/trustdb.c:1821
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu ¸°¤ò¹¹¿·¤·¤Þ¤·¤¿\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2166
 msgid "Ooops, no keys\n"
 msgstr "¤ª¤Ã¤È¡¢¸°¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/trustdb.c:2162
+#: g10/trustdb.c:2170
 msgid "Ooops, no user IDs\n"
 msgstr "¤ª¤Ã¤È¡¢¥æ¡¼¥¶ ID ¤¬¤¢¤ê¤Þ¤»¤ó\n"
 
-#: g10/trustdb.c:2320
+#: g10/trustdb.c:2328
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: ¥Ç¥£¥ì¥¯¥È¥ê¥ì¥³¡¼¥É¤Î¸¡º÷¤Ë¼ºÇÔ: %s\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2337
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "¸° %08lX: ¿®Íѥ쥳¡¼¥É¤ÎÁÞÆþ¤Ë¼ºÇÔ: %s\n"
 
-#: g10/trustdb.c:2333
+#: g10/trustdb.c:2341
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "¸° %08lX.%lu: ¿®Íѥ쥳¡¼¥É¤ËÁÞÆþ¤·¤Þ¤·¤¿\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2349
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "¸° %08lX.%lu: ̤Íè¤ËºîÀ®¤µ¤ì¤Æ¤¤¤Þ¤¹ (»þ´Öι¹Ô¤«»þ·×¤Î¤¯¤ë¤¤¤Ç¤·¤ç¤¦)\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2364
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "¸° %08lX.%lu: %s ¤Ç´ü¸ÂÀÚ¤ì¤Ç¤¹\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2372
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "¸° %08lX.%lu: ¿®ÍѤθ¡¾Ú¤Ë¼ºÇÔ: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2523
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "¥æ¡¼¥¶ '%s' ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó: %s\n"
 
-#: g10/trustdb.c:2517
+#: g10/trustdb.c:2525
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤«¤é '%s' ¤Î¸¡º÷¤Ë¾ã³²: %s\n"
 
-#: g10/trustdb.c:2520
+#: g10/trustdb.c:2528
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "¥æ¡¼¥¶ '%s' ¤Ï¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤ËÅÐÏ¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó - ÁÞÆþ¤·¤Þ¤·¤¿\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2531
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "'%s' ¤Î¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤Ø¤ÎÅÐÏ¿¤Ë¼ºÇÔ: %s\n"
 
-#: g10/trustdb.c:2709 g10/trustdb.c:2739
+#: g10/trustdb.c:2717 g10/trustdb.c:2747
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "·Ù¹ð: ¤Þ¤À long pref ¥ì¥³¡¼¥É¤Ï¼è¤ê°·¤¨¤Þ¤»¤ó\n"
 
@@ -3276,46 +3284,40 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "ÆþÎϤÎ%u¹ÔÌܤ¬Ä¹²á¤®¤ë¤«¡¢LF¤¬¤Ê¤¤¤è¤¦¤Ç¤¹\n"
 
-#: g10/ringedit.c:302
+#: g10/ringedit.c:324
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: ¸°¥ê¥ó¥°¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1368
+#: g10/ringedit.c:341 g10/ringedit.c:1412 g10/ringedit.c:1883
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: ¸°¥ê¥ó¥°¤òºîÀ®¤·¤Þ¤·¤¿\n"
 
-#: g10/ringedit.c:1545
+#: g10/ringedit.c:1589 g10/ringedit.c:2060
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "·Ù¹ð: ¿®ÍѾðÊó¤ò»ý¤Ã¤¿ 2 ¤Ä¤Î¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Þ¤¹¡£\n"
 
-#: g10/ringedit.c:1546
+#: g10/ringedit.c:1590 g10/ringedit.c:2061
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ¤ÏÊѹ¹¤µ¤ì¤Æ¤¤¤Ê¤¤Êý¤Ç¤¹\n"
 
-#: g10/ringedit.c:1547
+#: g10/ringedit.c:1591 g10/ringedit.c:2062
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s ¤Ï¿·¤·¤¤Êý¤Ç¤¹\n"
 
-#: g10/ringedit.c:1548
+#: g10/ringedit.c:1592 g10/ringedit.c:2063
 msgid "Please fix this possible security flaw\n"
 msgstr "¤³¤Î°ÂÁ´¾å¤Î·ç´Ù¤ò½¤Àµ¤·¤Æ²¼¤µ¤¤\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
-msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr ""
-"¸°¤Ë¤Ï°ÂÁ´¤Ç¤Ê¤¤¥Õ¥é¥°¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó - "
-"µ¶ÊªÍð¿ôÀ¸À®ÁõÃ֤ˤÏÄɲäǤ­¤Þ¤»¤ó!\n"
-
-#: g10/skclist.c:113
+#: g10/skclist.c:96
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s' ¤ò¥¹¥­¥Ã¥×: %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:102
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3371,26 +3373,26 @@ msgstr "%s: 
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr "¥ª¥×¥·¥ç¥ó¡¦¥Õ¥¡¥¤¥ë¤òÆɤßľ¤¹¤è¤¦¡¢GnuPG¤òºÆµ¯Æ°¤·¤Æ¤¯¤À¤µ¤¤\n"
 
-#: g10/encr-data.c:66
-#, c-format
-msgid "%s encrypted data\n"
-msgstr "%s °Å¹æ²½¤µ¤ì¤¿¥Ç¡¼¥¿\n"
-
-#: g10/encr-data.c:68
+#: g10/encr-data.c:64
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "ÉÔÌÀ¤Ê¥¢¥ë¥´¥ê¥º¥à¤Ë¤è¤ë°Å¹æ %d\n"
 
-#: g10/encr-data.c:90
+#: g10/encr-data.c:69
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s °Å¹æ²½¤µ¤ì¤¿¥Ç¡¼¥¿\n"
+
+#: g10/encr-data.c:99
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "·Ù¹ð: ¥á¥Ã¥»¡¼¥¸¤ÏÂоΰŹæË¡¤Î¼å¤¤¸°¤Ë¤è¤ê°Å¹æ²½¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:61
 msgid "weak key created - retrying\n"
 msgstr "¼å¤¤¸°¤¬ºîÀ®¤µ¤ì¤Þ¤·¤¿ - ºÆ¼Â¹Ô¤·¤Þ¤¹\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:66
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr "ÂоΰŹæË¡¤Î¼å¤¤¸°¤ò²óÈò¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó¡£%d ²ó»î¤ß¤Þ¤·¤¿!\n"
@@ -3631,7 +3633,7 @@ msgid ""
 "  \"Key has been compromised\"\n"
 "      Use this if you have a reason to believe that unauthorized persons\n"
 "      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
+"  \"Key is superseeded\"\n"
 "      Use this if you have replaced this key with a newer one.\n"
 "  \"Key is no longer used\"\n"
 "      Use this if you have retired this key.\n"
@@ -3656,6 +3658,17 @@ msgstr "
 msgid "No help available for `%s'"
 msgstr "`%s' ¤Ø¤Î¥Ø¥ë¥×¤Ï¤¢¤ê¤Þ¤»¤ó"
 
+#~ msgid "not processed"
+#~ msgstr "̤½èÍý"
+
+#~ msgid "assuming bad MDC due to an unknown critical bit\n"
+#~ msgstr "ÉÔÌÀ¤Ê¥¯¥ê¥Æ¥£¥«¥ë¥Ó¥Ã¥È¤¬¤¢¤Ã¤¿¤Î¤Ç¡¢MDC ¤ÏÉÔÀµ¤À¤È¸«¤Ê¤·¤Þ¤¹\n"
+
+#~ msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
+#~ msgstr ""
+#~ "¸°¤Ë¤Ï°ÂÁ´¤Ç¤Ê¤¤¥Õ¥é¥°¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó - "
+#~ "µ¶ÊªÍð¿ôÀ¸À®ÁõÃ֤ˤÏÄɲäǤ­¤Þ¤»¤ó!\n"
+
 #~ msgid "set debugging flags"
 #~ msgstr "¥Ç¥Ð¥Ã¥°¥Õ¥é¥°¤ò¥»¥Ã¥È¤¹¤ë"
 
diff --git a/po/nl.po b/po/nl.po
index b299216b5..bf32ceead 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-07-30 20:02+0200\n"
 "PO-Revision-Date: 2000-02-20 21:30+01:00\n"
 "Last-Translator: Ivo Timmermans <itimmermans@bigfoot.com>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -13,305 +13,289 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:79
-msgid "Warning: using insecure memory!\n"
-msgstr "Let op: er wordt onveilig geheugen gebruikt!\n"
-
-#: util/secmem.c:289
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "bewerking is niet mogelijk zonder initialisatie van veilig geheugen\n"
-
-#: util/secmem.c:290
-msgid "(you may have used the wrong program for this task)\n"
-msgstr "(misschien heb je hiervoor het verkeerde programma gebruikt)\n"
-
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:278 util/miscutil.c:307
 msgid "yes"
 msgstr "ja"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:279 util/miscutil.c:310
 msgid "yY"
 msgstr "yYjJ"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:280 util/miscutil.c:308
 msgid "no"
 msgstr "nee"
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:281 util/miscutil.c:311
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:580 util/miscutil.c:309
 msgid "quit"
 msgstr "einde"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:312
 msgid "qQ"
 msgstr "qQeE"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "algemene fout"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "onbekend pakket type"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "onbekende versie"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "onbekend publieke sleutel algoritme"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "onbekend verteeralgoritme"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "foutieve publieke sleutel"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "foutieve geheime sleutel"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "foutieve ondertekening"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "verkeerd controlegetal"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "verkeerde sleuteltekst"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "publieke sleutel niet gevonden"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "onbekend versleutelalgoritme"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "kan de sleutelbos niet openen"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "ongeldig pakket"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "ongeldige versleuteling"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "niet-bestaand gebruikersnummer"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "geheime sleutel niet beschikbaar"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "verkeerde geheime sleutel gebruikt"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "niet ondersteund"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "foutieve sleutel"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "leesfout op bestand"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "schrijffout op bestand"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "onbekend compressiealgoritme"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "fout bij openen bestand"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "fout bij aanmaken bestand"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "ongeldige sleuteltekst"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "publieke sleutel algoritme niet geïmplementeerd"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "encryptie-algoritme niet geïmplementeerd"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "onbekende klasse van ondertekeningen"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "fout in de vertrouwensrelatiedatabase"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "foutieve MPI"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "hulpbronlimiet"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "ongeldige sleutelbos"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "foutief certificaat"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "ongeldige gebruikersidentificatie"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "fout bij het sluiten van het bestand"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "fout bij het hernoemen van het bestand"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "fout bij het verwijderen van het bestand"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "onverwachte gegevens"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "tijden komen niet overeen"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "onbruikbaar publieke sleutel-algoritme"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "bestand bestaat al"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "onveilige sleutel"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "ongeldig argument"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "foutieve URI"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "URI wordt niet ondersteund"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "netwerkfout"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "niet versleuteld"
 
-#: util/errors.c:103
-msgid "not processed"
-msgstr "niet behandeld"
-
-#: util/logger.c:224
+#: util/logger.c:225
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... dit is een programmeerfout (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:231
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "u heeft een fout in het programma gevonden ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:321 g10/import.c:127 g10/keygen.c:1348
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:325
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:330
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:325
+#: cipher/random.c:335
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:331
+#: cipher/random.c:341
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:339
+#: cipher/random.c:349
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:387
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:397
+#: cipher/random.c:407
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan %s niet aanmaken: %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:414
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:417
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:428
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:647
+#: cipher/random.c:657
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "LET OP: de willekeurige getallengenerator is niet veilig!!\n"
 
-#: cipher/random.c:648
+#: cipher/random.c:663
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -325,7 +309,7 @@ msgstr ""
 "Gebruik geen enkele gegevens die door dit programma gegenereerd zijn!!\n"
 "\n"
 
-#: cipher/rndlinux.c:141
+#: cipher/rndlinux.c:125
 #, c-format
 msgid ""
 "\n"
@@ -337,7 +321,19 @@ msgstr ""
 "om het besturingssysteem de kans te geven om meer entropie te\n"
 "verzamelen! (Nog %d bytes nodig)\n"
 
-#: g10/g10.c:197
+#: gcrypt/secmem.c:77
+msgid "Warning: using insecure memory!\n"
+msgstr "Let op: er wordt onveilig geheugen gebruikt!\n"
+
+#: gcrypt/secmem.c:287
+msgid "operation is not possible without initialized secure memory\n"
+msgstr "bewerking is niet mogelijk zonder initialisatie van veilig geheugen\n"
+
+#: gcrypt/secmem.c:288
+msgid "(you may have used the wrong program for this task)\n"
+msgstr "(misschien heb je hiervoor het verkeerde programma gebruikt)\n"
+
+#: g10/gpg.c:197
 msgid ""
 "@Commands:\n"
 " "
@@ -345,139 +341,139 @@ msgstr ""
 "@Opdrachten:\n"
 " "
 
-#: g10/g10.c:199
+#: g10/gpg.c:199
 msgid "|[file]|make a signature"
 msgstr "|[bestand]|maak een ondertekening"
 
-#: g10/g10.c:200
+#: g10/gpg.c:200
 msgid "|[file]|make a clear text signature"
 msgstr "|[bestand]|maak een niet versleutelde ondertekening"
 
-#: g10/g10.c:201
+#: g10/gpg.c:201
 msgid "make a detached signature"
 msgstr "maak een losstaande ondertekening"
 
-#: g10/g10.c:202
+#: g10/gpg.c:202
 msgid "encrypt data"
 msgstr "versleutel gegevens"
 
-#: g10/g10.c:203
+#: g10/gpg.c:203
 msgid "encryption only with symmetric cipher"
 msgstr "versleutel slechts met een symmetrische versleutelmethode"
 
-#: g10/g10.c:204
+#: g10/gpg.c:204
 msgid "store only"
 msgstr "alleen bewaren"
 
-#: g10/g10.c:205
+#: g10/gpg.c:205
 msgid "decrypt data (default)"
 msgstr "gegevens decoderen (standaard)"
 
-#: g10/g10.c:206
+#: g10/gpg.c:206
 msgid "verify a signature"
 msgstr "ondertekening controleren"
 
-#: g10/g10.c:208
+#: g10/gpg.c:208
 msgid "list keys"
 msgstr "lijst van sleutels genereren"
 
-#: g10/g10.c:210
+#: g10/gpg.c:210
 msgid "list keys and signatures"
 msgstr "sleutels en ondertekeningen opnoemen"
 
-#: g10/g10.c:211
+#: g10/gpg.c:211
 msgid "check key signatures"
 msgstr "sleutelverificaties controleren"
 
-#: g10/g10.c:212
+#: g10/gpg.c:212
 msgid "list keys and fingerprints"
 msgstr "sleutels en vingerafdrukken opnoemen"
 
-#: g10/g10.c:213
+#: g10/gpg.c:213
 msgid "list secret keys"
 msgstr "geheime sleutels opnoemen"
 
-#: g10/g10.c:214
+#: g10/gpg.c:214
 msgid "generate a new key pair"
 msgstr "nieuw sleutelpaar genereren"
 
-#: g10/g10.c:215
+#: g10/gpg.c:215
 msgid "remove key from the public keyring"
 msgstr "sleutel weghalen uit de publieke sleutelbos"
 
-#: g10/g10.c:217
+#: g10/gpg.c:217
 msgid "remove key from the secret keyring"
 msgstr "sleutel weghalen uit de geheime sleutelbos"
 
-#: g10/g10.c:218
+#: g10/gpg.c:218
 msgid "sign a key"
 msgstr "onderteken een sleutel"
 
-#: g10/g10.c:219
+#: g10/gpg.c:219
 msgid "sign a key locally"
 msgstr "onderteken een sleutel lokaal"
 
-#: g10/g10.c:220
+#: g10/gpg.c:220
 msgid "sign or edit a key"
 msgstr "onderteken of bewerk een sleutel"
 
-#: g10/g10.c:221
+#: g10/gpg.c:221
 msgid "generate a revocation certificate"
 msgstr "genereer een terugtrekkings-certificaat"
 
-#: g10/g10.c:222
+#: g10/gpg.c:222
 msgid "export keys"
 msgstr "exporteer sleutels"
 
-#: g10/g10.c:223
+#: g10/gpg.c:223
 msgid "export keys to a key server"
 msgstr "exporteer sleutels naar een sleutelserver"
 
-#: g10/g10.c:224
+#: g10/gpg.c:224
 msgid "import keys from a key server"
 msgstr "importeer sleutels van een sleutelserver"
 
-#: g10/g10.c:228
+#: g10/gpg.c:228
 msgid "import/merge keys"
 msgstr "sleutels importeren/samenvoegen"
 
-#: g10/g10.c:230
+#: g10/gpg.c:230
 msgid "list only the sequence of packets"
 msgstr "noem alleen de volgorde van pakketten"
 
-#: g10/g10.c:232
+#: g10/gpg.c:232
 msgid "export the ownertrust values"
 msgstr "exporteer het vertrouwen in de eigenaars"
 
-#: g10/g10.c:234
+#: g10/gpg.c:234
 msgid "import ownertrust values"
 msgstr "importeer het vertrouwen in de eigenaars"
 
-#: g10/g10.c:236
+#: g10/gpg.c:236
 msgid "update the trust database"
 msgstr "werk de vertrouwensdatabase bij"
 
-#: g10/g10.c:238
+#: g10/gpg.c:238
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMEN]|controleer de vertrouwensdatabase"
 
-#: g10/g10.c:239
+#: g10/gpg.c:239
 msgid "fix a corrupted trust database"
 msgstr "repareer een beschadigde vertrouwensdatabase"
 
-#: g10/g10.c:240
+#: g10/gpg.c:240
 msgid "De-Armor a file or stdin"
 msgstr "Verwijder de beveiliging op bestand of standaard invoer"
 
-#: g10/g10.c:242
+#: g10/gpg.c:242
 msgid "En-Armor a file or stdin"
 msgstr "Voeg beveiliging toe aan bestad of standaard invoer"
 
-#: g10/g10.c:244
+#: g10/gpg.c:244
 msgid "|algo [files]|print message digests"
 msgstr "|algo [bestanden]|geef controlegetal van berichten weer"
 
-#: g10/g10.c:248
+#: g10/gpg.c:249
 msgid ""
 "@\n"
 "Options:\n"
@@ -487,155 +483,155 @@ msgstr ""
 "Opties:\n"
 " "
 
-#: g10/g10.c:250
+#: g10/gpg.c:251
 msgid "create ascii armored output"
 msgstr "genereer beveiliging in ASCII"
 
-#: g10/g10.c:252
+#: g10/gpg.c:253
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAAM|versleutel voor NAAM"
 
-#: g10/g10.c:255
+#: g10/gpg.c:256
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAAM|gebruik NAAM als standaard ontvanger"
 
-#: g10/g10.c:257
+#: g10/gpg.c:258
 msgid "use the default key as default recipient"
 msgstr "gebruik de standaard sleutel als standaard ontvanger"
 
-#: g10/g10.c:261
+#: g10/gpg.c:262
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "gebruik deze gebruikersidentificatie om te ondertekenen of te decoderen"
 
-#: g10/g10.c:262
+#: g10/gpg.c:263
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|stel compressieniveau in op N (uitzetten met 0)"
 
-#: g10/g10.c:264
+#: g10/gpg.c:265
 msgid "use canonical text mode"
 msgstr "gebruik de verkorte tekstmodus"
 
-#: g10/g10.c:265
+#: g10/gpg.c:266
 msgid "use as output file"
 msgstr "gebruik als uitvoerbestand"
 
-#: g10/g10.c:266
+#: g10/gpg.c:267
 msgid "verbose"
 msgstr "geef meer informatie"
 
-#: g10/g10.c:267
+#: g10/gpg.c:268
 msgid "be somewhat more quiet"
 msgstr "wees iets stiller"
 
-#: g10/g10.c:268
+#: g10/gpg.c:269
 msgid "don't use the terminal at all"
 msgstr "gebruik de terminal helemaal niet"
 
-#: g10/g10.c:269
+#: g10/gpg.c:270
 msgid "force v3 signatures"
 msgstr "forcees v3 ondertekening"
 
-#: g10/g10.c:270
+#: g10/gpg.c:271
 msgid "always use a MDC for encryption"
 msgstr "gebruik altijd een MDC voor versleuteling"
 
-#: g10/g10.c:271
+#: g10/gpg.c:272
 msgid "do not make any changes"
 msgstr "maak geen enkele verandering"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/gpg.c:274
 msgid "batch mode: never ask"
 msgstr "doorlopende modus: vraag nooit"
 
-#: g10/g10.c:274
+#: g10/gpg.c:275
 msgid "assume yes on most questions"
 msgstr "veronderstel ja als antwoord op de meeste vragen"
 
-#: g10/g10.c:275
+#: g10/gpg.c:276
 msgid "assume no on most questions"
 msgstr "veronderstel nee als antwoord op de meeste vragen"
 
-#: g10/g10.c:276
+#: g10/gpg.c:277
 msgid "add this keyring to the list of keyrings"
 msgstr "voeg deze sleutelbos toe aan de lijst van sleutelbossen"
 
-#: g10/g10.c:277
+#: g10/gpg.c:278
 msgid "add this secret keyring to the list"
 msgstr "voeg deze geheime sleutelbos toe aan de lijst"
 
-#: g10/g10.c:278
+#: g10/gpg.c:279
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAAM|gebruik NAAM als standaard geheime sleutel"
 
-#: g10/g10.c:279
+#: g10/gpg.c:280
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVER|gebruik deze sleutelserver om sleutels op te zoeken"
 
-#: g10/g10.c:280
+#: g10/gpg.c:281
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAAM|zet tekenverzameling van terminal op NAAM"
 
-#: g10/g10.c:281
+#: g10/gpg.c:282
 msgid "read options from file"
 msgstr "lees opties uit bestand"
 
-#: g10/g10.c:285
+#: g10/gpg.c:286
 msgid "|FD|write status info to this FD"
 msgstr "|BB|schrijf status naar deze bestandsbeschrijver"
 
-#: g10/g10.c:290
+#: g10/gpg.c:291
 msgid "|FILE|load extension module FILE"
 msgstr "|BESTAND|laad extensiemodule BESTAND"
 
-#: g10/g10.c:291
+#: g10/gpg.c:292
 msgid "emulate the mode described in RFC1991"
 msgstr "doe als RFC1991 voorschrijft"
 
-#: g10/g10.c:292
+#: g10/gpg.c:293
 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:293
+#: g10/gpg.c:294
 msgid "|N|use passphrase mode N"
 msgstr "|N|gebruik sleuteltekst modus N"
 
-#: g10/g10.c:295
+#: g10/gpg.c:296
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM voor sleutelteksten"
 
-#: g10/g10.c:297
+#: g10/gpg.c:298
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAAM|gebruik versleutelalgoritme NAAM voor sleutelteksten"
 
-#: g10/g10.c:298
+#: g10/gpg.c:299
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAAM|gebruik versleutelalgoritme NAAM"
 
-#: g10/g10.c:299
+#: g10/gpg.c:300
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM"
 
-#: g10/g10.c:300
+#: g10/gpg.c:301
 msgid "|N|use compress algorithm N"
 msgstr "|N|gebruik compressiealgoritme N"
 
-#: g10/g10.c:301
+#: g10/gpg.c:302
 msgid "throw keyid field of encrypted packets"
 msgstr "plaats geen sleutelidentificatieveld in versleutelde pakketten"
 
-#: g10/g10.c:302
+#: g10/gpg.c:303
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAAM=WAARDE|gebruik deze notitiegegevens"
 
-#: g10/g10.c:305
+#: g10/gpg.c:306
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:308
+#: g10/gpg.c:309
 msgid ""
 "@\n"
 "Examples:\n"
@@ -655,17 +651,17 @@ msgstr ""
 " --list-keys [namen]         toon sleutels\n"
 " --fingerprints [namen]      toon vingerafdrukken\n"
 
-#: g10/g10.c:403
+#: g10/gpg.c:409
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Meld fouten in het programma a.u.b. aan <gnupg-bugs@gnu.org>;\n"
 "fouten in de vertaling aan <nl@li.org>.\n"
 
-#: g10/g10.c:407
+#: g10/gpg.c:413
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Gebruik: gpg [opties] [bestanden] (-h voor hulp)"
 
-#: g10/g10.c:410
+#: g10/gpg.c:416
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -675,7 +671,7 @@ msgstr ""
 "onderteken, controleer, versleutel of decodeer de ingevoerde gegevens\n"
 "standaardactie hangt af van de gegevens\n"
 
-#: g10/g10.c:417
+#: g10/gpg.c:423
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -683,184 +679,189 @@ msgstr ""
 "\n"
 "Ondersteunde algoritmes:\n"
 
-#: g10/g10.c:496
+#: g10/gpg.c:525
 msgid "usage: gpg [options] "
 msgstr "gebruik: gpg [opties] "
 
-#: g10/g10.c:549
+#: g10/gpg.c:583
 msgid "conflicting commands\n"
 msgstr "tegenstrijdige commando's\n"
 
-#: g10/g10.c:692
+#: g10/gpg.c:638
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
+#: g10/gpg.c:734
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "LET OP: geen bestand `%s' met standaardopties\n"
 
-#: g10/g10.c:696
+#: g10/gpg.c:738
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "optiebestand `%s': %s\n"
 
-#: g10/g10.c:703
+#: g10/gpg.c:745
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "opties inlezen van `%s'\n"
 
-#: g10/g10.c:893
+#: g10/gpg.c:937
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s is een onbekende tekenverzameling\n"
 
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/gpg.c:1002 g10/gpg.c:1011
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "LET OP: %s is niet voor gewoon gebruik!\n"
 
-#: g10/g10.c:951
+#: g10/gpg.c:1004
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s is niet toegestaan met deze %s!\n"
 
-#: g10/g10.c:954
+#: g10/gpg.c:1007
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s heeft geen betekenis met %s!\n"
 
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/gpg.c:1027 g10/gpg.c:1039
 msgid "selected cipher algorithm is invalid\n"
 msgstr "geselecteerd versleutelalgoritme is ongeldig\n"
 
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/gpg.c:1033 g10/gpg.c:1045
 msgid "selected digest algorithm is invalid\n"
 msgstr "geselecteerd controle-algoritme is ongeldig\n"
 
-#: g10/g10.c:995
+#: g10/gpg.c:1049
 msgid "the given policy URL is invalid\n"
 msgstr "de gegeven beleids-URL is ongeldig\n"
 
-#: g10/g10.c:998
+#: g10/gpg.c:1052
 #, 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:1000
+#: g10/gpg.c:1054
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed(?) moet groter zijn dan 0\n"
 
-#: g10/g10.c:1002
+#: g10/gpg.c:1056
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed(?) moet groter zijn dan 1\n"
 
-#: g10/g10.c:1004
+#: g10/gpg.c:1058
 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:1007
+#: g10/gpg.c:1061
 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:1011
+#: g10/gpg.c:1065
 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:1096
+#: g10/gpg.c:1154
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "fout bij het initialiseren van de vertrouwensdatabase: %s\n"
 
-#: g10/g10.c:1102
+#: g10/gpg.c:1160
 msgid "--store [filename]"
 msgstr "--store [bestandsnaam]"
 
-#: g10/g10.c:1109
+#: g10/gpg.c:1167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [bestandsnaam]"
 
-#: g10/g10.c:1117
+#: g10/gpg.c:1175
 msgid "--encrypt [filename]"
 msgstr "--encrypt [bestandsnaam]"
 
-#: g10/g10.c:1130
+#: g10/gpg.c:1188
 msgid "--sign [filename]"
 msgstr "--sign [bestandsnaam]"
 
-#: g10/g10.c:1143
+#: g10/gpg.c:1201
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [bestandsnaam]"
 
-#: g10/g10.c:1157
+#: g10/gpg.c:1215
 msgid "--clearsign [filename]"
 msgstr "--clearsign [bestandsnaam]"
 
-#: g10/g10.c:1174
+#: g10/gpg.c:1232
 msgid "--decrypt [filename]"
 msgstr "--decrypt [bestandsnaam]"
 
-#: g10/g10.c:1182
+#: g10/gpg.c:1240
 msgid "--sign-key user-id"
 msgstr "--sign-key gebruikersidentificatie"
 
-#: g10/g10.c:1190
+#: g10/gpg.c:1248
 msgid "--lsign-key user-id"
 msgstr "--lsign-key gebruikers-identificatie"
 
-#: g10/g10.c:1198
+#: g10/gpg.c:1256
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key gebruikersidentificatie [opdrachten]"
 
-#: g10/g10.c:1214
+#: g10/gpg.c:1272
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key gebruikersidentificatie"
 
-#: g10/g10.c:1217
+#: g10/gpg.c:1275
 msgid "--delete-key user-id"
 msgstr "--delete-key gebruikersidentificatie"
 
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:311 g10/gpg.c:1312 g10/sign.c:449
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan %s niet openen: %s\n"
 
-#: g10/g10.c:1269
+#: g10/gpg.c:1327
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [gebruikersidentificatie] [sleutelbos]"
 
-#: g10/g10.c:1335
+#: g10/gpg.c:1393
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "opheffen van beveiliging mislukt: %s\n"
 
-#: g10/g10.c:1343
+#: g10/gpg.c:1401
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "beveiligen mislukt: %s\n"
 
-#: g10/g10.c:1411
+#: g10/gpg.c:1474 g10/gpg.c:1495
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ongeldig frommelalgoritme `%s'\n"
 
-#: g10/g10.c:1492
+#: g10/gpg.c:1580
 msgid "[filename]"
 msgstr "[bestandsnaam]"
 
-#: g10/g10.c:1496
+#: g10/gpg.c:1584
 msgid "Go ahead and type your message ...\n"
 msgstr "Gaat uw gang, type het bericht ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/gpg.c:1587 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan `%s' niet openen\n"
 
-#: g10/g10.c:1669
+#: g10/gpg.c:1765
 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:1675
+#: g10/gpg.c:1771
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -868,11 +869,11 @@ msgstr ""
 "een notitienaam mag alleen letters, cijfers, punten of underscores bevatten "
 "en eindig met een =\n"
 
-#: g10/g10.c:1681
+#: g10/gpg.c:1777
 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:1689
+#: g10/gpg.c:1785
 msgid "a notation value must not use any control characters\n"
 msgstr "een notitienaam mag geen controletekens bevatten\n"
 
@@ -959,50 +960,50 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1188 g10/pkclist.c:53
+#: g10/keyedit.c:1191 g10/pkclist.c:54
 msgid "             Fingerprint:"
 msgstr "            Vingerafdruk:"
 
-#: g10/pkclist.c:80
+#: g10/pkclist.c:81
 msgid "Fingerprint:"
 msgstr "Vingerafdruk:"
 
-#: g10/pkclist.c:116
+#: g10/pkclist.c:117
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:118
+#: g10/pkclist.c:119
 #, fuzzy
-msgid "Key is superseded"
+msgid "Key is superseeded"
 msgstr "Sleutel is beveiligd.\n"
 
-#: g10/pkclist.c:120
+#: g10/pkclist.c:121
 #, fuzzy
 msgid "Key has been compromised"
 msgstr "Deze sleutel is niet beschikbaar"
 
-#: g10/pkclist.c:122
+#: g10/pkclist.c:123
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:124
+#: g10/pkclist.c:125
 msgid "User ID is no longer valid"
 msgstr ""
 
-#: g10/pkclist.c:128
+#: g10/pkclist.c:129
 msgid "Reason for revocation: "
 msgstr ""
 
-#: g10/pkclist.c:145
+#: g10/pkclist.c:146
 msgid "Revocation comment: "
 msgstr ""
 
 #. a string with valid answers
-#: g10/pkclist.c:303
+#: g10/pkclist.c:304
 msgid "sSmMqQ"
 msgstr "sSmMqQ"
 
-#: g10/pkclist.c:307
+#: g10/pkclist.c:308
 #, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -1011,7 +1012,7 @@ msgstr ""
 "Geen vertrouwenswaarde toegekend aan %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1033,23 +1034,23 @@ msgstr ""
 " 4 = Ik vertrouw hem volledig\n"
 " s = Geef wat meer informatie\n"
 
-#: g10/pkclist.c:328
+#: g10/pkclist.c:329
 msgid " m = back to the main menu\n"
 msgstr " m = terug naar hoofdmenu\n"
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:331
 msgid " q = quit\n"
 msgstr " q = beëindigen\n"
 
-#: g10/pkclist.c:336
+#: g10/pkclist.c:337
 msgid "Your decision? "
 msgstr "Uw keuze? "
 
-#: g10/pkclist.c:358
+#: g10/pkclist.c:359
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificaten die leiden tot een volledig betrouwbare sleutel:\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 msgid ""
 "Could not find a valid trust path to the key.  Let's see whether we\n"
 "can assign some missing owner trust values.\n"
@@ -1059,7 +1060,7 @@ msgstr ""
 "eens proberen of we wat missende waarden kunnen invullen.\n"
 "\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
@@ -1067,7 +1068,7 @@ msgstr ""
 "Geen pad gevonden dat leidt naar een van onze sleutels.\n"
 "\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:438
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
@@ -1075,7 +1076,7 @@ msgstr ""
 "Geen certificaten gevonden zonder betrouwbaarheidswaarden.\n"
 "\n"
 
-#: g10/pkclist.c:439
+#: g10/pkclist.c:440
 msgid ""
 "No trust values changed.\n"
 "\n"
@@ -1083,36 +1084,36 @@ msgstr ""
 "Betrouwbaarheidswaarden zijn niet veranderd.\n"
 "\n"
 
-#: g10/pkclist.c:457
+#: g10/pkclist.c:458
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "sleutel %08lx: sleutel is teruggeroepen!\n"
 
-#: g10/pkclist.c:464 g10/pkclist.c:476 g10/pkclist.c:598
+#: g10/pkclist.c:465 g10/pkclist.c:477 g10/pkclist.c:599
 msgid "Use this key anyway? "
 msgstr "Deze sleutel toch gebruiken? "
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "sleutel %08lx: subsleutel is teruggeroepen!\n"
 
-#: g10/pkclist.c:512
+#: g10/pkclist.c:513
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lx: sleutel is verlopen\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr "%08lx: geen informatie om een betrouwbaarheidskans te berekenen\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lx: We vertrouwen deze sleutel NIET\n"
 
-#: g10/pkclist.c:539
+#: g10/pkclist.c:540
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -1121,15 +1122,15 @@ msgstr ""
 "%08lx: Het is niet helemaal zeker dat deze sleutel echt aan de\n"
 "eigenaar toebehoort, maar ik accepteer hem toch\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:546
 msgid "This key probably belongs to the owner\n"
 msgstr "Deze sleutel behoort waarschijnlijk toe aan de eigenaar\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid "This key belongs to us\n"
 msgstr "Deze sleutel is van ons\n"
 
-#: g10/pkclist.c:593
+#: g10/pkclist.c:594
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -1141,70 +1142,70 @@ msgstr ""
 "beantwoorden met ja\n"
 "\n"
 
-#: g10/pkclist.c:607 g10/pkclist.c:630
+#: g10/pkclist.c:608 g10/pkclist.c:631
 msgid "WARNING: Using untrusted key!\n"
 msgstr "LET OP: Ik gebruik een onbetrouwbare sleutel!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:652
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "LET OP: Deze sleutel is ingetrokken door de eigenaar!\n"
 
-#: g10/pkclist.c:652
+#: g10/pkclist.c:653
 msgid "         This could mean that the signature is forgery.\n"
 msgstr ""
 "         Dit zou kunnen betekenen dat de ondertekening een vervalsing is.\n"
 
-#: g10/pkclist.c:657
+#: g10/pkclist.c:658
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "LET OP: Deze subsleutel is ingetrokken door de eigenaar!\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:680
 msgid "Note: This key has expired!\n"
 msgstr "Let op: Deze sleutel is verlopen!\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:688
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "LET OP: Deze sleutel is niet getekend met een betrouwbare ondertekening!\n"
 
-#: g10/pkclist.c:689
+#: g10/pkclist.c:690
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Er is geen indicatie dat deze ondertekening van de eigenaar is.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:707
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "LET OP: We vertrouwen NIET op deze sleutel!\n"
 
-#: g10/pkclist.c:707
+#: g10/pkclist.c:708
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         De sleutel is waarschijnlijk VERVALST.\n"
 
-#: g10/pkclist.c:714
+#: g10/pkclist.c:715
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "LET OP: Deze sleutel is niet getekend met genoeg betrouwbare "
 "ondertekeningen!\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:718
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "        Het is niet zeker dat deze ondertekening toebehoort aan de "
 "eigenaar.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:968 g10/pkclist.c:1013
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: overgeslagen: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:828 g10/pkclist.c:995
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: overgeslagen: openbare sleutel is al aanwezig\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:855
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1212,45 +1213,45 @@ msgstr ""
 "Je gaf geen gebruikersidentificatie op. (je kunt \"-r\" gebruiken)\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:865
 msgid "Enter the user ID: "
 msgstr "Geef de gebruikersidentificatie: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:877
 msgid "No such user ID.\n"
 msgstr "Gebruiker bestaat niet.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:882
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "overgeslagen: openbare sleutel is al ingesteld als de standaard ontvanger\n"
 
 # fixme
-#: g10/pkclist.c:904
+#: g10/pkclist.c:905
 msgid "Public key is disabled.\n"
 msgstr "Openbare sleutel is niet toegankelijk.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:912
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "overgeslagen: openbare sleutel is al ingesteld met --encrypt-to\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:943
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "onbekende standaard ontvanger `%s'\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:976
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: fout tijdens controleren van de sleutel: %s\n"
 
 # fixme
-#: g10/pkclist.c:980
+#: g10/pkclist.c:981
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: overgeslagen: openbare sleutel is niet toegankelijk\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1019
 msgid "no valid addressees\n"
 msgstr "geen geldige adressen\n"
 
@@ -1262,58 +1263,58 @@ msgstr "zelfondertekening wegschrijven\n"
 msgid "writing key binding signature\n"
 msgstr "schrijven van sleutelbindingsondertekening\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
+#: g10/keygen.c:308 g10/keygen.c:419 g10/keygen.c:529
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Gevraagde sleutellengte is %u bits\n"
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:438
+#: g10/keygen.c:313 g10/keygen.c:424 g10/keygen.c:534
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "afgerond naar %u bits\n"
 
-#: g10/keygen.c:537
+#: g10/keygen.c:633
 msgid "Please select what kind of key you want:\n"
 msgstr "Selecteer aub wat voor sleutel u wilt:\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:635
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA en ElGamal (standaard)\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:636
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (alleen ondertekenen)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:638
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (alleen versleutelen)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:639
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (ondertekenen en versleutelen)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:641
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (ondertekenen en versleutelen)\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:645
 msgid "Your selection? "
 msgstr "Uw keuze? "
 
-#: g10/keygen.c:560 g10/keygen.c:568
+#: g10/keygen.c:656 g10/keygen.c:664
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Wilt u echt een sleutel maken om mee te ondertekenen en versleutelen? "
 
-#: g10/keygen.c:582
+#: g10/keygen.c:678
 msgid "Invalid selection.\n"
 msgstr "Ongeldige keuze.\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:690
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1326,19 +1327,19 @@ msgstr ""
 "                standaard sleutellengte is 1024 bits\n"
 "     hoogste aan te raden sleutellengte is 2048 bits\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:697
 msgid "What keysize do you want? (1024) "
 msgstr "Hoe lang wil je de sleutel maken? (1024) "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:702
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA staat alleen sleutellengtes toe van 512 tot 1024\n"
 
-#: g10/keygen.c:608
+#: g10/keygen.c:704
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "sleutel te kort; 768 is de kleinste toegestane waarde.\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:706
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "sleutel te kort; 768 is de kleinste toegestane waarde.\n"
@@ -1351,12 +1352,12 @@ msgstr "sleutel te kort; 768 is de kleinste toegestane waarde.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:621
+#: g10/keygen.c:717
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "sleutel te lang; %d is de maximumlengte.\n"
 
-#: g10/keygen.c:626
+#: g10/keygen.c:722
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1364,11 +1365,11 @@ msgstr ""
 "Sleutels langer dan 2048 worden afgeraden omdat berekeningen dan ERG\n"
 "lang duren!\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:725
 msgid "Are you sure that you want this keysize? "
 msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
 
-#: g10/keygen.c:630
+#: g10/keygen.c:726
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1376,21 +1377,21 @@ msgstr ""
 "Okee, maar houd er rekening mee dat straling van monitor en toetsenbord ook "
 "erg vatbaar zijn voor aanvallen!\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:734
 msgid "Do you really need such a large keysize? "
 msgstr "Heb je echt een sleutel nodig die zo lang is? "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:740
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Gevraagde sleutellengte is %u bits\n"
 
-#: g10/keygen.c:647 g10/keygen.c:651
+#: g10/keygen.c:743 g10/keygen.c:747
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "afgerond naar %u bits\n"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:795
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1406,26 +1407,26 @@ msgstr ""
 "    <n>m = sleutel verloopt over n maanden\n"
 "    <n>y = sleutel verloopt over n jaar\n"
 
-#: g10/keygen.c:714
+#: g10/keygen.c:810
 msgid "Key is valid for? (0) "
 msgstr "Sleutel is geldig gedurende? (0) "
 
-#: g10/keygen.c:719
+#: g10/keygen.c:815
 msgid "invalid value\n"
 msgstr "ongeldige waarde\n"
 
-#: g10/keygen.c:724
+#: g10/keygen.c:820
 msgid "Key does not expire at all\n"
 msgstr "Sleutel verloopt nooit\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:730
+#: g10/keygen.c:826
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Sleutel verloopt op %s\n"
 
 # fixme
-#: g10/keygen.c:733
+#: g10/keygen.c:829
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1433,11 +1434,11 @@ msgstr ""
 "Uw systeem kan geen data weergeven van na 2038.\n"
 "Desondanks wordt het goed behandeld tot 2106.\n"
 
-#: g10/keygen.c:738
+#: g10/keygen.c:834
 msgid "Is this correct (y/n)? "
 msgstr "Klopt dit (j/n)? "
 
-#: g10/keygen.c:781
+#: g10/keygen.c:877
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1453,44 +1454,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:793
+#: g10/keygen.c:889
 msgid "Real name: "
 msgstr "Echte naam: "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:893
 msgid "Invalid character in name\n"
 msgstr "Ongeldig teken in naam\n"
 
-#: g10/keygen.c:799
+#: g10/keygen.c:895
 msgid "Name may not start with a digit\n"
 msgstr "Naam mag niet beginnen met een cijfer\n"
 
-#: g10/keygen.c:801
+#: g10/keygen.c:897
 msgid "Name must be at least 5 characters long\n"
 msgstr "Naam moet ten minste 5 tekens lang zijn\n"
 
-#: g10/keygen.c:809
+#: g10/keygen.c:905
 msgid "Email address: "
 msgstr "Email Adres: "
 
-#: g10/keygen.c:820
+#: g10/keygen.c:916
 msgid "Not a valid email address\n"
 msgstr "Ongeldig email adres\n"
 
-#: g10/keygen.c:828
+#: g10/keygen.c:924
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:834
+#: g10/keygen.c:930
 msgid "Invalid character in comment\n"
 msgstr "Ongeldig teken in kommentaar\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:956
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Je gebruik tekenverzameling `%s'.\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:962
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1501,28 +1502,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:867
+#: g10/keygen.c:966
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:872
+#: g10/keygen.c:971
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoEe"
 
-#: g10/keygen.c:882
+#: g10/keygen.c:981
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Verander (N)aam, (K)ommentaar, (E)mail of (O)kee/ei(N)de? "
 
-#: g10/keygen.c:883
+#: g10/keygen.c:982
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Verander (N)aam, (K)ommentaar, (E)mail of (O)kee/ei(N)de? "
 
-#: g10/keygen.c:902
+#: g10/keygen.c:1001
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:940
+#: g10/keygen.c:1039
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1530,11 +1531,11 @@ msgstr ""
 "Je hebt een sleuteltekst nodig om je geheime sleutel te bewaken.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:948
+#: g10/keyedit.c:468 g10/keygen.c:1047
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "sleuteltekst is niet goed herhaald; probeer het opnieuw.\n"
 
-#: g10/keygen.c:954
+#: g10/keygen.c:1053
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1546,7 +1547,7 @@ msgstr ""
 "nog aanpassen, gebruik dit programma met de optie \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1074
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1559,29 +1560,29 @@ msgstr ""
 "dit geeft de generator een grotere kans om genoeg entropie te\n"
 "verzamelen.\n"
 
-#: g10/keygen.c:1424
+#: g10/keygen.c:1523
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA sleutelpaar zal 1024 bits lang zijn.\n"
 
-#: g10/keygen.c:1467
+#: g10/keygen.c:1566
 msgid "Key generation canceled.\n"
 msgstr "Sleutelgeneratie afgebroken.\n"
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1663
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "Openbaar certificaat wordt geschreven naar `%s'\n"
 
-#: g10/keygen.c:1565
+#: g10/keygen.c:1664
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "Geheim certificaat wordt weggeschreven naar `%s'\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1760
 msgid "public and secret key created and signed.\n"
 msgstr "openbare en geheime sleutels zijn gemaakt en getekend.\n"
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1765
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1590,12 +1591,12 @@ msgstr ""
 "U wilt misschien het commando \"--edit-key\" gebruiken om een tweede\n"
 "sleutel te maken hiervoor.\n"
 
-#: g10/keygen.c:1683 g10/keygen.c:1784
+#: g10/keygen.c:1782 g10/keygen.c:1883
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Sleutelgeneratie is mislukt: %s\n"
 
-#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1826 g10/sig-check.c:300 g10/sign.c:167
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1603,7 +1604,7 @@ msgstr ""
 "Sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
 "klokprobleem)\n"
 
-#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1828 g10/sig-check.c:302 g10/sign.c:169
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1611,32 +1612,32 @@ msgstr ""
 "sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
 "klokprobleem)\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1861
 msgid "Really create? "
 msgstr "Echt maken? "
 
-#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:142 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: kon niet openen: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:164
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fout tijdens aanmake sleuteltekst: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:222 g10/encode.c:370
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: LET OP: leeg bestand\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:317
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lezen uit `%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:534
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s versleuteld voor: %s\n"
@@ -1665,32 +1666,32 @@ msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
 msgid "WARNING: nothing exported\n"
 msgstr "LET OP: er is niets geëxporteerd\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:212
 msgid "too many entries in pk cache - disabled\n"
 msgstr "te veel ingangen in de pk cache - uitgezet\n"
 
-#: g10/getkey.c:350
+#: g10/getkey.c:351
 msgid "too many entries in unk cache - disabled\n"
 msgstr "te veel ingangen in de unk cache - uitgezet\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
+#: g10/getkey.c:1311 g10/getkey.c:1350
 msgid "RSA key cannot be used in this version\n"
 msgstr "RSA sleutel kan niet gebruikt worden in deze versie\n"
 
-#: g10/getkey.c:1310 g10/getkey.c:1349
+#: g10/getkey.c:1313 g10/getkey.c:1352
 msgid "No key for user ID\n"
 msgstr "Geen sleutel voor gebruikersidentificatie\n"
 
-#: g10/getkey.c:1388 g10/getkey.c:1428
+#: g10/getkey.c:1391 g10/getkey.c:1431
 msgid "No user ID for key\n"
 msgstr "Geen gebruikersidentificatie voor sleutel\n"
 
-#: g10/getkey.c:1642 g10/getkey.c:1698
+#: g10/getkey.c:1645 g10/getkey.c:1701
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "gebruik secundaire sleutel %08lx in plaats van de primaire %08lx\n"
 
-#: g10/getkey.c:2017
+#: g10/getkey.c:2020
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: gebruiker niet gevonden\n"
@@ -1700,7 +1701,7 @@ msgstr "%s: gebruiker niet gevonden\n"
 msgid "skipping block of type %d\n"
 msgstr "blok van type %d wordt overgeslagen\n"
 
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:188 g10/trustdb.c:1748 g10/trustdb.c:1789
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu sleutels zijn tot nu toe behandeld\n"
@@ -1789,7 +1790,7 @@ msgstr "sleutel %08lX: openbare sleutel niet gevonden: %s\n"
 msgid "no default public keyring\n"
 msgstr "geen standaard openbare sleutelbos\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:350 g10/sign.c:669
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "schrijven naar `%s'\n"
@@ -2054,7 +2055,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "Echt tekenen? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1870 g10/keyedit.c:1932 g10/sign.c:136
+#: g10/keyedit.c:373 g10/keyedit.c:1873 g10/keyedit.c:1935 g10/sign.c:191
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "ondertekening mislukt: %s\n"
@@ -2410,104 +2411,104 @@ msgstr "sleutel is niet veranderd en hoeft dus niet bijgewerkt te worden.\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Foutief commando (probeer \"help\")\n"
 
-#: g10/keyedit.c:1080 g10/keyedit.c:1106
+#: g10/keyedit.c:1083 g10/keyedit.c:1109
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1089
+#: g10/keyedit.c:1092
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1093
+#: g10/keyedit.c:1096
 msgid "This key has been disabled"
 msgstr "Deze sleutel is niet beschikbaar"
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1125
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "sleutel %08lx: subsleutel is teruggeroepen!\n"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1128
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "nieuwe sleutelterugtrekkingen: %lu\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1130
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1368
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Verwijder deze goede ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1372
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Verwijder deze ongeldige ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1376
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Verwijder deze onbekende ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1382
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Deze zelfondertekening echt verwijderen? (j/N)"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1396
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d ondertekening verwijderd.\n"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1397
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d ondertekeningen verwijderd.\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1400
 msgid "Nothing deleted.\n"
 msgstr "Niets verwijderd.\n"
 
-#: g10/keyedit.c:1466
+#: g10/keyedit.c:1469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Haal a.u.b. de selecties weg voor de geheime sleutels.\n"
 
-#: g10/keyedit.c:1472
+#: g10/keyedit.c:1475
 msgid "Please select at most one secondary key.\n"
 msgstr "Selecteer a.u.b. maximaal één secundaire sleutel.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1479
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Vervaldatum voor secundaire sleutel instellen.\n"
 
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1481
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Vervaldatum voor primaire sleutel instellen.\n"
 
-#: g10/keyedit.c:1520
+#: g10/keyedit.c:1523
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "U kunt de vervaldatum van een v3 sleutel niet wijzigen\n"
 
-#: g10/keyedit.c:1536
+#: g10/keyedit.c:1539
 msgid "No corresponding signature in secret ring\n"
 msgstr "Geen overeenkomende ondertekening in de geheime sleutelbos\n"
 
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1600
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Geen gebruikersidentificatie met index %d\n"
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1646
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Geen secundaire sleutel met index %d\n"
 
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1744
 msgid "user ID: \""
 msgstr "gebruikersidentificatie: \""
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1747
 #, c-format
 msgid ""
 "\"\n"
@@ -2516,164 +2517,174 @@ msgstr ""
 "\"\n"
 "tekende met uw sleutel %08lX op %s\n"
 
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:1751
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Terugtrekkingscertificaat maken voor deze ondertekening? (j/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1775
 msgid "You have signed these user IDs:\n"
 msgstr "U heeft deze gebruikers ondertekend:\n"
 
-#: g10/keyedit.c:1786 g10/keyedit.c:1821
+#: g10/keyedit.c:1789 g10/keyedit.c:1824
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   getekend door %08lX op %s\n"
 
-#: g10/keyedit.c:1791
+#: g10/keyedit.c:1794
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   ingetrokken door %08lX op %s\n"
 
-#: g10/keyedit.c:1811
+#: g10/keyedit.c:1814
 msgid "You are about to revoke these signatures:\n"
 msgstr "U staat op het punt om deze ondertekeningen in te trekken:\n"
 
-#: g10/keyedit.c:1829
+#: g10/keyedit.c:1832
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Echt deze terugtrekkingscertificaten aanmaken? (j/N)"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1861
 msgid "no secret key\n"
 msgstr "geen geheime sleutel\n"
 
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "ongeldige versleuteling"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "revkey"
+
 #. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:401 g10/mainproc.c:754
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "Sleutel verloopt op %s\n"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:212
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "openbare sleutel is %08lX\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:247
 msgid "public key encrypted data: good DEK\n"
 msgstr "gegevens versleuteld met een openbare sleutel: goede DEK\n"
 
-#: g10/mainproc.c:281
+#: g10/mainproc.c:280
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "versleuteld met %u-bit %s sleutel, nummer %08lX, gemaakt op %s\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "versleuteld met %s sleutel, nummer %08lX\n"
 
-#: g10/mainproc.c:297
+#: g10/mainproc.c:296
 msgid "no secret key for decryption available\n"
 msgstr "geheime sleutel voor ontsleuteling is niet beschikbaar\n"
 
-#: g10/mainproc.c:306
+#: g10/mainproc.c:305
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "openbare sleutel-ontsleuteling ging niet: %s\n"
 
-#: g10/mainproc.c:343
+#: g10/mainproc.c:342
 msgid "decryption okay\n"
 msgstr "ontsleutelen ging goed\n"
 
-#: g10/mainproc.c:348
+#: g10/mainproc.c:347
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "LET OP: het versleutelde bericht is veranderd!\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:352
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ontsleuteling mislukte: %s\n"
 
 # Dit kan wel Engels blijven.. toch?
-#: g10/mainproc.c:372
+#: g10/mainproc.c:371
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "LET OP: afzender vroeg om \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:374
+#: g10/mainproc.c:373
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originele bestandsnaam='%.*s'\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:538
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "alleenstaande intrekking - gebruik \"gpg --import\" om uit te voeren\n"
 
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:625 g10/mainproc.c:634
 msgid "WARNING: invalid notation data found\n"
 msgstr "LET OP: ongeldige aantekeningen gevonden\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:637
 msgid "Notation: "
 msgstr "Aantekening: "
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:644
 msgid "Policy: "
 msgstr "Beleid: "
 
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1074
 msgid "signature verification suppressed\n"
 msgstr "controle van de ondertekening overgeslagen\n"
 
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1080
 #, 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:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1106 g10/mainproc.c:1117
 msgid "BAD signature from \""
 msgstr "FOUTE ondertekening van \""
 
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1107 g10/mainproc.c:1118
 msgid "Good signature from \""
 msgstr "Correcte ondertekening van \""
 
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1109
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1165
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ondertekening niet controleren: %s\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1230
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "losstaande ondertekening van type 0x%02x\n"
 
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1282
 msgid "old style (PGP 2.x) signature\n"
 msgstr "oude stijl (PGP 2.x) ondertekening\n"
 
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1287
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ongeldig hoofdpakket gevonden in proc_tree()\n"
 
-#: g10/misc.c:94
+#: g10/misc.c:83
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan geheugendumps niet uitzetten: %s\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:86
 msgid "WARNING: program may create a core file!\n"
 msgstr "LET OP: programma zou een geheugendump kunnen maken!\n"
 
-#: g10/misc.c:205
+#: g10/misc.c:312
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Experimentele algoritmes dienen niet gebruikt te worden!\n"
 
-#: g10/misc.c:219
+#: g10/misc.c:326
 msgid ""
 "RSA keys are deprecated; please consider creating a new key and use this key "
 "in the future\n"
@@ -2681,16 +2692,16 @@ msgstr ""
 "RSA sleutels zijn verouderd; overweeg a.u.b. het aanmaken van een\n"
 "nieuwe sleutel om in de toekomst te gebruiken\n"
 
-#: g10/misc.c:241
+#: g10/misc.c:348
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr "dit versleutelalgoritme is verouderd; gebruik een meer algemene!\n"
 
-#: g10/parse-packet.c:117
+#: g10/parse-packet.c:115
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan openbare sleutel-algoritme %d niet behandelen\n"
 
-#: g10/parse-packet.c:965
+#: g10/parse-packet.c:963
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpakket type %d heeft kritische bit gezet\n"
@@ -2727,52 +2738,52 @@ msgstr "Geef de sleuteltekst: "
 msgid "Repeat passphrase: "
 msgstr "Herhaal de sleuteltekst: "
 
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "gegevens niet bewaard; gebruik de optie \"--output\" om het op te slaan in\n"
 
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
 msgid "Detached signature.\n"
 msgstr "Losstaande ondertekening.\n"
 
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
 msgid "Please enter name of data file: "
 msgstr "Geef de naam van het gegevensbestand: "
 
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
 msgid "reading stdin ...\n"
 msgstr "lezen uit standaard invoer ...\n"
 
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kan ondertekende gegevens `%s' niet openen\n"
 
-#: g10/pubkey-enc.c:79
+#: g10/pubkey-enc.c:138
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "anonieme ontvanger; ik probeer geheime sleutel %08lX ...\n"
 
-#: g10/pubkey-enc.c:85
+#: g10/pubkey-enc.c:144
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "okee, wij zijn de anonieme ontvanger.\n"
 
-#: g10/pubkey-enc.c:137
+#: g10/pubkey-enc.c:200
 msgid "old encoding of the DEK is not supported\n"
 msgstr "oude codering van de DEK wordt niet ondersteund.\n"
 
-#: g10/pubkey-enc.c:156
+#: g10/pubkey-enc.c:219
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "beschermingsalgoritme %d wordt niet ondersteund\n"
 
-#: g10/pubkey-enc.c:195
+#: g10/pubkey-enc.c:258
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "LET OP: versleutelalgoritme %d niet gevonden in de voorkeuren\n"
 
-#: g10/pubkey-enc.c:201
+#: g10/pubkey-enc.c:264
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "LET OP: sleutel voor ondertekening is vervallen op %s\n"
@@ -2816,71 +2827,67 @@ msgstr "versturen naar `%s' gelukt (status=%u)\n"
 msgid "failed sending to `%s': status=%u\n"
 msgstr "fout bij versturen naar `%s': status=%u\n"
 
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:90
 #, fuzzy
 msgid "secret key parts are not available\n"
 msgstr "geheime sleutel niet beschikbaar"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:96
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "beschermingsalgoritme %d wordt niet ondersteund\n"
 
-#: g10/seckey-cert.c:175
+#: g10/seckey-cert.c:239
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Foutieve sleuteltekst; probeer a.u.b. opnieuw ...\n"
 
-#: g10/seckey-cert.c:231
+#: g10/seckey-cert.c:302
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "LET OP: Kwetsbare sleutel gevonden - verander a.u.b. de sleuteltekst "
 "opnieuw.\n"
 
-#: g10/sig-check.c:202
-msgid "assuming bad MDC due to an unknown critical bit\n"
-msgstr "foutieve MDC aangenomen wegens een onbekende kritische bit\n"
-
-#: g10/sig-check.c:300
+#: g10/sig-check.c:282
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "dit is een ElGamal sleutel van PGP, die NIET veilig is voor "
 "ondertekeningen!\n"
 
-#: g10/sig-check.c:308
+#: g10/sig-check.c:290
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "openbare sleutel is %lu seconde nieuwer dan de ondertekening\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:291
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "openbare sleutel is %lu seconden nieuwer dan de ondertekening\n"
 
-#: g10/sig-check.c:327
+#: g10/sig-check.c:309
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "LET OP: sleutel voor ondertekening is vervallen op %s\n"
 
-#: g10/sig-check.c:396
+#: g10/sig-check.c:378
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "foutieve ondertekening aangenomen wegens een onbekende kritische bit\n"
 
-#: g10/sign.c:140
+#: g10/sign.c:195
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s ondertekening van: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:606
+#: g10/sign.c:345 g10/sign.c:664
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "kan %s niet aanmaken: %s\n"
 
-#: g10/sign.c:388
+#: g10/sign.c:444
 msgid "signing:"
 msgstr "ondertekenen:"
 
-#: g10/sign.c:431
+#: g10/sign.c:487
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "LET OP: `%s' is een leeg bestand\n"
@@ -2920,7 +2927,8 @@ msgstr "%s: kan er niet bij: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: map bestaat niet!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1363 g10/tdbio.c:444
+#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1407
+#: g10/ringedit.c:1878 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: kan hem niet aanmaken: %s\n"
@@ -3108,205 +3116,205 @@ msgstr "sleutel %08lX: geaccepteerd als een betrouwbare sleutel.\n"
 msgid "enumerate secret keys failed: %s\n"
 msgstr "nummeren van de geheime sleutels mislukte: %s\n"
 
-#: g10/trustdb.c:921
+#: g10/trustdb.c:925
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "sleutel %08lX.%lu: Goede subsleutelbinding\n"
 
-#: g10/trustdb.c:927 g10/trustdb.c:962
+#: g10/trustdb.c:931 g10/trustdb.c:966
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "sleutel %08lX.%lu: Foutieve subsleutelbinding: %s\n"
 
-#: g10/trustdb.c:939
+#: g10/trustdb.c:943
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "sleutel %08lX.%lu: Geldige sleutelterugtrekking\n"
 
-#: g10/trustdb.c:945
+#: g10/trustdb.c:949
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "sleutel %08lX.%lu: Ongeldige sleutelterugtrekking: %s\n"
 
-#: g10/trustdb.c:956
+#: g10/trustdb.c:960
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "sleutel %08lX.%lu: Geldige subsleutelterugtrekking\n"
 
-#: g10/trustdb.c:1067
+#: g10/trustdb.c:1071
 msgid "Good self-signature"
 msgstr "Correcte zelfondertekening"
 
-#: g10/trustdb.c:1077
+#: g10/trustdb.c:1081
 msgid "Invalid self-signature"
 msgstr "Ongeldige zelfondertekening"
 
 # User ID onvertaald
-#: g10/trustdb.c:1104
+#: g10/trustdb.c:1108
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Geldig terugtrekkingscertificaat overgeslagen wegens een nieuwere "
 "zelfondertekening"
 
-#: g10/trustdb.c:1110
+#: g10/trustdb.c:1114
 msgid "Valid user ID revocation"
 msgstr "Geldig terugtrekkingscertificaat voor gebruiker"
 
-#: g10/trustdb.c:1115
+#: g10/trustdb.c:1119
 msgid "Invalid user ID revocation"
 msgstr "Ongeldig terugtrekkingscertificaat voor gebruiker"
 
-#: g10/trustdb.c:1157
+#: g10/trustdb.c:1161
 msgid "Valid certificate revocation"
 msgstr "Geldige terugtrekking van certificaat"
 
-#: g10/trustdb.c:1158
+#: g10/trustdb.c:1162
 msgid "Good certificate"
 msgstr "Correct certificaat"
 
-#: g10/trustdb.c:1186
+#: g10/trustdb.c:1190
 msgid "Invalid certificate revocation"
 msgstr "Ongeldige terugtrekking van certificaat"
 
-#: g10/trustdb.c:1187
+#: g10/trustdb.c:1191
 msgid "Invalid certificate"
 msgstr "Ongeldig certificaat"
 
-#: g10/trustdb.c:1204 g10/trustdb.c:1208
+#: g10/trustdb.c:1208 g10/trustdb.c:1212
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "ondert. veld %lu[%d] wijst naar een verkeerd veld.\n"
 
-#: g10/trustdb.c:1267
+#: g10/trustdb.c:1271
 msgid "duplicated certificate - deleted"
 msgstr "dubbel certificaat - verwijderd"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1592
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir mislukte: %s\n"
 
-#: g10/trustdb.c:1718
+#: g10/trustdb.c:1726
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: invoegen mislukte: %s\n"
 
-#: g10/trustdb.c:1723
+#: g10/trustdb.c:1731
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: invoegen mislukte: %s\n"
 
-#: g10/trustdb.c:1729
+#: g10/trustdb.c:1737
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: ingevoegd\n"
 
-#: g10/trustdb.c:1734
+#: g10/trustdb.c:1742
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "fout bij het lezen van indexveld: %s\n"
 
-#: g10/trustdb.c:1742 g10/trustdb.c:1805
+#: g10/trustdb.c:1750 g10/trustdb.c:1813
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu sleutels verwerkt\n"
 
-#: g10/trustdb.c:1744 g10/trustdb.c:1811
+#: g10/trustdb.c:1752 g10/trustdb.c:1819
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "        %lu sleutels met fouten\n"
 
-#: g10/trustdb.c:1746
+#: g10/trustdb.c:1754
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "        %lu sleutels ingevoegd\n"
 
-#: g10/trustdb.c:1749
+#: g10/trustdb.c:1757
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "nummeren van de sleutelblokken mislukte: %s\n"
 
-#: g10/trustdb.c:1797
+#: g10/trustdb.c:1805
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: indexveld zonder sleutel - overgeslagen\n"
 
-#: g10/trustdb.c:1807
+#: g10/trustdb.c:1815
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "        %lu vanwege nieuwe openbare sleutels\n"
 
-#: g10/trustdb.c:1809
+#: g10/trustdb.c:1817
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "        %lu sleutels overgeslagen\n"
 
-#: g10/trustdb.c:1813
+#: g10/trustdb.c:1821
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "        %lu sleutels bijgewerkt\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2166
 msgid "Ooops, no keys\n"
 msgstr "Ooeeps, geen sleutels\n"
 
-#: g10/trustdb.c:2162
+#: g10/trustdb.c:2170
 msgid "Ooops, no user IDs\n"
 msgstr "Ooeeps, geen gebruikersidentificaties\n"
 
-#: g10/trustdb.c:2320
+#: g10/trustdb.c:2328
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: zoeken naar indexveld mislukte: %s\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2337
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "sleutel %08lX: invoegen van vertrouwensveld mislukte: %s\n"
 
-#: g10/trustdb.c:2333
+#: g10/trustdb.c:2341
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "sleutel %08lX.%lu: ingevoegd in de vertrouwensdatabase\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2349
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "sleutel %08lX.%lu: aangemaakt in de toekomst (tijdsverschuiving of "
 "klokprobleem)\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2364
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "sleutel %08lX.%lu: vervallen op %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2372
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "sleutel %08lX.%lu: betrouwbaarheidscontrole mislukt: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2523
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "gebruiker `%s' niet gevonden: %s\n"
 
-#: g10/trustdb.c:2517
+#: g10/trustdb.c:2525
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "kon `%s' niet opzoeken in de vertrouwensdatabase: %s\n"
 
-#: g10/trustdb.c:2520
+#: g10/trustdb.c:2528
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "gebruiker '%s' komt niet voor in de vertrouwensdatabase - invoegen\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2531
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "kon '%s' niet invoegen in de vertrouwensdatabase: %s\n"
 
-#: g10/trustdb.c:2709 g10/trustdb.c:2739
+#: g10/trustdb.c:2717 g10/trustdb.c:2747
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "LET OP: kan nog geen lange voorkeursblokken verwerken\n"
 
@@ -3325,46 +3333,40 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "invoerregel %u is te lang, of ontbrekende LF\n"
 
-#: g10/ringedit.c:302
+#: g10/ringedit.c:324
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: kan sleutelbos niet aanmaken: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1368
+#: g10/ringedit.c:341 g10/ringedit.c:1412 g10/ringedit.c:1883
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: sleutelbos aangemaakt\n"
 
-#: g10/ringedit.c:1545
+#: g10/ringedit.c:1589 g10/ringedit.c:2060
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "LET OP: er zijn 2 bestanden met vertrouwelijke informatie.\n"
 
-#: g10/ringedit.c:1546
+#: g10/ringedit.c:1590 g10/ringedit.c:2061
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s is de onveranderde\n"
 
-#: g10/ringedit.c:1547
+#: g10/ringedit.c:1591 g10/ringedit.c:2062
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s is de nieuwe\n"
 
-#: g10/ringedit.c:1548
+#: g10/ringedit.c:1592 g10/ringedit.c:2063
 msgid "Please fix this possible security flaw\n"
 msgstr "Dicht dit mogelijke beveiligingsgat\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
-msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr ""
-"sleutel is niet als onveilig gemarkeerd - kan hem niet gebruiken met "
-"nep-RNG!\n"
-
-#: g10/skclist.c:113
+#: g10/skclist.c:96
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s' overgeslagen: %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:102
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3421,28 +3423,28 @@ msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 "u moet GnuPG opnieuw starten, zodat het het nieuwe optiebestand kan inlezen\n"
 
-#: g10/encr-data.c:66
-#, c-format
-msgid "%s encrypted data\n"
-msgstr "%s versleutelde gegevens\n"
-
-#: g10/encr-data.c:68
+#: g10/encr-data.c:64
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "versleuteld met onbekend algoritme %d\n"
 
-#: g10/encr-data.c:90
+#: g10/encr-data.c:69
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s versleutelde gegevens\n"
+
+#: g10/encr-data.c:99
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "LET OP: dit bericht werd versleuteld met een zwakke sleutel in het\n"
 "symmetrische versleutelalgoritme.\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:61
 msgid "weak key created - retrying\n"
 msgstr "zwakke sleutel gemaakt - ik probeer het opnieuw\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:66
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
@@ -3695,7 +3697,7 @@ msgid ""
 "  \"Key has been compromised\"\n"
 "      Use this if you have a reason to believe that unauthorized persons\n"
 "      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
+"  \"Key is superseeded\"\n"
 "      Use this if you have replaced this key with a newer one.\n"
 "  \"Key is no longer used\"\n"
 "      Use this if you have retired this key.\n"
@@ -3720,6 +3722,17 @@ msgstr "Geen hulp beschikbaar"
 msgid "No help available for `%s'"
 msgstr "Geen hulp beschikbaar voor `%s'"
 
+#~ msgid "not processed"
+#~ msgstr "niet behandeld"
+
+#~ msgid "assuming bad MDC due to an unknown critical bit\n"
+#~ msgstr "foutieve MDC aangenomen wegens een onbekende kritische bit\n"
+
+#~ msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
+#~ msgstr ""
+#~ "sleutel is niet als onveilig gemarkeerd - kan hem niet gebruiken met "
+#~ "nep-RNG!\n"
+
 #~ msgid "set debugging flags"
 #~ msgstr "zet afluistervlaggen"
 
diff --git a/po/pl.po b/po/pl.po
index d2662c11f..64e6247cb 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-07-30 20:02+0200\n"
 "PO-Revision-Date: 1999-12-05 21:29+01:00\n"
 "Last-Translator: Janusz A. Urbanowicz <alex@bofh.net.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -23,307 +23,291 @@ msgstr ""
 "g10/sig-check.c g10/sign.c g10/trustdb.c g10/verify.c g10/status.c "
 "g10/pubkey-enc.c\n"
 
-#: util/secmem.c:79
-msgid "Warning: using insecure memory!\n"
-msgstr "Ostrze¿enie: u¿ywana pamiêæ nie jest pamiêci± bezpieczn±!\n"
-
-#: util/secmem.c:289
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "operacja niemo¿liwa do wykonania bez dostêpnej pamiêci bezpiecznej\n"
-
-#: util/secmem.c:290
-msgid "(you may have used the wrong program for this task)\n"
-msgstr "(prawdopodobnie u¿ywany program jest niew³a¶ciwy dla tego zadania)\n"
-
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:278 util/miscutil.c:307
 msgid "yes"
 msgstr "tak"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:279 util/miscutil.c:310
 msgid "yY"
 msgstr "tT"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:280 util/miscutil.c:308
 msgid "no"
 msgstr "nie"
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:281 util/miscutil.c:311
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:580 util/miscutil.c:309
 msgid "quit"
 msgstr "wyj¶cie"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:312
 msgid "qQ"
 msgstr "wW"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "b³±d ogólny"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "nieznany rodzaj pakietu"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "nieznana wersja"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "nieznany algorytm klucza publicznego"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "nieznany algorytm skrótu"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "niepoprawny klucz publiczny"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "niepoprawny klucz tajny"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "niepoprawny podpis"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "b³±d sumy kontrolnej"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "niepoprawne wyra¿enie przej¶ciowe"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "nie odnaleziono klucza publicznego"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "nieznany algorytm szyfruj±cy"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "otwarcie zbioru kluczy jest niemo¿liwe"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "niepoprawny pakiet"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "b³±d w opakowaniu ASCII"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "brak takiego identyfikatora u¿ytkownika."
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "klucz tajny nie jest dostêpny"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "u¿yty zosta³ niew³a¶ciwy klucz tajny"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "nie jest obs³ugiwany"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "niepoprawny klucz"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "b³±d przy odczycie pliku"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "b³±d przy zapisie pliku"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "nieznany algorytm kompresji"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "b³±d przy otwieraniu pliku"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "b³±d przy tworzeniu pliku"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "niepoprawne wyra¿enie przej¶ciowe"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "algorytm szyfrowania z kluczem publicznym nie jest zaimplementowany"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "algorytm szyfruj±cy nie jest zaimplementowany"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "nieznana klasa podpisu"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "b³±d w bazie zaufania"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "b³±d MPI"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "ograniczenie zasobów"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "b³±d w zbiorze kluczy"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "niepoprawny certyfikat"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "b³±d formatu indentyfikatora u¿ytkownika"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "b³±d przy zamykaniu pliku"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "b³±d przy zmianie nazwy pliku"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "b³±d przy usuwaniu pliku"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "nieoczekiwane dane"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "konflikt znaczników czasu"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "nieu¿yteczny algorytm z kluczem publicznym"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "plik ju¿ istnieje"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "klucz s³aby"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "b³êdny argument"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "niepoprawny URI"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "URI nie obs³ugiwanego typu"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "b³±d sieci"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "nie jest zaszyfrowany"
 
-#: util/errors.c:103
-msgid "not processed"
-msgstr "nie przetworzony"
-
-#: util/logger.c:224
+#: util/logger.c:225
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... to jest b³±d w programie (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:231
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "znalaz³e¶(a¶) b³±d w programie ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:321 g10/import.c:127 g10/keygen.c:1348
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo¿na otworzyæ %s: %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:325
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "nie mo¿na otworzyæ %s: %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:330
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:325
+#: cipher/random.c:335
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:331
+#: cipher/random.c:341
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:339
+#: cipher/random.c:349
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "nie mo¿na otworzyæ %s: %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:387
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:397
+#: cipher/random.c:407
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nie mo¿na stworzyæ %s: %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:414
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "nie mo¿na otworzyæ %s: %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:417
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "nie mo¿na otworzyæ %s: %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:428
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:647
+#: cipher/random.c:657
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "OSTRZE¯ENIE: u¿ywany generator liczb losowych\n"
 "nie jest kryptograficznie bezpieczny!!\n"
 
-#: cipher/random.c:648
+#: cipher/random.c:663
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -337,7 +321,7 @@ msgstr ""
 "JAKIEKOLWIEK DANE GENEROWANE PRZEZ TEN PROGRAM NIE NADAJ¡ SIÊ DO \n"
 "NORMALNEGO U¯YTKU I NIE ZAPEWNIAJ¡ BEZPIECZEÑSTWA!!\n"
 
-#: cipher/rndlinux.c:141
+#: cipher/rndlinux.c:125
 #, c-format
 msgid ""
 "\n"
@@ -349,7 +333,19 @@ 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:197
+#: gcrypt/secmem.c:77
+msgid "Warning: using insecure memory!\n"
+msgstr "Ostrze¿enie: u¿ywana pamiêæ nie jest pamiêci± bezpieczn±!\n"
+
+#: gcrypt/secmem.c:287
+msgid "operation is not possible without initialized secure memory\n"
+msgstr "operacja niemo¿liwa do wykonania bez dostêpnej pamiêci bezpiecznej\n"
+
+#: gcrypt/secmem.c:288
+msgid "(you may have used the wrong program for this task)\n"
+msgstr "(prawdopodobnie u¿ywany program jest niew³a¶ciwy dla tego zadania)\n"
+
+#: g10/gpg.c:197
 msgid ""
 "@Commands:\n"
 " "
@@ -357,139 +353,139 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/g10.c:199
+#: g10/gpg.c:199
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z³o¿enie podpisu"
 
-#: g10/g10.c:200
+#: g10/gpg.c:200
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z³o¿enie podpisu na czytelnym dokumencie"
 
-#: g10/g10.c:201
+#: g10/gpg.c:201
 msgid "make a detached signature"
 msgstr "sporz±dzenie podpisu oddzielonego od dokumentu"
 
-#: g10/g10.c:202
+#: g10/gpg.c:202
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/g10.c:203
+#: g10/gpg.c:203
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/g10.c:204
+#: g10/gpg.c:204
 msgid "store only"
 msgstr "tylko zapis do pliku"
 
-#: g10/g10.c:205
+#: g10/gpg.c:205
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy¶lnie)"
 
-#: g10/g10.c:206
+#: g10/gpg.c:206
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/g10.c:208
+#: g10/gpg.c:208
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/g10.c:210
+#: g10/gpg.c:210
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpisów"
 
-#: g10/g10.c:211
+#: g10/gpg.c:211
 msgid "check key signatures"
 msgstr "sprawdzenie podpisów kluczy"
 
-#: g10/g10.c:212
+#: g10/gpg.c:212
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisków"
 
-#: g10/g10.c:213
+#: g10/gpg.c:213
 msgid "list secret keys"
 msgstr "lista kluczy tajnych"
 
-#: g10/g10.c:214
+#: g10/gpg.c:214
 msgid "generate a new key pair"
 msgstr "generacja nowej pary klucza"
 
-#: g10/g10.c:215
+#: g10/gpg.c:215
 msgid "remove key from the public keyring"
 msgstr "usuniêcie klucza ze zbioru kluczy publicznych"
 
-#: g10/g10.c:217
+#: g10/gpg.c:217
 msgid "remove key from the secret keyring"
 msgstr "usuniêcie klucza ze zbioru kluczy tajnych"
 
-#: g10/g10.c:218
+#: g10/gpg.c:218
 msgid "sign a key"
 msgstr "z³o¿enie podpisu na kluczu"
 
-#: g10/g10.c:219
+#: g10/gpg.c:219
 msgid "sign a key locally"
 msgstr "z³o¿enie lokalnego podpisu na kluczu"
 
-#: g10/g10.c:220
+#: g10/gpg.c:220
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/g10.c:221
+#: g10/gpg.c:221
 msgid "generate a revocation certificate"
 msgstr "tworzenie certyfikatu uniewa¿nienia klucza"
 
-#: g10/g10.c:222
+#: g10/gpg.c:222
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/g10.c:223
+#: g10/gpg.c:223
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/g10.c:224
+#: g10/gpg.c:224
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/g10.c:228
+#: g10/gpg.c:228
 msgid "import/merge keys"
 msgstr "import/do³±czanie kluczy"
 
-#: g10/g10.c:230
+#: g10/gpg.c:230
 msgid "list only the sequence of packets"
 msgstr "wypisane sekwencji pakietów"
 
-#: g10/g10.c:232
+#: g10/gpg.c:232
 msgid "export the ownertrust values"
 msgstr "eksport warto¶ci zaufania"
 
-#: g10/g10.c:234
+#: g10/gpg.c:234
 msgid "import ownertrust values"
 msgstr "wczytanie warto¶æi zaufania"
 
-#: g10/g10.c:236
+#: g10/gpg.c:236
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/g10.c:238
+#: g10/gpg.c:238
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAZWY]|sprawdzenie bazy zaufania"
 
-#: g10/g10.c:239
+#: g10/gpg.c:239
 msgid "fix a corrupted trust database"
 msgstr "naprawa uszkodzonej bazy zaufania"
 
-#: g10/g10.c:240
+#: g10/gpg.c:240
 msgid "De-Armor a file or stdin"
 msgstr "zdjêcie opakowania ASCII pliku lub potoku"
 
-#: g10/g10.c:242
+#: g10/gpg.c:242
 msgid "En-Armor a file or stdin"
 msgstr "opakowanie ASCII pliku lub potoku"
 
-#: g10/g10.c:244
+#: g10/gpg.c:244
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skróty wiadomo¶ci"
 
-#: g10/g10.c:248
+#: g10/gpg.c:249
 msgid ""
 "@\n"
 "Options:\n"
@@ -499,154 +495,154 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/g10.c:250
+#: g10/gpg.c:251
 msgid "create ascii armored output"
 msgstr "plik wynikowy bêdzie w opakowaniu ASCII"
 
-#: g10/g10.c:252
+#: g10/gpg.c:253
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla adresata NAZWA"
 
-#: g10/g10.c:255
+#: g10/gpg.c:256
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAZWA|u¿ycie NAZWA jako domy¶lnego adresata"
 
-#: g10/g10.c:257
+#: g10/gpg.c:258
 msgid "use the default key as default recipient"
 msgstr "domy¶lny klucz jest domy¶lnym adresatem"
 
-#: g10/g10.c:261
+#: g10/gpg.c:262
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/g10.c:262
+#: g10/gpg.c:263
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - brak)"
 
-#: g10/g10.c:264
+#: g10/gpg.c:265
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/g10.c:265
+#: g10/gpg.c:266
 msgid "use as output file"
 msgstr "plik wyj¶ciowy"
 
-#: g10/g10.c:266
+#: g10/gpg.c:267
 msgid "verbose"
 msgstr "z informacjami dodatkowymi"
 
-#: g10/g10.c:267
+#: g10/gpg.c:268
 msgid "be somewhat more quiet"
 msgstr "mniej komunikatóww"
 
-#: g10/g10.c:268
+#: g10/gpg.c:269
 msgid "don't use the terminal at all"
 msgstr "bez odwo³añ do terminala"
 
-#: g10/g10.c:269
+#: g10/gpg.c:270
 msgid "force v3 signatures"
 msgstr "wymuszenie trzeciej wersji formatu podpisów"
 
-#: g10/g10.c:270
+#: g10/gpg.c:271
 msgid "always use a MDC for encryption"
 msgstr "do szyfrowania bêdzie u¿ywany MDC"
 
-#: g10/g10.c:271
+#: g10/gpg.c:272
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/gpg.c:274
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: ¿adnych pytañ"
 
-#: g10/g10.c:274
+#: g10/gpg.c:275
 msgid "assume yes on most questions"
 msgstr "automatyczna odpowied¼ tak na wiêkszo¶æ pytañ"
 
-#: g10/g10.c:275
+#: g10/gpg.c:276
 msgid "assume no on most questions"
 msgstr "automatyczna odpowied¼ nie na wiêkszo¶æ pytañ"
 
-#: g10/g10.c:276
+#: g10/gpg.c:277
 msgid "add this keyring to the list of keyrings"
 msgstr "dodaæ zbiór kluczy do listy u¿ywanych"
 
-#: g10/g10.c:277
+#: g10/gpg.c:278
 msgid "add this secret keyring to the list"
 msgstr "dodaæ zbiór kluczy tajnych do listy"
 
-#: g10/g10.c:278
+#: g10/gpg.c:279
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|u¿ycie NAZWA jako domy¶lnego klucza tajnego"
 
-#: g10/g10.c:279
+#: g10/gpg.c:280
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|serwer kluczy w którym bêd± poszukiwane"
 
-#: g10/g10.c:280
+#: g10/gpg.c:281
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAZWA|zestaw znaków terminala NAZWA"
 
-#: g10/g10.c:281
+#: g10/gpg.c:282
 msgid "read options from file"
 msgstr "wczytanie opcji z pliku"
 
-#: g10/g10.c:285
+#: g10/gpg.c:286
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapisaæ opis stanu do FD"
 
-#: g10/g10.c:290
+#: g10/gpg.c:291
 msgid "|FILE|load extension module FILE"
 msgstr "|PLIK|³adowanie modu³u rozszerzenia z PLIK"
 
-#: g10/g10.c:291
+#: g10/gpg.c:292
 msgid "emulate the mode described in RFC1991"
 msgstr "emulacja trybu opisanego w RFC1991"
 
-#: g10/g10.c:292
+#: g10/gpg.c:293
 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:293
+#: g10/gpg.c:294
 msgid "|N|use passphrase mode N"
 msgstr "|N|N-ty tryb wprowadzania wyra¿enia przej¶ciowego"
 
-#: g10/g10.c:295
+#: g10/gpg.c:296
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|ALG|algorytm obliczania skrótów wiadomo¶ci ALG"
 
-#: g10/g10.c:297
+#: g10/gpg.c:298
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|ALG|algorytmu szyfruj±cy ALG dla has³a"
 
-#: g10/g10.c:298
+#: g10/gpg.c:299
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|algorytm szyfruj±cy NAZWA"
 
-#: g10/g10.c:299
+#: g10/gpg.c:300
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|algorytm obliczania skrótów wiadomo¶ci NAZWA"
 
-#: g10/g10.c:300
+#: g10/gpg.c:301
 msgid "|N|use compress algorithm N"
 msgstr "|N|algorytm kompresji N"
 
-#: g10/g10.c:301
+#: g10/gpg.c:302
 msgid "throw keyid field of encrypted packets"
 msgstr "usuniêcie identyfikatorów kluczy z pakietów"
 
-#: g10/g10.c:302
+#: g10/gpg.c:303
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAZWA=TRE¦Æ|adnotacje"
 
-#: g10/g10.c:305
+#: g10/gpg.c:306
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:308
+#: g10/gpg.c:309
 msgid ""
 "@\n"
 "Examples:\n"
@@ -667,15 +663,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/g10.c:403
+#: g10/gpg.c:409
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "B³êdy prosimy zg³aszaæ na adres <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:407
+#: g10/gpg.c:413
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo³anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/g10.c:410
+#: g10/gpg.c:416
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -685,7 +681,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpisów, szyfrowanie, deszyfrowanie\n"
 "domy¶lnie wykonywana operacja zale¿y od danych wej¶ciowych\n"
 
-#: g10/g10.c:417
+#: g10/gpg.c:423
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -693,182 +689,187 @@ msgstr ""
 "\n"
 "Obs³ugiwane algorytmy:\n"
 
-#: g10/g10.c:496
+#: g10/gpg.c:525
 msgid "usage: gpg [options] "
 msgstr "wywo³anie: gpg [opcje]"
 
-#: g10/g10.c:549
+#: g10/gpg.c:583
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/g10.c:692
+#: g10/gpg.c:638
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
+#: g10/gpg.c:734
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy¶lnego pliku opcji '%s'\n"
 
-#: g10/g10.c:696
+#: g10/gpg.c:738
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji '%s': %s\n"
 
-#: g10/g10.c:703
+#: g10/gpg.c:745
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z '%s'\n"
 
-#: g10/g10.c:893
+#: g10/gpg.c:937
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nie jest poprawn± nazw± zestawu znaków\n"
 
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/gpg.c:1002 g10/gpg.c:1011
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u¿ytku!\n"
 
-#: g10/g10.c:951
+#: g10/gpg.c:1004
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s jest niedozwolony z %s!\n"
 
-#: g10/g10.c:954
+#: g10/gpg.c:1007
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu z %s!\n"
 
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/gpg.c:1027 g10/gpg.c:1039
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj±cy jest niepoprawny\n"
 
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/gpg.c:1033 g10/gpg.c:1045
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm geenracji skrótów wiadomo¶ci jest niepoprawny\n"
 
-#: g10/g10.c:995
+#: g10/gpg.c:1049
 msgid "the given policy URL is invalid\n"
 msgstr "podany URL regulaminu jest niepoprawny\n"
 
-#: g10/g10.c:998
+#: g10/gpg.c:1052
 #, 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:1000
+#: g10/gpg.c:1054
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto¶æ completes-needed musi byæ wiêksza od 0\n"
 
-#: g10/g10.c:1002
+#: g10/gpg.c:1056
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto¶æ marginals-needed musi byæ wiêksza od 1\n"
 
-#: g10/g10.c:1004
+#: g10/gpg.c:1058
 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:1007
+#: g10/gpg.c:1061
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/g10.c:1011
+#: g10/gpg.c:1065
 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:1096
+#: g10/gpg.c:1154
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod³o siê: %s\n"
 
-#: g10/g10.c:1102
+#: g10/gpg.c:1160
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/g10.c:1109
+#: g10/gpg.c:1167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:1117
+#: g10/gpg.c:1175
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/g10.c:1130
+#: g10/gpg.c:1188
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/g10.c:1143
+#: g10/gpg.c:1201
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:1157
+#: g10/gpg.c:1215
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]"
 
-#: g10/g10.c:1174
+#: g10/gpg.c:1232
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/g10.c:1182
+#: g10/gpg.c:1240
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u¿ytkownika"
 
-#: g10/g10.c:1190
+#: g10/gpg.c:1248
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u¿ytkownika"
 
-#: g10/g10.c:1198
+#: g10/gpg.c:1256
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u¿ytkownika [polecenia]"
 
-#: g10/g10.c:1214
+#: g10/gpg.c:1272
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key nazwa u¿ytkownika"
 
-#: g10/g10.c:1217
+#: g10/gpg.c:1275
 msgid "--delete-key user-id"
 msgstr "--delete-key nazwa u¿ytkownika"
 
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:311 g10/gpg.c:1312 g10/sign.c:449
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "nie mo¿na otworzyæ %s: %s\n"
 
-#: g10/g10.c:1269
+#: g10/gpg.c:1327
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbiór kluczy]"
 
-#: g10/g10.c:1335
+#: g10/gpg.c:1393
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "usuniêcie opakowania ASCII nie powiod³o siê: %s\n"
 
-#: g10/g10.c:1343
+#: g10/gpg.c:1401
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod³o siê: %s\n"
 
-#: g10/g10.c:1411
+#: g10/gpg.c:1474 g10/gpg.c:1495
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew³a¶ciwy algorytm skrótu '%s'\n"
 
-#: g10/g10.c:1492
+#: g10/gpg.c:1580
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/g10.c:1496
+#: g10/gpg.c:1584
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj± wiadomo¶æ ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/gpg.c:1587 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mo¿na otworzyæ '%s'\n"
 
-#: g10/g10.c:1669
+#: g10/gpg.c:1765
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "adnotacja musi zaczynaæ siê od litery lub podkre¶lenia\n"
 
-#: g10/g10.c:1675
+#: g10/gpg.c:1771
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -876,11 +877,11 @@ msgstr ""
 "nazwa adnotacji mo¿e zawieraæ tylko litery, cyfry, kropki,\n"
 "podkre¶lenia, i musi koñczyæ siê '='\n"
 
-#: g10/g10.c:1681
+#: g10/gpg.c:1777
 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:1689
+#: g10/gpg.c:1785
 msgid "a notation value must not use any control characters\n"
 msgstr "warto¶æ adnotacji nie mo¿e zawieraæ znaków steruj±cych\n"
 
@@ -965,50 +966,50 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1188 g10/pkclist.c:53
+#: g10/keyedit.c:1191 g10/pkclist.c:54
 msgid "             Fingerprint:"
 msgstr "                  Odcisk:"
 
-#: g10/pkclist.c:80
+#: g10/pkclist.c:81
 msgid "Fingerprint:"
 msgstr "Odcisk klucza:"
 
-#: g10/pkclist.c:116
+#: g10/pkclist.c:117
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:118
+#: g10/pkclist.c:119
 #, fuzzy
-msgid "Key is superseded"
+msgid "Key is superseeded"
 msgstr "Klucz jest chroniony.\n"
 
-#: g10/pkclist.c:120
+#: g10/pkclist.c:121
 #, fuzzy
 msgid "Key has been compromised"
 msgstr "Ten klucz zosta³ wy³±czony z u¿ycia"
 
-#: g10/pkclist.c:122
+#: g10/pkclist.c:123
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:124
+#: g10/pkclist.c:125
 msgid "User ID is no longer valid"
 msgstr ""
 
-#: g10/pkclist.c:128
+#: g10/pkclist.c:129
 msgid "Reason for revocation: "
 msgstr ""
 
-#: g10/pkclist.c:145
+#: g10/pkclist.c:146
 msgid "Revocation comment: "
 msgstr ""
 
 #. a string with valid answers
-#: g10/pkclist.c:303
+#: g10/pkclist.c:304
 msgid "sSmMqQ"
 msgstr "iIpPwW"
 
-#: g10/pkclist.c:307
+#: g10/pkclist.c:308
 #, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -1017,7 +1018,7 @@ msgstr ""
 "Brak warto¶ci zaufania dla %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1040,23 +1041,23 @@ msgstr ""
 " 4 = W pe³ni mu ufam.\n"
 " i = potrzebujê wiêcej informacji\n"
 
-#: g10/pkclist.c:328
+#: g10/pkclist.c:329
 msgid " m = back to the main menu\n"
 msgstr " p = powrót do g³ównego menu\n"
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:331
 msgid " q = quit\n"
 msgstr "w = wyj¶cie\n"
 
-#: g10/pkclist.c:336
+#: g10/pkclist.c:337
 msgid "Your decision? "
 msgstr "Twoja decyzja? "
 
-#: g10/pkclist.c:358
+#: g10/pkclist.c:359
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certyfikaty prowadz±ce do ostatecznie zaufanego klucza:\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 msgid ""
 "Could not find a valid trust path to the key.  Let's see whether we\n"
 "can assign some missing owner trust values.\n"
@@ -1066,7 +1067,7 @@ msgstr ""
 "Sprawd¼my czy mo¿na przypisaæ brakuj±ce warto¶ci zaufania.\n"
 "\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
@@ -1074,7 +1075,7 @@ msgstr ""
 "Brak ¶cie¿ki prowadz±cej do którego¶ z naszych kluczy.\n"
 "\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:438
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
@@ -1082,7 +1083,7 @@ msgstr ""
 "Brak certyfikatów o niezdefiniowanym poziomie zaufania.\n"
 "\n"
 
-#: g10/pkclist.c:439
+#: g10/pkclist.c:440
 msgid ""
 "No trust values changed.\n"
 "\n"
@@ -1090,36 +1091,36 @@ msgstr ""
 "Parametry zaufania nie zosta³y zmienione.\n"
 "\n"
 
-#: g10/pkclist.c:457
+#: g10/pkclist.c:458
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "klucz %08lX: klucz zosta³ uniewa¿niony!\n"
 
-#: g10/pkclist.c:464 g10/pkclist.c:476 g10/pkclist.c:598
+#: g10/pkclist.c:465 g10/pkclist.c:477 g10/pkclist.c:599
 msgid "Use this key anyway? "
 msgstr "U¿yæ tego klucza mimo wszystko? "
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "klucz %08lX: podklucz zosta³ uniewa¿niony!\n"
 
-#: g10/pkclist.c:512
+#: g10/pkclist.c:513
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: data wa¿no¶ci klucza up³ynê³a\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr "%08lX: brak informacji aby obliczyæ prawdopodobieñstwo zaufania\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: NIE UFAMY temu kluczowi\n"
 
-#: g10/pkclist.c:539
+#: g10/pkclist.c:540
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -1128,16 +1129,16 @@ msgstr ""
 "%08lX: Nie ma pewno¶æi ¿e ten klucz faktycznie nale¿y do odoby podaj±cej\n"
 "siê za jego w³a¶ciciela, ale jest akceptowalny.\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:546
 msgid "This key probably belongs to the owner\n"
 msgstr ""
 "Ten klucz prawdopodobnie nale¿y do osoby podaj±cej siê za jego w³a¶ciciela.\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid "This key belongs to us\n"
 msgstr "Ten klucz nale¿y do nas\n"
 
-#: g10/pkclist.c:593
+#: g10/pkclist.c:594
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -1148,68 +1149,68 @@ msgstr ""
 "w³a¶ciciela. Je¶li nie masz co do tego ¿adnych w±tpliwo¶ci i *naprawdê*\n"
 "wiesz co robisz mo¿esz odpowiedzieæ \"tak\" na nastêpne pytanie.\n"
 
-#: g10/pkclist.c:607 g10/pkclist.c:630
+#: g10/pkclist.c:608 g10/pkclist.c:631
 msgid "WARNING: Using untrusted key!\n"
 msgstr "OSTRZE¯ENIE: u¿ywany jest klucz nie obdarzony zaufaniem!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:652
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "OSTRZE¯ENIE: Ten klucz zosta³ uniewa¿niony przez w³a¶ciciela!\n"
 
-#: g10/pkclist.c:652
+#: g10/pkclist.c:653
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "             To mo¿e oznaczaæ ¿e podpis jest fa³szerstwem.\n"
 
-#: g10/pkclist.c:657
+#: g10/pkclist.c:658
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "OSTRZE¯ENIE: Ten podklucz zosta³ uniewa¿niony przez w³a¶ciciela!\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:680
 msgid "Note: This key has expired!\n"
 msgstr "Uwaga: Data wa¿no¶ci tego klucza up³ynê³a!\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:688
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "OSTRZE¯ENIE: Ten klucz nie jest po¶wiadczony zaufanym podpisem!\n"
 
-#: g10/pkclist.c:689
+#: g10/pkclist.c:690
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "             Nic nie wskazuje na to ¿e ten podpis z³o¿y³ w³a¶ciciel klucza.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:707
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "OSTRZE¯ENIE: NIE UFAMY temu kluczowi!\n"
 
-#: g10/pkclist.c:707
+#: g10/pkclist.c:708
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "             Ten podpis prawdopodobnie jest FA£SZERSTWEM.\n"
 
-#: g10/pkclist.c:714
+#: g10/pkclist.c:715
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "OSTRZE¯ENIE: Ten klucz nie jest po¶wiadczony wystarczaj±co zaufanymi "
 "podpisami!\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:718
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "             Nie ma pewno¶ci ¿e ten podpis zosta³ z³o¿ony przez "
 "w³a¶ciciela.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:968 g10/pkclist.c:1013
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: pominiêty: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:828 g10/pkclist.c:995
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: pominiêty: klucz publiczny ju¿ znajduje siê w bazie\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:855
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1217,42 +1218,42 @@ msgstr ""
 "Nie poda³e¶(a¶) identyfikatora u¿ytkownika (user ID).\n"
 "Mo¿na to zrobiæ za pomoc± opcji \"-r\".\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:865
 msgid "Enter the user ID: "
 msgstr "Wprowad¼ identyfikator u¿ytkownika (user ID): "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:877
 msgid "No such user ID.\n"
 msgstr "Brak takiego identyfikatora u¿ytkownika.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:882
 msgid "skipped: public key already set as default recipient\n"
 msgstr "pominiêty: klucz publiczny ju¿ jest domy¶lnym adresatem\n"
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:905
 msgid "Public key is disabled.\n"
 msgstr "Klucz publiczny wy³±czony z uzycia.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:912
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "pominiêty: klucz publiczny ju¿ wybrany w --encrypt-to\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:943
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "nieznany domy¶lny adresat '%s'\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:976
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: b³±d podczas sprawdzania klucza: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:981
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: pominiêty: klucz publiczny wy³±czony z u¿ycia\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1019
 msgid "no valid addressees\n"
 msgstr "brak poprawnych adresów\n"
 
@@ -1264,58 +1265,58 @@ msgstr "zapis podpisu klucza nim samym\n"
 msgid "writing key binding signature\n"
 msgstr "zapis podpisu wi±¿±cego klucz\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
+#: g10/keygen.c:308 g10/keygen.c:419 g10/keygen.c:529
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "¯±dana d³ugo¶æ klucza to %u bity.\n"
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:438
+#: g10/keygen.c:313 g10/keygen.c:424 g10/keygen.c:534
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "zaokr±glono do %u bitów\n"
 
-#: g10/keygen.c:537
+#: g10/keygen.c:633
 msgid "Please select what kind of key you want:\n"
 msgstr "Proszê wybraæ rodzaj klucza:\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:635
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) Para kluczy dla algorytmów DSA i ElGamala (domy¶lne)\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:636
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:638
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowanie)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:639
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (do szyfrowania i podpisywania)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:641
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (do szyfrowania i podpisywania)\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:645
 msgid "Your selection? "
 msgstr "Twój wybór? "
 
-#: g10/keygen.c:560 g10/keygen.c:568
+#: g10/keygen.c:656 g10/keygen.c:664
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Czy na pewno chcesz stworzyæ klucz do szyfrowania i podpisywania? "
 
-#: g10/keygen.c:582
+#: g10/keygen.c:678
 msgid "Invalid selection.\n"
 msgstr "Niew³a¶ciwy wybór.\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:690
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1328,19 +1329,19 @@ msgstr ""
 "               domy¶lny rozmiar klucza wynosi 1024 bity\n"
 "  najwiêkszy sugerowany rozmiar klucza wynosi 2048 bitów\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:697
 msgid "What keysize do you want? (1024) "
 msgstr "Jakiej d³ugo¶ci klucz wygenerowaæ? (1024) "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:702
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "Klucz dla DSA musi mieæ d³ugo¶æ pomiêdzy 512 i 1024 bitow.\n"
 
-#: g10/keygen.c:608
+#: g10/keygen.c:704
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "D³ugo¶æ klucza zbyt ma³a; minimalna dopuszczona wynosi 768 bitów.\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:706
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "D³ugo¶æ klucza zbyt ma³a; minimalna dopuszczona wynosi 768 bitów.\n"
@@ -1353,12 +1354,12 @@ msgstr "D
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:621
+#: g10/keygen.c:717
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "zbyt du¿y rozmiar klucza, ograniczenie wynosi %d.\n"
 
-#: g10/keygen.c:626
+#: g10/keygen.c:722
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1366,11 +1367,11 @@ msgstr ""
 "Klucze d³u¿sze ni¿ 2048 bitów s± odradzane, poniewa¿ obliczenia\n"
 "trwaj± wtedy BARDZO d³ugo!\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:725
 msgid "Are you sure that you want this keysize? "
 msgstr "Na pewno wygenerowaæ klucz takiej d³ugo¶ci? "
 
-#: g10/keygen.c:630
+#: g10/keygen.c:726
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1378,21 +1379,21 @@ msgstr ""
 "Nale¿y tak¿e pamiêtaæ o tym, ¿e informacje mog± byæ te¿ wykradzione z\n"
 "komputera przez pods³uch emisji elektromagnetycznej klawiatury i monitora!\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:734
 msgid "Do you really need such a large keysize? "
 msgstr "Czy naprawdê potrzebujesz takiego d³ugiego klucza? "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:740
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "¯±dana d³ugo¶æ klucza to %u bity.\n"
 
-#: g10/keygen.c:647 g10/keygen.c:651
+#: g10/keygen.c:743 g10/keygen.c:747
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr±glono do %u bitów\n"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:795
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1408,25 +1409,25 @@ msgstr ""
 "      <n>m = termin wa¿no¶ci klucza up³ywa za n miesiêcy\n"
 "      <n>y = termin wa¿no¶ci klucza up³ywa za n lat\n"
 
-#: g10/keygen.c:714
+#: g10/keygen.c:810
 msgid "Key is valid for? (0) "
 msgstr "Okres wa¿no¶ci klucza ? (0) "
 
-#: g10/keygen.c:719
+#: g10/keygen.c:815
 msgid "invalid value\n"
 msgstr "niepoprawna warto¶æ\n"
 
-#: g10/keygen.c:724
+#: g10/keygen.c:820
 msgid "Key does not expire at all\n"
 msgstr "Klucz nie ma daty wa¿no¶ci (nie traci wa¿no¶ci z up³ywem czasu).\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:730
+#: g10/keygen.c:826
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Data wa¿no¶ci klucza: %s\n"
 
-#: g10/keygen.c:733
+#: g10/keygen.c:829
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1434,11 +1435,11 @@ msgstr ""
 "Twój system nie potrafi poprawnie wy¶wietlaæ dat po roku 2036.\n"
 "Jednak¿e poprawnie obs³ugiwane s± daty do roku 2106.\n"
 
-#: g10/keygen.c:738
+#: g10/keygen.c:834
 msgid "Is this correct (y/n)? "
 msgstr "Dane poprawne (t/n)? "
 
-#: g10/keygen.c:781
+#: g10/keygen.c:877
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1454,44 +1455,44 @@ msgstr ""
 "    \"Tadeusz ¯eleñski (Boy) <tzb@provider.com.pl>\"\n"
 "\n"
 
-#: g10/keygen.c:793
+#: g10/keygen.c:889
 msgid "Real name: "
 msgstr "Imiê i nazwisko: "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:893
 msgid "Invalid character in name\n"
 msgstr "Niew³a¶ciwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:799
+#: g10/keygen.c:895
 msgid "Name may not start with a digit\n"
 msgstr "Imiê lub nazwisko nie mo¿e zaczynaæ siê od cyfry\n"
 
-#: g10/keygen.c:801
+#: g10/keygen.c:897
 msgid "Name must be at least 5 characters long\n"
 msgstr "Imiê i nazwisko musz± mieæ conajmniej 5 znaków d³ugo¶ci.\n"
 
-#: g10/keygen.c:809
+#: g10/keygen.c:905
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:820
+#: g10/keygen.c:916
 msgid "Not a valid email address\n"
 msgstr "to nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:828
+#: g10/keygen.c:924
 msgid "Comment: "
 msgstr "Komentarz: "
 
-#: g10/keygen.c:834
+#: g10/keygen.c:930
 msgid "Invalid character in comment\n"
 msgstr "Niew³a¶ciwy znak w komentarzu\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:956
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "U¿ywasz zestawu znaków %s.\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:962
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1502,46 +1503,46 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:867
+#: g10/keygen.c:966
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:872
+#: g10/keygen.c:971
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:882
+#: g10/keygen.c:981
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr ""
 "Zmieniæ (I)miê/nazwisko, (K)omentarz, adres (E)mail, \n"
 "przej¶æ (D)alej czy (W)yj¶æ z programu? "
 
-#: g10/keygen.c:883
+#: g10/keygen.c:982
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Zmieniæ (I)miê/nazwisko, (K)omentarz, adres (E)mail, \n"
 "przej¶æ (D)alej czy (W)yj¶æ z programu? "
 
-#: g10/keygen.c:902
+#: g10/keygen.c:1001
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:940
+#: g10/keygen.c:1039
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 "Musisz podaæ wyra¿enie przej¶ciowe (has³o) aby ochroniæ swój klucz tajny.\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:948
+#: g10/keyedit.c:468 g10/keygen.c:1047
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr ""
 "Powtórzone wyra¿enie przej¶ciowe nie zgadza siê z podanym w pierwszej "
 "próbie;\n"
 "spróbuj jeszcze raz.\n"
 
-#: g10/keygen.c:954
+#: g10/keygen.c:1053
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1553,7 +1554,7 @@ msgstr ""
 "i opcji \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1074
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1567,29 +1568,29 @@ msgstr ""
 "generator liczb losowych ma mo¿liwo¶æ zebrania odpowiedniej ilo¶ci entropii. "
 "\n"
 
-#: g10/keygen.c:1424
+#: g10/keygen.c:1523
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Para kluczy dla DSA bêdzie mia³a 1024 bity d³ugo¶ci.\n"
 
-#: g10/keygen.c:1467
+#: g10/keygen.c:1566
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza zosta³a anulowana.\n"
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1663
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapis certyfikatu publicznego w '%s'\n"
 
-#: g10/keygen.c:1565
+#: g10/keygen.c:1664
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapis tajnego certyfikatu w '%s'\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1760
 msgid "public and secret key created and signed.\n"
 msgstr "klucze publiczny i tajny zosta³y stworzone i podpisane.\n"
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1765
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1597,12 +1598,12 @@ msgstr ""
 "Ten klucz nie mo¿e byæ wykorzystany do szyfrowania. Komend± \"--edit-key\" \n"
 "mo¿na dodaæ do niego podklucz u¿ywany do szyfrowania.\n"
 
-#: g10/keygen.c:1683 g10/keygen.c:1784
+#: g10/keygen.c:1782 g10/keygen.c:1883
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod³a siê: %s\n"
 
-#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1826 g10/sig-check.c:300 g10/sign.c:167
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1610,7 +1611,7 @@ msgstr ""
 "klucz zosta³ stworzony %lu sekund w przysz³o¶ci (zaburzenia\n"
 "czasoprzestrzeni, lub ¼le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1828 g10/sig-check.c:302 g10/sign.c:169
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1618,32 +1619,32 @@ msgstr ""
 "klucz zosta³ stworzony %lu sekund w przysz³o¶ci (zaburzenia\n"
 "czasoprzestrzeni, lub ¼le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1861
 msgid "Really create? "
 msgstr "Na pewno generowaæ? "
 
-#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:142 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: nie mo¿na otworzyæ: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:164
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "b³±d podczs tworzenia wyra¿enia przej¶ciowego (has³a): %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:222 g10/encode.c:370
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: OSTRZE¯ENIE: plik jest pusty\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:317
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "odczyt z '%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:534
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s zaszyfrowany dla: %s\n"
@@ -1672,32 +1673,32 @@ msgstr "klucz %08lX: nie jest w formacie RFC 2440 - pomini
 msgid "WARNING: nothing exported\n"
 msgstr "OSTRZE¯ENIE: nic nie zosta³o wyeksportowane!\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:212
 msgid "too many entries in pk cache - disabled\n"
 msgstr "zbyt wiele wpisów w buforze kluczy publicznych - wy³±czony\n"
 
-#: g10/getkey.c:350
+#: g10/getkey.c:351
 msgid "too many entries in unk cache - disabled\n"
 msgstr "zbyt wiele wpisów w buforze nieznanych kluczy - wy³±czony\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
+#: g10/getkey.c:1311 g10/getkey.c:1350
 msgid "RSA key cannot be used in this version\n"
 msgstr "W tej wersji nie mo¿na u¿ywaæ kluczy RSA\n"
 
-#: g10/getkey.c:1310 g10/getkey.c:1349
+#: g10/getkey.c:1313 g10/getkey.c:1352
 msgid "No key for user ID\n"
 msgstr "Brak klucza z takim identyfikatorem u¿ytkownika.\n"
 
-#: g10/getkey.c:1388 g10/getkey.c:1428
+#: g10/getkey.c:1391 g10/getkey.c:1431
 msgid "No user ID for key\n"
 msgstr "Brak identyfikatora u¿ytkownika dla klucza.\n"
 
-#: g10/getkey.c:1642 g10/getkey.c:1698
+#: g10/getkey.c:1645 g10/getkey.c:1701
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "u¿ywany jest podklucz %08lX zamiast klucza g³ównego %08lX\n"
 
-#: g10/getkey.c:2017
+#: g10/getkey.c:2020
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: nie znaleziono u¿ytkownika\n"
@@ -1707,7 +1708,7 @@ msgstr "%s: nie znaleziono u
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d zostaje pominiêty\n"
 
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:188 g10/trustdb.c:1748 g10/trustdb.c:1789
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu kluczy przetworzonych do tej chwili\n"
@@ -1795,7 +1796,7 @@ msgstr "klucz %08lX: brak klucza publicznego: %s\n"
 msgid "no default public keyring\n"
 msgstr "brak domy¶lnego zbioru kluczy publicznych\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:350 g10/sign.c:669
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
@@ -2059,7 +2060,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "Na pewno podpisaæ? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1870 g10/keyedit.c:1932 g10/sign.c:136
+#: g10/keyedit.c:373 g10/keyedit.c:1873 g10/keyedit.c:1935 g10/sign.c:191
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "z³o¿enie podpisu nie powiod³o siê: %s\n"
@@ -2416,104 +2417,104 @@ msgstr ""
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawne polecenie  (spróbuj \"help\")\n"
 
-#: g10/keyedit.c:1080 g10/keyedit.c:1106
+#: g10/keyedit.c:1083 g10/keyedit.c:1109
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1089
+#: g10/keyedit.c:1092
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1093
+#: g10/keyedit.c:1096
 msgid "This key has been disabled"
 msgstr "Ten klucz zosta³ wy³±czony z u¿ycia"
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1125
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "klucz %08lX: podklucz zosta³ uniewa¿niony!\n"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1128
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "   nowych uniewa¿nieñ kluczy: %lu\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1130
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1368
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usun±æ ten poprawny podpis? (t/N/w)"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1372
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usun±æ ten niepoprawny podpis? (t/N/w)"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1376
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usun±æ ten nieznany podpis? (t/N/w)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1382
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usun±æ ten podpis klucza nim samym? (t/N)"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1396
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d podpis usuniêty.\n"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1397
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d podpisów usuniêtych.\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1400
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta³o usuniête.\n"
 
-#: g10/keyedit.c:1466
+#: g10/keyedit.c:1469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Proszê usun±æ znacznik wyboru z kluczy tajnych.\n"
 
-#: g10/keyedit.c:1472
+#: g10/keyedit.c:1475
 msgid "Please select at most one secondary key.\n"
 msgstr "Proszê wybraæ najwy¿ej jeden podklucz.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1479
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Zmiana daty wa¿no¶ci podklucza.\n"
 
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1481
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa¿no¶ci g³ównego klucza.\n"
 
-#: g10/keyedit.c:1520
+#: g10/keyedit.c:1523
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nie mo¿na zmieniæ daty wa¿no¶ci klucza w wersji 3.\n"
 
-#: g10/keyedit.c:1536
+#: g10/keyedit.c:1539
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj±cego podpisu w zbiorze kluczy tajnych\n"
 
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1600
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora u¿ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1646
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Brak podklucza o indeksie %d\n"
 
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1744
 msgid "user ID: \""
 msgstr "Identyfikator u¿ytkownika: "
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1747
 #, c-format
 msgid ""
 "\"\n"
@@ -2522,115 +2523,125 @@ msgstr ""
 "\"\n"
 "podpisano Twoim kluczem %08lX w %s\n"
 
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:1751
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Stworzyæ certyfikat uniewa¿nienia tego podpisu? (t/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1775
 msgid "You have signed these user IDs:\n"
 msgstr "Te identyfikatory s± podpisane przez ciebie:\n"
 
-#: g10/keyedit.c:1786 g10/keyedit.c:1821
+#: g10/keyedit.c:1789 g10/keyedit.c:1824
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   podpisany kluczem %08lX w %s\n"
 
-#: g10/keyedit.c:1791
+#: g10/keyedit.c:1794
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "uniewa¿niony kluczem %08lX w %s\n"
 
-#: g10/keyedit.c:1811
+#: g10/keyedit.c:1814
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz uniewa¿niæ te podpisy:\n"
 
-#: g10/keyedit.c:1829
+#: g10/keyedit.c:1832
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Na pewno utworzyæ certyfikaty uniewa¿nienia ? (t/N)"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1861
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "b³±d w opakowaniu ASCII"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "unpkl"
+
 #. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:401 g10/mainproc.c:754
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "Data wa¿no¶ci klucza: %s\n"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:212
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "klucz publiczny %08lX\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:247
 msgid "public key encrypted data: good DEK\n"
 msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
 
-#: g10/mainproc.c:281
+#: g10/mainproc.c:280
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "d³ugo¶æ %u bitów, typ %s, klucz %08lX, stworzony %s\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "zaszyfrowane kluczem %s, o identyfikatorze %08lX\n"
 
-#: g10/mainproc.c:297
+#: g10/mainproc.c:296
 msgid "no secret key for decryption available\n"
 msgstr "odszyfrowuj±cy klucz tajny do jest niedostêpny\n"
 
-#: g10/mainproc.c:306
+#: g10/mainproc.c:305
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "b³±d odszyfrowywania kluczem publicznym: %s\n"
 
-#: g10/mainproc.c:343
+#: g10/mainproc.c:342
 msgid "decryption okay\n"
 msgstr "odszyfrowane poprawnie\n"
 
-#: g10/mainproc.c:348
+#: g10/mainproc.c:347
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "OSTRZE¯ENIE: dokonano manipulacji zaszyfrowan± wiadomo¶ci±!\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:352
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "b³±d odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:372
+#: g10/mainproc.c:371
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "UWAGA: nadawca zaznaczy³ ¿e wiadomo¶æ nie powinna byæ zapisywana!\n"
 
-#: g10/mainproc.c:374
+#: g10/mainproc.c:373
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:538
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "oddzielony certyfikat uniewa¿nienia - wywo³aj \"gpg --import\" aby go u¿yæ\n"
 
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:625 g10/mainproc.c:634
 msgid "WARNING: invalid notation data found\n"
 msgstr "OSTRZE¯ENIE: niepoprawne dane w adnotacji\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:637
 msgid "Notation: "
 msgstr "Adnotacja: "
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:644
 msgid "Policy: "
 msgstr "Regulamin: "
 
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1074
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pominiêcie sprawdzenia podpisu\n"
 
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1080
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
@@ -2638,50 +2649,50 @@ msgstr ""
 "z u¿yciem klucza o identyfikatorze %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1106 g10/mainproc.c:1117
 msgid "BAD signature from \""
 msgstr "NIEPOPRAWNY podpis z³o¿ony przez \""
 
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1107 g10/mainproc.c:1118
 msgid "Good signature from \""
 msgstr "Poprawny podpis z³o¿ony przez \""
 
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1109
 msgid "                aka \""
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1165
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie mo¿na sprawdziæ podpisu: %s\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1230
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "oddzielony podpis klasy 0x%02x\n"
 
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1282
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1287
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
-#: g10/misc.c:94
+#: g10/misc.c:83
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nie mo¿na wy³±czyæ zrzutów pamiêci: %s\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:86
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE¯ENIE: program mo¿e stworzyæ plik zrzutu pamiêci!\n"
 
-#: g10/misc.c:205
+#: g10/misc.c:312
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Nie nale¿y u¿ywaæ algorytmów do¶wiadczalnych!\n"
 
-#: g10/misc.c:219
+#: g10/misc.c:326
 msgid ""
 "RSA keys are deprecated; please consider creating a new key and use this key "
 "in the future\n"
@@ -2689,18 +2700,18 @@ msgstr ""
 "Klucze RSA s± odradzane; proszê rozwa¿yæ przej¶cie na inne algorytmy po\n"
 "wygenerowaniu odpowiednich kluczy.\n"
 
-#: g10/misc.c:241
+#: g10/misc.c:348
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "ten algorytm szyfruj±cy jest odradzany; proszê u¿ywaæ bardziej "
 "standardowych!\n"
 
-#: g10/parse-packet.c:117
+#: g10/parse-packet.c:115
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "algorytm klucza publicznego niemo¿liwy do obs³u¿enia: %d\n"
 
-#: g10/parse-packet.c:965
+#: g10/parse-packet.c:963
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
@@ -2739,52 +2750,52 @@ msgstr "Wyra
 msgid "Repeat passphrase: "
 msgstr "Powtórzone wyra¿enie przej¶ciowe: "
 
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "dane nie zosta³y zapisane; nale¿y u¿yæ opcji \"--output\" aby je zapisaæ\n"
 
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
 msgid "Detached signature.\n"
 msgstr "Podpis oddzielony.\n"
 
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
 msgid "Please enter name of data file: "
 msgstr "Nazwa pliku danych: "
 
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
 msgid "reading stdin ...\n"
 msgstr "odczyt ze strumienia standardowego wej¶cia...\n"
 
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nie mo¿na otworzyæ podpisanego pliku '%s'\n"
 
-#: g10/pubkey-enc.c:79
+#: g10/pubkey-enc.c:138
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "adresat anonimowy; próba klucza tajnego %08lX ...\n"
 
-#: g10/pubkey-enc.c:85
+#: g10/pubkey-enc.c:144
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "OK, to my jeste¶my adresatem anonimowym.\n"
 
-#: g10/pubkey-enc.c:137
+#: g10/pubkey-enc.c:200
 msgid "old encoding of the DEK is not supported\n"
 msgstr "stary, nie obs³ugiwany algorytm szyfrowania klucza sesyjnego\n"
 
-#: g10/pubkey-enc.c:156
+#: g10/pubkey-enc.c:219
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "%d - algorytm ochrony nie obs³ugiwany\n"
 
-#: g10/pubkey-enc.c:195
+#: g10/pubkey-enc.c:258
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "UWAGA: brak algorytmu szyfruj±cego %d w ustawieniach\n"
 
-#: g10/pubkey-enc.c:201
+#: g10/pubkey-enc.c:264
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "UWAGA: klucz podpisuj±cy przekroczy³ datê wa¿no¶ci %s\n"
@@ -2828,74 +2839,69 @@ msgstr ""
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
 
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:90
 #, fuzzy
 msgid "secret key parts are not available\n"
 msgstr "klucz tajny nie jest dostêpny"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:96
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "%d - algorytm ochrony nie obs³ugiwany\n"
 
-#: g10/seckey-cert.c:175
+#: g10/seckey-cert.c:239
 msgid "Invalid passphrase; please try again ...\n"
 msgstr ""
 "Niepoprawne wyra¿enie przej¶ciowe (has³o); proszê spróbowaæ ponownie ...\n"
 
-#: g10/seckey-cert.c:231
+#: g10/seckey-cert.c:302
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "OSTRZE¯ENIE: Wykryto klucz s³aby algorytmu - nale¿y ponownie zmieniæ \n"
 "             wyra¿enie przej¶ciowe (has³o).\n"
 
-#: g10/sig-check.c:202
-msgid "assuming bad MDC due to an unknown critical bit\n"
-msgstr ""
-"przyjêto niepoprawno¶æ MDC z powonu ustawienia nieznanego bitu krytycznego\n"
-
-#: g10/sig-check.c:300
+#: g10/sig-check.c:282
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "Klucz algorytmu ElGamala wygenerowany przez PGP - podpisy nim sk³adane\n"
 "nie zapewniaj± bezpieczeñstwa!\n"
 
-#: g10/sig-check.c:308
+#: g10/sig-check.c:290
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "klucz publiczny jest o %lu sekund m³odszy od podpisu\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:291
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "klucz publiczny jest o %lu sekund m³odszy od podpisu\n"
 
-#: g10/sig-check.c:327
+#: g10/sig-check.c:309
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "UWAGA: klucz podpisuj±cy przekroczy³ datê wa¿no¶ci %s\n"
 
-#: g10/sig-check.c:396
+#: g10/sig-check.c:378
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "przyjêto niewa¿no¶æ podpisu z powodu ustawienia nieznanego bitu krytycznego\n"
 
-#: g10/sign.c:140
+#: g10/sign.c:195
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s podpis z³o¿ony przez: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:606
+#: g10/sign.c:345 g10/sign.c:664
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "nie mo¿na stworzyæ %s: %s\n"
 
-#: g10/sign.c:388
+#: g10/sign.c:444
 msgid "signing:"
 msgstr "podpis:"
 
-#: g10/sign.c:431
+#: g10/sign.c:487
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "OSTRZE¯ENIE: plik '%s' jest pusty\n"
@@ -2934,7 +2940,8 @@ msgstr "%s: dost
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalog nie istnieje!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1363 g10/tdbio.c:444
+#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1407
+#: g10/ringedit.c:1878 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: nie mo¿na utworzyæ: %s\n"
@@ -3120,204 +3127,204 @@ msgstr "Klucz %08lX: zaakceptowany jako klucz zaufany.\n"
 msgid "enumerate secret keys failed: %s\n"
 msgstr "wyliczenie kluczy tajnych nie powiod³o siê %s\n"
 
-#: g10/trustdb.c:921
+#: g10/trustdb.c:925
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "klucz %08lX.%lu Dobre dowi±zanie podklucza\n"
 
-#: g10/trustdb.c:927 g10/trustdb.c:962
+#: g10/trustdb.c:931 g10/trustdb.c:966
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "klucz %08lX.%lu: Niepoprawne dowi±zanie podklucza %s\n"
 
-#: g10/trustdb.c:939
+#: g10/trustdb.c:943
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "klucz %08lX.%lu: Poprawne uniewa¿nienie klucza\n"
 
-#: g10/trustdb.c:945
+#: g10/trustdb.c:949
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "klucz %08lX.%lu: Niew³a¶ciwe uniewa¿nienie klucza: %s\n"
 
-#: g10/trustdb.c:956
+#: g10/trustdb.c:960
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "klucz %08lX.%lu: Poprawne uniewa¿nienie podklucza\n"
 
-#: g10/trustdb.c:1067
+#: g10/trustdb.c:1071
 msgid "Good self-signature"
 msgstr "Poprawny podpis klucza nim samym"
 
-#: g10/trustdb.c:1077
+#: g10/trustdb.c:1081
 msgid "Invalid self-signature"
 msgstr "Niepoprawny podpis klucza nim samym"
 
-#: g10/trustdb.c:1104
+#: g10/trustdb.c:1108
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Poprawne uniewa¿nienie identyfikatora u¿ytkownika pominiête z powodu\n"
 "nowszego podpisu tym samym kluczem"
 
-#: g10/trustdb.c:1110
+#: g10/trustdb.c:1114
 msgid "Valid user ID revocation"
 msgstr "Poprawne uniewa¿nienie identyfikatora u¿ytkownika"
 
-#: g10/trustdb.c:1115
+#: g10/trustdb.c:1119
 msgid "Invalid user ID revocation"
 msgstr "Niepoprawne uniewa¿nienie identyfikatora u¿ytkownika"
 
-#: g10/trustdb.c:1157
+#: g10/trustdb.c:1161
 msgid "Valid certificate revocation"
 msgstr "Poprawne uniewa¿nienie certyfikatu"
 
-#: g10/trustdb.c:1158
+#: g10/trustdb.c:1162
 msgid "Good certificate"
 msgstr "Poprawny certyfikat"
 
-#: g10/trustdb.c:1186
+#: g10/trustdb.c:1190
 msgid "Invalid certificate revocation"
 msgstr "Niepoprawne uniewa¿nienie certyfikatu"
 
-#: g10/trustdb.c:1187
+#: g10/trustdb.c:1191
 msgid "Invalid certificate"
 msgstr "Niepoprawny certyfikat"
 
-#: g10/trustdb.c:1204 g10/trustdb.c:1208
+#: g10/trustdb.c:1208 g10/trustdb.c:1212
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "zapis o podpisach %lu[%d] wskazuje na z³y wpis.\n"
 
-#: g10/trustdb.c:1267
+#: g10/trustdb.c:1271
 msgid "duplicated certificate - deleted"
 msgstr "podwójny certyfikat - usuniêty"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1592
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "Procedura tdbio_search_dir nie powiod³a siê: %s\n"
 
-#: g10/trustdb.c:1718
+#: g10/trustdb.c:1726
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: wpisanie nie powiod³o siê: %s\n"
 
-#: g10/trustdb.c:1723
+#: g10/trustdb.c:1731
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: wpisanie nie powiod³o siê: %s\n"
 
-#: g10/trustdb.c:1729
+#: g10/trustdb.c:1737
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: wpisany\n"
 
-#: g10/trustdb.c:1734
+#: g10/trustdb.c:1742
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "b³±d podczas odczytu wpisu katalogowego: %s\n"
 
-#: g10/trustdb.c:1742 g10/trustdb.c:1805
+#: g10/trustdb.c:1750 g10/trustdb.c:1813
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu kluczy przetworzonych\n"
 
-#: g10/trustdb.c:1744 g10/trustdb.c:1811
+#: g10/trustdb.c:1752 g10/trustdb.c:1819
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu kluczy z b³êdami\n"
 
-#: g10/trustdb.c:1746
+#: g10/trustdb.c:1754
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu kluczy wpisanych\n"
 
-#: g10/trustdb.c:1749
+#: g10/trustdb.c:1757
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "wyliczenie bloków kluczy nie powiod³o siê: %s\n"
 
-#: g10/trustdb.c:1797
+#: g10/trustdb.c:1805
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: wpis katalogowy bez bloku klucza - pominiêty\n"
 
-#: g10/trustdb.c:1807
+#: g10/trustdb.c:1815
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu z powodu nowych kluczy publicznych\n"
 
-#: g10/trustdb.c:1809
+#: g10/trustdb.c:1817
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu kluczy pominiêtych\n"
 
-#: g10/trustdb.c:1813
+#: g10/trustdb.c:1821
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu kluczy uaktualnionych\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2166
 msgid "Ooops, no keys\n"
 msgstr "Oops, brak kluczy\n"
 
-#: g10/trustdb.c:2162
+#: g10/trustdb.c:2170
 msgid "Ooops, no user IDs\n"
 msgstr "Oops, brak identyfikatorów u¿ytkowników\n"
 
-#: g10/trustdb.c:2320
+#: g10/trustdb.c:2328
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: poszukiwanie wpisu katalogowego nie powiod³o siê: %s\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2337
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "klucz %08lX: wprowadzenie wpisu zaufania nie powiod³o siê: %s\n"
 
-#: g10/trustdb.c:2333
+#: g10/trustdb.c:2341
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "Klucz %08lX.%lu: wprowadzony do bazy zaufania\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2349
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "Klucz %08lX.%lu: stworzony w przysz³o¶ci (zaburzenia czasoprzestrzeni,\n"
 "lub ¼le ustawiony zegar systemowy)\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2364
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "klucz %08lX.%lu: okres wa¿no¶ci up³yn±³ %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2372
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "klucz %08lX.%lu: b³±d przy sprawdzaniu zaufania: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2523
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "u¿ytkownik '%s' nie odnaleziony: %s\n"
 
-#: g10/trustdb.c:2517
+#: g10/trustdb.c:2525
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problem podczas szukania '%s' w bazie zaufania: %s\n"
 
-#: g10/trustdb.c:2520
+#: g10/trustdb.c:2528
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "brak u¿ytkownika '%s' w bazie zaufania - dodano\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2531
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "umieszczenie '%s' w bazie zaufania nie powiod³o siê: %s\n"
 
-#: g10/trustdb.c:2709 g10/trustdb.c:2739
+#: g10/trustdb.c:2717 g10/trustdb.c:2747
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "OSTRZE¯ENIE: d³ugie wpisy ustawieñ jeszcze nie s± obs³ugiwane.\n"
 
@@ -3336,46 +3343,40 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "linia wej¶ciowa %u jest zbyt d³uga lub brakuje jej zakoñczenia\n"
 
-#: g10/ringedit.c:302
+#: g10/ringedit.c:324
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: stworzenie zbioru kluczy jest niemo¿liwe: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1368
+#: g10/ringedit.c:341 g10/ringedit.c:1412 g10/ringedit.c:1883
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: zbiór kluczy utworzony\n"
 
-#: g10/ringedit.c:1545
+#: g10/ringedit.c:1589 g10/ringedit.c:2060
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "OSTRZE¯ENIE: Istniej± dwa pliki z poufnymi informacjami.\n"
 
-#: g10/ringedit.c:1546
+#: g10/ringedit.c:1590 g10/ringedit.c:2061
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s pozosta³ bez zmian\n"
 
-#: g10/ringedit.c:1547
+#: g10/ringedit.c:1591 g10/ringedit.c:2062
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s zosta³ utworzony\n"
 
-#: g10/ringedit.c:1548
+#: g10/ringedit.c:1592 g10/ringedit.c:2063
 msgid "Please fix this possible security flaw\n"
 msgstr "Proszê usun±æ to naruszenie zasad bezpieczeñstwa.\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
-msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr ""
-"klucz nie jest oznaczony jako niepewny - nie mo¿na go u¿yæ z atrap±\n"
-"generatora liczb losowych!\n"
-
-#: g10/skclist.c:113
+#: g10/skclist.c:96
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "pominiêty '%s': %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:102
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3431,27 +3432,27 @@ msgstr "%s: katalog utworzony\n"
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr "musisz uruchomiæ GnuPG od nowa aby wczytaæ nowe ustawienia\n"
 
-#: g10/encr-data.c:66
-#, c-format
-msgid "%s encrypted data\n"
-msgstr "%s zaszyfrowane dane\n"
-
-#: g10/encr-data.c:68
+#: g10/encr-data.c:64
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "zaszyfrowane nieznanym algorytmem %d\n"
 
-#: g10/encr-data.c:90
+#: g10/encr-data.c:69
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s zaszyfrowane dane\n"
+
+#: g10/encr-data.c:99
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "OSTRZE¯ENIE: wiadomo¶æ by³a szyfrowana s³abym kluczem szyfru symetrycznego.\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:61
 msgid "weak key created - retrying\n"
 msgstr "wygenerowano s³aby klucz - operacja zostaje powtórzona\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:66
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
@@ -3702,7 +3703,7 @@ msgid ""
 "  \"Key has been compromised\"\n"
 "      Use this if you have a reason to believe that unauthorized persons\n"
 "      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
+"  \"Key is superseeded\"\n"
 "      Use this if you have replaced this key with a newer one.\n"
 "  \"Key is no longer used\"\n"
 "      Use this if you have retired this key.\n"
@@ -3727,6 +3728,18 @@ msgstr "Pomoc niedost
 msgid "No help available for `%s'"
 msgstr "Brak pomocy o '%s'"
 
+#~ msgid "not processed"
+#~ msgstr "nie przetworzony"
+
+#~ msgid "assuming bad MDC due to an unknown critical bit\n"
+#~ msgstr ""
+#~ "przyjêto niepoprawno¶æ MDC z powonu ustawienia nieznanego bitu krytycznego\n"
+
+#~ msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
+#~ msgstr ""
+#~ "klucz nie jest oznaczony jako niepewny - nie mo¿na go u¿yæ z atrap±\n"
+#~ "generatora liczb losowych!\n"
+
 #~ msgid "set debugging flags"
 #~ msgstr "ustawienie opcji ¶ledzenia wykonania programu"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6fdf31e9d..5c5769a7b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-07-30 20:02+0200\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-20 23:46:36-0200\n"
 "From: Thiago Jung Bauermann <jungmann@usa.net>\n"
@@ -17,307 +17,291 @@ msgstr ""
 "g10/mainproc.c g10/passphrase.c g10/plaintext.c g10/pref.c g10/seckey-cert.c "
 "g10/sig-check.c g10/sign.c g10/trustdb.c g10/verify.c\n"
 
-#: util/secmem.c:79
-msgid "Warning: using insecure memory!\n"
-msgstr "Aviso: usando memória insegura!\n"
-
-#: util/secmem.c:289
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "a operação não é possível sem memória segura inicializada\n"
-
-#: util/secmem.c:290
-msgid "(you may have used the wrong program for this task)\n"
-msgstr "(você pode ter usado o programa errado para esta tarefa)\n"
-
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:278 util/miscutil.c:307
 msgid "yes"
 msgstr "sim"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:279 util/miscutil.c:310
 msgid "yY"
 msgstr "sS"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:280 util/miscutil.c:308
 msgid "no"
 msgstr "não"
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:281 util/miscutil.c:311
 msgid "nN"
 msgstr "nN"
 
 # INICIO MENU
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:580 util/miscutil.c:309
 msgid "quit"
 msgstr "sair"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:312
 msgid "qQ"
 msgstr "qQ"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "erro geral"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "formato de pacote desconhecido"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "versão desconhecida"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "algoritmo de chave pública desconhecido"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "algoritmo de \"digest\" desconhecido"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "chave pública incorreta"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "chave secreta incorreta"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "assinatura incorreta"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "erro de \"checksum\""
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "frase secreta incorreta"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "chave pública não encontrada"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "algoritmo de criptografia desconhecido"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "não é possível abrir o chaveiro"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "pacote inválido"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "armadura inválida"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "identificador de usuário inexistente"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "chave secreta não disponível"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "chave secreta incorreta"
 
 # suportado ???
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "não suportado"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "chave incorreta"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "erro de leitura"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "erro de escrita"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "algoritmo de compressão desconhecido"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "erro na abertura de arquivo"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "erro na criação de arquivo"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "frase secreta inválida"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "algoritmo de chave pública não implementado"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "algoritmo de criptografia não implementado"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "classe de assinatura desconhecida"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "erro no banco de dados de confiabilidade"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "MPI incorreto"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "limite de recurso"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "chaveiro inválido"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "certificado incorreto"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "identificador de usuário malformado"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "erro no fechamento de arquivo"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "erro na renomeação de arquivo"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "erro na remoção de arquivo"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "dados inesperados"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "conflito de \"timestamp\""
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "algoritmo de chave pública inutilizável"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "o arquivo já existe"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "chave fraca"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "argumento inválido"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "URI incorreto"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "URI não suportado"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "erro na rede"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "não criptografado"
 
-#: util/errors.c:103
-msgid "not processed"
-msgstr "não processado(s)"
-
-#: util/logger.c:224
+#: util/logger.c:225
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... isto é um bug (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:231
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "você encontrou um bug ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:321 g10/import.c:127 g10/keygen.c:1348
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:325
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:330
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:325
+#: cipher/random.c:335
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:331
+#: cipher/random.c:341
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:339
+#: cipher/random.c:349
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:387
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:397
+#: cipher/random.c:407
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossível criar %s: %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:414
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:417
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:428
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:647
+#: cipher/random.c:657
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: usando gerador de números aleatórios inseguro!\n"
 
-#: cipher/random.c:648
+#: cipher/random.c:663
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -331,7 +315,7 @@ msgstr ""
 "NÃO USE NENHUM DADO GERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:141
+#: cipher/rndlinux.c:125
 #, c-format
 msgid ""
 "\n"
@@ -343,7 +327,19 @@ msgstr ""
 "para que o sistema possa coletar mais entropia!\n"
 "(São necessários mais %d bytes)\n"
 
-#: g10/g10.c:197
+#: gcrypt/secmem.c:77
+msgid "Warning: using insecure memory!\n"
+msgstr "Aviso: usando memória insegura!\n"
+
+#: gcrypt/secmem.c:287
+msgid "operation is not possible without initialized secure memory\n"
+msgstr "a operação não é possível sem memória segura inicializada\n"
+
+#: gcrypt/secmem.c:288
+msgid "(you may have used the wrong program for this task)\n"
+msgstr "(você pode ter usado o programa errado para esta tarefa)\n"
+
+#: g10/gpg.c:197
 msgid ""
 "@Commands:\n"
 " "
@@ -351,144 +347,144 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:199
+#: g10/gpg.c:199
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: g10/g10.c:200
+#: g10/gpg.c:200
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:201
+#: g10/gpg.c:201
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:202
+#: g10/gpg.c:202
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/g10.c:203
+#: g10/gpg.c:203
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "simétrica"
 
-#: g10/g10.c:204
+#: g10/gpg.c:204
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/g10.c:205
+#: g10/gpg.c:205
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padrão)"
 
-#: g10/g10.c:206
+#: g10/gpg.c:206
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:208
+#: g10/gpg.c:208
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:210
+#: g10/gpg.c:210
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:211
+#: g10/gpg.c:211
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:212
+#: g10/gpg.c:212
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impressões digitais"
 
-#: g10/g10.c:213
+#: g10/gpg.c:213
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:214
+#: g10/gpg.c:214
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:215
+#: g10/gpg.c:215
 msgid "remove key from the public keyring"
 msgstr "remover a chave do chaveiro público"
 
-#: g10/g10.c:217
+#: g10/gpg.c:217
 msgid "remove key from the secret keyring"
 msgstr "remover a chave do chaveiro secreto"
 
-#: g10/g10.c:218
+#: g10/gpg.c:218
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:219
+#: g10/gpg.c:219
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:220
+#: g10/gpg.c:220
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:221
+#: g10/gpg.c:221
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revogação"
 
-#: g10/g10.c:222
+#: g10/gpg.c:222
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:223
+#: g10/gpg.c:223
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:224
+#: g10/gpg.c:224
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:228
+#: g10/gpg.c:228
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:230
+#: g10/gpg.c:230
 msgid "list only the sequence of packets"
 msgstr "listar apenas as seqüências de pacotes"
 
 # ownertrust ???
-#: g10/g10.c:232
+#: g10/gpg.c:232
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confiança"
 
-#: g10/g10.c:234
+#: g10/gpg.c:234
 msgid "import ownertrust values"
 msgstr "importar os valores de confiança"
 
-#: g10/g10.c:236
+#: g10/gpg.c:236
 msgid "update the trust database"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/g10.c:238
+#: g10/gpg.c:238
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMES]|verificar o banco de dados de confiabilidade"
 
-#: g10/g10.c:239
+#: g10/gpg.c:239
 msgid "fix a corrupted trust database"
 msgstr ""
 "consertar um banco de dados de confiabilidade\n"
 "danificado"
 
-#: g10/g10.c:240
+#: g10/gpg.c:240
 msgid "De-Armor a file or stdin"
 msgstr "retirar a armadura de um arquivo ou de \"stdin\""
 
-#: g10/g10.c:242
+#: g10/gpg.c:242
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um arquivo ou \"stdin\""
 
-#: g10/g10.c:244
+#: g10/gpg.c:244
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:248
+#: g10/gpg.c:249
 msgid ""
 "@\n"
 "Options:\n"
@@ -498,171 +494,171 @@ msgstr ""
 "Opções:\n"
 " "
 
-#: g10/g10.c:250
+#: g10/gpg.c:251
 msgid "create ascii armored output"
 msgstr "criar saída com armadura ascii"
 
-#: g10/g10.c:252
+#: g10/gpg.c:253
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/g10.c:255
+#: g10/gpg.c:256
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinatário padrão"
 
-#: g10/g10.c:257
+#: g10/gpg.c:258
 msgid "use the default key as default recipient"
 msgstr "usar a chave padrão como destinatário padrão"
 
-#: g10/g10.c:261
+#: g10/gpg.c:262
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usuário para\n"
 "assinar ou descriptografar"
 
-#: g10/g10.c:262
+#: g10/gpg.c:263
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer nível de compressão N\n"
 "(0 desabilita)"
 
-#: g10/g10.c:264
+#: g10/gpg.c:265
 msgid "use canonical text mode"
 msgstr "usar modo de texto canônico"
 
-#: g10/g10.c:265
+#: g10/gpg.c:266
 msgid "use as output file"
 msgstr "usar como arquivo de saída"
 
-#: g10/g10.c:266
+#: g10/gpg.c:267
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:267
+#: g10/gpg.c:268
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:268
+#: g10/gpg.c:269
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/g10.c:269
+#: g10/gpg.c:270
 msgid "force v3 signatures"
 msgstr "forçar assinaturas v3"
 
-#: g10/g10.c:270
+#: g10/gpg.c:271
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para criptografar"
 
-#: g10/g10.c:271
+#: g10/gpg.c:272
 msgid "do not make any changes"
 msgstr "não fazer alterações"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/gpg.c:274
 msgid "batch mode: never ask"
 msgstr "modo não-interativo: nunca perguntar"
 
-#: g10/g10.c:274
+#: g10/gpg.c:275
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:275
+#: g10/gpg.c:276
 msgid "assume no on most questions"
 msgstr "assumir não para a maioria das perguntas"
 
-#: g10/g10.c:276
+#: g10/gpg.c:277
 msgid "add this keyring to the list of keyrings"
 msgstr "adicionar este chaveiro à lista de chaveiros"
 
-#: g10/g10.c:277
+#: g10/gpg.c:278
 msgid "add this secret keyring to the list"
 msgstr "adicionar este chaveiro secreto à lista"
 
-#: g10/g10.c:278
+#: g10/gpg.c:279
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta padrão"
 
-#: g10/g10.c:279
+#: g10/gpg.c:280
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDEREÇO|usar este servidor para buscar chaves"
 
-#: g10/g10.c:280
+#: g10/gpg.c:281
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/g10.c:281
+#: g10/gpg.c:282
 msgid "read options from file"
 msgstr "ler opções do arquivo"
 
-#: g10/g10.c:285
+#: g10/gpg.c:286
 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:290
+#: g10/gpg.c:291
 msgid "|FILE|load extension module FILE"
 msgstr "|ARQUIVO|carregar módulo de extensão ARQUIVO"
 
-#: g10/g10.c:291
+#: g10/gpg.c:292
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/g10.c:292
+#: g10/gpg.c:293
 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:293
+#: g10/gpg.c:294
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar frase secreta modo N"
 
-#: g10/g10.c:295
+#: g10/gpg.c:296
 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:297
+#: g10/gpg.c:298
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:298
+#: g10/gpg.c:299
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:299
+#: g10/gpg.c:300
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:300
+#: g10/gpg.c:301
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compressão N"
 
-#: g10/g10.c:301
+#: g10/gpg.c:302
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "eliminar o campo keyid dos pacotes\n"
 "criptografados"
 
-#: g10/g10.c:302
+#: g10/gpg.c:303
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALOR|usar estes dados de notação"
 
-#: g10/g10.c:305
+#: g10/gpg.c:306
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:308
+#: g10/gpg.c:309
 msgid ""
 "@\n"
 "Examples:\n"
@@ -682,15 +678,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impressões digitais\n"
 
-#: g10/g10.c:403
+#: g10/gpg.c:409
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:407
+#: g10/gpg.c:413
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opções] [arquivos] (-h para ajuda)"
 
-#: g10/g10.c:410
+#: g10/gpg.c:416
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -700,7 +696,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a operação padrão depende dos dados de entrada\n"
 
-#: g10/g10.c:417
+#: g10/gpg.c:423
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -708,185 +704,190 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:496
+#: g10/gpg.c:525
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opções] "
 
-#: g10/g10.c:549
+#: g10/gpg.c:583
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/g10.c:692
+#: g10/gpg.c:638
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
+#: g10/gpg.c:734
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de opções padrão `%s' inexistente\n"
 
-#: g10/g10.c:696
+#: g10/gpg.c:738
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de opções `%s': %s\n"
 
-#: g10/g10.c:703
+#: g10/gpg.c:745
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo opções de `%s'\n"
 
-#: g10/g10.c:893
+#: g10/gpg.c:937
 #, 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:949 g10/g10.c:958
+#: g10/gpg.c:1002 g10/gpg.c:1011
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s não é para uso normal!\n"
 
-#: g10/g10.c:951
+#: g10/gpg.c:1004
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s não é permitido com %s!\n"
 
-#: g10/g10.c:954
+#: g10/gpg.c:1007
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s não faz sentido com %s!\n"
 
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/gpg.c:1027 g10/gpg.c:1039
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado não é válido\n"
 
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/gpg.c:1033 g10/gpg.c:1045
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado não é válido\n"
 
-#: g10/g10.c:995
+#: g10/gpg.c:1049
 msgid "the given policy URL is invalid\n"
 msgstr "a URL de política dada é inválida\n"
 
-#: g10/g10.c:998
+#: g10/gpg.c:1052
 #, 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:1000
+#: g10/gpg.c:1054
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:1002
+#: g10/gpg.c:1056
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:1004
+#: g10/gpg.c:1058
 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:1007
+#: g10/gpg.c:1061
 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:1011
+#: g10/gpg.c:1065
 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:1096
+#: g10/gpg.c:1154
 #, 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:1102
+#: g10/gpg.c:1160
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/g10.c:1109
+#: g10/gpg.c:1167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:1117
+#: g10/gpg.c:1175
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1130
+#: g10/gpg.c:1188
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/g10.c:1143
+#: g10/gpg.c:1201
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1157
+#: g10/gpg.c:1215
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/g10.c:1174
+#: g10/gpg.c:1232
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1182
+#: g10/gpg.c:1240
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuário"
 
-#: g10/g10.c:1190
+#: g10/gpg.c:1248
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuário"
 
-#: g10/g10.c:1198
+#: g10/gpg.c:1256
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuário [comandos]"
 
-#: g10/g10.c:1214
+#: g10/gpg.c:1272
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-usuário"
 
-#: g10/g10.c:1217
+#: g10/gpg.c:1275
 msgid "--delete-key user-id"
 msgstr "--delete-key id-usuário"
 
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:311 g10/gpg.c:1312 g10/sign.c:449
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossível abrir %s: %s\n"
 
-#: g10/g10.c:1269
+#: g10/gpg.c:1327
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuário] [chaveiro]"
 
-#: g10/g10.c:1335
+#: g10/gpg.c:1393
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1343
+#: g10/gpg.c:1401
 #, 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:1411
+#: g10/gpg.c:1474 g10/gpg.c:1495
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inválido `%s'\n"
 
-#: g10/g10.c:1492
+#: g10/gpg.c:1580
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/g10.c:1496
+#: g10/gpg.c:1584
 msgid "Go ahead and type your message ...\n"
 msgstr "Vá em frente e digite sua mensagem ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/gpg.c:1587 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossível abrir `%s'\n"
 
-#: g10/g10.c:1669
+#: g10/gpg.c:1765
 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:1675
+#: g10/gpg.c:1771
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -894,12 +895,12 @@ msgstr ""
 "um nome de notação deve ter apenas letras, dígitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:1681
+#: g10/gpg.c:1777
 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:1689
+#: g10/gpg.c:1785
 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"
 
@@ -984,50 +985,50 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1188 g10/pkclist.c:53
+#: g10/keyedit.c:1191 g10/pkclist.c:54
 msgid "             Fingerprint:"
 msgstr "       Impressão digital:"
 
-#: g10/pkclist.c:80
+#: g10/pkclist.c:81
 msgid "Fingerprint:"
 msgstr "Impressão digital:"
 
-#: g10/pkclist.c:116
+#: g10/pkclist.c:117
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:118
+#: g10/pkclist.c:119
 #, fuzzy
-msgid "Key is superseded"
+msgid "Key is superseeded"
 msgstr "A chave é protegida.\n"
 
-#: g10/pkclist.c:120
+#: g10/pkclist.c:121
 #, fuzzy
 msgid "Key has been compromised"
 msgstr "Esta chave foi desativada"
 
-#: g10/pkclist.c:122
+#: g10/pkclist.c:123
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:124
+#: g10/pkclist.c:125
 msgid "User ID is no longer valid"
 msgstr ""
 
-#: g10/pkclist.c:128
+#: g10/pkclist.c:129
 msgid "Reason for revocation: "
 msgstr ""
 
-#: g10/pkclist.c:145
+#: g10/pkclist.c:146
 msgid "Revocation comment: "
 msgstr ""
 
 #. a string with valid answers
-#: g10/pkclist.c:303
+#: g10/pkclist.c:304
 msgid "sSmMqQ"
 msgstr "sSmMqQ"
 
-#: g10/pkclist.c:307
+#: g10/pkclist.c:308
 #, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -1036,7 +1037,7 @@ msgstr ""
 "Nenhum valor de confiança designado para %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1059,23 +1060,23 @@ msgstr ""
 " 4 = Eu confio completamente\n"
 " s = Mostrar mais informações\n"
 
-#: g10/pkclist.c:328
+#: g10/pkclist.c:329
 msgid " m = back to the main menu\n"
 msgstr " m = voltar ao menu principal\n"
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:331
 msgid " q = quit\n"
 msgstr " q = sair\n"
 
-#: g10/pkclist.c:336
+#: g10/pkclist.c:337
 msgid "Your decision? "
 msgstr "Sua decisão? "
 
-#: g10/pkclist.c:358
+#: g10/pkclist.c:359
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 msgid ""
 "Could not find a valid trust path to the key.  Let's see whether we\n"
 "can assign some missing owner trust values.\n"
@@ -1085,13 +1086,13 @@ msgstr ""
 "Vamos ver se é possível designar alguns valores de confiança ausentes.\n"
 "\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
 msgstr "Nenhuma rota encontrada que leve a uma de nossas chaves.\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:438
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
@@ -1099,7 +1100,7 @@ msgstr ""
 "Nenhum certificado com confiança indefinida encontrado.\n"
 "\n"
 
-#: g10/pkclist.c:439
+#: g10/pkclist.c:440
 msgid ""
 "No trust values changed.\n"
 "\n"
@@ -1107,36 +1108,36 @@ msgstr ""
 "Nenhum valor de confiança modificado.\n"
 "\n"
 
-#: g10/pkclist.c:457
+#: g10/pkclist.c:458
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "chave %08lX: a chave foi revogada!\n"
 
-#: g10/pkclist.c:464 g10/pkclist.c:476 g10/pkclist.c:598
+#: g10/pkclist.c:465 g10/pkclist.c:477 g10/pkclist.c:599
 msgid "Use this key anyway? "
 msgstr "Usa esta chave de qualquer modo? "
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "chave %08lX: a subchave foi revogada!\n"
 
-#: g10/pkclist.c:512
+#: g10/pkclist.c:513
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: a chave expirou\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr "%08lX: sem informação para calcular probabilidade de confiança\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: Nós NÃO confiamos nesta chave\n"
 
-#: g10/pkclist.c:539
+#: g10/pkclist.c:540
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -1145,15 +1146,15 @@ msgstr ""
 "%08lX: Não se tem certeza de que esta chave realmente pertence ao dono,\n"
 "mas é aceita de qualquer modo\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:546
 msgid "This key probably belongs to the owner\n"
 msgstr "Esta chave provavelmente pertence ao dono\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid "This key belongs to us\n"
 msgstr "Esta chave pertence a nós\n"
 
-#: g10/pkclist.c:593
+#: g10/pkclist.c:594
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -1165,65 +1166,65 @@ msgstr ""
 "sim à próxima pergunta\n"
 "\n"
 
-#: g10/pkclist.c:607 g10/pkclist.c:630
+#: g10/pkclist.c:608 g10/pkclist.c:631
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVISO: Usando chave não confiável!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:652
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:652
+#: g10/pkclist.c:653
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "       Isto pode significar que a assinatura é falsificada.\n"
 
-#: g10/pkclist.c:657
+#: g10/pkclist.c:658
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:680
 msgid "Note: This key has expired!\n"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:688
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: Esta chave não está certificada com uma assinatura confiável!\n"
 
-#: g10/pkclist.c:689
+#: g10/pkclist.c:690
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "       Não há indicação de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:707
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: Nós NÃO confiamos nesta chave!\n"
 
-#: g10/pkclist.c:707
+#: g10/pkclist.c:708
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "       A assinatura é provavelmente uma FALSIFICAÇÃO.\n"
 
-#: g10/pkclist.c:714
+#: g10/pkclist.c:715
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVISO: Esta chave não está certificada com assinaturas suficientemente\n"
 "       confiáveis!\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:718
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "       Não se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:968 g10/pkclist.c:1013
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:828 g10/pkclist.c:995
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave pública já está presente\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:855
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1231,42 +1232,42 @@ msgstr ""
 "Você não especificou um identificador de usuário. (pode-se usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:865
 msgid "Enter the user ID: "
 msgstr "Digite o identificador de usuário: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:877
 msgid "No such user ID.\n"
 msgstr "Identificador de usuário inexistente.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:882
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorado: chave pública já marcada como destinatário padrão\n"
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:905
 msgid "Public key is disabled.\n"
 msgstr "A chave pública está desativada.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:912
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "ignorado: chave pública já marcada com --encrypt-to\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:943
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinatário padrão desconhecido `%s'\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:976
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: erro na verificação da chave: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:981
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave pública está desativada\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1019
 msgid "no valid addressees\n"
 msgstr "nenhum endereço válido\n"
 
@@ -1279,58 +1280,58 @@ msgstr "escrevendo auto-assinatura\n"
 msgid "writing key binding signature\n"
 msgstr "escrevendo assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
+#: g10/keygen.c:308 g10/keygen.c:419 g10/keygen.c:529
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "O tamanho de chave pedido é %u bits\n"
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:438
+#: g10/keygen.c:313 g10/keygen.c:424 g10/keygen.c:534
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:537
+#: g10/keygen.c:633
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:635
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (padrão)\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:636
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:638
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:639
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e criptografia)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:641
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e criptografia)\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:645
 msgid "Your selection? "
 msgstr "Sua opção? "
 
-#: g10/keygen.c:560 g10/keygen.c:568
+#: g10/keygen.c:656 g10/keygen.c:664
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Você realmente quer criar uma chave para assinatura e criptografia? "
 
-#: g10/keygen.c:582
+#: g10/keygen.c:678
 msgid "Invalid selection.\n"
 msgstr "Opção inválida.\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:690
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1343,19 +1344,19 @@ msgstr ""
 "              tamanho padrão é 1024 bits\n"
 "     tamanho máximo sugerido é 2048 bits\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:697
 msgid "What keysize do you want? (1024) "
 msgstr "Que tamanho de chave você quer? (1024) "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:702
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
 
-#: g10/keygen.c:608
+#: g10/keygen.c:704
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:706
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n"
@@ -1368,12 +1369,12 @@ msgstr "tamanho muito pequeno; 768 
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:621
+#: g10/keygen.c:717
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "tamanho muito grande; %d é o valor máximo permitido.\n"
 
-#: g10/keygen.c:626
+#: g10/keygen.c:722
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1381,11 +1382,11 @@ msgstr ""
 "Tamanhos de chave maiores que 2048 não são recomendados\n"
 "porque o tempo de computação é REALMENTE longo!\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:725
 msgid "Are you sure that you want this keysize? "
 msgstr "Você tem certeza de que quer este tamanho de chave? "
 
-#: g10/keygen.c:630
+#: g10/keygen.c:726
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1393,21 +1394,21 @@ msgstr ""
 "Tudo bem, mas tenha em mente que a radiação de seu monitor e teclado também "
 "é vulnerável a ataques!\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:734
 msgid "Do you really need such a large keysize? "
 msgstr "Você realmente precisa de uma chave tão grande? "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:740
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido é %u bits\n"
 
-#: g10/keygen.c:647 g10/keygen.c:651
+#: g10/keygen.c:743 g10/keygen.c:747
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:795
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1423,25 +1424,25 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:714
+#: g10/keygen.c:810
 msgid "Key is valid for? (0) "
 msgstr "A chave é valida por? (0) "
 
-#: g10/keygen.c:719
+#: g10/keygen.c:815
 msgid "invalid value\n"
 msgstr "valor inválido\n"
 
-#: g10/keygen.c:724
+#: g10/keygen.c:820
 msgid "Key does not expire at all\n"
 msgstr "A chave não expira nunca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:730
+#: g10/keygen.c:826
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:733
+#: g10/keygen.c:829
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1449,11 +1450,11 @@ msgstr ""
 "Seu sistema não consegue mostrar datas além de 2038.\n"
 "Apesar disso, elas serão corretamente manipuladas até 2106.\n"
 
-#: g10/keygen.c:738
+#: g10/keygen.c:834
 msgid "Is this correct (y/n)? "
 msgstr "Está correto (s/n)? "
 
-#: g10/keygen.c:781
+#: g10/keygen.c:877
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1469,44 +1470,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:793
+#: g10/keygen.c:889
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:893
 msgid "Invalid character in name\n"
 msgstr "Caractere inválido no nome\n"
 
-#: g10/keygen.c:799
+#: g10/keygen.c:895
 msgid "Name may not start with a digit\n"
 msgstr "O nome não pode começar com um dígito\n"
 
-#: g10/keygen.c:801
+#: g10/keygen.c:897
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:809
+#: g10/keygen.c:905
 msgid "Email address: "
 msgstr "Endereço de correio eletrônico: "
 
-#: g10/keygen.c:820
+#: g10/keygen.c:916
 msgid "Not a valid email address\n"
 msgstr "Endereço eletrônico inválido\n"
 
-#: g10/keygen.c:828
+#: g10/keygen.c:924
 msgid "Comment: "
 msgstr "Comentário: "
 
-#: g10/keygen.c:834
+#: g10/keygen.c:930
 msgid "Invalid character in comment\n"
 msgstr "Caractere inválido no comentário\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:956
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Você está usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:962
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1517,28 +1518,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:867
+#: g10/keygen.c:966
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:872
+#: g10/keygen.c:971
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:882
+#: g10/keygen.c:981
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muda (N)ome, (C)omentário, (E)ndereço ou (O)k/(S)air? "
 
-#: g10/keygen.c:883
+#: g10/keygen.c:982
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muda (N)ome, (C)omentário, (E)ndereço ou (O)k/(S)air? "
 
-#: g10/keygen.c:902
+#: g10/keygen.c:1001
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:940
+#: g10/keygen.c:1039
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1546,11 +1547,11 @@ msgstr ""
 "Você precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:948
+#: g10/keyedit.c:468 g10/keygen.c:1047
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "A frase secreta não foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keygen.c:954
+#: g10/keygen.c:1053
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1562,7 +1563,7 @@ msgstr ""
 "qualquer hora, usando este programa com a opção \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1074
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1574,29 +1575,29 @@ msgstr ""
 "geração dos números primos; isso dá ao gerador de números aleatórios\n"
 "uma chance melhor de conseguir entropia suficiente.\n"
 
-#: g10/keygen.c:1424
+#: g10/keygen.c:1523
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA terá 1024 bits.\n"
 
-#: g10/keygen.c:1467
+#: g10/keygen.c:1566
 msgid "Key generation canceled.\n"
 msgstr "Geração de chave cancelada.\n"
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1663
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado público para `%s'\n"
 
-#: g10/keygen.c:1565
+#: g10/keygen.c:1664
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1760
 msgid "public and secret key created and signed.\n"
 msgstr "chaves pública e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1765
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1604,12 +1605,12 @@ msgstr ""
 "Note que esta chave não pode ser usada para criptografia. Você pode usar\n"
 "o comando \"--edit-key\" para gerar uma chave secundária para esse fim.\n"
 
-#: g10/keygen.c:1683 g10/keygen.c:1784
+#: g10/keygen.c:1782 g10/keygen.c:1883
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1826 g10/sig-check.c:300 g10/sign.c:167
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1617,7 +1618,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1828 g10/sig-check.c:302 g10/sign.c:169
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1625,32 +1626,32 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1861
 msgid "Really create? "
 msgstr "Realmente criar? "
 
-#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:142 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: impossível abrir: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:164
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:222 g10/encode.c:370
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVISO: arquivo vazio\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:317
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:534
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s criptografado para: %s\n"
@@ -1679,32 +1680,32 @@ msgstr "chave %08lX: n
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:212
 msgid "too many entries in pk cache - disabled\n"
 msgstr "entradas demais no cache pk - desativado\n"
 
-#: g10/getkey.c:350
+#: g10/getkey.c:351
 msgid "too many entries in unk cache - disabled\n"
 msgstr "entradas demais no cache unk - desativado\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
+#: g10/getkey.c:1311 g10/getkey.c:1350
 msgid "RSA key cannot be used in this version\n"
 msgstr "chave RSA não pode ser usada nesta versão\n"
 
-#: g10/getkey.c:1310 g10/getkey.c:1349
+#: g10/getkey.c:1313 g10/getkey.c:1352
 msgid "No key for user ID\n"
 msgstr "Nenhuma chave para identificador de usuário\n"
 
-#: g10/getkey.c:1388 g10/getkey.c:1428
+#: g10/getkey.c:1391 g10/getkey.c:1431
 msgid "No user ID for key\n"
 msgstr "Nenhum identificador de usuário para chave\n"
 
-#: g10/getkey.c:1642 g10/getkey.c:1698
+#: g10/getkey.c:1645 g10/getkey.c:1701
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "usando chave secundária %08lX ao invés de chave primária %08lX\n"
 
-#: g10/getkey.c:2017
+#: g10/getkey.c:2020
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: usuário não encontrado\n"
@@ -1714,7 +1715,7 @@ msgstr "%s: usu
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:188 g10/trustdb.c:1748 g10/trustdb.c:1789
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu chaves processadas até agora\n"
@@ -1802,7 +1803,7 @@ msgstr "chave %08lX: chave p
 msgid "no default public keyring\n"
 msgstr "sem chaveiro público padrão\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:350 g10/sign.c:669
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
@@ -2060,7 +2061,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1870 g10/keyedit.c:1932 g10/sign.c:136
+#: g10/keyedit.c:373 g10/keyedit.c:1873 g10/keyedit.c:1935 g10/sign.c:191
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
@@ -2417,104 +2418,104 @@ msgstr "Chave n
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inválido (tente \"help\")\n"
 
-#: g10/keyedit.c:1080 g10/keyedit.c:1106
+#: g10/keyedit.c:1083 g10/keyedit.c:1109
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1089
+#: g10/keyedit.c:1092
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1093
+#: g10/keyedit.c:1096
 msgid "This key has been disabled"
 msgstr "Esta chave foi desativada"
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1125
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "chave %08lX: a subchave foi revogada!\n"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1128
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "   novas revogações de chaves: %lu\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1130
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1368
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deletar esta assinatura válida? (s/N/q)"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1372
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deletar esta assinatura inválida? (s/N/q)"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1376
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1382
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1396
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1397
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1400
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:1466
+#: g10/keyedit.c:1469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as seleções das chaves secretas.\n"
 
-#: g10/keyedit.c:1472
+#: g10/keyedit.c:1475
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor selecione no máximo uma chave secundária.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1479
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Modificando a data de validade para uma chave secundária.\n"
 
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1481
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de validade para uma chave primária.\n"
 
-#: g10/keyedit.c:1520
+#: g10/keyedit.c:1523
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Você não pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:1536
+#: g10/keyedit.c:1539
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1600
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de usuário com índice %d\n"
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1646
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secundária com índice %d\n"
 
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1744
 msgid "user ID: \""
 msgstr "ID de usuário: \""
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1747
 #, c-format
 msgid ""
 "\"\n"
@@ -2523,163 +2524,173 @@ msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:1751
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1775
 msgid "You have signed these user IDs:\n"
 msgstr "Você assinou estes IDs de usuário:\n"
 
-#: g10/keyedit.c:1786 g10/keyedit.c:1821
+#: g10/keyedit.c:1789 g10/keyedit.c:1824
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:1791
+#: g10/keyedit.c:1794
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:1811
+#: g10/keyedit.c:1814
 msgid "You are about to revoke these signatures:\n"
 msgstr "Você está prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:1829
+#: g10/keyedit.c:1832
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Realmente gerar os certificados de revogação? (s/N)"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1861
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "armadura inválida"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "revkey"
+
 #. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:401 g10/mainproc.c:754
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "A chave expira em %s\n"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:212
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "a chave pública é %08lX\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:247
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados criptografados com chave pública: DEK válido\n"
 
-#: g10/mainproc.c:281
+#: g10/mainproc.c:280
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "criptografado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "criptografado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:297
+#: g10/mainproc.c:296
 msgid "no secret key for decryption available\n"
 msgstr "nenhuma chave secreta para descriptografia disponível\n"
 
-#: g10/mainproc.c:306
+#: g10/mainproc.c:305
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descriptografia de chave pública falhou: %s\n"
 
-#: g10/mainproc.c:343
+#: g10/mainproc.c:342
 msgid "decryption okay\n"
 msgstr "descriptografia correta\n"
 
-#: g10/mainproc.c:348
+#: g10/mainproc.c:347
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem criptografada foi manipulada!\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:352
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/mainproc.c:372
+#: g10/mainproc.c:371
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:374
+#: g10/mainproc.c:373
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome de arquivo original='%.*s'\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:538
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revogação isolada - use \"gpg --import\" para aplicá-la\n"
 
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:625 g10/mainproc.c:634
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de notação inválidos encontrados\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:637
 msgid "Notation: "
 msgstr "Notação: "
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:644
 msgid "Policy: "
 msgstr "Política: "
 
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1074
 msgid "signature verification suppressed\n"
 msgstr "verificação de assinatura suprimida\n"
 
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1080
 #, 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:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1106 g10/mainproc.c:1117
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRETA de \""
 
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1107 g10/mainproc.c:1118
 msgid "Good signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1109
 msgid "                aka \""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1165
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossível verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1230
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura isolada da classe 0x%02x\n"
 
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1282
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1287
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inválido detectado em proc_tree()\n"
 
-#: g10/misc.c:94
+#: g10/misc.c:83
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossível desativar core dumps: %s\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:86
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/misc.c:205
+#: g10/misc.c:312
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Algoritmos experimentais não devem ser usados!\n"
 
-#: g10/misc.c:219
+#: g10/misc.c:326
 msgid ""
 "RSA keys are deprecated; please consider creating a new key and use this key "
 "in the future\n"
@@ -2687,18 +2698,18 @@ msgstr ""
 "Chaves RSA não são recomendáveis; por favor considere criar uma nova chave e "
 "usá-la no futuro\n"
 
-#: g10/misc.c:241
+#: g10/misc.c:348
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "este algoritmo de criptografia é depreciado; por favor use algum\n"
 "algoritmo padrão!\n"
 
-#: g10/parse-packet.c:117
+#: g10/parse-packet.c:115
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossível manipular algoritmo de chave pública %d\n"
 
-#: g10/parse-packet.c:965
+#: g10/parse-packet.c:963
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit crítico ligado\n"
@@ -2735,51 +2746,51 @@ msgstr "Digite a frase secreta: "
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "dados não salvos; use a opção \"--output\" para salvá-los\n"
 
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
 msgid "Detached signature.\n"
 msgstr "Assinatura separada.\n"
 
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do arquivo de dados: "
 
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
 msgid "reading stdin ...\n"
 msgstr "lendo de \"stdin\" ...\n"
 
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossível abrir dados assinados `%s'\n"
 
-#: g10/pubkey-enc.c:79
+#: g10/pubkey-enc.c:138
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "destinatário anônimo; tentando chave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:85
+#: g10/pubkey-enc.c:144
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "certo, nós somos o destinatário anônimo.\n"
 
-#: g10/pubkey-enc.c:137
+#: g10/pubkey-enc.c:200
 msgid "old encoding of the DEK is not supported\n"
 msgstr "codificação antiga do DEK não suportada\n"
 
-#: g10/pubkey-enc.c:156
+#: g10/pubkey-enc.c:219
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "algoritmo de proteção %d não é suportado\n"
 
-#: g10/pubkey-enc.c:195
+#: g10/pubkey-enc.c:258
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d não encontrado nas preferências\n"
 
-#: g10/pubkey-enc.c:201
+#: g10/pubkey-enc.c:264
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: chave de assinatura expirou %s\n"
@@ -2823,69 +2834,65 @@ msgstr ""
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
 
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:90
 #, fuzzy
 msgid "secret key parts are not available\n"
 msgstr "chave secreta não disponível"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:96
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "algoritmo de proteção %d não é suportado\n"
 
-#: g10/seckey-cert.c:175
+#: g10/seckey-cert.c:239
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Frase secreta inválida; por favor tente novamente ...\n"
 
-#: g10/seckey-cert.c:231
+#: g10/seckey-cert.c:302
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Chave fraca detectada - por favor mude a frase secreta novamente.\n"
 
-#: g10/sig-check.c:202
-msgid "assuming bad MDC due to an unknown critical bit\n"
-msgstr "assumindo MDC incorreto devido a um bit crítico desconhecido\n"
-
-#: g10/sig-check.c:300
+#: g10/sig-check.c:282
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "esta é uma chave ElGamal gerada pelo PGP que NÃO é segura para assinaturas!\n"
 
-#: g10/sig-check.c:308
+#: g10/sig-check.c:290
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "a chave pública é %lu segundo mais nova que a assinatura\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:291
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "a chave pública é %lu segundos mais nova que a assinatura\n"
 
-#: g10/sig-check.c:327
+#: g10/sig-check.c:309
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTA: chave de assinatura expirou %s\n"
 
-#: g10/sig-check.c:396
+#: g10/sig-check.c:378
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "assumindo assinatura incorreta devido a um bit crítico desconhecido\n"
 
-#: g10/sign.c:140
+#: g10/sign.c:195
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:606
+#: g10/sign.c:345 g10/sign.c:664
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossível criar %s: %s\n"
 
-#: g10/sign.c:388
+#: g10/sign.c:444
 msgid "signing:"
 msgstr "assinando:"
 
-#: g10/sign.c:431
+#: g10/sign.c:487
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' é um arquivo vazio\n"
@@ -2924,7 +2931,8 @@ msgstr "%s: imposs
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diretório inexistente!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1363 g10/tdbio.c:444
+#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1407
+#: g10/ringedit.c:1878 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: impossível criar: %s\n"
@@ -3112,203 +3120,203 @@ msgstr "chave %08lX: aceita como chave confi
 msgid "enumerate secret keys failed: %s\n"
 msgstr "enumeração de chaves secretas falhou: %s\n"
 
-#: g10/trustdb.c:921
+#: g10/trustdb.c:925
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "chave %08lX.%lu: Ligação de subchave válida\n"
 
-#: g10/trustdb.c:927 g10/trustdb.c:962
+#: g10/trustdb.c:931 g10/trustdb.c:966
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "chave %08lX.%lu: Ligação de subchave inválida: %s\n"
 
-#: g10/trustdb.c:939
+#: g10/trustdb.c:943
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "chave %08lX.%lu: Revogação de chave válida\n"
 
-#: g10/trustdb.c:945
+#: g10/trustdb.c:949
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "chave %08lX.%lu: Revogação de chave inválida: %s\n"
 
-#: g10/trustdb.c:956
+#: g10/trustdb.c:960
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "chave %08lX.%lu: Revogação de subchave válida\n"
 
-#: g10/trustdb.c:1067
+#: g10/trustdb.c:1071
 msgid "Good self-signature"
 msgstr "Auto-assinatura válida"
 
-#: g10/trustdb.c:1077
+#: g10/trustdb.c:1081
 msgid "Invalid self-signature"
 msgstr "Auto-assinatura inválida"
 
-#: g10/trustdb.c:1104
+#: g10/trustdb.c:1108
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Revogação válida de ID de usuário ignorada devido a nova auto-assinatura"
 
-#: g10/trustdb.c:1110
+#: g10/trustdb.c:1114
 msgid "Valid user ID revocation"
 msgstr "Revogação de ID de usuário válida"
 
-#: g10/trustdb.c:1115
+#: g10/trustdb.c:1119
 msgid "Invalid user ID revocation"
 msgstr "Revogação de ID de usuário inválida"
 
-#: g10/trustdb.c:1157
+#: g10/trustdb.c:1161
 msgid "Valid certificate revocation"
 msgstr "Certificado de revogação válido"
 
-#: g10/trustdb.c:1158
+#: g10/trustdb.c:1162
 msgid "Good certificate"
 msgstr "Certificado correto"
 
-#: g10/trustdb.c:1186
+#: g10/trustdb.c:1190
 msgid "Invalid certificate revocation"
 msgstr "Certificado de revogação inválido"
 
-#: g10/trustdb.c:1187
+#: g10/trustdb.c:1191
 msgid "Invalid certificate"
 msgstr "Certificado inválido"
 
-#: g10/trustdb.c:1204 g10/trustdb.c:1208
+#: g10/trustdb.c:1208 g10/trustdb.c:1212
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "registro de assinatura %lu[%d] aponta para registro errado.\n"
 
-#: g10/trustdb.c:1267
+#: g10/trustdb.c:1271
 msgid "duplicated certificate - deleted"
 msgstr "certificado duplicado - removido"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1592
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir falhou: %s\n"
 
-#: g10/trustdb.c:1718
+#: g10/trustdb.c:1726
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: inserção falhou: %s\n"
 
-#: g10/trustdb.c:1723
+#: g10/trustdb.c:1731
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: inserção falhou: %s\n"
 
-#: g10/trustdb.c:1729
+#: g10/trustdb.c:1737
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: inserido\n"
 
-#: g10/trustdb.c:1734
+#: g10/trustdb.c:1742
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "erro lendo registro de diretório: %s\n"
 
-#: g10/trustdb.c:1742 g10/trustdb.c:1805
+#: g10/trustdb.c:1750 g10/trustdb.c:1813
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu chaves processadas\n"
 
-#: g10/trustdb.c:1744 g10/trustdb.c:1811
+#: g10/trustdb.c:1752 g10/trustdb.c:1819
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu chaves com erros\n"
 
-#: g10/trustdb.c:1746
+#: g10/trustdb.c:1754
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu chaves inseridas\n"
 
-#: g10/trustdb.c:1749
+#: g10/trustdb.c:1757
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enumeração de blocos de chaves falhou: %s\n"
 
-#: g10/trustdb.c:1797
+#: g10/trustdb.c:1805
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: registro de diretório sem chave - ignorado\n"
 
-#: g10/trustdb.c:1807
+#: g10/trustdb.c:1815
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu devido a novas chaves públicas\n"
 
-#: g10/trustdb.c:1809
+#: g10/trustdb.c:1817
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu chaves ignoradas\n"
 
-#: g10/trustdb.c:1813
+#: g10/trustdb.c:1821
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu chaves atualizadas\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2166
 msgid "Ooops, no keys\n"
 msgstr "Ooops, nenhuma chave\n"
 
-#: g10/trustdb.c:2162
+#: g10/trustdb.c:2170
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, nenhum ID de usuário\n"
 
-#: g10/trustdb.c:2320
+#: g10/trustdb.c:2328
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: busca de registro de diretório falhou: %s\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2337
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "chave %08lX: inserção de registro de confiança falhou: %s\n"
 
-#: g10/trustdb.c:2333
+#: g10/trustdb.c:2341
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "chave %08lX.%lu: inserida no banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2349
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "chave %08lX.%lu: criada no futuro (viagem no tempo ou problema no relogio)\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2364
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "chave %08lX.%lu: expirou em %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2372
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "chave %08lX.%lu: verificação de confiança falhou: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2523
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "usuário `%s' não encontrado: %s\n"
 
-#: g10/trustdb.c:2517
+#: g10/trustdb.c:2525
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problemas na procura de `%s' no banco de dados de confiabilidade: %s\n"
 
-#: g10/trustdb.c:2520
+#: g10/trustdb.c:2528
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr ""
 "usuário `%s' não encontrado no banco de dados de confiabilidade - inserindo\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2531
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "falha ao colocar `%s' no banco de dados de confiabilidade: %s\n"
 
-#: g10/trustdb.c:2709 g10/trustdb.c:2739
+#: g10/trustdb.c:2717 g10/trustdb.c:2747
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "AVISO: ainda é impossível manipular registros de preferências longos\n"
 
@@ -3327,46 +3335,40 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "linha %u muito longa ou sem LF\n"
 
-#: g10/ringedit.c:302
+#: g10/ringedit.c:324
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: impossível criar chaveiro: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1368
+#: g10/ringedit.c:341 g10/ringedit.c:1412 g10/ringedit.c:1883
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro criado\n"
 
-#: g10/ringedit.c:1545
+#: g10/ringedit.c:1589 g10/ringedit.c:2060
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existem 2 arquivos com informações confidenciais.\n"
 
-#: g10/ringedit.c:1546
+#: g10/ringedit.c:1590 g10/ringedit.c:2061
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s é o não modificado\n"
 
-#: g10/ringedit.c:1547
+#: g10/ringedit.c:1591 g10/ringedit.c:2062
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s é o novo\n"
 
-#: g10/ringedit.c:1548
+#: g10/ringedit.c:1592 g10/ringedit.c:2063
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte este possível furo de segurança\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
-msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr ""
-"a chave não está marcada como insegura - impossível usá-la com o pseudo "
-"RNG!\n"
-
-#: g10/skclist.c:113
+#: g10/skclist.c:96
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:102
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3424,28 +3426,28 @@ msgstr ""
 "você deve reiniciar o GnuPG, para que ele possa ler o novo arquivo\n"
 "de opções\n"
 
-#: g10/encr-data.c:66
-#, c-format
-msgid "%s encrypted data\n"
-msgstr "dados criptografados com %s\n"
-
-#: g10/encr-data.c:68
+#: g10/encr-data.c:64
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "criptografado com algoritmo desconhecido %d\n"
 
-#: g10/encr-data.c:90
+#: g10/encr-data.c:69
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "dados criptografados com %s\n"
+
+#: g10/encr-data.c:99
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVISO: A mensagem foi criptografada com uma chave fraca na criptografia\n"
 "simétrica.\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:61
 msgid "weak key created - retrying\n"
 msgstr "chave fraca criada - tentando novamente\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:66
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
@@ -3690,7 +3692,7 @@ msgid ""
 "  \"Key has been compromised\"\n"
 "      Use this if you have a reason to believe that unauthorized persons\n"
 "      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
+"  \"Key is superseeded\"\n"
 "      Use this if you have replaced this key with a newer one.\n"
 "  \"Key is no longer used\"\n"
 "      Use this if you have retired this key.\n"
@@ -3715,6 +3717,17 @@ msgstr "Nenhuma ajuda dispon
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda disponível para `%s'"
 
+#~ msgid "not processed"
+#~ msgstr "não processado(s)"
+
+#~ msgid "assuming bad MDC due to an unknown critical bit\n"
+#~ msgstr "assumindo MDC incorreto devido a um bit crítico desconhecido\n"
+
+#~ msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
+#~ msgstr ""
+#~ "a chave não está marcada como insegura - impossível usá-la com o pseudo "
+#~ "RNG!\n"
+
 #~ msgid "set debugging flags"
 #~ msgstr "definir parâmetros de depuração"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 8c6555bf0..83cf419df 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-07-30 20:02+0200\n"
 "PO-Revision-Date: 1999-09-09 20:28+0000\n"
 "Last-Translator: Pedro Morais <morais@poli.org>\n"
 "Language-Team: pt\n"
@@ -15,306 +15,290 @@ msgstr ""
 "Content-Type:\n"
 "Content-Transfer-Encoding:\n"
 
-#: util/secmem.c:79
-msgid "Warning: using insecure memory!\n"
-msgstr "Aviso: a utilizar memória insegura!\n"
-
-#: util/secmem.c:289
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "a operação não é possível sem memória segura inicializada\n"
-
-#: util/secmem.c:290
-msgid "(you may have used the wrong program for this task)\n"
-msgstr "(você pode ter usado o programa errado para esta tarefa)\n"
-
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:278 util/miscutil.c:307
 msgid "yes"
 msgstr "sim"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:279 util/miscutil.c:310
 msgid "yY"
 msgstr "sS"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:280 util/miscutil.c:308
 msgid "no"
 msgstr "não"
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:281 util/miscutil.c:311
 msgid "nN"
 msgstr "nN"
 
 # INICIO MENU
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:580 util/miscutil.c:309
 msgid "quit"
 msgstr "sair"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:312
 msgid "qQ"
 msgstr "qQ"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "erro geral"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "formato de pacote desconhecido"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "versão desconhecida"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "algoritmo de chave pública desconhecido"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "algoritmo de \"digest\" desconhecido"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "chave pública incorrecta"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "chave secreta incorrecta"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "assinatura incorrecta"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "erro de \"checksum\""
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "frase secreta incorrecta"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "chave pública não encontrada"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "algoritmo de criptografia desconhecido"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "não é possível abrir o porta-chaves"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "pacote inválido"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "armadura inválida"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "identificador de utilizador inexistente"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "chave secreta não disponível"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "chave secreta incorrecta"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "não suportado"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "chave incorrecta"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "erro de leitura"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "erro de escrita"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "algoritmo de compressão desconhecido"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "erro na abertura do ficheiro"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "erro na criação do ficheiro"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "frase-secreta inválida"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "algoritmo de chave pública não implementado"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "algoritmo de criptografia não implementado"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "classe de assinatura desconhecida"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "erro na base de dados de confiança"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "MPI incorreto"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "limite de recursos"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "porta-chaves inválido"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "certificado incorrecto"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "identificador de utilizador malformado"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "erro ao fechar ficheiro"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "erro na renomeação do ficheiro"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "erro na remoção do ficheiro"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "dados inesperados"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "conflito de \"timestamp\""
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "algoritmo de chave pública inutilizável"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "o ficheiro já existe"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "chave fraca"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "argumento inválido"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "URI incorrecto"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "URI não suportado"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "erro na rede"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "não encriptado"
 
-#: util/errors.c:103
-msgid "not processed"
-msgstr "não processado"
-
-#: util/logger.c:224
+#: util/logger.c:225
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... isto é um bug (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:231
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "você encontrou um bug ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:321 g10/import.c:127 g10/keygen.c:1348
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:325
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:330
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:325
+#: cipher/random.c:335
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:331
+#: cipher/random.c:341
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:339
+#: cipher/random.c:349
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:387
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:397
+#: cipher/random.c:407
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossível criar %s: %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:414
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:417
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:428
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:647
+#: cipher/random.c:657
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: a utilizar gerador de números aleatórios inseguro!\n"
 
-#: cipher/random.c:648
+#: cipher/random.c:663
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -328,7 +312,7 @@ msgstr ""
 "NÃO USE NENHUM DADO GERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:141
+#: cipher/rndlinux.c:125
 #, c-format
 msgid ""
 "\n"
@@ -339,7 +323,19 @@ 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:197
+#: gcrypt/secmem.c:77
+msgid "Warning: using insecure memory!\n"
+msgstr "Aviso: a utilizar memória insegura!\n"
+
+#: gcrypt/secmem.c:287
+msgid "operation is not possible without initialized secure memory\n"
+msgstr "a operação não é possível sem memória segura inicializada\n"
+
+#: gcrypt/secmem.c:288
+msgid "(you may have used the wrong program for this task)\n"
+msgstr "(você pode ter usado o programa errado para esta tarefa)\n"
+
+#: g10/gpg.c:197
 msgid ""
 "@Commands:\n"
 " "
@@ -347,140 +343,140 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:199
+#: g10/gpg.c:199
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: g10/g10.c:200
+#: g10/gpg.c:200
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:201
+#: g10/gpg.c:201
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:202
+#: g10/gpg.c:202
 msgid "encrypt data"
 msgstr "encriptar dados"
 
-#: g10/g10.c:203
+#: g10/gpg.c:203
 msgid "encryption only with symmetric cipher"
 msgstr "encriptar apenas com cifra simétrica"
 
-#: g10/g10.c:204
+#: g10/gpg.c:204
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/g10.c:205
+#: g10/gpg.c:205
 msgid "decrypt data (default)"
 msgstr "desencriptar dados (acção por omissão)"
 
-#: g10/g10.c:206
+#: g10/gpg.c:206
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:208
+#: g10/gpg.c:208
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:210
+#: g10/gpg.c:210
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:211
+#: g10/gpg.c:211
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:212
+#: g10/gpg.c:212
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impressões digitais"
 
-#: g10/g10.c:213
+#: g10/gpg.c:213
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:214
+#: g10/gpg.c:214
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:215
+#: g10/gpg.c:215
 msgid "remove key from the public keyring"
 msgstr "remover a chave do porta-chaves público"
 
-#: g10/g10.c:217
+#: g10/gpg.c:217
 msgid "remove key from the secret keyring"
 msgstr "remover a chave do porta-chaves secreto"
 
-#: g10/g10.c:218
+#: g10/gpg.c:218
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:219
+#: g10/gpg.c:219
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:220
+#: g10/gpg.c:220
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:221
+#: g10/gpg.c:221
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revogação"
 
-#: g10/g10.c:222
+#: g10/gpg.c:222
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:223
+#: g10/gpg.c:223
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:224
+#: g10/gpg.c:224
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:228
+#: g10/gpg.c:228
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:230
+#: g10/gpg.c:230
 msgid "list only the sequence of packets"
 msgstr "listar apenas as sequências de pacotes"
 
 # ownertrust ???
-#: g10/g10.c:232
+#: g10/gpg.c:232
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confiança"
 
-#: g10/g10.c:234
+#: g10/gpg.c:234
 msgid "import ownertrust values"
 msgstr "importar os valores de confiança"
 
-#: g10/g10.c:236
+#: g10/gpg.c:236
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confiança"
 
-#: g10/g10.c:238
+#: g10/gpg.c:238
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMES]|verificar a base de dados de confiança"
 
-#: g10/g10.c:239
+#: g10/gpg.c:239
 msgid "fix a corrupted trust database"
 msgstr "consertar uma base de dados de confiança"
 
-#: g10/g10.c:240
+#: g10/gpg.c:240
 msgid "De-Armor a file or stdin"
 msgstr "retirar armadura de um ficheiro ou do \"stdin\""
 
-#: g10/g10.c:242
+#: g10/gpg.c:242
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um ficheiro ou \"stdin\""
 
-#: g10/g10.c:244
+#: g10/gpg.c:244
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:248
+#: g10/gpg.c:249
 msgid ""
 "@\n"
 "Options:\n"
@@ -490,171 +486,171 @@ msgstr ""
 "Opções:\n"
 " "
 
-#: g10/g10.c:250
+#: g10/gpg.c:251
 msgid "create ascii armored output"
 msgstr "criar saída com armadura ascii"
 
-#: g10/g10.c:252
+#: g10/gpg.c:253
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|encriptar para NOME"
 
-#: g10/g10.c:255
+#: g10/gpg.c:256
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinatário padrão"
 
-#: g10/g10.c:257
+#: g10/gpg.c:258
 msgid "use the default key as default recipient"
 msgstr "usar a chave padrão como destinatário padrão"
 
-#: g10/g10.c:261
+#: g10/gpg.c:262
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou desencriptar"
 
-#: g10/g10.c:262
+#: g10/gpg.c:263
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer nível de compressão N\n"
 "(0 desactiva)"
 
-#: g10/g10.c:264
+#: g10/gpg.c:265
 msgid "use canonical text mode"
 msgstr "usar modo de texto canônico"
 
-#: g10/g10.c:265
+#: g10/gpg.c:266
 msgid "use as output file"
 msgstr "usar como ficheiro de saída"
 
-#: g10/g10.c:266
+#: g10/gpg.c:267
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:267
+#: g10/gpg.c:268
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:268
+#: g10/gpg.c:269
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/g10.c:269
+#: g10/gpg.c:270
 msgid "force v3 signatures"
 msgstr "forçar assinaturas v3"
 
-#: g10/g10.c:270
+#: g10/gpg.c:271
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para encriptar"
 
-#: g10/g10.c:271
+#: g10/gpg.c:272
 msgid "do not make any changes"
 msgstr "não fazer alterações"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/gpg.c:274
 msgid "batch mode: never ask"
 msgstr "modo não-interactivo: nunca perguntar"
 
-#: g10/g10.c:274
+#: g10/gpg.c:275
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:275
+#: g10/gpg.c:276
 msgid "assume no on most questions"
 msgstr "assumir não para a maioria das perguntas"
 
-#: g10/g10.c:276
+#: g10/gpg.c:277
 msgid "add this keyring to the list of keyrings"
 msgstr ""
 "adicionar este porta-chaves\n"
 "à lista de porta-chaves"
 
-#: g10/g10.c:277
+#: g10/gpg.c:278
 msgid "add this secret keyring to the list"
 msgstr "adicionar este porta-chaves secreto à lista"
 
-#: g10/g10.c:278
+#: g10/gpg.c:279
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta por omissão"
 
-#: g10/g10.c:279
+#: g10/gpg.c:280
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDEREÇO|usar este servidor para buscar chaves"
 
-#: g10/g10.c:280
+#: g10/gpg.c:281
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/g10.c:281
+#: g10/gpg.c:282
 msgid "read options from file"
 msgstr "ler opções do ficheiro"
 
-#: g10/g10.c:285
+#: g10/gpg.c:286
 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:290
+#: g10/gpg.c:291
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: g10/g10.c:291
+#: g10/gpg.c:292
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/g10.c:292
+#: g10/gpg.c:293
 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:293
+#: g10/gpg.c:294
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar mode de frase secreta N"
 
-#: g10/g10.c:295
+#: g10/gpg.c:296
 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:297
+#: g10/gpg.c:298
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:298
+#: g10/gpg.c:299
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:299
+#: g10/gpg.c:300
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:300
+#: g10/gpg.c:301
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compressão N"
 
-#: g10/g10.c:301
+#: g10/gpg.c:302
 msgid "throw keyid field of encrypted packets"
 msgstr "eliminar campo keyid dos pacotes encriptados"
 
-#: g10/g10.c:302
+#: g10/gpg.c:303
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALOR|usar estes dados de notação"
 
-#: g10/g10.c:305
+#: g10/gpg.c:306
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:308
+#: g10/gpg.c:309
 msgid ""
 "@\n"
 "Examples:\n"
@@ -674,15 +670,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impressões digitais\n"
 
-#: g10/g10.c:403
+#: g10/gpg.c:409
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:407
+#: g10/gpg.c:413
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: g10/g10.c:410
+#: g10/gpg.c:416
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -692,7 +688,7 @@ msgstr ""
 "assina, verifica, encripta ou desencripta\n"
 "a operação por omissão depende dos dados de entrada\n"
 
-#: g10/g10.c:417
+#: g10/gpg.c:423
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -700,185 +696,190 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:496
+#: g10/gpg.c:525
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opções] "
 
-#: g10/g10.c:549
+#: g10/gpg.c:583
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/g10.c:692
+#: g10/gpg.c:638
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
+#: g10/gpg.c:734
 #, 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:696
+#: g10/gpg.c:738
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opções `%s': %s\n"
 
-#: g10/g10.c:703
+#: g10/gpg.c:745
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler opções de `%s'\n"
 
-#: g10/g10.c:893
+#: g10/gpg.c:937
 #, 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:949 g10/g10.c:958
+#: g10/gpg.c:1002 g10/gpg.c:1011
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s não é para uso normal!\n"
 
-#: g10/g10.c:951
+#: g10/gpg.c:1004
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s não é permitido com %s!\n"
 
-#: g10/g10.c:954
+#: g10/gpg.c:1007
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s não faz sentido com %s!\n"
 
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/gpg.c:1027 g10/gpg.c:1039
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado não é válido\n"
 
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/gpg.c:1033 g10/gpg.c:1045
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado não é válido\n"
 
-#: g10/g10.c:995
+#: g10/gpg.c:1049
 msgid "the given policy URL is invalid\n"
 msgstr "a URL de política dada é inválida\n"
 
-#: g10/g10.c:998
+#: g10/gpg.c:1052
 #, 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:1000
+#: g10/gpg.c:1054
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:1002
+#: g10/gpg.c:1056
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:1004
+#: g10/gpg.c:1058
 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:1007
+#: g10/gpg.c:1061
 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:1011
+#: g10/gpg.c:1065
 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:1096
+#: g10/gpg.c:1154
 #, 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:1102
+#: g10/gpg.c:1160
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/g10.c:1109
+#: g10/gpg.c:1167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:1117
+#: g10/gpg.c:1175
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1130
+#: g10/gpg.c:1188
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/g10.c:1143
+#: g10/gpg.c:1201
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1157
+#: g10/gpg.c:1215
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/g10.c:1174
+#: g10/gpg.c:1232
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1182
+#: g10/gpg.c:1240
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/g10.c:1190
+#: g10/gpg.c:1248
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/g10.c:1198
+#: g10/gpg.c:1256
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/g10.c:1214
+#: g10/gpg.c:1272
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-utilizador"
 
-#: g10/g10.c:1217
+#: g10/gpg.c:1275
 msgid "--delete-key user-id"
 msgstr "--delete-key id-utilizador"
 
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:311 g10/gpg.c:1312 g10/sign.c:449
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossível abrir %s: %s\n"
 
-#: g10/g10.c:1269
+#: g10/gpg.c:1327
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/g10.c:1335
+#: g10/gpg.c:1393
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1343
+#: g10/gpg.c:1401
 #, 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:1411
+#: g10/gpg.c:1474 g10/gpg.c:1495
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inválido `%s'\n"
 
-#: g10/g10.c:1492
+#: g10/gpg.c:1580
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/g10.c:1496
+#: g10/gpg.c:1584
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/gpg.c:1587 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossível abrir `%s'\n"
 
-#: g10/g10.c:1669
+#: g10/gpg.c:1765
 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:1675
+#: g10/gpg.c:1771
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -886,12 +887,12 @@ msgstr ""
 "um nome de notação deve ter apenas letras, dígitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:1681
+#: g10/gpg.c:1777
 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:1689
+#: g10/gpg.c:1785
 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"
 
@@ -976,50 +977,50 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1188 g10/pkclist.c:53
+#: g10/keyedit.c:1191 g10/pkclist.c:54
 msgid "             Fingerprint:"
 msgstr "       Impressão digital:"
 
-#: g10/pkclist.c:80
+#: g10/pkclist.c:81
 msgid "Fingerprint:"
 msgstr "Impressão digital:"
 
-#: g10/pkclist.c:116
+#: g10/pkclist.c:117
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:118
+#: g10/pkclist.c:119
 #, fuzzy
-msgid "Key is superseded"
+msgid "Key is superseeded"
 msgstr "A chave é protegida.\n"
 
-#: g10/pkclist.c:120
+#: g10/pkclist.c:121
 #, fuzzy
 msgid "Key has been compromised"
 msgstr "Esta chave foi desactivada"
 
-#: g10/pkclist.c:122
+#: g10/pkclist.c:123
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:124
+#: g10/pkclist.c:125
 msgid "User ID is no longer valid"
 msgstr ""
 
-#: g10/pkclist.c:128
+#: g10/pkclist.c:129
 msgid "Reason for revocation: "
 msgstr ""
 
-#: g10/pkclist.c:145
+#: g10/pkclist.c:146
 msgid "Revocation comment: "
 msgstr ""
 
 #. a string with valid answers
-#: g10/pkclist.c:303
+#: g10/pkclist.c:304
 msgid "sSmMqQ"
 msgstr "sSmMqQ"
 
-#: g10/pkclist.c:307
+#: g10/pkclist.c:308
 #, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -1028,7 +1029,7 @@ msgstr ""
 "Nenhum valor de confiança designado para %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1050,23 +1051,23 @@ msgstr ""
 " 4 = Eu confio completamente\n"
 " s = Mostrar mais informações\n"
 
-#: g10/pkclist.c:328
+#: g10/pkclist.c:329
 msgid " m = back to the main menu\n"
 msgstr " m = volta ao menu principal\n"
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:331
 msgid " q = quit\n"
 msgstr " q = sair\n"
 
-#: g10/pkclist.c:336
+#: g10/pkclist.c:337
 msgid "Your decision? "
 msgstr "Decisão? "
 
-#: g10/pkclist.c:358
+#: g10/pkclist.c:359
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 msgid ""
 "Could not find a valid trust path to the key.  Let's see whether we\n"
 "can assign some missing owner trust values.\n"
@@ -1076,7 +1077,7 @@ msgstr ""
 "Vamos ver se é possível designar alguns valores de confiança ausentes.\n"
 "\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
@@ -1084,7 +1085,7 @@ msgstr ""
 "Nenhuma rota encontrada que leve a uma de nossas chaves.\n"
 "\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:438
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
@@ -1092,7 +1093,7 @@ msgstr ""
 "Nenhum certificado com confiança indefinida encontrado.\n"
 "\n"
 
-#: g10/pkclist.c:439
+#: g10/pkclist.c:440
 msgid ""
 "No trust values changed.\n"
 "\n"
@@ -1100,36 +1101,36 @@ msgstr ""
 "Nenhum valor de confiança modificado.\n"
 "\n"
 
-#: g10/pkclist.c:457
+#: g10/pkclist.c:458
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "chave %08lX: a chave foi revogada!\n"
 
-#: g10/pkclist.c:464 g10/pkclist.c:476 g10/pkclist.c:598
+#: g10/pkclist.c:465 g10/pkclist.c:477 g10/pkclist.c:599
 msgid "Use this key anyway? "
 msgstr "Usar esta chave de qualquer modo? "
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "chave %08lX: a subchave foi revogada!\n"
 
-#: g10/pkclist.c:512
+#: g10/pkclist.c:513
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: a chave expirou\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr "%08lX: sem informação para calcular probabilidade de confiança\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: Nós NÃO confiamos nesta chave\n"
 
-#: g10/pkclist.c:539
+#: g10/pkclist.c:540
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -1138,15 +1139,15 @@ msgstr ""
 "%08lX: Não se tem certeza de que esta chave realmente pertence ao dono,\n"
 "mas é aceite de qualquer modo\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:546
 msgid "This key probably belongs to the owner\n"
 msgstr "Esta chave provavelmente pertence ao dono\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid "This key belongs to us\n"
 msgstr "Esta chave pertence-nos\n"
 
-#: g10/pkclist.c:593
+#: g10/pkclist.c:594
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -1158,65 +1159,65 @@ msgstr ""
 "sim à próxima pergunta\n"
 "\n"
 
-#: g10/pkclist.c:607 g10/pkclist.c:630
+#: g10/pkclist.c:608 g10/pkclist.c:631
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVISO: Utilizando chave não confiável!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:652
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:652
+#: g10/pkclist.c:653
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Isto pode significar que a assinatura é falsificada.\n"
 
-#: g10/pkclist.c:657
+#: g10/pkclist.c:658
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:680
 msgid "Note: This key has expired!\n"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:688
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: Esta chave não está certificada com uma assinatura confiável!\n"
 
-#: g10/pkclist.c:689
+#: g10/pkclist.c:690
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Não há indicação de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:707
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: Nós NÃO confiamos nesta chave!\n"
 
-#: g10/pkclist.c:707
+#: g10/pkclist.c:708
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         A assinatura é provavelmente uma FALSIFICAÇÃO.\n"
 
-#: g10/pkclist.c:714
+#: g10/pkclist.c:715
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVISO: Esta chave não está certificada com assinaturas suficientemente\n"
 "       confiáveis!\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:718
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Não se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:968 g10/pkclist.c:1013
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:828 g10/pkclist.c:995
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave pública já está presente\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:855
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1224,42 +1225,42 @@ msgstr ""
 "Você não especificou um identificador de utilizador. (pode-se usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:865
 msgid "Enter the user ID: "
 msgstr "Digite o identificador de utilizador: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:877
 msgid "No such user ID.\n"
 msgstr "Identificador de utilizador inexistente.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:882
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorado: chave pública já colocada como destinatário por omissão\n"
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:905
 msgid "Public key is disabled.\n"
 msgstr "A chave pública está desativada.\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:912
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "ignorado: a chave pública já colocada com --encrypt-to\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:943
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinatário padrão desconhecido `%s'\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:976
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: erro na verificação da chave: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:981
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave pública está desactivada\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1019
 msgid "no valid addressees\n"
 msgstr "nenhum endereço válido\n"
 
@@ -1272,58 +1273,58 @@ msgstr "escrevendo auto-assinatura\n"
 msgid "writing key binding signature\n"
 msgstr "escrevendo assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
+#: g10/keygen.c:308 g10/keygen.c:419 g10/keygen.c:529
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "O tamanho de chave pedido é %u bits\n"
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:438
+#: g10/keygen.c:313 g10/keygen.c:424 g10/keygen.c:534
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:537
+#: g10/keygen.c:633
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:635
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por omissão)\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:636
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:638
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas encripção)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:639
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e encriptação)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:641
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e encriptação)\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:645
 msgid "Your selection? "
 msgstr "Opção? "
 
-#: g10/keygen.c:560 g10/keygen.c:568
+#: g10/keygen.c:656 g10/keygen.c:664
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Você quer realmente criar uma chave para assinatura e criptografia? "
 
-#: g10/keygen.c:582
+#: g10/keygen.c:678
 msgid "Invalid selection.\n"
 msgstr "Opção inválida.\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:690
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1336,19 +1337,19 @@ msgstr ""
 "         tamanho por omissão é 1024 bits\n"
 "     tamanho máximo sugerido é 2048 bits\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:697
 msgid "What keysize do you want? (1024) "
 msgstr "Qual o tamanho de chave desejado? (1024) "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:702
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
 
-#: g10/keygen.c:608
+#: g10/keygen.c:704
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:706
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n"
@@ -1361,12 +1362,12 @@ msgstr "tamanho muito pequeno; 768 
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:621
+#: g10/keygen.c:717
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "tamanho muito grande; %d é o valor máximo permitido.\n"
 
-#: g10/keygen.c:626
+#: g10/keygen.c:722
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1374,11 +1375,11 @@ msgstr ""
 "Tamanhos de chave maiores que 2048 não são recomendados\n"
 "porque o tempo de computação é REALMENTE longo!\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:725
 msgid "Are you sure that you want this keysize? "
 msgstr "Você tem certeza de que quer este tamanho de chave? "
 
-#: g10/keygen.c:630
+#: g10/keygen.c:726
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1386,21 +1387,21 @@ msgstr ""
 "Tudo bem, mas não se esqueça que a radiação do seu monitor e teclado também "
 "é extremamente vulnerável a ataques!\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:734
 msgid "Do you really need such a large keysize? "
 msgstr "Você precisa realmente de uma chave tão grande? "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:740
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido é %u bits\n"
 
-#: g10/keygen.c:647 g10/keygen.c:651
+#: g10/keygen.c:743 g10/keygen.c:747
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:795
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1416,25 +1417,25 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:714
+#: g10/keygen.c:810
 msgid "Key is valid for? (0) "
 msgstr "A chave é valida por? (0) "
 
-#: g10/keygen.c:719
+#: g10/keygen.c:815
 msgid "invalid value\n"
 msgstr "valor inválido\n"
 
-#: g10/keygen.c:724
+#: g10/keygen.c:820
 msgid "Key does not expire at all\n"
 msgstr "A chave não expira nunca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:730
+#: g10/keygen.c:826
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:733
+#: g10/keygen.c:829
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1442,11 +1443,11 @@ msgstr ""
 "O seu sistema não consegue mostrar datas para além de 2038.\n"
 "No entanto, estas vão ser tratadas correctamente até 2106.\n"
 
-#: g10/keygen.c:738
+#: g10/keygen.c:834
 msgid "Is this correct (y/n)? "
 msgstr "Está correto (s/n)? "
 
-#: g10/keygen.c:781
+#: g10/keygen.c:877
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1463,44 +1464,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:793
+#: g10/keygen.c:889
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:893
 msgid "Invalid character in name\n"
 msgstr "Caracter inválido no nome\n"
 
-#: g10/keygen.c:799
+#: g10/keygen.c:895
 msgid "Name may not start with a digit\n"
 msgstr "O nome não pode começar com um dígito\n"
 
-#: g10/keygen.c:801
+#: g10/keygen.c:897
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:809
+#: g10/keygen.c:905
 msgid "Email address: "
 msgstr "Endereço de correio eletrónico: "
 
-#: g10/keygen.c:820
+#: g10/keygen.c:916
 msgid "Not a valid email address\n"
 msgstr "Endereço eletrónico inválido\n"
 
-#: g10/keygen.c:828
+#: g10/keygen.c:924
 msgid "Comment: "
 msgstr "Comentário: "
 
-#: g10/keygen.c:834
+#: g10/keygen.c:930
 msgid "Invalid character in comment\n"
 msgstr "Caracter inválido no comentário\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:956
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Você está usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:962
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1511,28 +1512,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:867
+#: g10/keygen.c:966
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:872
+#: g10/keygen.c:971
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:882
+#: g10/keygen.c:981
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Mudar (N)ome, (C)omentário, (E)ndereço ou (O)k/(S)air? "
 
-#: g10/keygen.c:883
+#: g10/keygen.c:982
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Mudar (N)ome, (C)omentário, (E)ndereço ou (O)k/(S)air? "
 
-#: g10/keygen.c:902
+#: g10/keygen.c:1001
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:940
+#: g10/keygen.c:1039
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1540,11 +1541,11 @@ msgstr ""
 "Você precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:948
+#: g10/keyedit.c:468 g10/keygen.c:1047
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "a frase secreta não foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keygen.c:954
+#: g10/keygen.c:1053
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1556,7 +1557,7 @@ msgstr ""
 "qualquer hora, usando este programa com a opção \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1074
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1568,29 +1569,29 @@ msgstr ""
 "geração dos números primos; isso dá ao gerador de números aleatórios\n"
 "uma hipótese maior de ganhar entropia suficiente.\n"
 
-#: g10/keygen.c:1424
+#: g10/keygen.c:1523
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA terá 1024 bits.\n"
 
-#: g10/keygen.c:1467
+#: g10/keygen.c:1566
 msgid "Key generation canceled.\n"
 msgstr "Geração de chave cancelada.\n"
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1663
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado público para `%s'\n"
 
-#: g10/keygen.c:1565
+#: g10/keygen.c:1664
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1760
 msgid "public and secret key created and signed.\n"
 msgstr "chaves pública e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1765
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1598,12 +1599,12 @@ msgstr ""
 "Note que esta chave não pode ser usada para encriptação. Você pode usar\n"
 "o comando \"--edit-key\" para gerar uma chave secundária para esse fim.\n"
 
-#: g10/keygen.c:1683 g10/keygen.c:1784
+#: g10/keygen.c:1782 g10/keygen.c:1883
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1826 g10/sig-check.c:300 g10/sign.c:167
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1611,7 +1612,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1828 g10/sig-check.c:302 g10/sign.c:169
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1619,32 +1620,32 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1861
 msgid "Really create? "
 msgstr "Realmente criar? "
 
-#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:142 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: impossível abrir: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:164
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:222 g10/encode.c:370
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVISO: ficheiro vazio\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:317
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:534
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s encriptado para: %s\n"
@@ -1673,32 +1674,32 @@ msgstr "chave %08lX: n
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:212
 msgid "too many entries in pk cache - disabled\n"
 msgstr "entradas demais no cache pk - desactivado\n"
 
-#: g10/getkey.c:350
+#: g10/getkey.c:351
 msgid "too many entries in unk cache - disabled\n"
 msgstr "entradas demais no cache unk - desactivado\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
+#: g10/getkey.c:1311 g10/getkey.c:1350
 msgid "RSA key cannot be used in this version\n"
 msgstr "chave RSA não pode ser usada nesta versão\n"
 
-#: g10/getkey.c:1310 g10/getkey.c:1349
+#: g10/getkey.c:1313 g10/getkey.c:1352
 msgid "No key for user ID\n"
 msgstr "Nenhuma chave para identificador de utilizador\n"
 
-#: g10/getkey.c:1388 g10/getkey.c:1428
+#: g10/getkey.c:1391 g10/getkey.c:1431
 msgid "No user ID for key\n"
 msgstr "Nenhum identificador de utilizador para chave\n"
 
-#: g10/getkey.c:1642 g10/getkey.c:1698
+#: g10/getkey.c:1645 g10/getkey.c:1701
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "usando chave secundária %08lX ao invés de chave primária %08lX\n"
 
-#: g10/getkey.c:2017
+#: g10/getkey.c:2020
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: utilizador não encontrado\n"
@@ -1708,7 +1709,7 @@ msgstr "%s: utilizador n
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:188 g10/trustdb.c:1748 g10/trustdb.c:1789
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu chaves processadas até agora\n"
@@ -1796,7 +1797,7 @@ msgstr "chave %08lX: chave p
 msgid "no default public keyring\n"
 msgstr "sem porta-chaves público padrão\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:350 g10/sign.c:669
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "a escrever para `%s'\n"
@@ -2054,7 +2055,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1870 g10/keyedit.c:1932 g10/sign.c:136
+#: g10/keyedit.c:373 g10/keyedit.c:1873 g10/keyedit.c:1935 g10/sign.c:191
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
@@ -2411,104 +2412,104 @@ msgstr "Chave n
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inválido (tente \"help\")\n"
 
-#: g10/keyedit.c:1080 g10/keyedit.c:1106
+#: g10/keyedit.c:1083 g10/keyedit.c:1109
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1089
+#: g10/keyedit.c:1092
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1093
+#: g10/keyedit.c:1096
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1125
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "chave %08lX: a subchave foi revogada!\n"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1128
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "   novas revogações de chaves: %lu\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1130
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1368
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura válida? (s/N/q)"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1372
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inválida? (s/N/q)"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1376
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1382
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1396
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1397
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1400
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:1466
+#: g10/keyedit.c:1469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as selecções das chaves secretas.\n"
 
-#: g10/keyedit.c:1472
+#: g10/keyedit.c:1475
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor seleccione no máximo uma chave secundária.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1479
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "A modificar a data de validade para uma chave secundária.\n"
 
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1481
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave primária.\n"
 
-#: g10/keyedit.c:1520
+#: g10/keyedit.c:1523
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Você não pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:1536
+#: g10/keyedit.c:1539
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1600
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1646
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secundária com índice %d\n"
 
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1744
 msgid "user ID: \""
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1747
 #, c-format
 msgid ""
 "\"\n"
@@ -2517,163 +2518,173 @@ msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:1751
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1775
 msgid "You have signed these user IDs:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:1786 g10/keyedit.c:1821
+#: g10/keyedit.c:1789 g10/keyedit.c:1824
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:1791
+#: g10/keyedit.c:1794
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:1811
+#: g10/keyedit.c:1814
 msgid "You are about to revoke these signatures:\n"
 msgstr "Está prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:1829
+#: g10/keyedit.c:1832
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Realmente gerar os certificados de revogação? (s/N)"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1861
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "armadura inválida"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "revkey"
+
 #. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:401 g10/mainproc.c:754
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "A chave expira em %s\n"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:212
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "a chave pública é %08lX\n"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:247
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados encriptados com chave pública: DEK válido\n"
 
-#: g10/mainproc.c:281
+#: g10/mainproc.c:280
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "encriptado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "encriptado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:297
+#: g10/mainproc.c:296
 msgid "no secret key for decryption available\n"
 msgstr "nenhuma chave secreta para desencriptação disponível\n"
 
-#: g10/mainproc.c:306
+#: g10/mainproc.c:305
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "desencriptação de chave pública falhou: %s\n"
 
-#: g10/mainproc.c:343
+#: g10/mainproc.c:342
 msgid "decryption okay\n"
 msgstr "desencriptação correcta\n"
 
-#: g10/mainproc.c:348
+#: g10/mainproc.c:347
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem encriptada foi manipulada!\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:352
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "desencriptação falhou: %s\n"
 
-#: g10/mainproc.c:372
+#: g10/mainproc.c:371
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:374
+#: g10/mainproc.c:373
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro original='%.*s'\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:538
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocação solitária - utilize \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:625 g10/mainproc.c:634
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de notação inválidos encontrados\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:637
 msgid "Notation: "
 msgstr "Notação: "
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:644
 msgid "Policy: "
 msgstr "Política: "
 
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1074
 msgid "signature verification suppressed\n"
 msgstr "verificação de assinatura suprimida\n"
 
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1080
 #, 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:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1106 g10/mainproc.c:1117
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1107 g10/mainproc.c:1118
 msgid "Good signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1109
 msgid "                aka \""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1165
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossível verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1230
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1282
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1287
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inválido detectado em proc_tree()\n"
 
-#: g10/misc.c:94
+#: g10/misc.c:83
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossível desactivar core dumps: %s\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:86
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/misc.c:205
+#: g10/misc.c:312
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Algoritmos experimentais não devem ser usados!\n"
 
-#: g10/misc.c:219
+#: g10/misc.c:326
 msgid ""
 "RSA keys are deprecated; please consider creating a new key and use this key "
 "in the future\n"
@@ -2681,18 +2692,18 @@ msgstr ""
 "Chaves RSA não são recomendáveis; por favor considere criar uma nova chave e "
 "usá-la no futuro\n"
 
-#: g10/misc.c:241
+#: g10/misc.c:348
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "este algoritmo de criptografia não é recomendado;\n"
 "por favor use um algoritmo mais standard!\n"
 
-#: g10/parse-packet.c:117
+#: g10/parse-packet.c:115
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossível manipular algoritmo de chave pública %d\n"
 
-#: g10/parse-packet.c:965
+#: g10/parse-packet.c:963
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit crítico ligado\n"
@@ -2729,51 +2740,51 @@ msgstr "Digite a frase secreta: "
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "dados não gravados; use a opção \"--output\" para gravá-los\n"
 
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
 msgid "Detached signature.\n"
 msgstr "Assinatura desacoplada.\n"
 
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do ficheiro de dados: "
 
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
 msgid "reading stdin ...\n"
 msgstr "lendo do \"stdin\" ...\n"
 
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossível abrir dados assinados `%s'\n"
 
-#: g10/pubkey-enc.c:79
+#: g10/pubkey-enc.c:138
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "destinatário anónimo; a tentar chave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:85
+#: g10/pubkey-enc.c:144
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "certo, nós somos o destinatário anónimo.\n"
 
-#: g10/pubkey-enc.c:137
+#: g10/pubkey-enc.c:200
 msgid "old encoding of the DEK is not supported\n"
 msgstr "codificação antiga do DEK não suportada\n"
 
-#: g10/pubkey-enc.c:156
+#: g10/pubkey-enc.c:219
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "algoritmo de protecção %d não é suportado\n"
 
-#: g10/pubkey-enc.c:195
+#: g10/pubkey-enc.c:258
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "NOTA: algoritmo de cifragem %d não encontrado nas preferências\n"
 
-#: g10/pubkey-enc.c:201
+#: g10/pubkey-enc.c:264
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTA: chave de assinatura expirou %s\n"
@@ -2817,69 +2828,65 @@ msgstr ""
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
 
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:90
 #, fuzzy
 msgid "secret key parts are not available\n"
 msgstr "chave secreta não disponível"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:96
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "algoritmo de protecção %d não é suportado\n"
 
-#: g10/seckey-cert.c:175
+#: g10/seckey-cert.c:239
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Frase secreta inválida; por favor tente novamente ...\n"
 
-#: g10/seckey-cert.c:231
+#: g10/seckey-cert.c:302
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Chave fraca detectada - por favor mude a frase secreta novamente.\n"
 
-#: g10/sig-check.c:202
-msgid "assuming bad MDC due to an unknown critical bit\n"
-msgstr "assumindo MDC incorrecto devido a um bit crítico desconhecido\n"
-
-#: g10/sig-check.c:300
+#: g10/sig-check.c:282
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "esta é uma chave ElGamal gerada pelo PGP que NÃO é segura para assinaturas!\n"
 
-#: g10/sig-check.c:308
+#: g10/sig-check.c:290
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "a chave pública é %lu segundo mais nova que a assinatura\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:291
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "a chave pública é %lu segundos mais nova que a assinatura\n"
 
-#: g10/sig-check.c:327
+#: g10/sig-check.c:309
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTA: chave de assinatura expirou %s\n"
 
-#: g10/sig-check.c:396
+#: g10/sig-check.c:378
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "assumindo assinatura incorrecta devido a um bit crítico desconhecido\n"
 
-#: g10/sign.c:140
+#: g10/sign.c:195
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:606
+#: g10/sign.c:345 g10/sign.c:664
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossível criar %s: %s\n"
 
-#: g10/sign.c:388
+#: g10/sign.c:444
 msgid "signing:"
 msgstr "a assinar:"
 
-#: g10/sign.c:431
+#: g10/sign.c:487
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' é um ficheiro vazio\n"
@@ -2918,7 +2925,8 @@ msgstr "%s: imposs
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diretoria inexistente!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1363 g10/tdbio.c:444
+#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1407
+#: g10/ringedit.c:1878 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: impossível criar: %s\n"
@@ -3105,203 +3113,203 @@ msgstr "chave %08lX: aceite como chave confi
 msgid "enumerate secret keys failed: %s\n"
 msgstr "enumeração de chaves secretas falhou: %s\n"
 
-#: g10/trustdb.c:921
+#: g10/trustdb.c:925
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "chave %08lX.%lu: Ligação de subchave válida\n"
 
-#: g10/trustdb.c:927 g10/trustdb.c:962
+#: g10/trustdb.c:931 g10/trustdb.c:966
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "chave %08lX.%lu: Ligação de subchave inválida: %s\n"
 
-#: g10/trustdb.c:939
+#: g10/trustdb.c:943
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "chave %08lX.%lu: Revogação de chave válida\n"
 
-#: g10/trustdb.c:945
+#: g10/trustdb.c:949
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "chave %08lX.%lu: Revogação de chave inválida: %s\n"
 
-#: g10/trustdb.c:956
+#: g10/trustdb.c:960
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "chave %08lX.%lu: Revogação de subchave válida\n"
 
-#: g10/trustdb.c:1067
+#: g10/trustdb.c:1071
 msgid "Good self-signature"
 msgstr "Auto-assinatura válida"
 
-#: g10/trustdb.c:1077
+#: g10/trustdb.c:1081
 msgid "Invalid self-signature"
 msgstr "Auto-assinatura inválida"
 
-#: g10/trustdb.c:1104
+#: g10/trustdb.c:1108
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Revogação válida de ID de utilizador ignorada devido a nova auto-assinatura"
 
-#: g10/trustdb.c:1110
+#: g10/trustdb.c:1114
 msgid "Valid user ID revocation"
 msgstr "Revogação de ID de utilizador válida"
 
-#: g10/trustdb.c:1115
+#: g10/trustdb.c:1119
 msgid "Invalid user ID revocation"
 msgstr "Revogação de ID de utilizador inválida"
 
-#: g10/trustdb.c:1157
+#: g10/trustdb.c:1161
 msgid "Valid certificate revocation"
 msgstr "Certificado de revogação válido"
 
-#: g10/trustdb.c:1158
+#: g10/trustdb.c:1162
 msgid "Good certificate"
 msgstr "Certificado correcto"
 
-#: g10/trustdb.c:1186
+#: g10/trustdb.c:1190
 msgid "Invalid certificate revocation"
 msgstr "Certificado de revogação inválido"
 
-#: g10/trustdb.c:1187
+#: g10/trustdb.c:1191
 msgid "Invalid certificate"
 msgstr "Certificado inválido"
 
-#: g10/trustdb.c:1204 g10/trustdb.c:1208
+#: g10/trustdb.c:1208 g10/trustdb.c:1212
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "registo de assinatura %lu[%d] aponta para registo errado.\n"
 
-#: g10/trustdb.c:1267
+#: g10/trustdb.c:1271
 msgid "duplicated certificate - deleted"
 msgstr "certificado duplicado - removido"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1592
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir falhou: %s\n"
 
-#: g10/trustdb.c:1718
+#: g10/trustdb.c:1726
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: inserção falhou: %s\n"
 
-#: g10/trustdb.c:1723
+#: g10/trustdb.c:1731
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: inserção falhou: %s\n"
 
-#: g10/trustdb.c:1729
+#: g10/trustdb.c:1737
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: inserido\n"
 
-#: g10/trustdb.c:1734
+#: g10/trustdb.c:1742
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "erro ao ler registo de directório: %s\n"
 
-#: g10/trustdb.c:1742 g10/trustdb.c:1805
+#: g10/trustdb.c:1750 g10/trustdb.c:1813
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu chaves processadas\n"
 
-#: g10/trustdb.c:1744 g10/trustdb.c:1811
+#: g10/trustdb.c:1752 g10/trustdb.c:1819
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu chaves com erros\n"
 
-#: g10/trustdb.c:1746
+#: g10/trustdb.c:1754
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu chaves inseridas\n"
 
-#: g10/trustdb.c:1749
+#: g10/trustdb.c:1757
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enumeração de blocos de chaves falhou: %s\n"
 
-#: g10/trustdb.c:1797
+#: g10/trustdb.c:1805
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: registo de directório sem chave - ignorado\n"
 
-#: g10/trustdb.c:1807
+#: g10/trustdb.c:1815
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu devido a novas chaves públicas\n"
 
-#: g10/trustdb.c:1809
+#: g10/trustdb.c:1817
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu chaves ignoradas\n"
 
-#: g10/trustdb.c:1813
+#: g10/trustdb.c:1821
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu chaves actualizadas\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2166
 msgid "Ooops, no keys\n"
 msgstr "Ooops, nenhuma chave\n"
 
-#: g10/trustdb.c:2162
+#: g10/trustdb.c:2170
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, nenhum ID de utilizador\n"
 
-#: g10/trustdb.c:2320
+#: g10/trustdb.c:2328
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: busca de registo de directório falhou: %s\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2337
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "chave %08lX: inserção de registo de confiança falhou: %s\n"
 
-#: g10/trustdb.c:2333
+#: g10/trustdb.c:2341
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "chave %08lX.%lu: inserida na base de dados de confiança\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2349
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "chave %08lX.%lu: criada no futuro (viagem no tempo ou problema no relogio)\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2364
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "chave %08lX.%lu: expirou em %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2372
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "chave %08lX.%lu: verificação de confiança falhou: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2523
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "utilizador `%s' não encontrado: %s\n"
 
-#: g10/trustdb.c:2517
+#: g10/trustdb.c:2525
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problemas na procura de `%s' na base de dados de confiança: %s\n"
 
-#: g10/trustdb.c:2520
+#: g10/trustdb.c:2528
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr ""
 "utilizador `%s' não encontrado na base de dados de confiança - a inserir\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2531
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "falha ao colocar `%s' na base de dados de confiança: %s\n"
 
-#: g10/trustdb.c:2709 g10/trustdb.c:2739
+#: g10/trustdb.c:2717 g10/trustdb.c:2747
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "AVISO: ainda é impossível manipular registos de preferências longos\n"
 
@@ -3320,45 +3328,40 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "linha de entrada %u demasiado longa ou falta o LF\n"
 
-#: g10/ringedit.c:302
+#: g10/ringedit.c:324
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: impossível criar porta-chaves: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1368
+#: g10/ringedit.c:341 g10/ringedit.c:1412 g10/ringedit.c:1883
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: porta-chaves criado\n"
 
-#: g10/ringedit.c:1545
+#: g10/ringedit.c:1589 g10/ringedit.c:2060
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existem 2 ficheiros com informações confidenciais.\n"
 
-#: g10/ringedit.c:1546
+#: g10/ringedit.c:1590 g10/ringedit.c:2061
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s é o não modificado\n"
 
-#: g10/ringedit.c:1547
+#: g10/ringedit.c:1591 g10/ringedit.c:2062
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s é o novo\n"
 
-#: g10/ringedit.c:1548
+#: g10/ringedit.c:1592 g10/ringedit.c:2063
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte esta possível falha de segurança\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
-msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr ""
-"a chave não está marcada insegura - impossível usá-la com o RNG falso!\n"
-
-#: g10/skclist.c:113
+#: g10/skclist.c:96
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:102
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3414,28 +3417,28 @@ msgstr "%s: directoria criada\n"
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr "vai ter de reiniciar o GnuPG, para poder ler as novas opções\n"
 
-#: g10/encr-data.c:66
-#, c-format
-msgid "%s encrypted data\n"
-msgstr "dados encriptados com %s\n"
-
-#: g10/encr-data.c:68
+#: g10/encr-data.c:64
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "encriptado com algoritmo desconhecido %d\n"
 
-#: g10/encr-data.c:90
+#: g10/encr-data.c:69
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "dados encriptados com %s\n"
+
+#: g10/encr-data.c:99
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVISO: A mensagem foi encriptada com uma chave fraca na criptografia\n"
 "simétrica.\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:61
 msgid "weak key created - retrying\n"
 msgstr "chave fraca criada - tentando novamente\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:66
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
@@ -3679,7 +3682,7 @@ msgid ""
 "  \"Key has been compromised\"\n"
 "      Use this if you have a reason to believe that unauthorized persons\n"
 "      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
+"  \"Key is superseeded\"\n"
 "      Use this if you have replaced this key with a newer one.\n"
 "  \"Key is no longer used\"\n"
 "      Use this if you have retired this key.\n"
@@ -3704,6 +3707,16 @@ msgstr "Nenhuma ajuda dispon
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda disponível para `%s'"
 
+#~ msgid "not processed"
+#~ msgstr "não processado"
+
+#~ msgid "assuming bad MDC due to an unknown critical bit\n"
+#~ msgstr "assumindo MDC incorrecto devido a um bit crítico desconhecido\n"
+
+#~ msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
+#~ msgstr ""
+#~ "a chave não está marcada insegura - impossível usá-la com o RNG falso!\n"
+
 #~ msgid "set debugging flags"
 #~ msgstr "definir parâmetros de depuração"
 
diff --git a/po/ru.po b/po/ru.po
index 3e908ba90..fbfca038a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@
 # QingLong <qinglong@Bolizm> (couldn't send an email to let you know)
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-07-30 20:02+0200\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-01-26 22:08:36+0100\n"
 "From: Gregory Steuck <steuck@iname.com>\n"
@@ -21,356 +21,336 @@ msgstr ""
 "g10/mainproc.c g10/passphrase.c g10/plaintext.c g10/pref.c g10/seckey-cert.c "
 "g10/sig-check.c g10/sign.c g10/trustdb.c g10/verify.c\n"
 
-#: util/secmem.c:79
-msgid "Warning: using insecure memory!\n"
-msgstr ""
-"÷ÎÉÍÁÎÉÅ, ×ÏÚÍÏÖÎÁ ÕÔÅÞËÁ ÓÅËÒÅÔÎÙÈ ÄÁÎÎÙÈ!\n"
-"üÔÕ ÐÒÏÂÌÅÍÕ ÍÏÖÎÏ ÒÅÛÉÔØ, ÕÓÔÁÎÏ×É× ÐÒÏÇÒÁÍÍÕ suid(root).\n"
-"ïÂÒÁÔÉÔÅÓØ ÄÌÑ ÜÔÏÇÏ Ë ÁÄÍÉÎÉÓÔÒÁÔÏÒÕ ÷ÁÛÅÊ ÓÉÓÔÅÍÙ.\n"
-
-#: util/secmem.c:289
-msgid "operation is not possible without initialized secure memory\n"
-msgstr ""
-
-#: util/secmem.c:290
-msgid "(you may have used the wrong program for this task)\n"
-msgstr ""
-
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:278 util/miscutil.c:307
 msgid "yes"
 msgstr "ÄÁ(y)"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:279 util/miscutil.c:310
 msgid "yY"
 msgstr "yY"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:280 util/miscutil.c:308
 msgid "no"
 msgstr ""
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:281 util/miscutil.c:311
 msgid "nN"
 msgstr ""
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:580 util/miscutil.c:309
 msgid "quit"
 msgstr "×ÙÈÏÄ"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:312
 msgid "qQ"
 msgstr ""
 
-#: util/errors.c:54
+#: util/errors.c:55
 #, fuzzy
 msgid "general error"
 msgstr "ïÂÝÁÑ ÏÛÉÂËÁ"
 
-#: util/errors.c:55
+#: util/errors.c:56
 #, fuzzy
 msgid "unknown packet type"
 msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ ÐÁËÅÔÁ"
 
-#: util/errors.c:56
+#: util/errors.c:57
 #, fuzzy
 msgid "unknown version"
 msgstr "îÅÉÚ×ÅÓÔÎÁÑ ×ÅÒÓÉÑ"
 
-#: util/errors.c:57
+#: util/errors.c:58
 #, fuzzy
 msgid "unknown pubkey algorithm"
 msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÁÌÇÏÒÉÔÍ ÛÉÆÒÏ×ÁÎÉÑ Ó ÏÔËÒÙÔÙÍ ËÌÀÞÏÍ"
 
-#: util/errors.c:58
+#: util/errors.c:59
 #, fuzzy
 msgid "unknown digest algorithm"
 msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÁÌÇÏÒÉÔÍ ÇÅÎÅÒÁÃÉÉ ÄÁÊÄÖÅÓÔÁ"
 
-#: util/errors.c:59
+#: util/errors.c:60
 #, fuzzy
 msgid "bad public key"
 msgstr "ðÌÏÈÏÊ ÏÔËÒÙÔÙÊ ËÌÀÞ"
 
-#: util/errors.c:60
+#: util/errors.c:61
 #, fuzzy
 msgid "bad secret key"
 msgstr "ðÌÏÈÏÊ ÓÅËÒÅÔÎÙÊ ËÌÀÞ"
 
-#: util/errors.c:61
+#: util/errors.c:62
 #, fuzzy
 msgid "bad signature"
 msgstr "ðÌÏÈÁÑ ÐÏÄÐÉÓØ"
 
-#: util/errors.c:62
+#: util/errors.c:63
 #, fuzzy
 msgid "checksum error"
 msgstr "îÅÓÏ×ÐÁÄÅÎÉÅ ËÏÎÔÒÏÌØÎÏÊ ÓÕÍÍÙ"
 
-#: util/errors.c:63
+#: util/errors.c:64
 #, fuzzy
 msgid "bad passphrase"
 msgstr "îÅ×ÅÒÎÁÑ \"ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ\""
 
-#: util/errors.c:64
+#: util/errors.c:65
 #, fuzzy
 msgid "public key not found"
 msgstr "ïÔËÒÙÔÙÊ ËÌÀÞ ÎÅ ÎÁÊÄÅÎ"
 
-#: util/errors.c:65
+#: util/errors.c:66
 #, fuzzy
 msgid "unknown cipher algorithm"
 msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÁÌÇÏÒÉÔÍ ÛÉÆÒÏ×ÁÎÉÑ"
 
-#: util/errors.c:66
+#: util/errors.c:67
 #, fuzzy
 msgid "can't open the keyring"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ \"Ó×ÑÚËÕ ËÌÀÞÅÊ\""
 
-#: util/errors.c:67
+#: util/errors.c:68
 #, fuzzy
 msgid "invalid packet"
 msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÐÁËÅÔ"
 
-#: util/errors.c:68
+#: util/errors.c:69
 #, fuzzy
 msgid "invalid armor"
 msgstr "îÅÄÏÐÕÓÔÉÍÁÑ ASCII-ËÏÄÉÒÏ×ËÁ"
 
-#: util/errors.c:69
+#: util/errors.c:70
 #, fuzzy
 msgid "no such user id"
 msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: util/errors.c:70
+#: util/errors.c:71
 #, fuzzy
 msgid "secret key not available"
 msgstr "óÅËÒÅÔÎÙÊ ËÌÀÞ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ"
 
-#: util/errors.c:71
+#: util/errors.c:72
 #, fuzzy
 msgid "wrong secret key used"
 msgstr "éÓÐÏÌØÚÏ×ÁÎ ÎÅÐÒÁ×ÉÌØÎÙÊ ÓÅËÒÅÔÎÙÊ ËÌÀÞ"
 
-#: util/errors.c:72
+#: util/errors.c:73
 #, fuzzy
 msgid "not supported"
 msgstr "îÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
 
-#: util/errors.c:73
+#: util/errors.c:74
 #, fuzzy
 msgid "bad key"
 msgstr "ðÌÏÈÏÊ ËÌÀÞ"
 
-#: util/errors.c:74
+#: util/errors.c:75
 #, fuzzy
 msgid "file read error"
 msgstr "ïÛÉÂËÁ ÞÔÅÎÉÑ ÆÁÊÌÁ"
 
-#: util/errors.c:75
+#: util/errors.c:76
 #, fuzzy
 msgid "file write error"
 msgstr "ïÛÉÂËÁ ÚÁÐÉÓÉ ÆÁÊÌÁ"
 
-#: util/errors.c:76
+#: util/errors.c:77
 #, fuzzy
 msgid "unknown compress algorithm"
 msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÁÌÇÏÒÉÔÍ ÕÐÁËÏ×ËÉ"
 
-#: util/errors.c:77
+#: util/errors.c:78
 #, fuzzy
 msgid "file open error"
 msgstr "ïÛÉÂËÁ ÏÔËÒÙÔÉÑ ÆÁÊÌÁ"
 
-#: util/errors.c:78
+#: util/errors.c:79
 #, fuzzy
 msgid "file create error"
 msgstr "ïÛÉÂËÁ ÓÏÚÄÁÎÉÑ ÆÁÊÌÁ"
 
-#: util/errors.c:79
+#: util/errors.c:80
 #, fuzzy
 msgid "invalid passphrase"
 msgstr "îÅ×ÅÒÎÁÑ \"ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ\""
 
-#: util/errors.c:80
+#: util/errors.c:81
 #, fuzzy
 msgid "unimplemented pubkey algorithm"
 msgstr "îÅÒÅÁÌÉÚÏ×ÁÎÎÙÊ ÁÌÇÏÒÉÔÍ ÛÉÆÒÏ×ÁÎÉÑ Ó ÏÔËÒÙÔÙÍ ËÌÀÞÏÍ"
 
-#: util/errors.c:81
+#: util/errors.c:82
 #, fuzzy
 msgid "unimplemented cipher algorithm"
 msgstr "îÅÒÅÁÌÉÚÏ×ÁÎÎÙÊ ÁÌÇÏÒÉÔÍ ÛÉÆÒÏ×ÁÎÉÑ"
 
-#: util/errors.c:82
+#: util/errors.c:83
 #, fuzzy
 msgid "unknown signature class"
 msgstr "ðÏÄÐÉÓØ ÎÅÉÚ×ÅÓÔÎÏÇÏ ÔÉÐÁ"
 
-#: util/errors.c:83
+#: util/errors.c:84
 #, fuzzy
 msgid "trust database error"
 msgstr "ïÛÉÂËÁ × Trust-DB (ÂÁÚÁ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ)"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr ""
 
-#: util/errors.c:85
+#: util/errors.c:86
 #, fuzzy
 msgid "resource limit"
 msgstr "îÅÄÏÓÔÁÔÏÞÎÏ ÒÅÓÕÒÓÏ×"
 
-#: util/errors.c:86
+#: util/errors.c:87
 #, fuzzy
 msgid "invalid keyring"
 msgstr "îÅÄÏÐÕÓÔÉÍÁÑ \"Ó×ÑÚËÁ ËÌÀÞÅÊ\""
 
-#: util/errors.c:87
+#: util/errors.c:88
 #, fuzzy
 msgid "bad certificate"
 msgstr "ðÌÏÈÏÊ ÓÅÒÔÉÆÉËÁÔ"
 
-#: util/errors.c:88
+#: util/errors.c:89
 #, fuzzy
 msgid "malformed user id"
 msgstr "îÅÄÏÐÕÓÔÉÍÁÑ ÆÏÒÍÁ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: util/errors.c:89
+#: util/errors.c:90
 #, fuzzy
 msgid "file close error"
 msgstr "ïÛÉÂËÁ ÚÁËÒÙÔÉÑ ÆÁÊÌÁ"
 
-#: util/errors.c:90
+#: util/errors.c:91
 #, fuzzy
 msgid "file rename error"
 msgstr "ïÛÉÂËÁ ÐÅÒÅÉÍÅÎÏ×ÁÎÉÑ ÆÁÊÌÁ"
 
-#: util/errors.c:91
+#: util/errors.c:92
 #, fuzzy
 msgid "file delete error"
 msgstr "ïÛÉÂËÁ ÕÄÁÌÅÎÉÑ ÆÁÊÌÁ"
 
-#: util/errors.c:92
+#: util/errors.c:93
 #, fuzzy
 msgid "unexpected data"
 msgstr "îÅÏÖÉÄÁÎÎÙÅ ÄÁÎÎÙÅ"
 
-#: util/errors.c:93
+#: util/errors.c:94
 #, fuzzy
 msgid "timestamp conflict"
 msgstr "ëÏÎÆÌÉËÔ ×ÒÅÍÅÎÎÙÈ ÏÔÐÅÞÁÔËÏ× (timestamp)"
 
-#: util/errors.c:94
+#: util/errors.c:95
 #, fuzzy
 msgid "unusable pubkey algorithm"
 msgstr "îÅÐÒÉÇÏÄÎÙÊ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ ÁÌÇÏÒÉÔÍ ÏÔËÒÙÔÏÇÏ ËÌÀÞÁ"
 
-#: util/errors.c:95
+#: util/errors.c:96
 #, fuzzy
 msgid "file exists"
 msgstr "æÁÊÌ ÓÕÝÅÓÔ×ÕÅÔ"
 
-#: util/errors.c:96
+#: util/errors.c:97
 #, fuzzy
 msgid "weak key"
 msgstr "óÌÁÂÙÊ ËÌÀÞ"
 
-#: util/errors.c:97
+#: util/errors.c:98
 #, fuzzy
 msgid "invalid argument"
 msgstr "îÅÄÏÐÕÓÔÉÍÁÑ ASCII-ËÏÄÉÒÏ×ËÁ"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr ""
 
-#: util/errors.c:99
+#: util/errors.c:100
 #, fuzzy
 msgid "unsupported URI"
 msgstr "îÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
 
-#: util/errors.c:100
+#: util/errors.c:101
 #, fuzzy
 msgid "network error"
 msgstr "ïÂÝÁÑ ÏÛÉÂËÁ"
 
-#: util/errors.c:102
+#: util/errors.c:103
 #, fuzzy
 msgid "not encrypted"
 msgstr "ÚÁÛÉÆÒÏ×ÁÔØ ÄÁÎÎÙÅ"
 
-#: util/errors.c:103
-#, fuzzy
-msgid "not processed"
-msgstr "îÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
-
-#: util/logger.c:224
+#: util/logger.c:225
 #, fuzzy, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "ïÊ-ÊÏ ... ÏÛÉÂËÁ × ÐÒÏÇÒÁÍÍÅ (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:231
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "÷Ù ÎÁÛÌÉ ÏÛÉÂËÕ × ÐÒÏÇÒÁÍÍÅ ... (%s:%d)\n"
 
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:321 g10/import.c:127 g10/keygen.c:1348
 #, fuzzy, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:325
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:330
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:325
+#: cipher/random.c:335
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:331
+#: cipher/random.c:341
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:339
+#: cipher/random.c:349
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:387
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:397
+#: cipher/random.c:407
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:414
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:417
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:428
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr ""
 
-#: cipher/random.c:647
+#: cipher/random.c:657
 #, fuzzy
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "÷ÎÉÍÁÎÉÅ: ÉÓÐÏÌØÚÕÅÔÓÑ ÎÅÎÁÄÅÖÎÙÊ ÇÅÎÅÒÁÔÏÒ ÓÌÕÞÁÊÎÙÈ ÞÉÓÅÌ!\n"
 
-#: cipher/random.c:648
+#: cipher/random.c:663
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -384,7 +364,7 @@ msgstr ""
 "îå ðïìøúõêôåóø äáîîùíé óïúäáîîùíé üôïê ðòïçòáííïê!\n"
 "\n"
 
-#: cipher/rndlinux.c:141
+#: cipher/rndlinux.c:125
 #, c-format
 msgid ""
 "\n"
@@ -395,7 +375,22 @@ msgstr ""
 "îÅÄÏÓÔÁÔÏÞÎÏ ÓÌÕÞÁÊÎÙÈ ÄÁÎÎÙÈ. ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÅÌÁÊÔÅ ÞÔÏ-ÎÉÂÕÄØ, ÞÔÏÂÙ\n"
 "ïó ÍÏÇÌÁ ÎÁÂÒÁÔØ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÓÌÕÞÁÊÎÙÅ ÞÉÓÌÁ! (ÎÕÖÎÏ ÅÝÅ %d ÂÁÊÔ)\n"
 
-#: g10/g10.c:197
+#: gcrypt/secmem.c:77
+msgid "Warning: using insecure memory!\n"
+msgstr ""
+"÷ÎÉÍÁÎÉÅ, ×ÏÚÍÏÖÎÁ ÕÔÅÞËÁ ÓÅËÒÅÔÎÙÈ ÄÁÎÎÙÈ!\n"
+"üÔÕ ÐÒÏÂÌÅÍÕ ÍÏÖÎÏ ÒÅÛÉÔØ, ÕÓÔÁÎÏ×É× ÐÒÏÇÒÁÍÍÕ suid(root).\n"
+"ïÂÒÁÔÉÔÅÓØ ÄÌÑ ÜÔÏÇÏ Ë ÁÄÍÉÎÉÓÔÒÁÔÏÒÕ ÷ÁÛÅÊ ÓÉÓÔÅÍÙ.\n"
+
+#: gcrypt/secmem.c:287
+msgid "operation is not possible without initialized secure memory\n"
+msgstr ""
+
+#: gcrypt/secmem.c:288
+msgid "(you may have used the wrong program for this task)\n"
+msgstr ""
+
+#: g10/gpg.c:197
 msgid ""
 "@Commands:\n"
 " "
@@ -403,147 +398,147 @@ msgstr ""
 "@ëÏÍÁÎÄÙ:\n"
 " "
 
-#: g10/g10.c:199
+#: g10/gpg.c:199
 #, fuzzy
 msgid "|[file]|make a signature"
 msgstr "|[ÆÁÊÌ]|ÓÏÚÄÁÔØ ÐÏÄÐÉÓØ"
 
-#: g10/g10.c:200
+#: g10/gpg.c:200
 #, fuzzy
 msgid "|[file]|make a clear text signature"
 msgstr "|[ÆÁÊÌ]|ÓÏÚÄÁÔØ ÔÅËÓÔÏ×ÕÀ ÐÏÄÐÉÓØ"
 
-#: g10/g10.c:201
+#: g10/gpg.c:201
 msgid "make a detached signature"
 msgstr "ÓÏÚÄÁÔØ ÏÔÄÅÌØÎÕÀ ÐÏÄÐÉÓØ"
 
-#: g10/g10.c:202
+#: g10/gpg.c:202
 msgid "encrypt data"
 msgstr "ÚÁÛÉÆÒÏ×ÁÔØ ÄÁÎÎÙÅ"
 
-#: g10/g10.c:203
+#: g10/gpg.c:203
 msgid "encryption only with symmetric cipher"
 msgstr "ÚÁÛÉÆÒÏ×ÁÔØ ÓÉÍÍÅÔÒÉÞÎÙÍ ÁÌÇÏÒÉÔÍÏÍ"
 
-#: g10/g10.c:204
+#: g10/gpg.c:204
 msgid "store only"
 msgstr "ÔÏÌØËÏ ÓÏÈÒÁÎÉÔØ"
 
-#: g10/g10.c:205
+#: g10/gpg.c:205
 msgid "decrypt data (default)"
 msgstr "ÒÁÓÛÉÆÒÏ×ÁÔØ ÄÁÎÎÙÅ (ÐÏ ÕÍÏÌÞÁÎÉÀ)"
 
-#: g10/g10.c:206
+#: g10/gpg.c:206
 msgid "verify a signature"
 msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ"
 
-#: g10/g10.c:208
+#: g10/gpg.c:208
 msgid "list keys"
 msgstr "ÓÐÉÓÏË ËÌÀÞÅÊ"
 
-#: g10/g10.c:210
+#: g10/gpg.c:210
 msgid "list keys and signatures"
 msgstr "ÓÐÉÓÏË ËÌÀÞÅÊ É ÐÏÄÐÉÓÅÊ"
 
-#: g10/g10.c:211
+#: g10/gpg.c:211
 msgid "check key signatures"
 msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ ÎÁ ËÌÀÞÅ"
 
-#: g10/g10.c:212
+#: g10/gpg.c:212
 msgid "list keys and fingerprints"
 msgstr "ÓÐÉÓÏË ËÌÀÞÅÊ Ó ÉÈ \"ÏÔÐÅÞÁÔËÁÍÉ ÐÁÌØÃÅ×\""
 
-#: g10/g10.c:213
+#: g10/gpg.c:213
 msgid "list secret keys"
 msgstr "ÓÐÉÓÏË ÓÅËÒÅÔÎÙÈ ËÌÀÞÅÊ"
 
-#: g10/g10.c:214
+#: g10/gpg.c:214
 msgid "generate a new key pair"
 msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÎÏ×ÕÀ ÐÁÒÕ ËÌÀÞÅÊ (ÏÔËÒÙÔÙÊ É ÓÅËÒÅÔÎÙÊ)"
 
-#: g10/g10.c:215
+#: g10/gpg.c:215
 msgid "remove key from the public keyring"
 msgstr "ÕÄÁÌÉÔØ ËÌÀÞ ÓÏ Ó×ÑÚËÉ"
 
-#: g10/g10.c:217
+#: g10/gpg.c:217
 #, fuzzy
 msgid "remove key from the secret keyring"
 msgstr "ÕÄÁÌÉÔØ ËÌÀÞ ÓÏ Ó×ÑÚËÉ"
 
-#: g10/g10.c:218
+#: g10/gpg.c:218
 #, fuzzy
 msgid "sign a key"
 msgstr "ÐÏÄÐÉÓÁÔØ ËÌÀÞ"
 
-#: g10/g10.c:219
+#: g10/gpg.c:219
 #, fuzzy
 msgid "sign a key locally"
 msgstr "ÐÏÄÐÉÓÁÔØ ËÌÀÞ"
 
-#: g10/g10.c:220
+#: g10/gpg.c:220
 msgid "sign or edit a key"
 msgstr "ÐÏÄÐÉÓÁÔØ ÉÌÉ ÒÅÄÁËÔÉÒÏ×ÁÔØ ËÌÀÞ"
 
-#: g10/g10.c:221
+#: g10/gpg.c:221
 msgid "generate a revocation certificate"
 msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ"
 
-#: g10/g10.c:222
+#: g10/gpg.c:222
 msgid "export keys"
 msgstr "ÜËÓÐÏÒÔÉÒÏ×ÁÔØ ËÌÀÞÉ"
 
-#: g10/g10.c:223
+#: g10/gpg.c:223
 msgid "export keys to a key server"
 msgstr ""
 
-#: g10/g10.c:224
+#: g10/gpg.c:224
 msgid "import keys from a key server"
 msgstr ""
 
-#: g10/g10.c:228
+#: g10/gpg.c:228
 msgid "import/merge keys"
 msgstr "ÉÍÐÏÒÔÉÒÏ×ÁÔØ/ÄÏÂÁ×ÉÔØ ËÌÀÞÉ"
 
-#: g10/g10.c:230
+#: g10/gpg.c:230
 msgid "list only the sequence of packets"
 msgstr "ÎÁÐÅÞÁÔÁÔØ ÔÏÌØËÏ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ÐÁËÅÔÏ×"
 
-#: g10/g10.c:232
+#: g10/gpg.c:232
 #, fuzzy
 msgid "export the ownertrust values"
 msgstr "ÜËÓÐÏÒÔÉÒÏ×ÁÔØ ÐÁÒÁÍÅÔÒÙ ÄÏ×ÅÒÉÑ\n"
 
-#: g10/g10.c:234
+#: g10/gpg.c:234
 #, fuzzy
 msgid "import ownertrust values"
 msgstr "ÉÍÐÏÒÔÉÒÏ×ÁÔØ ÐÁÒÁÍÅÔÒÙ ÄÏ×ÅÒÉÑ\n"
 
-#: g10/g10.c:236
+#: g10/gpg.c:236
 #, fuzzy
 msgid "update the trust database"
 msgstr "|[éíåîá]|ÐÒÏ×ÅÒÉÔØ ÂÁÚÕ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ"
 
-#: g10/g10.c:238
+#: g10/gpg.c:238
 msgid "|[NAMES]|check the trust database"
 msgstr "|[éíåîá]|ÐÒÏ×ÅÒÉÔØ ÂÁÚÕ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ"
 
-#: g10/g10.c:239
+#: g10/gpg.c:239
 msgid "fix a corrupted trust database"
 msgstr "ÉÓÐÒÁ×ÉÔØ ÒÁÚÒÕÛÅÎÎÕÀ ÂÁÚÕ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ"
 
-#: g10/g10.c:240
+#: g10/gpg.c:240
 msgid "De-Armor a file or stdin"
 msgstr "äÅËÏÄÉÒÏ×ÁÔØ stdin ÉÌÉ ÆÁÊÌ ÉÚ ASCII-ÐÒÅÄÓÔÁ×ÌÅÎÉÑ"
 
-#: g10/g10.c:242
+#: g10/gpg.c:242
 msgid "En-Armor a file or stdin"
 msgstr "úÁËÏÄÉÒÏ×ÁÔØ stdin ÉÌÉ ÆÁÊÌ × ASCII-ÐÒÅÄÓÔÁ×ÌÅÎÉÅ"
 
-#: g10/g10.c:244
+#: g10/gpg.c:244
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|ÎÁÐÅÞÁÔÁÔØ ÄÁÊÄÖÅÓÔ ÓÏÏÂÝÅÎÉÑ"
 
-#: g10/g10.c:248
+#: g10/gpg.c:249
 msgid ""
 "@\n"
 "Options:\n"
@@ -553,164 +548,164 @@ msgstr ""
 "ðÁÒÁÍÅÔÒÙ:\n"
 " "
 
-#: g10/g10.c:250
+#: g10/gpg.c:251
 msgid "create ascii armored output"
 msgstr "×Ù×ÏÄ × ASCII-ÐÒÅÄÓÔÁ×ÌÅÎÉÉ"
 
-#: g10/g10.c:252
+#: g10/gpg.c:253
 #, fuzzy
 msgid "|NAME|encrypt for NAME"
 msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÛÉÆÒÏ×ÁÌØÎÙÊ ÁÌÇÏÒÉÔÍÏÍ éíñ"
 
-#: g10/g10.c:255
+#: g10/gpg.c:256
 #, fuzzy
 msgid "|NAME|use NAME as default recipient"
 msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ éíñ × ËÁÞÅÓÔ×Å ÓÅËÒÅÔÎÏÇÏ ËÌÀÞÁ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
-#: g10/g10.c:257
+#: g10/gpg.c:258
 msgid "use the default key as default recipient"
 msgstr ""
 
-#: g10/g10.c:261
+#: g10/gpg.c:262
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "ÉÓÐÏÌØÚÏ×ÁÔØ ÕËÁÚÁÎÎÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÐÏÄÐÉÓÉ ÉÌÉ ÒÁÓÛÉÆÒÏ×ËÉ"
 
-#: g10/g10.c:262
+#: g10/gpg.c:263
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|ÕÓÔÁÎÏ×ÉÔØ ÕÒÏ×ÅÎØ ÓÖÁÔÉÑ (0 - ÎÅ ÓÖÉÍÁÔØ)"
 
-#: g10/g10.c:264
+#: g10/gpg.c:265
 msgid "use canonical text mode"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ ËÁÎÏÎÉÞÅÓËÉÊ ÔÅËÓÔÏ×ÙÊ ÒÅÖÉÍ"
 
-#: g10/g10.c:265
+#: g10/gpg.c:266
 msgid "use as output file"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ × ËÁÞÅÓÔ×Å ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ"
 
-#: g10/g10.c:266
+#: g10/gpg.c:267
 msgid "verbose"
 msgstr "ÍÎÏÇÏÓÌÏ×ÎÙÊ"
 
-#: g10/g10.c:267
+#: g10/gpg.c:268
 msgid "be somewhat more quiet"
 msgstr ""
 
-#: g10/g10.c:268
+#: g10/gpg.c:269
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: g10/g10.c:269
+#: g10/gpg.c:270
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ ÎÁ ËÌÀÞÅ"
 
-#: g10/g10.c:270
+#: g10/gpg.c:271
 #, fuzzy
 msgid "always use a MDC for encryption"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ ÕËÁÚÁÎÎÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÛÉÆÒÏ×ÁÎÉÑ"
 
-#: g10/g10.c:271
+#: g10/gpg.c:272
 msgid "do not make any changes"
 msgstr "Keine wirklichen Änderungen durchführen"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/gpg.c:274
 msgid "batch mode: never ask"
 msgstr "ÐÁËÅÔÎÙÊ ÒÅÖÉÍ: ÎÉÞÅÇÏ ÎÅ ÓÐÒÁÛÉ×ÁÔØ"
 
-#: g10/g10.c:274
+#: g10/gpg.c:275
 msgid "assume yes on most questions"
 msgstr "ÏÔ×ÅÞÁÔØ \"ÄÁ\" ÎÁ ÂÏÌØÛÉÎÓÔ×Ï ×ÏÐÒÏÓÏ×"
 
-#: g10/g10.c:275
+#: g10/gpg.c:276
 msgid "assume no on most questions"
 msgstr "ÏÔ×ÅÞÁÔØ \"ÎÅÔ\" ÎÁ ÂÏÌØÛÉÎÓÔ×Ï ×ÏÐÒÏÓÏ×"
 
-#: g10/g10.c:276
+#: g10/gpg.c:277
 msgid "add this keyring to the list of keyrings"
 msgstr "ÄÏÂÁ×ÉÔØ ÜÔÕ Ó×ÑÚËÕ Ë ÓÐÉÓËÕ Ó×ÑÚÏË ËÌÀÞÅÊ"
 
-#: g10/g10.c:277
+#: g10/gpg.c:278
 msgid "add this secret keyring to the list"
 msgstr "ÄÏÂÁ×ÉÔØ ÜÔÕ ÓÅËÒÅÔÎÕÀ Ó×ÑÚËÕ Ë ÓÐÉÓËÕ Ó×ÑÚÏË ËÌÀÞÅÊ"
 
-#: g10/g10.c:278
+#: g10/gpg.c:279
 msgid "|NAME|use NAME as default secret key"
 msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ éíñ × ËÁÞÅÓÔ×Å ÓÅËÒÅÔÎÏÇÏ ËÌÀÞÁ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
-#: g10/g10.c:279
+#: g10/gpg.c:280
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: g10/g10.c:280
+#: g10/gpg.c:281
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÛÉÆÒÏ×ÁÌØÎÙÊ ÁÌÇÏÒÉÔÍÏÍ éíñ"
 
-#: g10/g10.c:281
+#: g10/gpg.c:282
 msgid "read options from file"
 msgstr "ÞÉÔÁÔØ ÐÁÒÁÍÅÔÒÙ ÉÚ ÆÁÊÌÁ"
 
-#: g10/g10.c:285
+#: g10/gpg.c:286
 msgid "|FD|write status info to this FD"
 msgstr "|FD| ÚÁÐÉÓÙ×ÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ÓÏÓÔÏÑÎÉÉ × ÄÅÓËÒÉÐÔÏÒ (FD)"
 
-#: g10/g10.c:290
+#: g10/gpg.c:291
 #, fuzzy
 msgid "|FILE|load extension module FILE"
 msgstr "|æáêì|ÚÁÇÒÕÚÉÔØ æáêì Ó ÒÁÓÛÉÒÑÀÝÉÍÉ ÍÏÄÕÌÑÍÉ"
 
-#: g10/g10.c:291
+#: g10/gpg.c:292
 msgid "emulate the mode described in RFC1991"
 msgstr "ÜÍÕÌÉÒÏ×ÁÔØ ÒÅÖÉÍ ÏÐÉÓÁÎÎÙÊ × RFC1991"
 
-#: g10/g10.c:292
+#: g10/gpg.c:293
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:293
+#: g10/gpg.c:294
 #, fuzzy
 msgid "|N|use passphrase mode N"
 msgstr "|N|ÉÓÐÏÌØÚÏ×ÁÔØ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ ÒÅÖÉÍÁ N\n"
 
-#: g10/g10.c:295
+#: g10/gpg.c:296
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÈÜÛ-ÁÌÇÏÒÉÔÍ éíñ ÄÌÑ ËÌÀÞÅ×ÙÈ ÆÒÁÚ"
 
-#: g10/g10.c:297
+#: g10/gpg.c:298
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÛÉÆÒÏ×ÁÌØÎÙÊ ÁÌÇÏÒÉÔÍÏÍ éíñ ÄÌÑ ËÌÀÞÅ×ÙÈ ÆÒÁÚ"
 
-#: g10/g10.c:298
+#: g10/gpg.c:299
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÛÉÆÒÏ×ÁÌØÎÙÊ ÁÌÇÏÒÉÔÍÏÍ éíñ"
 
-#: g10/g10.c:299
+#: g10/gpg.c:300
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÈÜÛ-ÁÌÇÏÒÉÔÍ éíñ"
 
-#: g10/g10.c:300
+#: g10/gpg.c:301
 msgid "|N|use compress algorithm N"
 msgstr "|N|ÉÓÐÏÌØÚÏ×ÁÔØ ÁÌÇÏÒÉÔÍ ÓÖÁÔÉÑ N"
 
-#: g10/g10.c:301
+#: g10/gpg.c:302
 msgid "throw keyid field of encrypted packets"
 msgstr "×ÙÂÒÁÓÙ×ÁÔØ ÐÏÌÅ keyid Õ ÚÁÛÉÆÒÏ×ÁÎÎÙÈ ÐÁËÅÔÏ×"
 
-#: g10/g10.c:302
+#: g10/gpg.c:303
 msgid "|NAME=VALUE|use this notation data"
 msgstr ""
 
-#: g10/g10.c:305
+#: g10/gpg.c:306
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:308
+#: g10/gpg.c:309
 #, fuzzy
 msgid ""
 "@\n"
@@ -731,17 +726,17 @@ msgstr ""
 " --list-keys [names]        ÐÏËÁÚÁÔØ ÓÐÉÓÏË ËÌÀÞÅÊ\n"
 " --fingerprint [names]      ÐÏËÁÚÁÔØ \"ÏÔÐÅÞÁÔËÉ ÐÁÌØÃÅ×\" ËÌÀÞÅÊ\n"
 
-#: g10/g10.c:403
+#: g10/gpg.c:409
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "ðÏÖÁÌÕÊÓÔÁ, ÏÔÐÒÁ×ÌÑÊÔÅ ÓÏÏÂÝÅÎÉÑ Ï ÏÛÉÂËÁÈ ÐÏ ÁÄÒÅÓÕ "
 "<gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:407
+#: g10/gpg.c:413
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: gpg [ÐÁÒÁÍÅÔÒÙ] [ÆÁÊÌÙ] (-h ÄÌÑ ÐÏÍÏÝÉ)"
 
-#: g10/g10.c:410
+#: g10/gpg.c:416
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -751,7 +746,7 @@ msgstr ""
 "ÐÏÄÐÉÓÙ×ÁÅÔ, ÐÒÏ×ÅÒÑÅÔ ÐÏÄÐÉÓÉ, ÛÉÆÒÕÅÔ ÉÌÉ ÒÁÓÛÉÆÒÏ×Ù×ÁÅÔ\n"
 "ÒÅÖÉÍ ÒÁÂÏÔÙ ÚÁ×ÉÓÉÔ ÏÔ ×ÈÏÄÎÙÈ ÄÁÎÎÙÈ\n"
 
-#: g10/g10.c:417
+#: g10/gpg.c:423
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -759,198 +754,203 @@ msgstr ""
 "\n"
 "ðÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÁÌÇÏÒÉÔÍÙ:\n"
 
-#: g10/g10.c:496
+#: g10/gpg.c:525
 msgid "usage: gpg [options] "
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: gpg [ÐÁÒÁÍÅÔÒÙ] "
 
-#: g10/g10.c:549
+#: g10/gpg.c:583
 msgid "conflicting commands\n"
 msgstr "Widersprüchliche Kommandos\n"
 
-#: g10/g10.c:692
+#: g10/gpg.c:638
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
+#: g10/gpg.c:734
 #, fuzzy, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ÚÁÍÅÞÁÎÉÅ: ÆÁÊÌ ÐÁÒÁÍÅÔÒÏ× ÐÏ ÕÍÏÌÞÁÎÉÀ `%s' ÏÔÓÕÔÓÔ×ÕÅÔ\n"
 
-#: g10/g10.c:696
+#: g10/gpg.c:738
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ÆÁÊÌ ÐÁÒÁÍÅÔÒÏ× `%s': %s\n"
 
-#: g10/g10.c:703
+#: g10/gpg.c:745
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "ÞÉÔÁÀÔÓÑ ÐÁÒÁÍÅÔÒÙ ÉÚ `%s'\n"
 
-#: g10/g10.c:893
+#: g10/gpg.c:937
 #, fuzzy, c-format
 msgid "%s is not a valid character set\n"
 msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ × ËÏÍÍÅÎÔÁÒÉÉ.\n"
 
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/gpg.c:1002 g10/gpg.c:1011
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/g10.c:951
+#: g10/gpg.c:1004
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr ""
 
-#: g10/g10.c:954
+#: g10/gpg.c:1007
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr ""
 
-#: g10/g10.c:973 g10/g10.c:985
+#: g10/gpg.c:1027 g10/gpg.c:1039
 msgid "selected cipher algorithm is invalid\n"
 msgstr "×ÙÂÒÁÎ ÎÅÄÏÐÕÓÔÉÍÙÊ ÁÌÇÏÒÉÔÍ ÛÉÆÒÏ×ÁÎÉÑ\n"
 
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/gpg.c:1033 g10/gpg.c:1045
 msgid "selected digest algorithm is invalid\n"
 msgstr "×ÙÂÒÁÎ ÎÅÄÏÐÕÓÔÉÍÙÊ ÄÁÊÄÖÅÓÔ-ÁÌÇÏÒÉÔÍ\n"
 
-#: g10/g10.c:995
+#: g10/gpg.c:1049
 msgid "the given policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:998
+#: g10/gpg.c:1052
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "ÁÌÇÏÒÉÔÍ ÕÐÁËÏ×ËÉ ÍÏÖÅÔ ÉÍÅÔØ ÚÎÁÞÅÎÉÑ ÏÔ %d ÄÏ %d\n"
 
-#: g10/g10.c:1000
+#: g10/gpg.c:1054
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ÄÏÌÖÅÎ ÂÙÔØ ÂÏÌØÛÅ 0\n"
 
-#: g10/g10.c:1002
+#: g10/gpg.c:1056
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ÄÏÌÖÅÎ ÂÙÔØ ÂÏÌØÛÅ 1\n"
 
-#: g10/g10.c:1004
+#: g10/gpg.c:1058
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:1007
+#: g10/gpg.c:1061
 #, fuzzy
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ÚÁÍÅÞÁÎÉÅ: ÐÒÏÓÔÏÊ S2K ÒÅÖÉÍ (0) ÏÞÅÎØ ÎÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ\n"
 
-#: g10/g10.c:1011
+#: g10/gpg.c:1065
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÒÅÖÉÍ S2K: ÄÏÌÖÅÎ ÂÙÔØ 0, 1 ÉÌÉ 3\n"
 
-#: g10/g10.c:1096
+#: g10/gpg.c:1154
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "ïÛÉÂËÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ: %s\n"
 
-#: g10/g10.c:1102
+#: g10/gpg.c:1160
 msgid "--store [filename]"
 msgstr "--store [ÉÍÑ ÆÁÊÌÁ]"
 
-#: g10/g10.c:1109
+#: g10/gpg.c:1167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ÉÍÑ ÆÁÊÌÁ]"
 
-#: g10/g10.c:1117
+#: g10/gpg.c:1175
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ÉÍÑ ÆÁÊÌÁ]"
 
-#: g10/g10.c:1130
+#: g10/gpg.c:1188
 msgid "--sign [filename]"
 msgstr "--sign [ÉÍÑ ÆÁÊÌÁ]"
 
-#: g10/g10.c:1143
+#: g10/gpg.c:1201
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ÉÍÑ ÆÁÊÌÁ]"
 
-#: g10/g10.c:1157
+#: g10/gpg.c:1215
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ÉÍÑ ÆÁÊÌÁ]"
 
-#: g10/g10.c:1174
+#: g10/gpg.c:1232
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ÉÍÑ ÆÁÊÌÁ]"
 
-#: g10/g10.c:1182
+#: g10/gpg.c:1240
 msgid "--sign-key user-id"
 msgstr ""
 
-#: g10/g10.c:1190
+#: g10/gpg.c:1248
 #, fuzzy
 msgid "--lsign-key user-id"
 msgstr "--delete-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: g10/g10.c:1198
+#: g10/gpg.c:1256
 #, fuzzy
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: g10/g10.c:1214
+#: g10/gpg.c:1272
 #, fuzzy
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: g10/g10.c:1217
+#: g10/gpg.c:1275
 #, fuzzy
 msgid "--delete-key user-id"
 msgstr "--delete-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:311 g10/gpg.c:1312 g10/sign.c:449
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n"
 
-#: g10/g10.c:1269
+#: g10/gpg.c:1327
 #, fuzzy
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ] [Ó×ÑÚËÁ ËÌÀÞÅÊ]"
 
-#: g10/g10.c:1335
+#: g10/gpg.c:1393
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ÏÛÉÂËÁ ÄÅËÏÄÉÒÏ×ÁÎÉÑ: %s\n"
 
-#: g10/g10.c:1343
+#: g10/gpg.c:1401
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ÏÛÉÂËÁ ËÏÄÉÒÏ×ÁÎÉÑ: %s\n"
 
-#: g10/g10.c:1411
+#: g10/gpg.c:1474 g10/gpg.c:1495
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÈÜÛ-ÁÌÇÏÒÉÔÍ `%s'\n"
 
-#: g10/g10.c:1492
+#: g10/gpg.c:1580
 msgid "[filename]"
 msgstr "[ÉÍÑ ÆÁÊÌÁ]"
 
-#: g10/g10.c:1496
+#: g10/gpg.c:1584
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/gpg.c:1587 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s'\n"
 
-#: g10/g10.c:1669
+#: g10/gpg.c:1765
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 
-#: g10/g10.c:1675
+#: g10/gpg.c:1771
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1681
+#: g10/gpg.c:1777
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1689
+#: g10/gpg.c:1785
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
@@ -1037,53 +1037,53 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1188 g10/pkclist.c:53
+#: g10/keyedit.c:1191 g10/pkclist.c:54
 msgid "             Fingerprint:"
 msgstr ""
 
-#: g10/pkclist.c:80
+#: g10/pkclist.c:81
 #, fuzzy
 msgid "Fingerprint:"
 msgstr "ÐÏËÁÚÁÔØ \"ÏÔÐÅÞÁÔÏË ÐÁÌØÃÁ\""
 
-#: g10/pkclist.c:116
+#: g10/pkclist.c:117
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:118
+#: g10/pkclist.c:119
 #, fuzzy
-msgid "Key is superseded"
+msgid "Key is superseeded"
 msgstr "üÔÏÔ ËÌÀÞ ÚÁÝÉÝÅÎ.\n"
 
-#: g10/pkclist.c:120
+#: g10/pkclist.c:121
 #, fuzzy
 msgid "Key has been compromised"
 msgstr "úÁÍÅÞÁÎÉÅ: óÒÏË ÄÅÊÓÔ×ÉÑ ËÌÀÞÁ ÕÖÅ ÉÓÔÅË!\n"
 
-#: g10/pkclist.c:122
+#: g10/pkclist.c:123
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:124
+#: g10/pkclist.c:125
 msgid "User ID is no longer valid"
 msgstr ""
 
-#: g10/pkclist.c:128
+#: g10/pkclist.c:129
 msgid "Reason for revocation: "
 msgstr ""
 
-#: g10/pkclist.c:145
+#: g10/pkclist.c:146
 msgid "Revocation comment: "
 msgstr ""
 
 # valid user replies (not including 1..4)
 #. a string with valid answers
-#: g10/pkclist.c:303
+#: g10/pkclist.c:304
 #, fuzzy
 msgid "sSmMqQ"
 msgstr "sSmMqQ"
 
-#: g10/pkclist.c:307
+#: g10/pkclist.c:308
 #, fuzzy, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -1092,7 +1092,7 @@ msgstr ""
 "îÅ ÏÐÒÅÄÅÌÅÎÙ ÐÁÒÁÍÅÔÒÙ ÄÏ×ÅÒÉÑ ÄÌÑ %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly\n"
@@ -1117,23 +1117,23 @@ msgstr ""
 " 4 = ÷ÅÒÀ ÐÏÌÎÏÓÔØÀ\n"
 " s = ðÏÖÁÌÕÊÓÔÁ, ÐÏËÁÖÉÔÅ ÄÏÐÏÌÎÉÔÅÌØÎÕÀ ÉÎÆÏÒÍÁÃÉÀ\n"
 
-#: g10/pkclist.c:328
+#: g10/pkclist.c:329
 msgid " m = back to the main menu\n"
 msgstr " m = ÏÂÒÁÔÎÏ × ÇÌÁ×ÎÏÅ ÍÅÎÀ\n"
 
-#: g10/pkclist.c:330
+#: g10/pkclist.c:331
 msgid " q = quit\n"
 msgstr ""
 
-#: g10/pkclist.c:336
+#: g10/pkclist.c:337
 msgid "Your decision? "
 msgstr "÷ÁÛÅ ÒÅÛÅÎÉÅ? "
 
-#: g10/pkclist.c:358
+#: g10/pkclist.c:359
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr ""
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 msgid ""
 "Could not find a valid trust path to the key.  Let's see whether we\n"
 "can assign some missing owner trust values.\n"
@@ -1144,70 +1144,70 @@ msgstr ""
 "ÎÅËÏÔÏÒÙÅ ÎÅÄÏÓÔÁÀÝÉÅ ÚÎÁÞÅÎÉÑ \"ÄÏ×ÅÒÉÑ ×ÌÁÄÅÌØÃÕ\"\n"
 "\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:438
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:439
+#: g10/pkclist.c:440
 #, fuzzy
 msgid ""
 "No trust values changed.\n"
 "\n"
 msgstr "úÎÁÞÅÎÉÑ ÐÁÒÁÍÅÔÒÏ× ÄÏ×ÅÒÉÑ ÎÅ ÉÚÍÅÎÅÎÙ.\n"
 
-#: g10/pkclist.c:457
+#: g10/pkclist.c:458
 #, fuzzy, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "build_sigrecs: ËÌÀÞ ist widerrufen\n"
 
-#: g10/pkclist.c:464 g10/pkclist.c:476 g10/pkclist.c:598
+#: g10/pkclist.c:465 g10/pkclist.c:477 g10/pkclist.c:599
 msgid "Use this key anyway? "
 msgstr "÷ÓÅ ÒÁ×ÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÜÔÏÔ ËÌÀÞ?"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 #, fuzzy, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "build_sigrecs: ËÌÀÞ ist widerrufen\n"
 
-#: g10/pkclist.c:512
+#: g10/pkclist.c:513
 #, fuzzy, c-format
 msgid "%08lX: key has expired\n"
 msgstr "úÁÍÅÞÁÎÉÅ: óÒÏË ÄÅÊÓÔ×ÉÑ ËÌÀÞÁ ÕÖÅ ÉÓÔÅË!\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr ""
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 #, fuzzy, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "÷îéíáîéå: íÙ îå ÄÏ×ÅÒÑÅÍ ÜÔÏÍÕ ËÌÀÞÕ!\n"
 
-#: g10/pkclist.c:539
+#: g10/pkclist.c:540
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
 "but it is accepted anyway\n"
 msgstr ""
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:546
 msgid "This key probably belongs to the owner\n"
 msgstr ""
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid "This key belongs to us\n"
 msgstr ""
 
-#: g10/pkclist.c:593
+#: g10/pkclist.c:594
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -1218,65 +1218,65 @@ msgstr ""
 "ËÔÏ ÕËÁÚÁÎ ÅÇÏ ×ÌÁÄÅÌØÃÅÍ. ïÔ×ÅÞÁÊÔÅ \"ÄÁ\" ÎÁ ÓÌÅÄÕÀÝÉÊ ×ÏÐÒÏÓ,\n"
 "ÔÏÌØËÏ ÅÓÌÉ ×Ù *ÄÅÊÓÔ×ÉÔÅÌØÎÏ* ÐÏÎÉÍÁÅÔÅ ÞÔÏ ÄÅÌÁÅÔÅ.\n"
 
-#: g10/pkclist.c:607 g10/pkclist.c:630
+#: g10/pkclist.c:608 g10/pkclist.c:631
 msgid "WARNING: Using untrusted key!\n"
 msgstr "÷îéíáîéå: éÓÐÏÌØÚÕÅÔÓÑ ËÌÀÞ Ë ËÏÔÏÒÏÍÕ ÎÅÔ ÄÏ×ÅÒÉÑ!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:652
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "÷îéíáîéå: ÷ÌÁÄÅÌÅà ËÌÀÞÁ ÕÖÅ ÏÔÏÚ×ÁÌ ÅÇÏ!\n"
 
-#: g10/pkclist.c:652
+#: g10/pkclist.c:653
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "          üÔÏ ÍÏÖÅÔ ÏÚÎÁÞÁÔØ, ÞÔÏ ÐÏÄÐÉÓØ ÐÏÄÄÅÌØÎÁÑ.\n"
 
-#: g10/pkclist.c:657
+#: g10/pkclist.c:658
 #, fuzzy
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "÷îéíáîéå: ÷ÌÁÄÅÌÅà ËÌÀÞÁ ÕÖÅ ÏÔÏÚ×ÁÌ ÅÇÏ!\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:680
 msgid "Note: This key has expired!\n"
 msgstr "úÁÍÅÞÁÎÉÅ: óÒÏË ÄÅÊÓÔ×ÉÑ ËÌÀÞÁ ÕÖÅ ÉÓÔÅË!\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:688
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "÷îéíáîéå: üÔÏÔ ËÌÀÞ ÎÅ ÚÁ×ÅÒÅÎ ÄÏ×ÅÒÅÎÎÏÊ ÐÏÄÐÉÓØÀ!\n"
 
-#: g10/pkclist.c:689
+#: g10/pkclist.c:690
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         îÅÔ ÎÉËÁËÉÈ ÕËÁÚÁÎÉÑ ÎÁ ÔÏ, ÞÔÏ ËÌÀÞ ÐÒÉÎÁÄÌÅÖÉÔ ÅÇÏ ×ÌÁÄÅÌØÃÕ.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:707
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "÷îéíáîéå: íÙ îå ÄÏ×ÅÒÑÅÍ ÜÔÏÍÕ ËÌÀÞÕ!\n"
 
-#: g10/pkclist.c:707
+#: g10/pkclist.c:708
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         ðÏÄÐÉÓØ ×ÅÒÏÑÔÎÏ -- ðïääåìëá.\n"
 
-#: g10/pkclist.c:714
+#: g10/pkclist.c:715
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "÷îéíáîéå: üÔÏÔ ËÌÀÞ ÎÅ ÚÁ×ÅÒÅÎ ÄÏÓÔÁÔÏÞÎÏ ÄÏ×ÅÒÅÎÎÙÍÉ ÐÏÄÐÉÓÑÍÉ!\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:718
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "          îÅÔ Õ×ÅÒÅÎÎÏÓÔÉ, ÞÔÏ ÐÏÄÐÉÓØ ÐÒÉÎÁÄÌÅÖÉÔ ×ÌÁÄÅÌØÃÕ.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:968 g10/pkclist.c:1013
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ÐÒÏÐÕÝÅÎ: %s\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:828 g10/pkclist.c:995
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr ""
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:855
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1285,43 +1285,43 @@ msgstr ""
 "\"-r\").\n"
 "\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:865
 msgid "Enter the user ID: "
 msgstr "÷×ÅÄÉÔÅ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:877
 msgid "No such user ID.\n"
 msgstr "îÅÔ ÔÁËÏÇÏ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:882
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:905
 #, fuzzy
 msgid "Public key is disabled.\n"
 msgstr "ïÔËÒÙÔÙÊ ËÌÀÞ ÎÅ ÎÁÊÄÅÎ"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:912
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr ""
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:943
 #, fuzzy, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "ÚÁÍÅÞÁÎÉÅ: ÆÁÊÌ ÐÁÒÁÍÅÔÒÏ× ÐÏ ÕÍÏÌÞÁÎÉÀ `%s' ÏÔÓÕÔÓÔ×ÕÅÔ\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:976
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: ÏÛÉÂËÁ ÐÒÉ ÐÒÏ×ÅÒËÅ ËÌÀÞÁ: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:981
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr ""
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1019
 msgid "no valid addressees\n"
 msgstr "ÎÅÔ ÄÏÐÕÓÔÉÍÙÈ ÁÄÒÅÓÏ×\n"
 
@@ -1333,59 +1333,59 @@ msgstr "
 msgid "writing key binding signature\n"
 msgstr "ÐÉÛÅÔÓÑ \"key-binding\" ÐÏÄÐÉÓØ\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
+#: g10/keygen.c:308 g10/keygen.c:419 g10/keygen.c:529
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "úÁÐÒÏÛÅÎÎÙÊ ËÌÀÞ ÉÍÅÅÔ ÄÌÉÎÕ %u ÂÉÔ\n"
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:438
+#: g10/keygen.c:313 g10/keygen.c:424 g10/keygen.c:534
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "ÏËÒÕÇÌÅÎÏ ÄÏ %u ÂÉÔ\n"
 
-#: g10/keygen.c:537
+#: g10/keygen.c:633
 msgid "Please select what kind of key you want:\n"
 msgstr "÷ÙÂÅÒÉÔÅ ÖÅÌÁÅÍÙÊ ÔÉÐ ËÌÀÞÁ:\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:635
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA É ElGamal (ÐÏ ÕÍÏÌÞÁÎÉÀ)\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:636
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (ÔÏÌØËÏ ÐÏÄÐÉÓØ)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:638
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (ÔÏÌØËÏ ÛÉÆÒÏ×ÁÎÉÅ)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:639
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (ÐÏÄÐÉÓØ É ÛÉÆÒÏ×ÁÎÉÅ)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:641
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (ÐÏÄÐÉÓØ É ÛÉÆÒÏ×ÁÎÉÅ)\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:645
 msgid "Your selection? "
 msgstr "÷ÁÛ ×ÙÂÏÒ? "
 
-#: g10/keygen.c:560 g10/keygen.c:568
+#: g10/keygen.c:656 g10/keygen.c:664
 #, fuzzy
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÕÄÁÌÉÔØ ×ÙÂÒÁÎÎÙÅ ËÌÀÞÉ? "
 
-#: g10/keygen.c:582
+#: g10/keygen.c:678
 msgid "Invalid selection.\n"
 msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ×ÙÂÏÒ.\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:690
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1398,19 +1398,19 @@ msgstr ""
 "               ÄÌÉÎÁ ËÌÀÞÁ ÐÏ ÕÍÏÌÞÁÎÉÀ: 1024 ÂÉÔÁ\n"
 " ÍÁËÓÉÍÁÌØÎÁÑ ÒÅËÏÍÅÎÄÕÅÍÁÑ ÄÌÉÎÁ ËÌÀÞÁ: 2048 ÂÉÔ\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:697
 msgid "What keysize do you want? (1024) "
 msgstr "ëÁËÏÇÏ ÒÁÚÍÅÒÁ ËÌÀÞ ×Ù ÖÅÌÁÅÔÅ? (1024)"
 
-#: g10/keygen.c:606
+#: g10/keygen.c:702
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "äÏÐÕÓÔÉÍÙÊ ÒÁÚÍÅÒ DSA ËÌÀÞÅÊ - ÏÔ 512 ÄÏ 1024 ÂÉÔ\n"
 
-#: g10/keygen.c:608
+#: g10/keygen.c:704
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "ÓÌÉÛËÏÍ ÍÁÌÅÎØËÁÑ ÄÌÉÎÁ ËÌÀÞÁ, ÎÁÉÍÅÎØÛÅÅ ÚÎÁÞÅÎÉÅ - 768.\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:706
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "ÓÌÉÛËÏÍ ÍÁÌÅÎØËÁÑ ÄÌÉÎÁ ËÌÀÞÁ, ÎÁÉÍÅÎØÛÅÅ ÚÎÁÞÅÎÉÅ - 768.\n"
@@ -1423,12 +1423,12 @@ msgstr "
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:621
+#: g10/keygen.c:717
 #, fuzzy, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "ÓÌÉÛËÏÍ ÍÁÌÅÎØËÁÑ ÄÌÉÎÁ ËÌÀÞÁ, ÎÁÉÍÅÎØÛÅÅ ÚÎÁÞÅÎÉÅ - 768.\n"
 
-#: g10/keygen.c:626
+#: g10/keygen.c:722
 #, fuzzy
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
@@ -1437,11 +1437,11 @@ msgstr ""
 "ëÌÀÞÉ ÄÌÉÎÏÊ ÂÏÌØÛÅ 2048 ÎÅ ÒÅËÏÍÅÎÄÕÀÔÓÑ, ÐÏÔÏÍÕ ÞÔÏ ×ÙÞÉÓÌÅÎÉÑÚÁÎÉÍÁÀÔ "
 "ïþåîø ÍÎÏÇÏ ×ÒÅÍÅÎÉ!\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:725
 msgid "Are you sure that you want this keysize? "
 msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ËÌÀÞ ÔÁËÏÊ ÄÌÉÎÙ? "
 
-#: g10/keygen.c:630
+#: g10/keygen.c:726
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1449,21 +1449,21 @@ msgstr ""
 "ïË, ÔÏÌØËÏ ÎÅ ÚÁÂÙ×ÁÊÔÅ, ÞÔÏ ÉÚÌÕÞÅÎÉÅ ×ÁÛÉÈ ËÌÁ×ÉÁÔÕÒÙ É ÍÏÎÉÔÏÒÁ ÔÏÖÅ\n"
 "ÄÅÌÁÀÔ ×ÁÓ ÕÑÚ×ÉÍÙÍ ÄÌÑ ÁÔÁË.\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:734
 msgid "Do you really need such a large keysize? "
 msgstr "÷ÁÍ ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÎÕÖÅÎ ÔÁËÏÊ ÄÌÉÎÎÙÊ ËÌÀÞ? "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:740
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "úÁÐÒÏÛÅÎÎÙÊ ËÌÀÞ ÉÍÅÅÔ ÄÌÉÎÕ %u ÂÉÔ\n"
 
-#: g10/keygen.c:647 g10/keygen.c:651
+#: g10/keygen.c:743 g10/keygen.c:747
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "ÏËÒÕÇÌÅÎÏ ÄÏ %u ÂÉÔ\n"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:795
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1479,35 +1479,35 @@ msgstr ""
 "      <n>m = ÓÒÏË ÄÅÊÓÔ×ÉÑ ËÌÀÞÁ n ÍÅÓÑÃÅ×\n"
 "      <n>y = ÓÒÏË ÄÅÊÓÔ×ÉÑ ËÌÀÞÁ n ÌÅÔ\n"
 
-#: g10/keygen.c:714
+#: g10/keygen.c:810
 msgid "Key is valid for? (0) "
 msgstr "ëÌÀÞ ÄÅÊÓÔ×ÉÔÅÌÅÎ × ÔÅÞÅÎÉÅ? (0) "
 
-#: g10/keygen.c:719
+#: g10/keygen.c:815
 msgid "invalid value\n"
 msgstr "ÎÅÄÏÐÕÓÔÉÍÏÅ ÚÎÁÞÅÎÉÅ.\n"
 
-#: g10/keygen.c:724
+#: g10/keygen.c:820
 msgid "Key does not expire at all\n"
 msgstr "âÅÓÓÒÏÞÎÙÊ ËÌÀÞ.\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:730
+#: g10/keygen.c:826
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "ëÌÀÞ ÄÅÊÓÔ×ÕÅÔ ÄÏ %s\n"
 
-#: g10/keygen.c:733
+#: g10/keygen.c:829
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:738
+#: g10/keygen.c:834
 msgid "Is this correct (y/n)? "
 msgstr "üÔÏ ×ÅÒÎÏ? (y/n) "
 
-#: g10/keygen.c:781
+#: g10/keygen.c:877
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1523,44 +1523,44 @@ msgstr ""
 "    \"Vasya Pupkin (KRUTOI) <vasya@mega-cool.ru>\"\n"
 "\n"
 
-#: g10/keygen.c:793
+#: g10/keygen.c:889
 msgid "Real name: "
 msgstr "÷ÁÛÅ ÉÍÑ (\"éÍÑ æÁÍÉÌÉÑ\"): "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:893
 msgid "Invalid character in name\n"
 msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ × ÉÍÅÎÉ\n"
 
-#: g10/keygen.c:799
+#: g10/keygen.c:895
 msgid "Name may not start with a digit\n"
 msgstr "ðÏÌÎÏÅ ÉÍÑ ÎÅ ÍÏÖÅÔ ÎÁÞÉÎÁÔØÓÑ Ó ÃÉÆÒÙ.\n"
 
-#: g10/keygen.c:801
+#: g10/keygen.c:897
 msgid "Name must be at least 5 characters long\n"
 msgstr "ðÏÌÎÏÅ ÉÍÑ ÄÏÌÖÎÏ ÓÏÓÔÏÑÔØ ÎÅ ÍÅÎÅÅ ÞÅÍ ÉÚ 5ÔÉ ÓÉÍ×ÏÌÏ×.\n"
 
-#: g10/keygen.c:809
+#: g10/keygen.c:905
 msgid "Email address: "
 msgstr "E-Mail: "
 
-#: g10/keygen.c:820
+#: g10/keygen.c:916
 msgid "Not a valid email address\n"
 msgstr "îÅÄÏÐÕÓÔÉÍÙÊ E-Mail\n"
 
-#: g10/keygen.c:828
+#: g10/keygen.c:924
 msgid "Comment: "
 msgstr "ëÏÍÍÅÎÔÁÒÉÊ: "
 
-#: g10/keygen.c:834
+#: g10/keygen.c:930
 msgid "Invalid character in comment\n"
 msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ × ËÏÍÍÅÎÔÁÒÉÉ.\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:956
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:863
+#: g10/keygen.c:962
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1571,29 +1571,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:867
+#: g10/keygen.c:966
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:872
+#: g10/keygen.c:971
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:882
+#: g10/keygen.c:981
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "éÚÍÅÎÉÔØ: N=éÍÑ, C=ëÏÍÍÅÎÔÁÒÉÊ, E=E-Mail, O=Okay/Q=÷ÙÈÏÄ? "
 
-#: g10/keygen.c:883
+#: g10/keygen.c:982
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "éÚÍÅÎÉÔØ: N=éÍÑ, C=ëÏÍÍÅÎÔÁÒÉÊ, E=E-Mail, O=Okay/Q=÷ÙÈÏÄ? "
 
-#: g10/keygen.c:902
+#: g10/keygen.c:1001
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:940
+#: g10/keygen.c:1039
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1601,11 +1601,11 @@ msgstr ""
 "äÌÑ ÚÁÝÉÔÙ ×ÁÛÅÇÏ ËÌÀÞÁ ÎÕÖÎÁ ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ.\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:948
+#: g10/keyedit.c:468 g10/keygen.c:1047
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ ÎÅ ÂÙÌÁ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÁ, ÐÏÐÒÏÂÕÊÔÅ ÓÎÏ×Á.\n"
 
-#: g10/keygen.c:954
+#: g10/keygen.c:1053
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1617,7 +1617,7 @@ msgstr ""
 "×ÒÅÍÑ, ÚÁÐÕÓÔÉ× ÜÔÕ ÐÒÏÇÒÁÍÍÕ Ó ÐÁÒÁÍÅÔÒÏÍ \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1074
 #, fuzzy
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
@@ -1630,30 +1630,30 @@ msgstr ""
 "ÎÁÇÒÕÚÉÔØ ÓÅÔÅ×ÕÀ ÉÌÉ ÄÉÓËÏ×ÕÀ ÐÏÄÓÉÓÔÅÍÕ). üÔÏ ÄÁÓÔ ÇÅÎÅÒÁÔÏÒÕ ÓÌÕÞÁÊÎÙÈ\n"
 "ÞÉÓÅÌ ×ÏÚÍÏÖÎÏÓÔØ ÎÁÂÒÁÔØ ÄÏÓÔÁÔÏÞÎÏ ÜÎÔÒÏÐÉÉ.\n"
 
-#: g10/keygen.c:1424
+#: g10/keygen.c:1523
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "ëÌÀÞÅ×ÁÑ ÐÁÒÁ DSA ÂÕÄÅÔ ÉÍÅÔØ ÄÌÉÎÕ 1024 ÂÉÔÁ.\n"
 
-#: g10/keygen.c:1467
+#: g10/keygen.c:1566
 #, fuzzy
 msgid "Key generation canceled.\n"
 msgstr "çÅÎÅÒÁÃÉÑ ËÌÀÞÁ ÏÔÍÅÎÅÎÁ: %s\n"
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1663
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "ÏÔËÒÙÔÙÊ ÓÅÒÔÉÆÉËÁÔ ÚÁÐÉÓÙ×ÁÅÔÓÑ × `%s'\n"
 
-#: g10/keygen.c:1565
+#: g10/keygen.c:1664
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "ÓÅËÒÅÔÎÙÊ ÓÅÒÔÉÆÉËÁÔ ÚÁÐÉÓÙ×ÁÅÔÓÑ × `%s'\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1760
 msgid "public and secret key created and signed.\n"
 msgstr "ÏÔËÒÙÔÙÊ É ÓÅËÒÅÔÎÙÊ ËÌÀÞÉ ÓÏÚÄÁÎÙ É ÐÏÄÐÉÓÁÎÙ.\n"
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1765
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -1664,12 +1664,12 @@ msgstr ""
 "ÄÏÐÏÌÎÉÔÅÌØÎÏÇÏ\n"
 "ËÌÀÞÁ ÄÌÑ ÛÉÆÒÏ×ÁÎÉÑ.\n"
 
-#: g10/keygen.c:1683 g10/keygen.c:1784
+#: g10/keygen.c:1782 g10/keygen.c:1883
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "çÅÎÅÒÁÃÉÑ ËÌÀÞÁ ÎÅ ÕÄÁÌÁÓØ: %s\n"
 
-#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1826 g10/sig-check.c:300 g10/sign.c:167
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1677,7 +1677,7 @@ msgstr ""
 "ÏÔËÒÙÔÙÊ ËÌÀÞ ÓÇÅÎÅÒÉÒÏ×ÁÎ × ÂÕÄÕÝÅÍ (ÉÓËÒÉ×ÌÅÎÉÅ ×ÒÅÍÅÎÉ ÉÌÉ ÎÅÐÒÁ×ÉÌØÎÏ "
 "ÕÓÔÁÎÏ×ÌÅÎÙ ÞÁÓÙ)\n"
 
-#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1828 g10/sig-check.c:302 g10/sign.c:169
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1685,33 +1685,33 @@ msgstr ""
 "ÏÔËÒÙÔÙÊ ËÌÀÞ ÓÇÅÎÅÒÉÒÏ×ÁÎ × ÂÕÄÕÝÅÍ (ÉÓËÒÉ×ÌÅÎÉÅ ×ÒÅÍÅÎÉ ÉÌÉ ÎÅÐÒÁ×ÉÌØÎÏ "
 "ÕÓÔÁÎÏ×ÌÅÎÙ ÞÁÓÙ)\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1861
 #, fuzzy
 msgid "Really create? "
 msgstr "äÅÊÓÔ×ÉÔÅÌØÎÏ ÓÏÚÄÁÔØ? "
 
-#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:142 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:164
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "ÏÛÉÂËÁ ÐÒÉ ÓÏÚÄÁÎÉÉ ËÌÀÞÅ×ÏÊ ÆÒÁÚÙ: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:222 g10/encode.c:370
 #, fuzzy, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÕÓÔÏÊ ÆÁÊÌ.\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:317
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "þÉÔÁÅÔÓÑ ÉÚ `%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:534
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s ÚÁÛÉÆÒÏ×ÁÎÏ ÄÌÑ: %s\n"
@@ -1741,34 +1741,34 @@ msgstr "
 msgid "WARNING: nothing exported\n"
 msgstr "÷îéíáîéå: éÓÐÏÌØÚÕÅÔÓÑ ËÌÀÞ Ë ËÏÔÏÒÏÍÕ ÎÅÔ ÄÏ×ÅÒÉÑ!\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:212
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:350
+#: g10/getkey.c:351
 msgid "too many entries in unk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
+#: g10/getkey.c:1311 g10/getkey.c:1350
 msgid "RSA key cannot be used in this version\n"
 msgstr ""
 
-#: g10/getkey.c:1310 g10/getkey.c:1349
+#: g10/getkey.c:1313 g10/getkey.c:1352
 #, fuzzy
 msgid "No key for user ID\n"
 msgstr "ËÌÀÞ %08lX: ÎÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ\n"
 
-#: g10/getkey.c:1388 g10/getkey.c:1428
+#: g10/getkey.c:1391 g10/getkey.c:1431
 #, fuzzy
 msgid "No user ID for key\n"
 msgstr "ðÌÏÈÏÊ ÓÅËÒÅÔÎÙÊ ËÌÀÞ"
 
-#: g10/getkey.c:1642 g10/getkey.c:1698
+#: g10/getkey.c:1645 g10/getkey.c:1701
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "ÉÓÐÏÌØÚÕÅÔÓÑ ÄÏÐÏÌÎÉÔÅÌØÎÙÊ ËÌÀÞ %09lX ×ÍÅÓÔÏ ÏÓÎÏ×ÎÏÇÏ %08lX%\n"
 
-#: g10/getkey.c:2017
+#: g10/getkey.c:2020
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: ÐÏÌØÚÏ×ÁÔÅÌØ ÎÅ ÎÁÊÄÅÎ\n"
@@ -1778,7 +1778,7 @@ msgstr "%s: 
 msgid "skipping block of type %d\n"
 msgstr "ÐÒÏÐÕÓËÁÅÍ ÂÌÏË ÔÉÐÁ %d\n"
 
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:188 g10/trustdb.c:1748 g10/trustdb.c:1789
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr ""
@@ -1866,7 +1866,7 @@ msgstr "
 msgid "no default public keyring\n"
 msgstr "ÎÅÔ Ó×ÑÚËÉ ÏÔËÒÙÔÙÈ ËÌÀÞÅÊ ÐÏ ÕÍÏÌÞÁÎÉÀ\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:350 g10/sign.c:669
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "ÚÁÐÉÓÙ×ÁÅÔÓÑ × `%s'\n"
@@ -2127,7 +2127,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "äÅÊÓÔ×ÉÔÅÌØÎÏ ÐÏÄÐÉÓÁÔØ? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1870 g10/keyedit.c:1932 g10/sign.c:136
+#: g10/keyedit.c:373 g10/keyedit.c:1873 g10/keyedit.c:1935 g10/sign.c:191
 #, fuzzy, c-format
 msgid "signing failed: %s\n"
 msgstr "ÏÛÉÂËÁ ÐÏÄÐÉÓÙ×ÁÎÉÑ: %s\n"
@@ -2518,282 +2518,292 @@ msgstr "
 msgid "Invalid command  (try \"help\")\n"
 msgstr "îÅÄÏÐÕÓÔÉÍÁÑ ËÏÍÁÎÄÁ (ÐÏÐÒÏÂÕÊÔÅ \"help\")\n"
 
-#: g10/keyedit.c:1080 g10/keyedit.c:1106
+#: g10/keyedit.c:1083 g10/keyedit.c:1109
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1089
+#: g10/keyedit.c:1092
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1093
+#: g10/keyedit.c:1096
 #, fuzzy
 msgid "This key has been disabled"
 msgstr "úÁÍÅÞÁÎÉÅ: óÒÏË ÄÅÊÓÔ×ÉÑ ËÌÀÞÁ ÕÖÅ ÉÓÔÅË!\n"
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1125
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "build_sigrecs: ËÌÀÞ ist widerrufen\n"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1128
 msgid "rev- faked revocation found\n"
 msgstr ""
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1130
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1368
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1372
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1376
 #, fuzzy
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1382
 #, fuzzy
 msgid "Really delete this self-signature? (y/N)"
 msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1396
 #, fuzzy, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d ÐÌÏÈÉÈ ÐÏÄÐÉÓÅÊ\n"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1397
 #, fuzzy, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d ÐÌÏÈÉÈ ÐÏÄÐÉÓÅÊ\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "Nothing deleted.\n"
 msgstr "÷îéíáîéå: éÓÐÏÌØÚÕÅÔÓÑ ËÌÀÞ Ë ËÏÔÏÒÏÍÕ ÎÅÔ ÄÏ×ÅÒÉÑ!\n"
 
-#: g10/keyedit.c:1466
+#: g10/keyedit.c:1469
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:1472
+#: g10/keyedit.c:1475
 #, fuzzy
 msgid "Please select at most one secondary key.\n"
 msgstr "÷Ù ÄÏÌÖÎÙ ×ÙÂÒÁÔØ ÈÏÔÑ ÂÙ ÏÄÉÎ ËÌÀÞ.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1479
 msgid "Changing expiration time for a secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1481
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1520
+#: g10/keyedit.c:1523
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:1536
+#: g10/keyedit.c:1539
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1600
 #, fuzzy, c-format
 msgid "No user ID with index %d\n"
 msgstr "îÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ Ó ÉÎÄÅËÓÏÍ %d\n"
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1646
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "îÅÔ ÄÏÐÏÌÎÉÔÅÌØÎÏÇÏ ËÌÀÞÁ Ó ÉÎÄÅËÓÏÍ %d\n"
 
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1744
 #, fuzzy
 msgid "user ID: \""
 msgstr "÷×ÅÄÉÔÅ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ: "
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1747
 #, fuzzy, c-format
 msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 msgstr "îÅÞÅÇÏ ÐÏÄÐÉÓÙ×ÁÔØ ËÌÀÞÁÍ %08lX\n"
 
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:1751
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1775
 #, fuzzy
 msgid "You have signed these user IDs:\n"
 msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ÕÄÁÌÉÔØ ÐÏÓÌÅÄÎÉÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ!\n"
 
-#: g10/keyedit.c:1786 g10/keyedit.c:1821
+#: g10/keyedit.c:1789 g10/keyedit.c:1824
 #, fuzzy, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "îÅÞÅÇÏ ÐÏÄÐÉÓÙ×ÁÔØ ËÌÀÞÁÍ %08lX\n"
 
-#: g10/keyedit.c:1791
+#: g10/keyedit.c:1794
 #, fuzzy, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "îÅÞÅÇÏ ÐÏÄÐÉÓÙ×ÁÔØ ËÌÀÞÁÍ %08lX\n"
 
-#: g10/keyedit.c:1811
+#: g10/keyedit.c:1814
 #, fuzzy
 msgid "You are about to revoke these signatures:\n"
 msgstr "Möchten Sie einige der ungültigen Signaturen entfernen? "
 
-#: g10/keyedit.c:1829
+#: g10/keyedit.c:1832
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1861
 #, fuzzy
 msgid "no secret key\n"
 msgstr "ðÌÏÈÏÊ ÓÅËÒÅÔÎÙÊ ËÌÀÞ"
 
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "îÅÄÏÐÕÓÔÉÍÁÑ ASCII-ËÏÄÉÒÏ×ËÁ"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "ËÌÀÞ"
+
 #. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:401 g10/mainproc.c:754
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "ëÌÀÞ ÄÅÊÓÔ×ÕÅÔ ÄÏ %s\n"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:212
 #, fuzzy, c-format
 msgid "public key is %08lX\n"
 msgstr "ïÔËÒÙÔÙÊ ËÌÀÞ ÎÅ ÎÁÊÄÅÎ"
 
-#: g10/mainproc.c:248
+#: g10/mainproc.c:247
 #, fuzzy
 msgid "public key encrypted data: good DEK\n"
 msgstr "ÒÁÓÛÉÆÒÏ×ËÁ ÏÔËÒÙÔÙÍ ËÌÀÞÏÍ ÎÅ ÕÄÁÌÁÓØ %s\n"
 
-#: g10/mainproc.c:281
+#: g10/mainproc.c:280
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "(%u-ÂÉÔ %s ËÌÀÞ, ID %08lX, ÓÏÚÄÁÎ %s)\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "ðÏÄÐÉÓØ ÓÄÅÌÁÎÁ %.*s, ÉÓÐÏÌØÚÕÑ %s ËÌÀÞ %08lX\n"
 
-#: g10/mainproc.c:297
+#: g10/mainproc.c:296
 #, fuzzy
 msgid "no secret key for decryption available\n"
 msgstr "óÅËÒÅÔÎÙÊ ËÌÀÞ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ"
 
-#: g10/mainproc.c:306
+#: g10/mainproc.c:305
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "ÒÁÓÛÉÆÒÏ×ËÁ ÏÔËÒÙÔÙÍ ËÌÀÞÏÍ ÎÅ ÕÄÁÌÁÓØ %s\n"
 
-#: g10/mainproc.c:343
+#: g10/mainproc.c:342
 #, fuzzy
 msgid "decryption okay\n"
 msgstr "ÒÁÓÛÉÆÒÏ×ËÁ ÎÅ ÕÄÁÌÁÓØ: %s\n"
 
-#: g10/mainproc.c:348
+#: g10/mainproc.c:347
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:352
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ÒÁÓÛÉÆÒÏ×ËÁ ÎÅ ÕÄÁÌÁÓØ: %s\n"
 
-#: g10/mainproc.c:372
+#: g10/mainproc.c:371
 #, fuzzy
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "ÚÁÍÅÞÁÎÉÅ: ÏÔÐÒÁ×ÉÔÅÌØ ÚÁÐÒÏÓÉÌ \"ÔÏÌØËÏ-ÄÌÑ-÷ÁÛÉÈ-ÇÌÁÚ\"\n"
 
-#: g10/mainproc.c:374
+#: g10/mainproc.c:373
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:538
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:613 g10/mainproc.c:622
+#: g10/mainproc.c:625 g10/mainproc.c:634
 #, fuzzy
 msgid "WARNING: invalid notation data found\n"
 msgstr "ÎÅ ÎÁÊÄÅÎÏ ÄÏÐÕÓÔÉÍÙÈ RFC1991 ÉÌÉ OpenPGP ÄÁÎÎÙÈ.\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:637
 msgid "Notation: "
 msgstr ""
 
-#: g10/mainproc.c:632
+#: g10/mainproc.c:644
 msgid "Policy: "
 msgstr ""
 
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1074
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1080
 #, 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:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1106 g10/mainproc.c:1117
 msgid "BAD signature from \""
 msgstr "ðìïèáñ ÐÏÄÐÉÓØ ÏÔ \""
 
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1107 g10/mainproc.c:1118
 msgid "Good signature from \""
 msgstr "èÏÒÏÛÁÑ ÐÏÄÐÉÓØ ÏÔ \""
 
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1109
 msgid "                aka \""
 msgstr ""
 
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1165
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ: %s\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1230
 #, fuzzy, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "ðÏÄÐÉÓØ ÎÅÉÚ×ÅÓÔÎÏÇÏ ÔÉÐÁ"
 
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1282
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1287
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:94
+#: g10/misc.c:83
 #, fuzzy, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:86
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/misc.c:205
+#: g10/misc.c:312
 msgid "Experimental algorithms should not be used!\n"
 msgstr ""
 
-#: g10/misc.c:219
+#: g10/misc.c:326
 msgid ""
 "RSA keys are deprecated; please consider creating a new key and use this key "
 "in the future\n"
@@ -2801,16 +2811,16 @@ msgstr ""
 "ðÏÌØÚÏ×ÁÎÉÅ RSA ËÌÀÞÁÍÉ ÎÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ, ÐÏÖÁÌÕÊÓÔÁ, ÐÏÄÕÍÁÊÔÅ Ï ÓÏÚÄÁÎÉÉ\n"
 "ÎÏ×ÏÇÏ ËÌÀÞÁ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ × ÂÕÄÕÝÅÍ\n"
 
-#: g10/misc.c:241
+#: g10/misc.c:348
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 
-#: g10/parse-packet.c:117
+#: g10/parse-packet.c:115
 #, fuzzy, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÂÌÏËÉÒÏ×ÁÔØ Ó×ÑÚËÕ ÏÔËÒÙÔÙÈ ËÌÀÞÅÊ: %s\n"
 
-#: g10/parse-packet.c:965
+#: g10/parse-packet.c:963
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -2850,54 +2860,54 @@ msgstr "
 msgid "Repeat passphrase: "
 msgstr "ðÏ×ÔÏÒÉÔÅ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ: %s\n"
 
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "ÄÁÎÎÙÅ ÎÅ ÂÙÌÉ ÓÏÈÒÁÎÅÎÙ; ×ÏÓÐÏÌØÚÕÊÔÅÓØ --\"output\" ÄÌÑ ÓÏÈÒÁÎÅÎÉÑ\n"
 
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
 #, fuzzy
 msgid "Detached signature.\n"
 msgstr "%d ÐÌÏÈÉÈ ÐÏÄÐÉÓÅÊ\n"
 
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
 msgid "Please enter name of data file: "
 msgstr "ðÏÖÁÌÕÊÓÔÁ, ××ÅÄÉÔÅ ÉÍÑ ÆÁÊÌÁ ÄÁÎÎÙÈ: "
 
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
 msgid "reading stdin ...\n"
 msgstr ""
 
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÐÏÄÐÉÓÁÎÎÙÅ ÄÁÎÎÙÅ `%s' .\n"
 
-#: g10/pubkey-enc.c:79
+#: g10/pubkey-enc.c:138
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "ÁÎÏÎÉÍÎÙÊ ÐÏÌÕÞÁÔÅÌØ, ÐÒÏÂÕÅÍ ÓÅËÒÅÔÎÙÊ ËÌÀÞ %08lX ...\n"
 
-#: g10/pubkey-enc.c:85
+#: g10/pubkey-enc.c:144
 #, fuzzy
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ïË, ÍÙ -- ÁÎÏÎÉÍÎÙÊ ÐÏÌÕÞÁÔÅÌØ.\n"
 
-#: g10/pubkey-enc.c:137
+#: g10/pubkey-enc.c:200
 #, fuzzy
 msgid "old encoding of the DEK is not supported\n"
 msgstr "ÁÌÇÏÒÉÔÍ ÚÁÝÉÔÙ %d ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n"
 
-#: g10/pubkey-enc.c:156
+#: g10/pubkey-enc.c:219
 #, fuzzy, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "ÁÌÇÏÒÉÔÍ ÚÁÝÉÔÙ %d ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n"
 
-#: g10/pubkey-enc.c:195
+#: g10/pubkey-enc.c:258
 #, fuzzy, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "ÚÁÍÅÞÁÎÉÅ: ÛÉÆÒÏ×ÁÌØÎÙÊ ÁÌÇÏÒÉÔÍ %d ÎÅ ÎÁÊÄÅÎ × ÐÒÅÄÐÏÞÔÅÎÉÑÈ\n"
 
-#: g10/pubkey-enc.c:201
+#: g10/pubkey-enc.c:264
 #, fuzzy, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ËÌÀÞ ÐÏÄÐÉÓÉ ÕÓÔÁÒÅÌ %s\n"
@@ -2941,69 +2951,65 @@ msgstr ""
 msgid "failed sending to `%s': status=%u\n"
 msgstr ""
 
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:90
 #, fuzzy
 msgid "secret key parts are not available\n"
 msgstr "óÅËÒÅÔÎÙÊ ËÌÀÞ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:96
 #, fuzzy, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "ÁÌÇÏÒÉÔÍ ÚÁÝÉÔÙ %d ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n"
 
-#: g10/seckey-cert.c:175
+#: g10/seckey-cert.c:239
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "îÅÐÒÁ×ÉÌØÎÁÑ ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ, ÐÏÐÒÏÂÕÊÔÅ ÓÎÏ×Á ...\n"
 
-#: g10/seckey-cert.c:231
+#: g10/seckey-cert.c:302
 #, fuzzy
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÏÂÎÁÒÕÖÅÎ ÓÌÁÂÙÊ ËÌÀÞ - ÓÍÅÎÉÔÅ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ.\n"
 
-#: g10/sig-check.c:202
-msgid "assuming bad MDC due to an unknown critical bit\n"
-msgstr ""
-
-#: g10/sig-check.c:300
+#: g10/sig-check.c:282
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr "ÜÔÏÔ ElGamal ËÌÀÞ, ÓÏÚÄÁÎÎÙÊ PGP, ÎÅ ÎÁÄÅÖÅÎ ÄÌÑ ÓÏÚÄÁÎÉÑ ÐÏÄÐÉÓÅÊ!\n"
 
-#: g10/sig-check.c:308
+#: g10/sig-check.c:290
 #, fuzzy, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "ËÌÀÞ %08lX: ÎÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÐÏÄÐÉÓÉ\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:291
 #, fuzzy, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "ËÌÀÞ %08lX: ÎÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÐÏÄÐÉÓÉ\n"
 
-#: g10/sig-check.c:327
+#: g10/sig-check.c:309
 #, fuzzy, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ËÌÀÞ ÐÏÄÐÉÓÉ ÕÓÔÁÒÅÌ %s\n"
 
-#: g10/sig-check.c:396
+#: g10/sig-check.c:378
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sign.c:140
+#: g10/sign.c:195
 #, fuzzy, c-format
 msgid "%s signature from: %s\n"
 msgstr "ðìïèáñ ÐÏÄÐÉÓØ ÏÔ \""
 
-#: g10/sign.c:290 g10/sign.c:606
+#: g10/sign.c:345 g10/sign.c:664
 #, fuzzy, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n"
 
-#: g10/sign.c:388
+#: g10/sign.c:444
 #, fuzzy
 msgid "signing:"
 msgstr "ÐÏÄÐÉÓÁÔØ"
 
-#: g10/sign.c:431
+#: g10/sign.c:487
 #, fuzzy, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÕÓÔÏÊ ÆÁÊÌ.\n"
@@ -3042,7 +3048,8 @@ msgstr "%s: 
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1363 g10/tdbio.c:444
+#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1407
+#: g10/ringedit.c:1878 g10/tdbio.c:444
 #, fuzzy, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n"
@@ -3228,211 +3235,211 @@ msgstr "
 msgid "enumerate secret keys failed: %s\n"
 msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÓÅËÒÅÔÁ ÎÅ ÕÄÁÌÏÓØ: %s\n"
 
-#: g10/trustdb.c:921
+#: g10/trustdb.c:925
 #, fuzzy, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "ËÌÀÞ %08lX: ÎÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ\n"
 
-#: g10/trustdb.c:927 g10/trustdb.c:962
+#: g10/trustdb.c:931 g10/trustdb.c:966
 #, fuzzy, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "ËÌÀÞ %08lX: ÎÅÔ ÄÏÐÕÓÔÉÍÙÈ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× ÐÏÌØÚÏ×ÁÔÅÌÅÊ\n"
 
-#: g10/trustdb.c:939
+#: g10/trustdb.c:943
 #, fuzzy, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "ËÌÀÞ %08lX.%lu: ÓÒÏË ÄÅÊÓÔ×ÉÑ ÉÓÔÅË %s\n"
 
-#: g10/trustdb.c:945
+#: g10/trustdb.c:949
 #, fuzzy, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "ËÌÀÞ %08lX: ÏÔËÒÙÔÙÊ ËÌÀÞ ÎÅ ÎÁÊÄÅÎ: %s\n"
 
-#: g10/trustdb.c:956
+#: g10/trustdb.c:960
 #, fuzzy, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "ËÌÀÞ %08lX: ÎÅÔ ÄÏÐÕÓÔÉÍÙÈ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× ÐÏÌØÚÏ×ÁÔÅÌÅÊ\n"
 
-#: g10/trustdb.c:1067
+#: g10/trustdb.c:1071
 #, fuzzy
 msgid "Good self-signature"
 msgstr "[ÓÁÍÏ-ÐÏÄÐÉÓØ]\n"
 
-#: g10/trustdb.c:1077
+#: g10/trustdb.c:1081
 #, fuzzy
 msgid "Invalid self-signature"
 msgstr "ËÌÀÞ %08lX: ÎÅÄÏÐÕÓÔÉÍÁÑ ÓÁÍÏ-ÐÏÄÐÉÓØ\n"
 
-#: g10/trustdb.c:1104
+#: g10/trustdb.c:1108
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 
-#: g10/trustdb.c:1110
+#: g10/trustdb.c:1114
 #, fuzzy
 msgid "Valid user ID revocation"
 msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ×ÙÂÏÒ.\n"
 
-#: g10/trustdb.c:1115
+#: g10/trustdb.c:1119
 #, fuzzy
 msgid "Invalid user ID revocation"
 msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ×ÙÂÏÒ.\n"
 
-#: g10/trustdb.c:1157
+#: g10/trustdb.c:1161
 #, fuzzy
 msgid "Valid certificate revocation"
 msgstr "ðÌÏÈÏÊ ÓÅÒÔÉÆÉËÁÔ"
 
-#: g10/trustdb.c:1158
+#: g10/trustdb.c:1162
 #, fuzzy
 msgid "Good certificate"
 msgstr "ðÌÏÈÏÊ ÓÅÒÔÉÆÉËÁÔ"
 
-#: g10/trustdb.c:1186
+#: g10/trustdb.c:1190
 #, fuzzy
 msgid "Invalid certificate revocation"
 msgstr "ðÌÏÈÏÊ ÓÅÒÔÉÆÉËÁÔ"
 
-#: g10/trustdb.c:1187
+#: g10/trustdb.c:1191
 #, fuzzy
 msgid "Invalid certificate"
 msgstr "ðÌÏÈÏÊ ÓÅÒÔÉÆÉËÁÔ"
 
-#: g10/trustdb.c:1204 g10/trustdb.c:1208
+#: g10/trustdb.c:1208 g10/trustdb.c:1212
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr ""
 
-#: g10/trustdb.c:1267
+#: g10/trustdb.c:1271
 #, fuzzy
 msgid "duplicated certificate - deleted"
 msgstr "ðÌÏÈÏÊ ÓÅÒÔÉÆÉËÁÔ"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1592
 #, fuzzy, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "ÏÛÉÂËÁ ÄÅËÏÄÉÒÏ×ÁÎÉÑ: %s\n"
 
-#: g10/trustdb.c:1718
+#: g10/trustdb.c:1726
 #, fuzzy, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÓÅËÒÅÔÁ ÎÅ ÕÄÁÌÏÓØ: %s\n"
 
-#: g10/trustdb.c:1723
+#: g10/trustdb.c:1731
 #, fuzzy, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÓÅËÒÅÔÁ ÎÅ ÕÄÁÌÏÓØ: %s\n"
 
-#: g10/trustdb.c:1729
+#: g10/trustdb.c:1737
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr ""
 
-#: g10/trustdb.c:1734
+#: g10/trustdb.c:1742
 #, fuzzy, c-format
 msgid "error reading dir record: %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/trustdb.c:1742 g10/trustdb.c:1805
+#: g10/trustdb.c:1750 g10/trustdb.c:1813
 #, c-format
 msgid "%lu keys processed\n"
 msgstr ""
 
-#: g10/trustdb.c:1744 g10/trustdb.c:1811
+#: g10/trustdb.c:1752 g10/trustdb.c:1819
 #, fuzzy, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "ïÛÉÂËÁ ÚÁÐÉÓÉ ÆÁÊÌÁ"
 
-#: g10/trustdb.c:1746
+#: g10/trustdb.c:1754
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr ""
 
-#: g10/trustdb.c:1749
+#: g10/trustdb.c:1757
 #, fuzzy, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÓÅËÒÅÔÁ ÎÅ ÕÄÁÌÏÓØ: %s\n"
 
-#: g10/trustdb.c:1797
+#: g10/trustdb.c:1805
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr ""
 
-#: g10/trustdb.c:1807
+#: g10/trustdb.c:1815
 #, fuzzy, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "ËÌÀÞ %08lX: %d ÎÏ×ÙÈ ÐÏÄ-ËÌÀÞÅÊ\n"
 
-#: g10/trustdb.c:1809
+#: g10/trustdb.c:1817
 #, fuzzy, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "%s: ÐÒÏÐÕÝÅÎ: %s\n"
 
-#: g10/trustdb.c:1813
+#: g10/trustdb.c:1821
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr ""
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2166
 msgid "Ooops, no keys\n"
 msgstr ""
 
-#: g10/trustdb.c:2162
+#: g10/trustdb.c:2170
 #, fuzzy
 msgid "Ooops, no user IDs\n"
 msgstr "ÓÐÉÓÏË ËÌÀÞÅÊ É ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× ÐÏÌØÚÏ×ÁÔÅÌÅÊ"
 
-#: g10/trustdb.c:2320
+#: g10/trustdb.c:2328
 #, fuzzy, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "ËÌÀÞ %08lX.%lu: ×ÓÔÁ×ËÁ ÄÏ×ÅÒÉÔÅÌØÎÏÊ ÚÁÐÉÓÉ ÎÅ ÕÄÁÌÁÓØ: %s\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2337
 #, fuzzy, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "ËÌÀÞ %08lX.%lu: ×ÓÔÁ×ËÁ ÄÏ×ÅÒÉÔÅÌØÎÏÊ ÚÁÐÉÓÉ ÎÅ ÕÄÁÌÁÓØ: %s\n"
 
-#: g10/trustdb.c:2333
+#: g10/trustdb.c:2341
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "ËÌÀÞ %08lX.%lu: ×ÓÔÁ×ÌÅÎ × ÂÁÚÕ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2349
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "ËÌÀÞ %08lX.%lu: ÓÇÅÎÅÒÉÒÏ×ÁÎ × ÂÕÄÕÝÅÍ (ÎÅÐÒÁ×ÉÌØÎÏ ÕÓÔÁÎÏ×ÌÅÎÙ ÞÁÓÙ)\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2364
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "ËÌÀÞ %08lX.%lu: ÓÒÏË ÄÅÊÓÔ×ÉÑ ÉÓÔÅË %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2372
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "ËÌÀÞ %08lX.%lu: ÐÒÏ×ÅÒËÁ ÄÏ×ÅÒÉÑ ÎÅ ÕÄÁÌÁÓØ: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2523
 #, fuzzy, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "%s: ÐÏÌØÚÏ×ÁÔÅÌØ ÎÅ ÎÁÊÄÅÎ\n"
 
-#: g10/trustdb.c:2517
+#: g10/trustdb.c:2525
 #, fuzzy, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "ïÛÉÂËÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ: %s\n"
 
-#: g10/trustdb.c:2520
+#: g10/trustdb.c:2528
 #, fuzzy, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ ÎÅ ÕÄÁÌÏÓØ: %s\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2531
 #, fuzzy, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "ïÛÉÂËÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ: %s\n"
 
-#: g10/trustdb.c:2709 g10/trustdb.c:2739
+#: g10/trustdb.c:2717 g10/trustdb.c:2747
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr ""
 
@@ -3448,44 +3455,40 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: g10/ringedit.c:302
+#: g10/ringedit.c:324
 #, fuzzy, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1368
+#: g10/ringedit.c:341 g10/ringedit.c:1412 g10/ringedit.c:1883
 #, fuzzy, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n"
 
-#: g10/ringedit.c:1545
+#: g10/ringedit.c:1589 g10/ringedit.c:2060
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/ringedit.c:1546
+#: g10/ringedit.c:1590 g10/ringedit.c:2061
 #, fuzzy, c-format
 msgid "%s is the unchanged one\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎ ÎÅÐÒÁ×ÉÌØÎÙÊ ÓÅËÒÅÔÎÙÊ ËÌÀÞ"
 
-#: g10/ringedit.c:1547
+#: g10/ringedit.c:1591 g10/ringedit.c:2062
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/ringedit.c:1548
+#: g10/ringedit.c:1592 g10/ringedit.c:2063
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
-#: g10/skclist.c:88 g10/skclist.c:125
-msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr ""
-
-#: g10/skclist.c:113
+#: g10/skclist.c:96
 #, fuzzy, c-format
 msgid "skipped `%s': %s\n"
 msgstr "%s: ÐÒÏÐÕÝÅÎ: %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:102
 #, fuzzy, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3541,17 +3544,17 @@ msgstr "%s: 
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr ""
 
-#: g10/encr-data.c:66
-#, fuzzy, c-format
-msgid "%s encrypted data\n"
-msgstr "ÚÁÛÉÆÒÏ×ÁÔØ ÄÁÎÎÙÅ"
-
-#: g10/encr-data.c:68
+#: g10/encr-data.c:64
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
 
-#: g10/encr-data.c:90
+#: g10/encr-data.c:69
+#, fuzzy, c-format
+msgid "%s encrypted data\n"
+msgstr "ÚÁÛÉÆÒÏ×ÁÔØ ÄÁÎÎÙÅ"
+
+#: g10/encr-data.c:99
 #, fuzzy
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -3559,11 +3562,11 @@ msgstr ""
 "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÓÏÏÂÝÅÎÉÅ ÂÙÌÏ ÚÁÛÉÆÒÏ×ÁÎÏ, ÉÓÐÏÌØÚÕÑ ÓÌÁÂÙÊ ËÌÀÞ, × "
 "ÓÉÍÍÅÔÒÉÞÎÏÍ ÁÌÇÏÒÉÔÍÅ ÛÉÆÒÏ×ÁÎÉÑ.\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:61
 msgid "weak key created - retrying\n"
 msgstr "ÐÏÌÕÞÉÌÓÑ ÓÌÁÂÙÊ ËÌÀÞ, ÐÒÏÂÕÅÍ ÅÝÅ ÒÁÚ\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:66
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
@@ -3765,7 +3768,7 @@ msgid ""
 "  \"Key has been compromised\"\n"
 "      Use this if you have a reason to believe that unauthorized persons\n"
 "      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
+"  \"Key is superseeded\"\n"
 "      Use this if you have replaced this key with a newer one.\n"
 "  \"Key is no longer used\"\n"
 "      Use this if you have retired this key.\n"
@@ -3790,6 +3793,10 @@ msgstr "
 msgid "No help available for `%s'"
 msgstr "ðÏÍÏÝØ ÄÌÑ `%s' ÏÔÓÕÔÓÔ×ÕÅÔ."
 
+#, fuzzy
+#~ msgid "not processed"
+#~ msgstr "îÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
+
 #~ msgid "set debugging flags"
 #~ msgstr "ÕÓÔÁÎÏ×ÉÔØ ÏÔÌÁÄÏÞÎÙÅ ÆÌÁÇÉ"
 
diff --git a/po/sv.po b/po/sv.po
index e5d6e248e..d98b08073 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.1e\n"
-"POT-Creation-Date: 2000-07-12 12:13+0200\n"
+"POT-Creation-Date: 2000-07-30 20:02+0200\n"
 "PO-Revision-Date: 2000-04-23 16:43+02:00\n"
 "Last-Translator: Daniel Resare <daniel@resare.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -21,55 +21,43 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:79
-msgid "Warning: using insecure memory!\n"
-msgstr "Varning: använder osäkert minne!\n"
-
-#: util/secmem.c:289
-msgid "operation is not possible without initialized secure memory\n"
-msgstr "operationen är ej möjlig utan tillgång till säkert minne\n"
-
-#: util/secmem.c:290
-msgid "(you may have used the wrong program for this task)\n"
-msgstr "(du kan ha använt fel program för denna uppgift)\n"
-
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:278 util/miscutil.c:307
 msgid "yes"
 msgstr "ja"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:279 util/miscutil.c:310
 msgid "yY"
 msgstr "jJ"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:280 util/miscutil.c:308
 msgid "no"
 msgstr "nej"
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:281 util/miscutil.c:311
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:580 util/miscutil.c:308
+#: g10/keyedit.c:580 util/miscutil.c:309
 msgid "quit"
 msgstr "avsluta"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:312
 msgid "qQ"
 msgstr "aA"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "allmänt fel"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "okänd pakettyp"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "okänd version"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "okänd algoritm för publik nyckel"
 
@@ -77,254 +65,250 @@ msgstr "ok
 # om du har ett bättre förslag kontakta mig gärna på
 # daniel@resare.com. Andra förslag jag sågat är digest (oöversatt),
 # fingeravtryck, indatakarakteristik, sammandrag och sammanfattning
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "okänd algoritm för beräkning av kontrollsumma"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "felaktig publik nyckel"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "felaktig hemlig nyckel"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "felaktig signatur"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "fel vid beräkning av kontrollsumma"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "felaktig lösenordsfras"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "hittade inte publik nyckel"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "okänd chifferalgoritm"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "kan inte öppna nyckelringen"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "felaktigt paket"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "felaktigt skal"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "okänd användaridentitet"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "den hemliga nyckeln är inte tillgänglig"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "fel hemlig nyckel har använts"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "ej stödd"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "felaktig nyckel"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "fel vid läsning av fil"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "fel vid skrivning av fil"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "okänd komprimeringsalgoritm"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "fel vid öppnande av fil"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "fel vid skapande av fil"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "felaktig lösenordsfras"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "algoritmen för publik nyckel är ej implementerad"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "chifferalgorimten är ej implementerad"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "okänd signaturklass"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "fel i tillitsdatabasen"
 
 # MPI står för Multiple Precision Integer (tror jag)
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "felaktig MPI"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "resursbegränsning"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "felaktig nyckelring"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "felaktigt certifikat"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "felformaterad användaridentitet"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "fel vid stängning av fil"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "fel vid namnbyte av fil"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "fel vid borttagande av fil"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "oväntad data"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "konflikt mellan tidsstämplar"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "oanvändbar algoritm för publika nycklar"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "filen finns"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "svag nyckel"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "felaktigt argument"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "felaktig URI"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "ej stödd URI"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "nätverksfel"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "ej krypterad"
 
-#: util/errors.c:103
-msgid "not processed"
-msgstr "inte behandlade"
-
-#: util/logger.c:224
+#: util/logger.c:225
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... detta är en bugg (%s:%d:%s)\n"
 
-#: util/logger.c:230
+#: util/logger.c:231
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du har hittat en bugg ... (%s:%d)\\n\n"
 
-#: cipher/random.c:311 g10/import.c:127 g10/keygen.c:1249
+#: cipher/random.c:321 g10/import.c:127 g10/keygen.c:1348
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
 
-#: cipher/random.c:315
+#: cipher/random.c:325
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan inte ta status på \"%s\": %s\n"
 
-#: cipher/random.c:320
+#: cipher/random.c:330
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "\"%s\" är inte än vanlig fil - ignorerad\n"
 
-#: cipher/random.c:325
+#: cipher/random.c:335
 msgid "note: random_seed file is empty\n"
 msgstr "notera: filen random_seed är tom\n"
 
-#: cipher/random.c:331
+#: cipher/random.c:341
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr "varning: random_seed har en felaktig storlek och används därför inte\n"
 
-#: cipher/random.c:339
+#: cipher/random.c:349
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan inte läsa \"%s\": %s\n"
 
-#: cipher/random.c:377
+#: cipher/random.c:387
 msgid "note: random_seed file not updated\n"
 msgstr "notera: random_seed uppdaterades inte\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:407
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:414
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan inte skriva till \"%s\": %s\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:417
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan inte stänga \"%s\": %s\n"
 
-#: cipher/random.c:418
+#: cipher/random.c:428
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
 msgstr "för många slumpmässiga bitar efterfrågades; maximalt antal är %d\n"
 
-#: cipher/random.c:647
+#: cipher/random.c:657
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VARNING: använder en osäker slumptalsgenerator!!\n"
 
-#: cipher/random.c:648
+#: cipher/random.c:663
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -339,7 +323,7 @@ msgstr ""
 "ANVÄND INGEN DATA GENERERAD AV DETTA PROGRAM!!\n"
 "\n"
 
-#: cipher/rndlinux.c:141
+#: cipher/rndlinux.c:125
 #, c-format
 msgid ""
 "\n"
@@ -351,7 +335,19 @@ msgstr ""
 "en stund för att ge operativsystemet en chans att samla mer entropi!\n"
 "(Behöver %d fler byte)\n"
 
-#: g10/g10.c:197
+#: gcrypt/secmem.c:77
+msgid "Warning: using insecure memory!\n"
+msgstr "Varning: använder osäkert minne!\n"
+
+#: gcrypt/secmem.c:287
+msgid "operation is not possible without initialized secure memory\n"
+msgstr "operationen är ej möjlig utan tillgång till säkert minne\n"
+
+#: gcrypt/secmem.c:288
+msgid "(you may have used the wrong program for this task)\n"
+msgstr "(du kan ha använt fel program för denna uppgift)\n"
+
+#: g10/gpg.c:197
 msgid ""
 "@Commands:\n"
 " "
@@ -359,139 +355,139 @@ msgstr ""
 "@Kommandon:\n"
 " "
 
-#: g10/g10.c:199
+#: g10/gpg.c:199
 msgid "|[file]|make a signature"
 msgstr "|[fil]|skapa en signatur"
 
-#: g10/g10.c:200
+#: g10/gpg.c:200
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|skapa en klartext-signatur"
 
-#: g10/g10.c:201
+#: g10/gpg.c:201
 msgid "make a detached signature"
 msgstr "skapa en signatur i en separat fil"
 
-#: g10/g10.c:202
+#: g10/gpg.c:202
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/g10.c:203
+#: g10/gpg.c:203
 msgid "encryption only with symmetric cipher"
 msgstr "endast kryptering med symmetriskt chiffer"
 
-#: g10/g10.c:204
+#: g10/gpg.c:204
 msgid "store only"
 msgstr "endast lagring"
 
-#: g10/g10.c:205
+#: g10/gpg.c:205
 msgid "decrypt data (default)"
 msgstr "dekryptera data (normalläge)"
 
-#: g10/g10.c:206
+#: g10/gpg.c:206
 msgid "verify a signature"
 msgstr "verifiera en signatur"
 
-#: g10/g10.c:208
+#: g10/gpg.c:208
 msgid "list keys"
 msgstr "räkna upp nycklar"
 
-#: g10/g10.c:210
+#: g10/gpg.c:210
 msgid "list keys and signatures"
 msgstr "räkna upp nycklar och signaturer"
 
-#: g10/g10.c:211
+#: g10/gpg.c:211
 msgid "check key signatures"
 msgstr "verifiera nyckelsignaturer"
 
-#: g10/g10.c:212
+#: g10/gpg.c:212
 msgid "list keys and fingerprints"
 msgstr "räkna upp nycklar och fingeravtryck"
 
-#: g10/g10.c:213
+#: g10/gpg.c:213
 msgid "list secret keys"
 msgstr "räkna upp hemliga nycklar"
 
-#: g10/g10.c:214
+#: g10/gpg.c:214
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/g10.c:215
+#: g10/gpg.c:215
 msgid "remove key from the public keyring"
 msgstr "ta bort en nyckel från den publika nyckelringen"
 
-#: g10/g10.c:217
+#: g10/gpg.c:217
 msgid "remove key from the secret keyring"
 msgstr "ta bort en nyckel från den hemliga nyckelringen"
 
-#: g10/g10.c:218
+#: g10/gpg.c:218
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: g10/g10.c:219
+#: g10/gpg.c:219
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/g10.c:220
+#: g10/gpg.c:220
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: g10/g10.c:221
+#: g10/gpg.c:221
 msgid "generate a revocation certificate"
 msgstr "generera ett återkallelesecertifikat"
 
-#: g10/g10.c:222
+#: g10/gpg.c:222
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/g10.c:223
+#: g10/gpg.c:223
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/g10.c:224
+#: g10/gpg.c:224
 msgid "import keys from a key server"
 msgstr "importera nycklar från en nyckelserver"
 
-#: g10/g10.c:228
+#: g10/gpg.c:228
 msgid "import/merge keys"
 msgstr "importera/slå ihop nycklar"
 
-#: g10/g10.c:230
+#: g10/gpg.c:230
 msgid "list only the sequence of packets"
 msgstr "skriv endast ut paketsekvensen"
 
-#: g10/g10.c:232
+#: g10/gpg.c:232
 msgid "export the ownertrust values"
 msgstr "exportera de värden som representerar ägartillit"
 
-#: g10/g10.c:234
+#: g10/gpg.c:234
 msgid "import ownertrust values"
 msgstr "importera värden som representerar ägartillit"
 
-#: g10/g10.c:236
+#: g10/gpg.c:236
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/g10.c:238
+#: g10/gpg.c:238
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMN]|kontrollera tillitsdatabasen"
 
-#: g10/g10.c:239
+#: g10/gpg.c:239
 msgid "fix a corrupted trust database"
 msgstr "reparera en korrupt tillitsdatabas"
 
-#: g10/g10.c:240
+#: g10/gpg.c:240
 msgid "De-Armor a file or stdin"
 msgstr "Skala av en fil eller standard in"
 
-#: g10/g10.c:242
+#: g10/gpg.c:242
 msgid "En-Armor a file or stdin"
 msgstr "Skapa ett skal för en fil eller standard in"
 
-#: g10/g10.c:244
+#: g10/gpg.c:244
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skriv ut kontrollsummor"
 
-#: g10/g10.c:248
+#: g10/gpg.c:249
 msgid ""
 "@\n"
 "Options:\n"
@@ -501,148 +497,148 @@ msgstr ""
 "Flaggor:\n"
 " "
 
-#: g10/g10.c:250
+#: g10/gpg.c:251
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/g10.c:252
+#: g10/gpg.c:253
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMN|kryptera för NAMN"
 
-#: g10/g10.c:255
+#: g10/gpg.c:256
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMN|använd NAMN som standardvärdet för mottagare"
 
-#: g10/g10.c:257
+#: g10/gpg.c:258
 msgid "use the default key as default recipient"
 msgstr "använd standardnyckeln som standardmottagare"
 
-#: g10/g10.c:261
+#: g10/gpg.c:262
 msgid "use this user-id to sign or decrypt"
 msgstr "använd denna användaridentitet för att signera eller dekryptera"
 
-#: g10/g10.c:262
+#: g10/gpg.c:263
 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:264
+#: g10/gpg.c:265
 msgid "use canonical text mode"
 msgstr "använd \"ursprunglig text\"-läget"
 
-#: g10/g10.c:265
+#: g10/gpg.c:266
 msgid "use as output file"
 msgstr "använd som fil för utdata"
 
-#: g10/g10.c:266
+#: g10/gpg.c:267
 msgid "verbose"
 msgstr "utförlig"
 
-#: g10/g10.c:267
+#: g10/gpg.c:268
 msgid "be somewhat more quiet"
 msgstr "var något tystare"
 
-#: g10/g10.c:268
+#: g10/gpg.c:269
 msgid "don't use the terminal at all"
 msgstr "använd inte terminalen alls"
 
-#: g10/g10.c:269
+#: g10/gpg.c:270
 msgid "force v3 signatures"
 msgstr "använd v3-signaturer"
 
-#: g10/g10.c:270
+#: g10/gpg.c:271
 msgid "always use a MDC for encryption"
 msgstr "använd alltid en MDC för kryptering"
 
-#: g10/g10.c:271
+#: g10/gpg.c:272
 msgid "do not make any changes"
 msgstr "gör inga ändringar"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:273
+#: g10/gpg.c:274
 msgid "batch mode: never ask"
 msgstr "batch-läge: fråga aldrig"
 
-#: g10/g10.c:274
+#: g10/gpg.c:275
 msgid "assume yes on most questions"
 msgstr "anta att svaret är ja på de flesta frågor"
 
-#: g10/g10.c:275
+#: g10/gpg.c:276
 msgid "assume no on most questions"
 msgstr "anta att svaret är nej på de flesta frågor"
 
-#: g10/g10.c:276
+#: g10/gpg.c:277
 msgid "add this keyring to the list of keyrings"
 msgstr "lägg till denna nyckelring till listan av nyckelringar"
 
-#: g10/g10.c:277
+#: g10/gpg.c:278
 msgid "add this secret keyring to the list"
 msgstr "lägg till denna hemliga nyckelring till listan"
 
-#: g10/g10.c:278
+#: g10/gpg.c:279
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
 
-#: g10/g10.c:279
+#: g10/gpg.c:280
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|VÄRD|använd denna nyckelserver för att slå upp nycklar"
 
-#: g10/g10.c:280
+#: g10/gpg.c:281
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMN|sätt teckentabellen för terminalen till NAMN"
 
-#: g10/g10.c:281
+#: g10/gpg.c:282
 msgid "read options from file"
 msgstr "läs flaggor från fil"
 
-#: g10/g10.c:285
+#: g10/gpg.c:286
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
-#: g10/g10.c:290
+#: g10/gpg.c:291
 msgid "|FILE|load extension module FILE"
 msgstr "|FIL|ladda tilläggsmodul FIL"
 
-#: g10/g10.c:291
+#: g10/gpg.c:292
 msgid "emulate the mode described in RFC1991"
 msgstr "imitera läget som beskrivs i RFC1991"
 
-#: g10/g10.c:292
+#: g10/gpg.c:293
 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:293
+#: g10/gpg.c:294
 msgid "|N|use passphrase mode N"
 msgstr "|N|använd lösenordsläget N"
 
-#: g10/g10.c:295
+#: g10/gpg.c:296
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAMN|använd kontrollsummealgoritmen NAMN för lösenordsfraser"
 
-#: g10/g10.c:297
+#: g10/gpg.c:298
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAMN|använd chifferalgoritmen NAMN för lösenordsfraser"
 
-#: g10/g10.c:298
+#: g10/gpg.c:299
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMN|använd chifferalgoritmen NAMN"
 
-#: g10/g10.c:299
+#: g10/gpg.c:300
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMN|använd kontrollsummealgoritmen NAMN"
 
-#: g10/g10.c:300
+#: g10/gpg.c:301
 msgid "|N|use compress algorithm N"
 msgstr "|N|använd komprimeringsalgoritmen N"
 
-#: g10/g10.c:301
+#: g10/gpg.c:302
 msgid "throw keyid field of encrypted packets"
 msgstr "släng bort nyckelidentitetsfältet från krypterade paket"
 
-#: g10/g10.c:302
+#: g10/gpg.c:303
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAMN=VÄRDE|använd detta sätt för att beskriva data"
 
-#: g10/g10.c:305
+#: g10/gpg.c:306
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -650,7 +646,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan för en komplett lista på alla kommandon och flaggor)\n"
 
-#: g10/g10.c:308
+#: g10/gpg.c:309
 msgid ""
 "@\n"
 "Examples:\n"
@@ -670,17 +666,17 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/g10.c:403
+#: g10/gpg.c:409
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Rapportera gärna fel till <gnupg-bugs@gnu.org>.\n"
 "Rapportera gärna fel eller synpunkter på översättningen till <sv@li.org>.\n"
 
-#: g10/g10.c:407
+#: g10/gpg.c:413
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
-#: g10/g10.c:410
+#: g10/gpg.c:416
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -690,7 +686,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "vilken operation som utförs beror på programmets indata\n"
 
-#: g10/g10.c:417
+#: g10/gpg.c:423
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -698,62 +694,67 @@ msgstr ""
 "\n"
 "Stödda algoritmer:\n"
 
-#: g10/g10.c:496
+#: g10/gpg.c:525
 msgid "usage: gpg [options] "
 msgstr "användning: gpg [flaggor] "
 
-#: g10/g10.c:549
+#: g10/gpg.c:583
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
-#: g10/g10.c:692
+#: g10/gpg.c:638
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
+#: g10/gpg.c:734
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTERA: inställningsfilen \"%s\" saknas\n"
 
-#: g10/g10.c:696
+#: g10/gpg.c:738
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: g10/g10.c:703
+#: g10/gpg.c:745
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "läser flaggor från \"%s\"\n"
 
-#: g10/g10.c:893
+#: g10/gpg.c:937
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s är ingen giltig teckentabell\n"
 
-#: g10/g10.c:949 g10/g10.c:958
+#: g10/gpg.c:1002 g10/gpg.c:1011
 #, 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:951
+#: g10/gpg.c:1004
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/g10.c:954
+#: g10/gpg.c:1007
 #, 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:973 g10/g10.c:985
+#: g10/gpg.c:1027 g10/gpg.c:1039
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen är ogiltig\n"
 
-#: g10/g10.c:979 g10/g10.c:991
+#: g10/gpg.c:1033 g10/gpg.c:1045
 msgid "selected digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen är ogiltig\n"
 
-#: g10/g10.c:995
+#: g10/gpg.c:1049
 msgid "the given policy URL is invalid\n"
 msgstr "angiven URL är ogiltig\n"
 
-#: g10/g10.c:998
+#: g10/gpg.c:1052
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "kompressionsalgoritmen måste vara i intervallet %d..%d\n"
@@ -764,127 +765,127 @@ msgstr "kompressionsalgoritmen m
 # är ändå litet. Eventuellt borde meddelandena inte alls
 # översättas för att göra eventuell felsökning lättare
 # för internationella felsökare
-#: g10/g10.c:1000
+#: g10/gpg.c:1054
 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:1002
+#: g10/gpg.c:1056
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" måste vara större än 1\n"
 
-#: g10/g10.c:1004
+#: g10/gpg.c:1058
 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:1007
+#: g10/gpg.c:1061
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTERA: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/g10.c:1011
+#: g10/gpg.c:1065
 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:1096
+#: g10/gpg.c:1154
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/g10.c:1102
+#: g10/gpg.c:1160
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/g10.c:1109
+#: g10/gpg.c:1167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/g10.c:1117
+#: g10/gpg.c:1175
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/g10.c:1130
+#: g10/gpg.c:1188
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/g10.c:1143
+#: g10/gpg.c:1201
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:1157
+#: g10/gpg.c:1215
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/g10.c:1174
+#: g10/gpg.c:1232
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/g10.c:1182
+#: g10/gpg.c:1240
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/g10.c:1190
+#: g10/gpg.c:1248
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/g10.c:1198
+#: g10/gpg.c:1256
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
-#: g10/g10.c:1214
+#: g10/gpg.c:1272
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key användaridentitet"
 
-#: g10/g10.c:1217
+#: g10/gpg.c:1275
 msgid "--delete-key user-id"
 msgstr "--delete-key användaridentitet"
 
 # Filnamn både med och utan fnuttar finns. lite ologiskt. Vill någon
 # fixa en patch?
-#: g10/encode.c:260 g10/g10.c:1254 g10/sign.c:393
+#: g10/encode.c:311 g10/gpg.c:1312 g10/sign.c:449
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan inte öppna %s: %s\n"
 
-#: g10/g10.c:1269
+#: g10/gpg.c:1327
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [användaridentitet] [nyckelring]"
 
-#: g10/g10.c:1335
+#: g10/gpg.c:1393
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort skalet: %s\n"
 
-#: g10/g10.c:1343
+#: g10/gpg.c:1401
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa skal: %s\n"
 
-#: g10/g10.c:1411
+#: g10/gpg.c:1474 g10/gpg.c:1495
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "felaktig hash-algoritm \"%s\"\n"
 
-#: g10/g10.c:1492
+#: g10/gpg.c:1580
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/g10.c:1496
+#: g10/gpg.c:1584
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
 # se förra kommentaren
-#: g10/decrypt.c:59 g10/g10.c:1499 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/gpg.c:1587 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
 
-#: g10/g10.c:1669
+#: g10/gpg.c:1765
 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:1675
+#: g10/gpg.c:1771
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -892,11 +893,11 @@ msgstr ""
 "ett notationsnamn kan bara innehålla bokstäver, siffror, punkter eller\n"
 "understrykningstecken och sluta med ett likhetstecken\n"
 
-#: g10/g10.c:1681
+#: g10/gpg.c:1777
 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:1689
+#: g10/gpg.c:1785
 msgid "a notation value must not use any control characters\n"
 msgstr "ett notationsvärde får inte inehålla några kontrolltecken\n"
 
@@ -982,53 +983,54 @@ msgstr ""
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
-#: g10/keyedit.c:1188 g10/pkclist.c:53
+#: g10/keyedit.c:1191 g10/pkclist.c:54
 msgid "             Fingerprint:"
 msgstr "           Fingeravtryck:"
 
-#: g10/pkclist.c:80
+#: g10/pkclist.c:81
 msgid "Fingerprint:"
 msgstr "Fingeravtryck:"
 
-#: g10/pkclist.c:116
+#: g10/pkclist.c:117
 msgid "No reason specified"
 msgstr "Ingen anledning har angivits"
 
 # tveksam översättning. funderar på "ersatt av något bättre" men det
 # känns inte heller bra
-#: g10/pkclist.c:118
-msgid "Key is superseded"
+#: g10/pkclist.c:119
+#, fuzzy
+msgid "Key is superseeded"
 msgstr "Nyckeln är ersatt"
 
-#: g10/pkclist.c:120
+#: g10/pkclist.c:121
 msgid "Key has been compromised"
 msgstr "Nyckeln har tappat sin säkerhet"
 
-#: g10/pkclist.c:122
+#: g10/pkclist.c:123
 msgid "Key is no longer used"
 msgstr "Nyckeln används inte längre"
 
-#: g10/pkclist.c:124
+#: g10/pkclist.c:125
 #, fuzzy
 msgid "User ID is no longer valid"
 msgstr "Användaridentiteten är inte längre giltig"
 
-#: g10/pkclist.c:128
+#: g10/pkclist.c:129
 msgid "Reason for revocation: "
 msgstr "Anledning till återkallelsen: "
 
-#: g10/pkclist.c:145
+#: g10/pkclist.c:146
 msgid "Revocation comment: "
 msgstr "Återkallelsekommentar: "
 
 # värdena står för s = show me more info,  m = back to menu, q = quit
 # hur skall sådant internationaliseras på ett bra sätt?
 #. a string with valid answers
-#: g10/pkclist.c:303
+#: g10/pkclist.c:304
 msgid "sSmMqQ"
 msgstr "sSmMqQ"
 
-#: g10/pkclist.c:307
+#: g10/pkclist.c:308
 #, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -1037,7 +1039,7 @@ msgstr ""
 "%lu har inte tilldelats något tillitsvärde:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:319
+#: g10/pkclist.c:320
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1060,24 +1062,24 @@ msgstr ""
 " 4 = Jag litar fullständigt på denna användare\n"
 " s = visa mig mer information\n"
 
-#: g10/pkclist.c:328
+#: g10/pkclist.c:329
 msgid " m = back to the main menu\n"
 msgstr " m = gå tillbaka till huvudmenyn\n"
 
 # q skall bytas ut mot a såfort det kollas upp så att q också funkar.
-#: g10/pkclist.c:330
+#: g10/pkclist.c:331
 msgid " q = quit\n"
 msgstr " q = avsluta\n"
 
-#: g10/pkclist.c:336
+#: g10/pkclist.c:337
 msgid "Your decision? "
 msgstr "Vad väljer du? "
 
-#: g10/pkclist.c:358
+#: g10/pkclist.c:359
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certifikat som leder till en pålitlig nyckel:\n"
 
-#: g10/pkclist.c:429
+#: g10/pkclist.c:430
 msgid ""
 "Could not find a valid trust path to the key.  Let's see whether we\n"
 "can assign some missing owner trust values.\n"
@@ -1087,7 +1089,7 @@ msgstr ""
 "tilldela några av de ägartillitsvärden som saknas\n"
 "\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:436
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
@@ -1095,7 +1097,7 @@ msgstr ""
 "En av de funna nycklarna saknar tillitsväg.\n"
 "\n"
 
-#: g10/pkclist.c:437
+#: g10/pkclist.c:438
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
@@ -1103,7 +1105,7 @@ msgstr ""
 "Hittade inga certifikat med odefinierat tillitvärde\n"
 "\n"
 
-#: g10/pkclist.c:439
+#: g10/pkclist.c:440
 msgid ""
 "No trust values changed.\n"
 "\n"
@@ -1111,36 +1113,36 @@ msgstr ""
 "Inga tillitsvärden ändrade.\n"
 "\n"
 
-#: g10/pkclist.c:457
+#: g10/pkclist.c:458
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "nyckeln %08lX: nyckeln har återkallats!\n"
 
-#: g10/pkclist.c:464 g10/pkclist.c:476 g10/pkclist.c:598
+#: g10/pkclist.c:465 g10/pkclist.c:477 g10/pkclist.c:599
 msgid "Use this key anyway? "
 msgstr "Vill du använda nyckeln trots det? "
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:470
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "nyckeln %08lX: en undernyckel har återkallats!\n"
 
-#: g10/pkclist.c:512
+#: g10/pkclist.c:513
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: nyckeln har blivit för gammal\n"
 
-#: g10/pkclist.c:518
+#: g10/pkclist.c:519
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr "%08lX: det finns ingen information för att beräkna ett tillitvärde\n"
 
-#: g10/pkclist.c:533
+#: g10/pkclist.c:534
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: Vi litar INTE på denna nyckel\n"
 
-#: g10/pkclist.c:539
+#: g10/pkclist.c:540
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -1149,15 +1151,15 @@ msgstr ""
 "%08lX: Det är inte säkert att denna nyckel verkligen tillhör ägaren\n"
 "men den accepteras trots detta\n"
 
-#: g10/pkclist.c:545
+#: g10/pkclist.c:546
 msgid "This key probably belongs to the owner\n"
 msgstr "Denna nyckel tillhör sannolikt ägaren\n"
 
-#: g10/pkclist.c:550
+#: g10/pkclist.c:551
 msgid "This key belongs to us\n"
 msgstr "Denna nyckel tillhör oss\n"
 
-#: g10/pkclist.c:593
+#: g10/pkclist.c:594
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -1168,108 +1170,108 @@ msgstr ""
 "*verkligen* vet vad du gör, kan du svara ja på nästa fråga\n"
 "\n"
 
-#: g10/pkclist.c:607 g10/pkclist.c:630
+#: g10/pkclist.c:608 g10/pkclist.c:631
 msgid "WARNING: Using untrusted key!\n"
 msgstr "VARNING: Använder en nyckel som inte är betrodd!\n"
 
-#: g10/pkclist.c:651
+#: g10/pkclist.c:652
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VARNING: Denna nyckel har återkallats av sin ägare!\n"
 
-#: g10/pkclist.c:652
+#: g10/pkclist.c:653
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Detta kan betyda att signaturen är en förfalskning.\n"
 
-#: g10/pkclist.c:657
+#: g10/pkclist.c:658
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "VARNING: Denna undernyckel har återkallats av sin ägare!\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:680
 msgid "Note: This key has expired!\n"
 msgstr "Notera: Denna nyckel har gått ut!\n"
 
-#: g10/pkclist.c:687
+#: g10/pkclist.c:688
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "VARNING: Denna nyckel är inte certifierad med en pålitlig signatur!\n"
 
-#: g10/pkclist.c:689
+#: g10/pkclist.c:690
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Det finns inget som indikerar att signaturen tillhör ägaren.\n"
 
-#: g10/pkclist.c:706
+#: g10/pkclist.c:707
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VARNING: Vi litar INTE på denna nyckel!\n"
 
-#: g10/pkclist.c:707
+#: g10/pkclist.c:708
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Signaturen är sannolikt en FÖRFALSKNING.\n"
 
-#: g10/pkclist.c:714
+#: g10/pkclist.c:715
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "VARNING: Denna nyckel är inte certifierad med signaturer med ett\n"
 "tillräckligt högt tillitsvärde!\n"
 
-#: g10/pkclist.c:717
+#: g10/pkclist.c:718
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Det är inte säkert att signaturen tillhör ägaren.\n"
 
-#: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
+#: g10/pkclist.c:820 g10/pkclist.c:842 g10/pkclist.c:968 g10/pkclist.c:1013
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: %s överhoppad\n"
 
-#: g10/pkclist.c:827 g10/pkclist.c:994
+#: g10/pkclist.c:828 g10/pkclist.c:995
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: hoppade över: publik nyckel finns redan\n"
 
-#: g10/pkclist.c:854
+#: g10/pkclist.c:855
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
 msgstr "Du specificerade ingen användaridentitet. (du kan använda \"-r\")\n"
 
-#: g10/pkclist.c:864
+#: g10/pkclist.c:865
 msgid "Enter the user ID: "
 msgstr "Ange användaridentiteten: "
 
-#: g10/pkclist.c:876
+#: g10/pkclist.c:877
 msgid "No such user ID.\n"
 msgstr "Hittade inte användaridentiteten.\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:882
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "hoppade över: den publika nyckeln är redan satt som förvald mottagare\n"
 
-#: g10/pkclist.c:904
+#: g10/pkclist.c:905
 msgid "Public key is disabled.\n"
 msgstr "Den publika nyckeln är deaktiverad\n"
 
-#: g10/pkclist.c:911
+#: g10/pkclist.c:912
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "hoppade över: publik nyckel är redan angiven med --encrypt-to\n"
 
-#: g10/pkclist.c:942
+#: g10/pkclist.c:943
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "den förvalda mottagaren \"%s\" är okänd\n"
 
-#: g10/pkclist.c:975
+#: g10/pkclist.c:976
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: fel vid kontroll av nyckeln: %s\n"
 
-#: g10/pkclist.c:980
+#: g10/pkclist.c:981
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: hoppade över: den publika nyckeln är deaktiverad\n"
 
-#: g10/pkclist.c:1018
+#: g10/pkclist.c:1019
 msgid "no valid addressees\n"
 msgstr "inga giltiga adresser\n"
 
@@ -1281,58 +1283,58 @@ msgstr "skriver sj
 msgid "writing key binding signature\n"
 msgstr "skriver signatur knuten till nyckeln\n"
 
-#: g10/keygen.c:261 g10/keygen.c:345 g10/keygen.c:433
+#: g10/keygen.c:308 g10/keygen.c:419 g10/keygen.c:529
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "ogiltig nyckelstorlek; använder %u bitar\n"
 
-#: g10/keygen.c:266 g10/keygen.c:350 g10/keygen.c:438
+#: g10/keygen.c:313 g10/keygen.c:424 g10/keygen.c:534
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
 
-#: g10/keygen.c:537
+#: g10/keygen.c:633
 msgid "Please select what kind of key you want:\n"
 msgstr "Välj vilken typ av nyckel du vill ha:\n"
 
-#: g10/keygen.c:539
+#: g10/keygen.c:635
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA och ElGamal (standardvalet)\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:636
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: g10/keygen.c:542
+#: g10/keygen.c:638
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (endast kryptering)\n"
 
-#: g10/keygen.c:543
+#: g10/keygen.c:639
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signering och kryptering)\n"
 
-#: g10/keygen.c:545
+#: g10/keygen.c:641
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signering och kryptering)\n"
 
-#: g10/keygen.c:549
+#: g10/keygen.c:645
 msgid "Your selection? "
 msgstr "Vad väljer du? "
 
-#: g10/keygen.c:560 g10/keygen.c:568
+#: g10/keygen.c:656 g10/keygen.c:664
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Vill du verkligen skapa en nyckel för signering och kryptering? "
 
-#: g10/keygen.c:582
+#: g10/keygen.c:678
 msgid "Invalid selection.\n"
 msgstr "Felaktigt val.\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:690
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1345,19 +1347,19 @@ msgstr ""
 "              den förvalda nyckelstorleken är 1024 bitar\n"
 "    den största föreslagna nyckelstorleken är 2048 bitar\n"
 
-#: g10/keygen.c:601
+#: g10/keygen.c:697
 msgid "What keysize do you want? (1024) "
 msgstr "Vilken nyckelstorlek vill du ha? (1024) "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:702
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA tillåter bara nyckelstorlekar från 512 till 1024\n"
 
-#: g10/keygen.c:608
+#: g10/keygen.c:704
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "nyckelstorleken är för liten; 768 är det minst tillåtna värdet.\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:706
 #, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 msgstr "nyckelstorleken är för liten; 768 är det minst tillåtna värdet.\n"
@@ -1370,12 +1372,12 @@ msgstr "nyckelstorleken 
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:621
+#: g10/keygen.c:717
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "nyckelstorleken är för stor; %d är det största tillåtna värdet\n"
 
-#: g10/keygen.c:626
+#: g10/keygen.c:722
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1383,11 +1385,11 @@ msgstr ""
 "Nyckelstorlekar större än 2048 är inte att rekommendera\n"
 "eftersom beräkningar tar MYCKET lång tid!\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:725
 msgid "Are you sure that you want this keysize? "
 msgstr "Är du säker på att du vill ha denna nyckelstorlek? "
 
-#: g10/keygen.c:630
+#: g10/keygen.c:726
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1395,22 +1397,22 @@ msgstr ""
 "Ok, men kom ihåg att din bildskärm och ditt tangentbord också sänder\n"
 "avslöjande strålning som kan avlyssnas!\n"
 
-#: g10/keygen.c:638
+#: g10/keygen.c:734
 msgid "Do you really need such a large keysize? "
 msgstr "Behöver du verkligen en så stor nyckelstorlek? "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:740
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Den efterfrågade nyckelstorleken är %u bitar\n"
 
-#: g10/keygen.c:647 g10/keygen.c:651
+#: g10/keygen.c:743 g10/keygen.c:747
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "avrundade uppåt till %u bitar\n"
 
 # borde kolla upp möjligheterna i källkoden att använda v m å istället för wmy
-#: g10/keygen.c:699
+#: g10/keygen.c:795
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1426,25 +1428,25 @@ msgstr ""
 "      <n>m = nyckeln blir ogiltig efter n månader\n"
 "      <n>y = nyckeln blir ogiltig efter n år\n"
 
-#: g10/keygen.c:714
+#: g10/keygen.c:810
 msgid "Key is valid for? (0) "
 msgstr "För hur lång tid är nyckeln giltig? (0) "
 
-#: g10/keygen.c:719
+#: g10/keygen.c:815
 msgid "invalid value\n"
 msgstr "ogiltigt värde\n"
 
-#: g10/keygen.c:724
+#: g10/keygen.c:820
 msgid "Key does not expire at all\n"
 msgstr "Nyckeln går aldrig ut\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:730
+#: g10/keygen.c:826
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Nyckeln går ut vid följande tidpunkt: %s\n"
 
-#: g10/keygen.c:733
+#: g10/keygen.c:829
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1452,11 +1454,11 @@ msgstr ""
 "Ditt system kan inte visa datum senare än år 2038.\n"
 "Datum fram till år 2106 kommer dock att hanteras korrekt.\n"
 
-#: g10/keygen.c:738
+#: g10/keygen.c:834
 msgid "Is this correct (y/n)? "
 msgstr "Stämmer detta (j/n)? "
 
-#: g10/keygen.c:781
+#: g10/keygen.c:877
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1472,44 +1474,44 @@ msgstr ""
 "     \"Gustav Vasa (Brutal kung) <gustav@trekronor.se>\"\n"
 "\n"
 
-#: g10/keygen.c:793
+#: g10/keygen.c:889
 msgid "Real name: "
 msgstr "Namn: "
 
-#: g10/keygen.c:797
+#: g10/keygen.c:893
 msgid "Invalid character in name\n"
 msgstr "Ogiltigt tecken i namnet\n"
 
-#: g10/keygen.c:799
+#: g10/keygen.c:895
 msgid "Name may not start with a digit\n"
 msgstr "Namnet får inte börja med en siffra\n"
 
-#: g10/keygen.c:801
+#: g10/keygen.c:897
 msgid "Name must be at least 5 characters long\n"
 msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
 
-#: g10/keygen.c:809
+#: g10/keygen.c:905
 msgid "Email address: "
 msgstr "Epostadress: "
 
-#: g10/keygen.c:820
+#: g10/keygen.c:916
 msgid "Not a valid email address\n"
 msgstr "Epostadressen är ogiltig\n"
 
-#: g10/keygen.c:828
+#: g10/keygen.c:924
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:834
+#: g10/keygen.c:930
 msgid "Invalid character in comment\n"
 msgstr "Ogiltigt tecken i kommentaren\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:956
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du använder teckenuppsättningen \"%s\"\n"
 
-#: g10/keygen.c:863
+#: g10/keygen.c:962
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1520,28 +1522,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:867
+#: g10/keygen.c:966
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Ange inte epostadressen som namn eller kommentar\n"
 
-#: g10/keygen.c:872
+#: g10/keygen.c:971
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoAa"
 
-#: g10/keygen.c:882
+#: g10/keygen.c:981
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (A)vsluta? "
 
-#: g10/keygen.c:883
+#: g10/keygen.c:982
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ändra (N)amn, (K)ommentar, (E)post eller (O)k/(A)vsluta? "
 
-#: g10/keygen.c:902
+#: g10/keygen.c:1001
 msgid "Please correct the error first\n"
 msgstr "Rätta först felet\n"
 
 # fel kapitalisering i originalet?
-#: g10/keygen.c:940
+#: g10/keygen.c:1039
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1549,11 +1551,11 @@ msgstr ""
 "Du behöver en lösenordsfras för att skydda din hemliga nyckel\n"
 "\n"
 
-#: g10/keyedit.c:468 g10/keygen.c:948
+#: g10/keyedit.c:468 g10/keygen.c:1047
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "lösenordsfrasen upprepades ej korrekt; försök igen.\n"
 
-#: g10/keygen.c:954
+#: g10/keygen.c:1053
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1564,7 +1566,7 @@ msgstr ""
 "Jag kommer att göra det ändå. Du kan ändra din lösenordsfras närsomhelst\n"
 "om du använder detta program med flaggan \"--edit-key\".\n"
 
-#: g10/keygen.c:975
+#: g10/keygen.c:1074
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1576,29 +1578,29 @@ msgstr ""
 "hårddisken) under primtalsgenereringen; detta ger slumptalsgeneratorn\n"
 "en större chans att samla ihop en tillräcklig mängd entropi.\n"
 
-#: g10/keygen.c:1424
+#: g10/keygen.c:1523
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA-nyckelparet kommer att ha 1024 bitar.\n"
 
-#: g10/keygen.c:1467
+#: g10/keygen.c:1566
 msgid "Key generation canceled.\n"
 msgstr "Skapandet av nycklar avbröts.\n"
 
-#: g10/keygen.c:1564
+#: g10/keygen.c:1663
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver publik nyckel till \"%s\"\n"
 
-#: g10/keygen.c:1565
+#: g10/keygen.c:1664
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/keygen.c:1661
+#: g10/keygen.c:1760
 msgid "public and secret key created and signed.\n"
 msgstr "publik och hemlig nyckel skapad och signerad.\n"
 
-#: g10/keygen.c:1666
+#: g10/keygen.c:1765
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1607,13 +1609,13 @@ msgstr ""
 "att vilja använda kommandot \"--edit-key\" för att generera en sekundär\n"
 "nyckel för detta syfte.\n"
 
-#: g10/keygen.c:1683 g10/keygen.c:1784
+#: g10/keygen.c:1782 g10/keygen.c:1883
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
 # c-format behövs inte i singularis
-#: g10/keygen.c:1727 g10/sig-check.c:318 g10/sign.c:112
+#: g10/keygen.c:1826 g10/sig-check.c:300 g10/sign.c:167
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1621,7 +1623,7 @@ msgstr ""
 "nyckeln är skapad %lu sekund in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/keygen.c:1729 g10/sig-check.c:320 g10/sign.c:114
+#: g10/keygen.c:1828 g10/sig-check.c:302 g10/sign.c:169
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1629,32 +1631,32 @@ msgstr ""
 "nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/keygen.c:1762
+#: g10/keygen.c:1861
 msgid "Really create? "
 msgstr "Vill du verkligen skapa? "
 
-#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/encode.c:142 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
 #: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: kan inte öppna: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:164
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fel vid skapandet av lösenordsfras: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:222 g10/encode.c:370
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: VARNING: tom fil\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:317
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "läser från \"%s\"\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:534
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s krypterad för: %s\n"
@@ -1683,32 +1685,32 @@ msgstr "nyckeln %08lX 
 msgid "WARNING: nothing exported\n"
 msgstr "VARNING: exporterade ingenting\n"
 
-#: g10/getkey.c:211
+#: g10/getkey.c:212
 msgid "too many entries in pk cache - disabled\n"
 msgstr "för många poster i pk-cachen - inaktiverad\n"
 
-#: g10/getkey.c:350
+#: g10/getkey.c:351
 msgid "too many entries in unk cache - disabled\n"
 msgstr "för många poster i unk-cachen - inaktiverad\n"
 
-#: g10/getkey.c:1308 g10/getkey.c:1347
+#: g10/getkey.c:1311 g10/getkey.c:1350
 msgid "RSA key cannot be used in this version\n"
 msgstr "det går inte att använda RSA-nycklar i denna version\n"
 
-#: g10/getkey.c:1310 g10/getkey.c:1349
+#: g10/getkey.c:1313 g10/getkey.c:1352
 msgid "No key for user ID\n"
 msgstr "Ingen nyckel för användaridentiteten\n"
 
-#: g10/getkey.c:1388 g10/getkey.c:1428
+#: g10/getkey.c:1391 g10/getkey.c:1431
 msgid "No user ID for key\n"
 msgstr "Inget användarid för nyckel\n"
 
-#: g10/getkey.c:1642 g10/getkey.c:1698
+#: g10/getkey.c:1645 g10/getkey.c:1701
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "använder sekundära nyckeln %08lX istället för primärnyckeln %08lX\n"
 
-#: g10/getkey.c:2017
+#: g10/getkey.c:2020
 #, fuzzy
 msgid "[User id not found]"
 msgstr "%s: hittade inte användaren\n"
@@ -1718,7 +1720,7 @@ msgstr "%s: hittade inte anv
 msgid "skipping block of type %d\n"
 msgstr "hoppar över block av typen %d\n"
 
-#: g10/import.c:188 g10/trustdb.c:1740 g10/trustdb.c:1781
+#: g10/import.c:188 g10/trustdb.c:1748 g10/trustdb.c:1789
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "har behandlat %lu nycklar hittills\n"
@@ -1806,7 +1808,7 @@ msgstr "nyckel %08lX: hittade ingen publik nyckel: %s\n"
 msgid "no default public keyring\n"
 msgstr "ingen förvald publik nyckel\n"
 
-#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:295 g10/sign.c:611
+#: g10/import.c:423 g10/openfile.c:220 g10/sign.c:350 g10/sign.c:669
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver till \"%s\"\n"
@@ -2065,7 +2067,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "Vill du verkligen signera? "
 
-#: g10/keyedit.c:373 g10/keyedit.c:1870 g10/keyedit.c:1932 g10/sign.c:136
+#: g10/keyedit.c:373 g10/keyedit.c:1873 g10/keyedit.c:1935 g10/sign.c:191
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
@@ -2422,105 +2424,105 @@ msgstr "Nyckeln 
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ogiltigt kommando (försök med \"help\")\n"
 
-#: g10/keyedit.c:1080 g10/keyedit.c:1106
+#: g10/keyedit.c:1083 g10/keyedit.c:1109
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1089
+#: g10/keyedit.c:1092
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1093
+#: g10/keyedit.c:1096
 msgid "This key has been disabled"
 msgstr "Denna nyckel har deaktiverats"
 
-#: g10/keyedit.c:1122
+#: g10/keyedit.c:1125
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "nyckeln %08lX: en undernyckel har återkallats!\n"
 
-#: g10/keyedit.c:1125
+#: g10/keyedit.c:1128
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "     nya återkallelser av nycklar: %lu\n"
 
-#: g10/keyedit.c:1127
+#: g10/keyedit.c:1130
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1368
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1372
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:1373
+#: g10/keyedit.c:1376
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna okända signatur? (j/N/a)"
 
-#: g10/keyedit.c:1379
+#: g10/keyedit.c:1382
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Vill du radera denna självsignatur? (j/N)"
 
 # skulle lika gärna kunna heta 1 signatur va?
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1396
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:1394
+#: g10/keyedit.c:1397
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Raderade %d signaturer.\n"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1400
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:1466
+#: g10/keyedit.c:1469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Tag bort markeringar från de hemliga nycklarna.\n"
 
-#: g10/keyedit.c:1472
+#: g10/keyedit.c:1475
 msgid "Please select at most one secondary key.\n"
 msgstr "Välj som mest en sekundär nyckel.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1479
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Ändrar giltighetstid för en sekundär nyckel.\n"
 
-#: g10/keyedit.c:1478
+#: g10/keyedit.c:1481
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändrar giltighetstid för den primära nyckeln.\n"
 
-#: g10/keyedit.c:1520
+#: g10/keyedit.c:1523
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n"
 
-#: g10/keyedit.c:1536
+#: g10/keyedit.c:1539
 msgid "No corresponding signature in secret ring\n"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
-#: g10/keyedit.c:1597
+#: g10/keyedit.c:1600
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen användaridentitet med index %d\n"
 
-#: g10/keyedit.c:1643
+#: g10/keyedit.c:1646
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ingen sekundär nyckel med index %d\n"
 
-#: g10/keyedit.c:1741
+#: g10/keyedit.c:1744
 msgid "user ID: \""
 msgstr "användaridentitet: \""
 
-#: g10/keyedit.c:1744
+#: g10/keyedit.c:1747
 #, c-format
 msgid ""
 "\"\n"
@@ -2529,44 +2531,54 @@ msgstr ""
 "\"\n"
 "signerad med din nyckel %08lX %s\n"
 
-#: g10/keyedit.c:1748
+#: g10/keyedit.c:1751
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Vill du skapa ett återkallelsecertifikat för denna signatur? (j/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1775
 msgid "You have signed these user IDs:\n"
 msgstr "Du har signerat följande användaridentiteter:\n"
 
-#: g10/keyedit.c:1786 g10/keyedit.c:1821
+#: g10/keyedit.c:1789 g10/keyedit.c:1824
 #, c-format
 msgid "   signed by %08lX at %s\n"
 msgstr "   signerad av %08lX %s\n"
 
-#: g10/keyedit.c:1791
+#: g10/keyedit.c:1794
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   återkallad av %08lX %s\n"
 
-#: g10/keyedit.c:1811
+#: g10/keyedit.c:1814
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du står i begrepp att återkalla dessa signaturer:\n"
 
-#: g10/keyedit.c:1829
+#: g10/keyedit.c:1832
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Vill du verkligen skapa återkallelsecertifikaten? (j/N)"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1861
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
+#: g10/keylist.c:158
+#, fuzzy
+msgid "invalid"
+msgstr "felaktigt skal"
+
+#: g10/keylist.c:178
+#, fuzzy
+msgid "revoked"
+msgstr "revkey"
+
 #. of subkey
-#: g10/keylist.c:318 g10/mainproc.c:742
+#: g10/keylist.c:401 g10/mainproc.c:754
 #, c-format
 msgid " [expires: %s]"
 msgstr "[går ut: %s]"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:212
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "den publika nyckeln är %08lX\n"
@@ -2578,125 +2590,125 @@ msgstr "den publika nyckeln 
 # rätt publik nyckel att kryptera datat med. Jag tycker
 # inte att svenska översättningen är mycket obskyrare än engelska
 # originalet iallafall.
-#: g10/mainproc.c:248
+#: g10/mainproc.c:247
 msgid "public key encrypted data: good DEK\n"
 msgstr "data krypterad med publik nyckel: korrekt krypteringsnyckel\n"
 
-#: g10/mainproc.c:281
+#: g10/mainproc.c:280
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "krypterad med %u-bitars %s-nyckel, ID %08lX, skapad %s\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "krypterad med %s-nyckel, ID %08lX\n"
 
-#: g10/mainproc.c:297
+#: g10/mainproc.c:296
 msgid "no secret key for decryption available\n"
 msgstr "det finns ingen hemlig nyckel tillgänglig för dekryptering\n"
 
-#: g10/mainproc.c:306
+#: g10/mainproc.c:305
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "dekryptering med publik nyckel misslyckades: %s\n"
 
-#: g10/mainproc.c:343
+#: g10/mainproc.c:342
 msgid "decryption okay\n"
 msgstr "dekrypteringen lyckades\n"
 
-#: g10/mainproc.c:348
+#: g10/mainproc.c:347
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VARNING: det krypterade meddelandet har ändrats!\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:352
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/mainproc.c:372
+#: g10/mainproc.c:371
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTERA: avsändaren efterfrågade \"endast-för-dina-ögon\"\n"
 
-#: g10/mainproc.c:374
+#: g10/mainproc.c:373
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "ursprungligt filnamn=\"%.*s\"\n"
 
-#: g10/mainproc.c:526
+#: g10/mainproc.c:538
 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:613 g10/mainproc.c:622
+#: g10/mainproc.c:625 g10/mainproc.c:634
 msgid "WARNING: invalid notation data found\n"
 msgstr "VARNING: ogiltig notationsdata hittades\n"
 
-#: g10/mainproc.c:625
+#: g10/mainproc.c:637
 msgid "Notation: "
 msgstr "Notation: "
 
 # finns det någon bra svensk översättning av policy?
-#: g10/mainproc.c:632
+#: g10/mainproc.c:644
 msgid "Policy: "
 msgstr "Policy: "
 
-#: g10/mainproc.c:1062
+#: g10/mainproc.c:1074
 msgid "signature verification suppressed\n"
 msgstr "signaturen verifierades inte\n"
 
-#: g10/mainproc.c:1068
+#: g10/mainproc.c:1080
 #, 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:1094 g10/mainproc.c:1105
+#: g10/mainproc.c:1106 g10/mainproc.c:1117
 msgid "BAD signature from \""
 msgstr "FELAKTIG signatur från \""
 
-#: g10/mainproc.c:1095 g10/mainproc.c:1106
+#: g10/mainproc.c:1107 g10/mainproc.c:1118
 msgid "Good signature from \""
 msgstr "Korrekt signatur från \""
 
-#: g10/mainproc.c:1097
+#: g10/mainproc.c:1109
 msgid "                aka \""
 msgstr "      även känd som \""
 
-#: g10/mainproc.c:1153
+#: g10/mainproc.c:1165
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte verifiera signaturen: %s\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1230
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "fristående signatur av klassen 0x%02x\n"
 
-#: g10/mainproc.c:1263
+#: g10/mainproc.c:1282
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
 
-#: g10/mainproc.c:1268
+#: g10/mainproc.c:1287
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "felaktigt rotpaket hittades i proc_tree()\n"
 
-#: g10/misc.c:94
+#: g10/misc.c:83
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan inte deaktivera minnesutskrifter: %s\n"
 
-#: g10/misc.c:97
+#: g10/misc.c:86
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
 
-#: g10/misc.c:205
+#: g10/misc.c:312
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Experimentella algoritmer bör inte användas!\n"
 
 # maila gnupg-bugs om konstigt felmeddelande, man skapar nycklar i pluralis
-#: g10/misc.c:219
+#: g10/misc.c:326
 msgid ""
 "RSA keys are deprecated; please consider creating a new key and use this key "
 "in the future\n"
@@ -2705,17 +2717,17 @@ msgstr ""
 "framtiden\n"
 
 # XXX
-#: g10/misc.c:241
+#: g10/misc.c:348
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "avråder från denna chifferalgoritm, använd istället en mer normal algoritm!\n"
 
-#: g10/parse-packet.c:117
+#: g10/parse-packet.c:115
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan inte hantera algoritm %d för publik nyckelhantering\n"
 
-#: g10/parse-packet.c:965
+#: g10/parse-packet.c:963
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n"
@@ -2752,51 +2764,51 @@ msgstr "Ange l
 msgid "Repeat passphrase: "
 msgstr "Repetera lösenordsfrasen: "
 
-#: g10/plaintext.c:63
+#: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data sparades inte, använd flaggan \"--output\" för att spara den\n"
 
-#: g10/plaintext.c:317
+#: g10/plaintext.c:324
 msgid "Detached signature.\n"
 msgstr "Löskopplad signatur.\n"
 
-#: g10/plaintext.c:321
+#: g10/plaintext.c:328
 msgid "Please enter name of data file: "
 msgstr "Ange namnet på datafilen: "
 
-#: g10/plaintext.c:342
+#: g10/plaintext.c:349
 msgid "reading stdin ...\n"
 msgstr "läser från standard in ...\n"
 
-#: g10/plaintext.c:385
+#: g10/plaintext.c:392
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kan inte öppna signerad data \"%s\"\n"
 
-#: g10/pubkey-enc.c:79
+#: g10/pubkey-enc.c:138
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "anonym mottagare, försöker använda den hemliga nyckeln %08lX ...\n"
 
-#: g10/pubkey-enc.c:85
+#: g10/pubkey-enc.c:144
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, vi är den hemliga mottagaren.\n"
 
-#: g10/pubkey-enc.c:137
+#: g10/pubkey-enc.c:200
 msgid "old encoding of the DEK is not supported\n"
 msgstr "gammal kodning av krypteringsnyckeln stöds inte\n"
 
-#: g10/pubkey-enc.c:156
+#: g10/pubkey-enc.c:219
 #, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
 msgstr "chifferalgoritmen %d är okänd eller avslagen\n"
 
-#: g10/pubkey-enc.c:195
+#: g10/pubkey-enc.c:258
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "NOTERA: chifferalgoritmen %d finns inte i inställningarna\n"
 
-#: g10/pubkey-enc.c:201
+#: g10/pubkey-enc.c:264
 #, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
 msgstr "NOTERA: den hemliga nyckeln %08lX gick ut %s\n"
@@ -2840,70 +2852,66 @@ msgstr "lyckades s
 msgid "failed sending to `%s': status=%u\n"
 msgstr "misslyckades sända till \"%s\": status=%u\n"
 
-#: g10/seckey-cert.c:53
+#: g10/seckey-cert.c:90
 msgid "secret key parts are not available\n"
 msgstr "de hemliga nyckeldelarna är inte tillgänliga\n"
 
-#: g10/seckey-cert.c:59
+#: g10/seckey-cert.c:96
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "skyddsalgoritmen %d stöds inte\n"
 
-#: g10/seckey-cert.c:175
+#: g10/seckey-cert.c:239
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Ogiltig lösenordsfras, försök igen ...\n"
 
 # är det nyckeln som är svag, konstigt
-#: g10/seckey-cert.c:231
+#: g10/seckey-cert.c:302
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "VARNING: Upptäckte en svag nyckel - byt lösenordsfras igen.\n"
 
-#: g10/sig-check.c:202
-msgid "assuming bad MDC due to an unknown critical bit\n"
-msgstr "antar att MDC är felaktig eftersom en okänd kritisk bit är satt\n"
-
-#: g10/sig-check.c:300
+#: g10/sig-check.c:282
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "detta är en PGP-genererad ElGamal-nyckel som INTE är säker för signaturer!\n"
 
 # behövs verkligen c-format här?
-#: g10/sig-check.c:308
+#: g10/sig-check.c:290
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "den publika nyckeln är %lu sekund nyare än signaturen\n"
 
-#: g10/sig-check.c:309
+#: g10/sig-check.c:291
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "den publika nyckeln är %lu sekunder nyare än signaturen\n"
 
-#: g10/sig-check.c:327
+#: g10/sig-check.c:309
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTERA: signaturnyckeln är för gammal, gick ut vid %s\n"
 
-#: g10/sig-check.c:396
+#: g10/sig-check.c:378
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "antar att signaturen är felaktig eftersom en okänd kritisk bit är satt\n"
 
-#: g10/sign.c:140
+#: g10/sign.c:195
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s-signatur från: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:606
+#: g10/sign.c:345 g10/sign.c:664
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "kan inte skapa %s: %s\n"
 
-#: g10/sign.c:388
+#: g10/sign.c:444
 msgid "signing:"
 msgstr "signerar:"
 
-#: g10/sign.c:431
+#: g10/sign.c:487
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VARNING: \"%s\" är en tom fil\n"
@@ -2942,7 +2950,8 @@ msgstr "%s: ingen 
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalogen finns inte!\n"
 
-#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1363 g10/tdbio.c:444
+#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1407
+#: g10/ringedit.c:1878 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: kan inte skapa: %s\n"
@@ -3131,206 +3140,206 @@ msgstr "nyckel %08lX: accepterad som en p
 msgid "enumerate secret keys failed: %s\n"
 msgstr "numrering av hemliga nycklar misslyckades: %s\n"
 
-#: g10/trustdb.c:921
+#: g10/trustdb.c:925
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "nyckel: %08lX.%lu: Korrekt bindning till undernyckel\n"
 
-#: g10/trustdb.c:927 g10/trustdb.c:962
+#: g10/trustdb.c:931 g10/trustdb.c:966
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "nyckel %08lX.%lu: Felaktig bindning till undernyckel: %s\n"
 
-#: g10/trustdb.c:939
+#: g10/trustdb.c:943
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "nyckel %08lX.%lu: Giltig återkallelse av nyckel\n"
 
-#: g10/trustdb.c:945
+#: g10/trustdb.c:949
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "nyckel %08lX.%lu: Felaktig återkallelse av nyckel: %s\n"
 
-#: g10/trustdb.c:956
+#: g10/trustdb.c:960
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "nyckel %08lX.%lu: Giltig återkallelse av undernyckel\n"
 
-#: g10/trustdb.c:1067
+#: g10/trustdb.c:1071
 msgid "Good self-signature"
 msgstr "Korrekt självsignatur"
 
-#: g10/trustdb.c:1077
+#: g10/trustdb.c:1081
 msgid "Invalid self-signature"
 msgstr "Felaktig självsignatur"
 
 # detta verkar mycket märkligt. Någon borde kanske få en förklaring från
 # gnupg-utvecklarna?
-#: g10/trustdb.c:1104
+#: g10/trustdb.c:1108
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Hoppade över en giltig återkallelse av användaridentiteten på\n"
 "grund av en nyare självsignatur"
 
-#: g10/trustdb.c:1110
+#: g10/trustdb.c:1114
 msgid "Valid user ID revocation"
 msgstr "Giltig återkallelse av användaridentitet"
 
-#: g10/trustdb.c:1115
+#: g10/trustdb.c:1119
 msgid "Invalid user ID revocation"
 msgstr "Ogiltig återkallelse av användaridentitet"
 
-#: g10/trustdb.c:1157
+#: g10/trustdb.c:1161
 msgid "Valid certificate revocation"
 msgstr "Giltig återkallelse av certifikat"
 
-#: g10/trustdb.c:1158
+#: g10/trustdb.c:1162
 msgid "Good certificate"
 msgstr "Korrekt certifikat"
 
-#: g10/trustdb.c:1186
+#: g10/trustdb.c:1190
 msgid "Invalid certificate revocation"
 msgstr "Ogiltig återkallelse av certifikat "
 
-#: g10/trustdb.c:1187
+#: g10/trustdb.c:1191
 msgid "Invalid certificate"
 msgstr "Ogiltigt certifikat"
 
-#: g10/trustdb.c:1204 g10/trustdb.c:1208
+#: g10/trustdb.c:1208 g10/trustdb.c:1212
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "signaturpost %lu[%d] pekar mot fel post.\n"
 
-#: g10/trustdb.c:1267
+#: g10/trustdb.c:1271
 msgid "duplicated certificate - deleted"
 msgstr "dubblett av certifikat - borttaget"
 
-#: g10/trustdb.c:1584
+#: g10/trustdb.c:1592
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir misslyckades: %s\n"
 
-#: g10/trustdb.c:1718
+#: g10/trustdb.c:1726
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lokalt id ?: tillägg misslyckades: %s\n"
 
-#: g10/trustdb.c:1723
+#: g10/trustdb.c:1731
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lokalt id %lu: tillägg misslyckades: %s\n"
 
-#: g10/trustdb.c:1729
+#: g10/trustdb.c:1737
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lokalt id %lu: lades till\n"
 
-#: g10/trustdb.c:1734
+#: g10/trustdb.c:1742
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "fel vid läsning av katalogpost: %s\n"
 
-#: g10/trustdb.c:1742 g10/trustdb.c:1805
+#: g10/trustdb.c:1750 g10/trustdb.c:1813
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu nycklar behandlade\n"
 
-#: g10/trustdb.c:1744 g10/trustdb.c:1811
+#: g10/trustdb.c:1752 g10/trustdb.c:1819
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu nycklar med fel\n"
 
-#: g10/trustdb.c:1746
+#: g10/trustdb.c:1754
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu nycklar tillagda\n"
 
-#: g10/trustdb.c:1749
+#: g10/trustdb.c:1757
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "numrering av nyckelblock misslyckades: %s\n"
 
-#: g10/trustdb.c:1797
+#: g10/trustdb.c:1805
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lokalt id %lu: katalogpost utan nyckel - hoppade över\n"
 
-#: g10/trustdb.c:1807
+#: g10/trustdb.c:1815
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
 msgstr "\t%lu på grund av nya publika nycklar\n"
 
-#: g10/trustdb.c:1809
+#: g10/trustdb.c:1817
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu nycklar hoppades över\n"
 
-#: g10/trustdb.c:1813
+#: g10/trustdb.c:1821
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu nycklar uppdaterades\n"
 
-#: g10/trustdb.c:2158
+#: g10/trustdb.c:2166
 msgid "Ooops, no keys\n"
 msgstr "Ooops, inga nycklar\n"
 
-#: g10/trustdb.c:2162
+#: g10/trustdb.c:2170
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, inga användaridentiteter\n"
 
-#: g10/trustdb.c:2320
+#: g10/trustdb.c:2328
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: sökning av katalogpost misslyckades: %s\n"
 
-#: g10/trustdb.c:2329
+#: g10/trustdb.c:2337
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "nyckel %08lX: tillägg av tillitspost misslyckades: %s\n"
 
-#: g10/trustdb.c:2333
+#: g10/trustdb.c:2341
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "nyckel %08lX.%lu: lades till i tillitsdatabasen\n"
 
-#: g10/trustdb.c:2341
+#: g10/trustdb.c:2349
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "nyckel %08lX.%lu: skapad i framtiden (problemet är relaterat till\n"
 "tidsresande eller en felställd klocka)\n"
 
-#: g10/trustdb.c:2356
+#: g10/trustdb.c:2364
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "nyckel %08lX.%lu: gick ut %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2372
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "nyckel %08lX.%lu: tillitskontroll misslyckades: %s\n"
 
-#: g10/trustdb.c:2515
+#: g10/trustdb.c:2523
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "användaren \"%s\" hittades inte: %s\n"
 
-#: g10/trustdb.c:2517
+#: g10/trustdb.c:2525
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problem att hitta \"%s\" i tillitsdatabasen: %s\n"
 
-#: g10/trustdb.c:2520
+#: g10/trustdb.c:2528
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "användaren \"%s\" finns inte tillitsdatabasen - lägger till\n"
 
-#: g10/trustdb.c:2523
+#: g10/trustdb.c:2531
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "misslyckades med att placera \"%s\" i tillitsdatabasen: %s\n"
 
-#: g10/trustdb.c:2709 g10/trustdb.c:2739
+#: g10/trustdb.c:2717 g10/trustdb.c:2747
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "VARNING: kan ännu inte hantera långa inställningsposter\n"
 
@@ -3349,47 +3358,41 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "raden %u är för lång, eller saknar nyradstecken\n"
 
-#: g10/ringedit.c:302
+#: g10/ringedit.c:324
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: kan inte skapa nyckelring: %s\n"
 
-#: g10/ringedit.c:319 g10/ringedit.c:1368
+#: g10/ringedit.c:341 g10/ringedit.c:1412 g10/ringedit.c:1883
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: nyckelring skapad\n"
 
 # märkligt felmeddelande, kolla upp
-#: g10/ringedit.c:1545
+#: g10/ringedit.c:1589 g10/ringedit.c:2060
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VARNING: det finns 2 filer med konfidentiell information.\n"
 
-#: g10/ringedit.c:1546
+#: g10/ringedit.c:1590 g10/ringedit.c:2061
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s är den oförändrade\n"
 
-#: g10/ringedit.c:1547
+#: g10/ringedit.c:1591 g10/ringedit.c:2062
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s är den nya\n"
 
-#: g10/ringedit.c:1548
+#: g10/ringedit.c:1592 g10/ringedit.c:2063
 msgid "Please fix this possible security flaw\n"
 msgstr "Lös detta potentiella säkerhetsproblem\n"
 
-# om någon kan tala om för mig vad detta betyder skulle jag bli jätteglad!
-#: g10/skclist.c:88 g10/skclist.c:125
-msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr ""
-"nyckeln är inte markerad osäker - går inte att använda med fejkad RNG!\n"
-
-#: g10/skclist.c:113
+#: g10/skclist.c:96
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "hoppade över \"%s\": %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:102
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3446,28 +3449,28 @@ msgstr "%s: katalog skapad\n"
 msgid "you have to start GnuPG again, so it can read the new options file\n"
 msgstr "du måste starta om GnuPG, så att den nya inställningsfilen kan läsas\n"
 
-#: g10/encr-data.c:66
-#, c-format
-msgid "%s encrypted data\n"
-msgstr "%s krypterad data\n"
-
-#: g10/encr-data.c:68
+#: g10/encr-data.c:64
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "krypterad med en okänd algoritm %d\n"
 
-#: g10/encr-data.c:90
+#: g10/encr-data.c:69
+#, c-format
+msgid "%s encrypted data\n"
+msgstr "%s krypterad data\n"
+
+#: g10/encr-data.c:99
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "VARNING: meddelandet krypterades med en svag nyckel i det symmetriska\n"
 "chiffret.\n"
 
-#: g10/seskey.c:52
+#: g10/seskey.c:61
 msgid "weak key created - retrying\n"
 msgstr "skapade en svag nyckel - försöker igen\n"
 
-#: g10/seskey.c:57
+#: g10/seskey.c:66
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
@@ -3720,7 +3723,7 @@ msgid ""
 "  \"Key has been compromised\"\n"
 "      Use this if you have a reason to believe that unauthorized persons\n"
 "      got access to your secret key.\n"
-"  \"Key is superseded\"\n"
+"  \"Key is superseeded\"\n"
 "      Use this if you have replaced this key with a newer one.\n"
 "  \"Key is no longer used\"\n"
 "      Use this if you have retired this key.\n"
@@ -3761,3 +3764,14 @@ msgstr "Det finns ingen hj
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Det finns ingen hjälp tillgänglig för \"%s\""
+
+#~ msgid "not processed"
+#~ msgstr "inte behandlade"
+
+#~ msgid "assuming bad MDC due to an unknown critical bit\n"
+#~ msgstr "antar att MDC är felaktig eftersom en okänd kritisk bit är satt\n"
+
+# om någon kan tala om för mig vad detta betyder skulle jag bli jätteglad!
+#~ msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
+#~ msgstr ""
+#~ "nyckeln är inte markerad osäker - går inte att använda med fejkad RNG!\n"