Merged in my changes, after disk crash. Fortunately the CVS was not

affected - but everything else and it seems that there is no backup of
the BTS data is available :-(

47 files changed, 7328 insertions, 7245 deletions

diff --git a/AUTHORS b/AUTHORS
index e12933ec5..a90ff8f95 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,7 +6,7 @@ Authors
 
 Birger Langkjer <[email protected]> Translations [da]
 
-Daniel Resare  <[email protected]> xxxx [sv]
+Daniel Resare  <[email protected]> Translations [sv]
 
 David Shaw <[email protected]> Assignment
     (all in keyserver/,
diff --git a/NEWS b/NEWS
index cdd7a52fd..07cb37666 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+    * The default cipher algorithm for encryption is now CAST5,
+      default default hash algorithm is SHA-1.  This will give us
+      better interoperability with other OpenPGP implementations.
+
     * Symmetric encrypted messages now use a fixed file size if
       possible.  This is a tradeoff: it breaks PGP 5, but fixes PGP 2,
       6, and 7.  Note this was only an issue with RFC-1991 style
diff --git a/TODO b/TODO
index 243927db6..592faa5ac 100644
--- a/TODO
+++ b/TODO
@@ -1,9 +1,19 @@
+  * change the maintainer address in faq.raw
+
+  * Do we need a configure test for putenv?
+
+  * Add remarks to the man page about OpenPGP OPTIONAL algorithms and
+    issue warnings when such an algorithm is used (disabled by expert modus?)
+
+  * Return status information even when an imported key is already
+    stored.  This is useful for GPGME's detailed info fucntion.
+
   * Describe some pitfalls when using EGD.  Check that ~/.gnupg/entropy
     really is the default.  What about needed permission?  
 
   * Using an expired key for signing should give an error message
-    "expired key"and not "unusable key'.  Furthermore the error should
-    also be thrown when the defaultkey has expired.  Reported by
+    "expired key" and not "unusable key'.  Furthermore the error should
+    also be thrown when the default key has expired.  Reported by
     [email protected].
 
   * pause scrolling help in --edit-key and elsewhere.
@@ -14,8 +24,6 @@
   * Selection using +wordlist does not work.
     What about adding a feature -word to the +wordlist search mode.
 
-  * add listing of notation data
-
   * Check the changes to the gpg random gatherer on all W32 platforms.
 
   * Put a note into readme.w32 that there is a man page and a options
@@ -32,10 +40,6 @@
     it's end and allow for multiple signature for one message.  And
     add a real grammar to the code in mainproc.c
 
-  * option to set the signature expiration time for key sigs.
-    Rework the way we create signature subpackets - the current code
-    is not easy to understand.
-
   * Option to warn when a non MDC message is decrypted?
 
   * If there is no secure memory, allocate more memory for the secure
@@ -51,20 +55,14 @@
 
   * Add an is_valid flag to each user ID.
 
-  * Do not create a secring.gpg if it is not needed; I have fixed this
-    sometime ago but it has later reappeared.
-
   * Check for consistent spelling of user ID, key ID etc.
     Replace "user id not found" in getkey.c by "no valid user ID found".
  
   * Replace the printing of the user name by [self-signature] when
     appropriate so that a key listing does not get clobbered.
 
-  * Using --list-only to check for recipients while decrypting may
-    yield an error about an unknown packet.
-
   * Check that the way we select cipher and digest algorithms w/o
-    preferences is okay and make AES the default.
+    preferences is okay and make AES the default in some future.
 
   * Concatenated encryption messages don't work corectly - only the
     first one is processed.
@@ -72,27 +70,11 @@
   * Add option to put the list of recipients (from the encryption
     layer) into the signatures notation data.
 
-  * Allow to update key signatures.  It is also not possible to resign
-    an already revoked key signature.
-
-  * For FreeBSD only: spit out a message that rndcontrol (8) should be
-    used to enable the use of IRQs for entropy gathering.
-
-  * --passphrase-fd  can't work with -cs: document this or find a way
-    to work around.
-
   * With option -i prompt before adding a key to the keyring and show some
     info what we are about to add.
 
   * --disable-asm should still assemble _udiv_qrnnd when needed
 
-  * replace the keyserver stuff either by a call to a specialized
-    utility and SOCKSify this utility.
-    [David is working on this]
-
-  * Check the beginning of file to detect already compressed files (gzip,
-    bzip2, xdelta and some picture formats)  [Timo has some code for this]
-
   * Get new assembler stuff from gmp 3.1
 
   * Use new-format headers for compressed packets.
@@ -101,8 +83,6 @@
   * use DEL and ^H for erasing the previous character (util/ttyio.c).
     or better readline.
 
-  * Print a warning if the directory mode is wrong.
-
   * preferences of hash algorithms are not yet used.
 
   * add test cases for invalid data (scrambled armor or other random data)
@@ -117,9 +97,6 @@
     verification status of the message to the output (i.e. write something to
     the --output file and not only to stderr.
 
-  * The user is asked for a revocation reasons even if this one can't
-    be used with v3 keys.
-
   * keyflags don't distinguish between {certify,signature}-only.
 
   * Instead of issuing a "signature packet without keyid" gpg should
diff --git a/cipher/ChangeLog b/cipher/ChangeLog
index 27c64b621..e2ff61f30 100644
--- a/cipher/ChangeLog
+++ b/cipher/ChangeLog
@@ -1,3 +1,10 @@
+2002-04-06  Werner Koch  <[email protected]>
+
+	* rijndael.c (rijndael_get_info): We do only support a 128 bit
+	blocksize so it makes sense to change the algorithm strings to
+	AES.
+	* cipher.c (string_to_cipher_algo): Map "RIJNDAEL" to "AES".
+
 2002-02-14  Werner Koch  <[email protected]>
 
 	* random.c (mix_pool): Removed the failsafe stuff again.  It makes
diff --git a/cipher/cipher.c b/cipher/cipher.c
index 0d9ebaf01..d2b4032f2 100644
--- a/cipher/cipher.c
+++ b/cipher/cipher.c
@@ -253,15 +253,29 @@ load_cipher_modules(void)
 int
 string_to_cipher_algo( const char *string )
 {
-    int i;
-    const char *s;
+  int i;
+  const char *s;
+
+  /* kludge to alias RIJNDAEL to AES */
+  if ( *string == 'R' || *string == 'r')
+    {
+      if (!ascii_strcasecmp (string, "RIJNDAEL"))
+        string = "AES";
+      else if (!ascii_strcasecmp (string, "RIJNDAEL192"))
+        string = "AES192";
+      else if (!ascii_strcasecmp (string, "RIJNDAEL256"))
+        string = "AES256";
+    }
 
-    do {
-	for(i=0; (s=cipher_table[i].name); i++ )
-	    if( !ascii_strcasecmp( s, string ) )
-		return cipher_table[i].algo;
+  do
+    {
+      for(i=0; (s=cipher_table[i].name); i++ ) 
+        {
+          if( !ascii_strcasecmp( s, string ) )
+            return cipher_table[i].algo;
+        }
     } while( load_cipher_modules() );
-    return 0;
+  return 0;
 }
 
 /****************
diff --git a/cipher/rijndael.c b/cipher/rijndael.c
index 50079cb75..cd29beaad 100644
--- a/cipher/rijndael.c
+++ b/cipher/rijndael.c
@@ -2151,11 +2151,11 @@ rijndael_get_info (int algo, size_t *keylen,
 							= rijndael_decrypt;
 
     if( algo == 7 )
-	return "RIJNDAEL";
+	return "AES";
     if (algo == 8)
-        return "RIJNDAEL192";
+        return "AES192";
     if (algo == 9)
-        return "RIJNDAEL256";
+        return "AES256";
     return NULL;
 }
 
diff --git a/doc/FAQ b/doc/FAQ
index 18c155251..b51b472fc 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -4,7 +4,7 @@ GNUPG FREQUENTLY ASKED QUESTIONS
 
 Version: 1.5.6
 Last-Modified: Sep 14, 2001
-Maintained-by: Nils Ellmenreich <nils 'at' gnupg.org>
+Maintained-by: We are looking for a new maintainer, <faq 'at' gnupg.org> 
 
 
 This is the GnuPG FAQ. The latest HTML version is available  
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index 160eaef92..d1dd56671 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -1538,7 +1538,6 @@ Allow the import and use of keys with user IDs which are not
 self-signed.  This is not recommended, as a non self-signed user ID is
 trivial to forge.
 </para></listitem></varlistentry>
-<varlistentry>
 
 <varlistentry>
 <term>--no-allow-non-selfsigned-uid</term>
@@ -1546,6 +1545,7 @@ trivial to forge.
 Reset the --allow-non-selfsigned-uid option.
 </para></listitem></varlistentry>
 
+<varlistentry>
 <term>--allow-freeform-uid</term>
 <listitem><para>
 Disable all checks on the form of the user ID while generating a new
diff --git a/doc/gpg.texi b/doc/gpg.texi
index add7eecba..f1de7be10 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -582,17 +582,20 @@ each time.
 @item ---keyserver-options @code{parameters}
 This is a space or comma delimited string that gives options for the
 keyserver. Options can be prepended with a `no-' to give the opposite
-meaning. While not all options are available for all keyserver
-schemes, some common options are:
+meaning. While not all options are available for all keyserver types,
+some common options are:
 
 @table @asis
 @item include-revoked
 When receiving or searching for a key, include keys that are marked on
-the keyserver as revoked.
+the keyserver as revoked. Note that this option is always set when
+using the NAI HKP keyserver, as this keyserver does not differentiate
+between revoked and unrevoked keys.
 
 @item include-disabled
 When receiving or searching for a key, include keys that are marked on
-the keyserver as disabled.
+the keyserver as disabled. Note that this option is not used with HKP
+keyservers, as they do not support disabling keys.
 
 @item use-temp-files
 On most Unix-like platforms, GnuPG communicates with the keyserver
@@ -911,7 +914,9 @@ Try to be more RFC1991 (PGP 2.x) compliant.
 @item ---pgp2
 Set up all options to be as PGP 2.x compliant as possible, and warn if
 an action is taken (e.g. encrypting to a non-RSA key) that will create
-a message that PGP 2.x will not be able to handle.
+a message that PGP 2.x will not be able to handle. Note that `PGP
+2.x' here means `MIT PGP 2.6.2'. There are other versions of PGP 2.x
+available, but the MIT release is a good common baseline.
 
 This option implies `---rfc1991 --no-openpgp --no-force-v4-certs
 ---no-comment --escape-from --no-force-v3-sigs --cipher-algo IDEA
@@ -949,16 +954,14 @@ Reset the ---force-v4-certs option.
 Force the use of encryption with appended manipulation
 code. This is always used with the newer ciphers (those
 with a blocksize greater than 64 bit).
-This option might not be implemented yet.
 
 @item ---allow-non-selfsigned-uid
-Allow the import of keys with user IDs which are not self-signed, but
-have at least one signature.
-This only allows the import - key validation will fail and you
-have to check the validity of the key by other means. This hack is
-needed for some German keys generated with pgp 2.6.3in. You should really
-avoid using it, because OpenPGP has better mechanics to do separate signing
-and encryption keys.
+Allow the import and use of keys with user IDs which are not
+self-signed. This is not recommended, as a non self-signed user ID is
+trivial to forge.
+
+@item ---no-allow-non-selfsigned-uid
+Reset the ---allow-non-selfsigned-uid option.
 
 @item ---allow-freeform-uid
 Disable all checks on the form of the user ID while generating a new
diff --git a/g10/ChangeLog b/g10/ChangeLog
index d2c63dc53..bb197982b 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,43 @@
+2002-04-06  Werner Koch  <[email protected]>
+
+	* keyring.c (keyring_get_keyblock): Disable the keylist mode here.
+
+	* encode.c (encode_simple, encode_crypt): Only test on compressed
+	files if a compress level was not explicity set.
+
+	* keygen.c (keygen_set_std_prefs): Removed Blowfish and Twofish
+	from the list of default preferences, swapped the preferences of
+	RMD160 and SHA1.  Don't include a preference to 3DES unless the
+	IDEA kludge gets used.
+
+	* free-packet.c (free_packet): call free_encrypted also for
+	PKT_ENCRYPTED_MDC.
+
+	* compress.c (release_context): New.
+	(handle_compressed): Allocate the context and setup a closure to
+	release the context.  This is required because there is no
+	guarabntee that the filter gets popped from the chain at the end
+	of the function.  Problem noted by Timo and probably also the
+	cause for a couple of other reports.
+	(compress_filter): Use the release function if set.
+
+	* tdbio.c [__CYGWIN32__]: Don't rename ftruncate.  Noted by
+	Disastry.
+
+	* parse-packet.c (parse_signature): Put parens around a bit test.
+
+	* exec.c (make_tempdir): Double backslash for TMP directory
+	creation under Windows.  Better strlen the DIRSEP_S constants for
+	allocation measurements.
+
+	* decrypt.c (decrypt_messages): Release the passphrase aquired
+	by get_last_passphrase.
+
+2002-04-02  Werner Koch  <[email protected]>
+
+	* Makefile.am (EXTRA_DIST): Removed OPTIONS an pubring.asc - they
+	are no longer of any use. 
+
 2002-04-03  David Shaw  <[email protected]>
 
 	* keyserver.c (parse_keyserver_options): fix auto-key-retrieve to
@@ -37,6 +77,16 @@
 
 	* hkp.c (write_quoted): quote backslashes from keyserver searches
 
+2002-03-26  Werner Koch  <[email protected]>
+
+	* keygen.c (ask_keysize): Removed the warning for key sizes > 1536.
+
+2002-03-25  Werner Koch  <[email protected]>
+
+	* keyedit.c (sign_uids): Use 2 strings and not a %s so that
+	translations can be done the right way.
+	* helptext.c: Fixed small typo.
+
 2002-03-23  David Shaw  <[email protected]>
 
 	* import.c (append_uid, merge_sigs): it is okay to import
@@ -95,6 +145,10 @@
 	* sign.c (clearsign_file): Allow --not-dash-escaped to work with
 	v3 keys.
 
+2002-03-14  Werner Koch  <[email protected]>
+
+	* main.h: Changed the default algorithms to CAST5 and SHA1.
+
 2002-03-13  David Shaw  <[email protected]>
 
 	* import.c (chk_self_sigs): Show which user ID a bad self-sig
diff --git a/g10/Makefile.am b/g10/Makefile.am
index 7ee1729df..cca0385d0 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -19,7 +19,7 @@
 ## Process this file with automake to produce Makefile.in
 
 INCLUDES = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl
-EXTRA_DIST = OPTIONS  pubring.asc  options.skel
+EXTRA_DIST = options.skel
 # it seems that we can't use this with automake 1.5
 #OMIT_DEPENDENCIES = zlib.h zconf.h
 LDFLAGS = @LDFLAGS@ @DYNLINK_LDFLAGS@
diff --git a/g10/compress.c b/g10/compress.c
index 766fad9a5..70df4510b 100644
--- a/g10/compress.c
+++ b/g10/compress.c
@@ -266,12 +266,21 @@ compress_filter( void *opaque, int control,
 	    zfx->opaque = NULL;
 	    m_free(zfx->outbuf); zfx->outbuf = NULL;
 	}
+        if (zfx->release)
+          zfx->release (zfx);
     }
     else if( control == IOBUFCTRL_DESC )
 	*(char**)buf = "compress_filter";
     return rc;
 }
 
+
+static void
+release_context (compress_filter_context_t *ctx)
+{
+  m_free (ctx);
+}
+
 /****************
  * Handle a compressed packet
  */
@@ -279,26 +288,19 @@ int
 handle_compressed( void *procctx, PKT_compressed *cd,
 		   int (*callback)(IOBUF, void *), void *passthru )
 {
-    compress_filter_context_t cfx;
+    compress_filter_context_t *cfx;
     int rc;
 
-    memset( &cfx, 0, sizeof cfx );
     if( cd->algorithm < 1 || cd->algorithm > 2	)
 	return G10ERR_COMPR_ALGO;
-    cfx.algo = cd->algorithm;
-
-    iobuf_push_filter( cd->buf, compress_filter, &cfx );
+    cfx = m_alloc_clear (sizeof *cfx);
+    cfx->algo = cd->algorithm;
+    cfx->release = release_context;
+    iobuf_push_filter( cd->buf, compress_filter, cfx );
     if( callback )
 	rc = callback(cd->buf, passthru );
     else
 	rc = proc_packets(procctx, cd->buf);
-  #if 0
-    iobuf_pop_filter( cd->buf, compress_filter, &cfx );
-    if( cd->len )
-	iobuf_set_limit( cd->buf, 0 ); /* disable the readlimit */
-    else
-	iobuf_clear_eof( cd->buf );
-  #endif
     cd->buf = NULL;
     return rc;
 }
diff --git a/g10/decrypt.c b/g10/decrypt.c
index 6e43295ba..ce2d9cd98 100644
--- a/g10/decrypt.c
+++ b/g10/decrypt.c
@@ -121,6 +121,7 @@ decrypt_messages(int nfiles, char **files)
                   g10_errstr(rc));
       p = get_last_passphrase();
       set_next_passphrase(p);
+      m_free (p);
       files++;
       m_free(output);
       write_status( STATUS_FILE_DONE );
diff --git a/g10/encode.c b/g10/encode.c
index 7412c8236..36747f074 100644
--- a/g10/encode.c
+++ b/g10/encode.c
@@ -86,7 +86,7 @@ encode_simple( const char *filename, int mode )
     memset( &tfx, 0, sizeof tfx);
     init_packet(&pkt);
     
-    if (is_file_compressed(filename, &rc))
+    if (opt.compress == -1 && is_file_compressed(filename, &rc))
       {
         if (opt.verbose)
           log_info(_("`%s' already compressed\n"), filename);
@@ -290,7 +290,7 @@ encode_crypt( const char *filename, STRLIST remusr )
 	  }
     }
 
-    if (is_file_compressed(filename, &rc2))
+    if (opt.compress == -1 && is_file_compressed(filename, &rc2))
       {
         if (opt.verbose)
           log_info(_("`%s' already compressed\n"), filename);
diff --git a/g10/encr-data.c b/g10/encr-data.c
index e2752bf36..c8a8c85db 100644
--- a/g10/encr-data.c
+++ b/g10/encr-data.c
@@ -148,6 +148,7 @@ decrypt_data( void *procctx, PKT_encrypted *ed, DEK *dek )
 	/*log_hexdump("MDC calculated:", md_read( dfx.mdc_hash, 0), datalen);*/
 	/*log_hexdump("MDC message   :", dfx.defer, 20);*/
     }
+    
 
   leave:
     cipher_close(dfx.cipher_hd);
diff --git a/g10/exec.c b/g10/exec.c
index 910413339..3be81e947 100644
--- a/g10/exec.c
+++ b/g10/exec.c
@@ -64,7 +64,7 @@ static int make_tempdir(struct exec_info *info)
 #elif defined (__MINGW32__) || defined (__CYGWIN32__)
 	      tmp=m_alloc(256);
 	      if(GetTempPath(256,tmp)==0)
-		strcpy(tmp,"c:\temp");
+		strcpy(tmp,"c:\\temp");
 	      else
 		{
 		  int len=strlen(tmp);
@@ -83,7 +83,7 @@ static int make_tempdir(struct exec_info *info)
 	}
     }
 
-  info->tempdir=m_alloc(strlen(tmp)+1+10+1);
+  info->tempdir=m_alloc(strlen(tmp)+strlen(DIRSEP_S)+10+1);
 
   sprintf(info->tempdir,"%s" DIRSEP_S "gpg-XXXXXX",tmp);
 
@@ -98,13 +98,15 @@ static int make_tempdir(struct exec_info *info)
     {
       info->madedir=1;
 
-      info->tempfile_in=m_alloc(strlen(info->tempdir)+1+10+1);
+      info->tempfile_in=m_alloc(strlen(info->tempdir)
+                                +strlen(DIRSEP_S)+6+strlen(EXTSEP_S)+3+1);
       sprintf(info->tempfile_in,"%s" DIRSEP_S "datain" EXTSEP_S "%s",
 	      info->tempdir,info->binary?"bin":"txt");
 
       if(!info->writeonly)
 	{
-	  info->tempfile_out=m_alloc(strlen(info->tempdir)+1+11+1);
+	  info->tempfile_out=m_alloc(strlen(info->tempdir)
+                                     +strlen(DIRSEP_S)+7+strlen(EXTSEP_S)+3+1);
 	  sprintf(info->tempfile_out,"%s" DIRSEP_S "dataout" EXTSEP_S "%s",
 		  info->tempdir,info->binary?"bin":"txt");
 	}
diff --git a/g10/filter.h b/g10/filter.h
index 2261a3cf2..b7a99e6bc 100644
--- a/g10/filter.h
+++ b/g10/filter.h
@@ -68,7 +68,7 @@ struct unarmor_pump_s;
 typedef struct unarmor_pump_s *UnarmorPump;
 
 
-typedef struct {
+struct compress_filter_context_s {
     int status;
     void *opaque;   /* (used for z_stream) */
     byte *inbuf;
@@ -77,7 +77,9 @@ typedef struct {
     unsigned outbufsize;
     int algo;	 /* compress algo */
     int algo1hack;
-} compress_filter_context_t;
+    void (*release)(struct compress_filter_context_s*);
+};
+typedef struct compress_filter_context_s compress_filter_context_t;
 
 
 typedef struct {
diff --git a/g10/free-packet.c b/g10/free-packet.c
index 4df3658d3..0161eac5a 100644
--- a/g10/free-packet.c
+++ b/g10/free-packet.c
@@ -390,6 +390,7 @@ free_packet( PACKET *pkt )
 	free_compressed( pkt->pkt.compressed);
 	break;
       case PKT_ENCRYPTED:
+      case PKT_ENCRYPTED_MDC:
 	free_encrypted( pkt->pkt.encrypted );
 	break;
       case PKT_PLAINTEXT:
diff --git a/g10/g10.c b/g10/g10.c
index 22acf8897..6732d0e30 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -832,7 +832,7 @@ main( int argc, char **argv )
       #endif
     }
 
-  #ifdef HAVE_DOSISH_SYSTEM
+#ifdef HAVE_DOSISH_SYSTEM
     if ( strchr (opt.homedir,'\\') ) {
         char *d, *buf = m_alloc (strlen (opt.homedir)+1);
         const char *s = opt.homedir;
@@ -841,13 +841,13 @@ main( int argc, char **argv )
         *d = 0;
         opt.homedir = buf;
     }
-  #endif
-  #undef USE_SHM_COPROCESSING	
-  #ifdef USE_SHM_COPROCESSING
+#endif
+#undef USE_SHM_COPROCESSING	 /* huh? */
+#ifdef USE_SHM_COPROCESSING
     if( opt.shm_coprocess ) {
 	init_shm_coprocessing(requested_shm_size, 1 );
     }
-  #endif
+#endif
     /* initialize the secure memory. */
     secmem_init( 16384 );
     maybe_setuid = 0;
diff --git a/g10/helptext.c b/g10/helptext.c
index 973a905c6..911998525 100644
--- a/g10/helptext.c
+++ b/g10/helptext.c
@@ -230,7 +230,7 @@ static struct helptexts { const char *key; const char *help; } helptexts[] = {
 { "keyedit.updpref.okay", N_(
  "Change the preferences of all user IDs (or just of the selected ones)\n"
  "to the current list of preferences.  The timestamp of all affected\n"
- "self-signatures fill be advanced by one second.\n"
+ "self-signatures will be advanced by one second.\n"
 )},
 
 
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 491ef4e2b..c7650e278 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -371,10 +371,19 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
 
 		    /* Fixme: see whether there is a revocation in which
 		     * case we should allow to sign it again. */
-		    tty_printf(_("\"%s\" was already %ssigned by key %08lX\n"),
-			       uidnode->pkt->pkt.user_id->name,
-			       (!node->pkt->pkt.signature->flags.exportable &&
-				local)?"locally ":"",(ulong)sk_keyid[1] );
+                    /* Note: I kept the %s and the empty string in the
+                       else branch so that not too many translations
+                       get broken. */
+                    if (!node->pkt->pkt.signature->flags.exportable && local)
+                      tty_printf(_(
+                         "\"%s\" was already locally signed by key %08lX\n"),
+                                   uidnode->pkt->pkt.user_id->name,
+                                   (ulong)sk_keyid[1] );
+                    else
+                      tty_printf(_(
+                         "\"%s\" was already %ssigned by key %08lX\n"),
+                                 uidnode->pkt->pkt.user_id->name,
+                                 "",(ulong)sk_keyid[1] );
                     sprintf (buf, "%08lX%08lX",
                              (ulong)sk->keyid[0], (ulong)sk->keyid[1] );
                     write_status_text (STATUS_ALREADY_SIGNED, buf);
diff --git a/g10/keygen.c b/g10/keygen.c
index 540857762..9c1bae7f1 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -219,9 +219,9 @@ keygen_set_std_prefs (const char *string)
 
     if (!string || !ascii_strcasecmp (string, "default")) {
       if ( !check_cipher_algo(CIPHER_ALGO_IDEA) )
-        string = "S7 S10 S3 S4 S2 S1 H3 H2 Z2 Z1";
+        string = "S7 S3 S2 S1 H2 H3 Z2 Z1";
       else
-        string = "S7 S10 S3 S4 S2 H3 H2 Z2 Z1";
+        string = "S7 S3 H2 H3 Z2 Z1";
 
       /* If we have it, IDEA goes *after* 3DES so it won't be used
          unless we're encrypting along with a V3 key.  Ideally, we
@@ -348,6 +348,7 @@ keygen_upd_std_prefs( PKT_signature *sig, void *opaque )
 /****************
  * Add preference to the self signature packet.
  * This is only called for packets with version > 3.
+
  */
 int
 keygen_add_std_prefs( PKT_signature *sig, void *opaque )
@@ -865,11 +866,6 @@ ask_keysize( int algo )
 		break;
 	    }
 	}
-	else if( nbits > 1536 && !cpr_enabled() && algo != PUBKEY_ALGO_RSA ) {
-	    if( cpr_get_answer_is_yes("keygen.size.large.okay",_(
-		    "Do you really need such a large keysize? ")) )
-		break;
-	}
 	else
 	    break;
     }
diff --git a/g10/keyring.c b/g10/keyring.c
index 7852a1481..f75a79dfe 100644
--- a/g10/keyring.c
+++ b/g10/keyring.c
@@ -354,6 +354,7 @@ keyring_get_keyblock (KEYRING_HANDLE hd, KBNODE *ret_kb)
     int in_cert = 0;
     int pk_no = 0;
     int uid_no = 0;
+    int save_mode;
 
     if (ret_kb)
         *ret_kb = NULL;
@@ -377,6 +378,7 @@ keyring_get_keyblock (KEYRING_HANDLE hd, KBNODE *ret_kb)
     init_packet (pkt);
     hd->found.n_packets = 0;;
     lastnode = NULL;
+    save_mode = set_packet_list_mode(0);
     while ((rc=parse_packet (a, pkt)) != -1) {
         hd->found.n_packets++;
         if (rc == G10ERR_UNKNOWN_PACKET) {
@@ -444,6 +446,7 @@ keyring_get_keyblock (KEYRING_HANDLE hd, KBNODE *ret_kb)
         pkt = m_alloc (sizeof *pkt);
         init_packet(pkt);
     }
+    set_packet_list_mode(save_mode);
 
     if (rc == -1 && keyblock) 
 	rc = 0; /* got the entire keyblock */
diff --git a/g10/main.h b/g10/main.h
index 5c1f34f42..adcd0cec1 100644
--- a/g10/main.h
+++ b/g10/main.h
@@ -25,9 +25,9 @@
 #include "cipher.h"
 #include "keydb.h"
 
-#define DEFAULT_CIPHER_ALGO  CIPHER_ALGO_BLOWFISH
+#define DEFAULT_CIPHER_ALGO  CIPHER_ALGO_CAST5
 #define DEFAULT_PUBKEY_ALGO  PUBKEY_ALGO_ELGAMAL
-#define DEFAULT_DIGEST_ALGO  DIGEST_ALGO_RMD160
+#define DEFAULT_DIGEST_ALGO  DIGEST_ALGO_SHA1
 
 
 typedef struct {
diff --git a/g10/options.skel b/g10/options.skel
index def2fe5fb..0458ac7b0 100644
--- a/g10/options.skel
+++ b/g10/options.skel
@@ -96,7 +96,7 @@ lock-once
 # support).
 #
 # Example HKP keyserver:
-#      x-hkp://wwwkeys.nl.pgp.net
+#      x-hkp://keyserver.cryptnet.net
 #
 # Example email keyserver:
 #      mailto:[email protected]
@@ -118,9 +118,9 @@ lock-once
 # Most servers do synchronize with each other and DNS round-robin may
 # give you a quasi-random server each time.
 
+#keyserver x-hkp://keyserver.cryptnet.net
 #keyserver mailto:[email protected]
 #keyserver ldap://keyserver.pgp.com
-#keyserver x-hkp://wwwkeys.nl.pgp.net
 
 # Options for keyserver functions
 #
diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index 68754c25f..9db08fb70 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -1254,7 +1254,7 @@ parse_signature( IOBUF inp, int pkttype, unsigned long pktlen,
 	if(p && *p==0)
 	  sig->flags.exportable=0;
 
-	/* Find all revokation keys. Back to hashed area only. */
+	/* Find all revocation keys. Back to hashed area only. */
 	if(sig->sig_class==0x1F)
 	  {
 	    struct revocation_key *revkey;
@@ -1267,7 +1267,7 @@ parse_signature( IOBUF inp, int pkttype, unsigned long pktlen,
 							    &len,&seq)))
 	      {
 		if(len==sizeof(struct revocation_key) &&
-		   revkey->class&0x80) /* 0x80 bit must be set */
+		   (revkey->class&0x80)) /* 0x80 bit must be set */
 		  {
 		    sig->revkey=m_realloc(sig->revkey,
 			  sizeof(struct revocation_key *)*(sig->numrevkeys+1));
diff --git a/g10/tdbio.c b/g10/tdbio.c
index 1fa087e46..33e2583c8 100644
--- a/g10/tdbio.c
+++ b/g10/tdbio.c
@@ -39,7 +39,7 @@
 #include "trustdb.h"
 #include "tdbio.h"
 
-#ifdef HAVE_DOSISH_SYSTEM
+#if defined(HAVE_DOSISH_SYSTEM) && !defined(__CYGWIN32__)
 #define ftruncate chsize
 #endif
 
diff --git a/po/ChangeLog b/po/ChangeLog
index 2a286048d..8a8c24aea 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,15 @@
+2002-04-06  Werner Koch  <[email protected]>
+
+	* fr.po: Updated.
+
+2002-04-02  Werner Koch  <[email protected]>
+
+	* de.po, de.glo: Updated.
+
+2002-03-08  Werner Koch  <[email protected]>
+
+	* et.po: Updated.
+
 2002-03-06  Werner Koch  <[email protected]>
 
 	* pt_PT.po: Removed.
diff --git a/po/da.po b/po/da.po
index 4a4c455ee..8ecb02239 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: 2002-03-03 15:18+0100\n"
+"POT-Creation-Date: 2002-04-06 17:29+0200\n"
 "PO-Revision-Date: 2000-03-07 22:51+01:00\n"
 "Last-Translator: Birger Langkjer <[email protected]>\n"
 "Language-Team: Danish <[email protected]>\n"
@@ -47,7 +47,7 @@ msgstr "n"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:768 util/miscutil.c:326
+#: g10/keyedit.c:777 util/miscutil.c:326
 msgid "quit"
 msgstr "afslut"
 
@@ -277,7 +277,7 @@ msgstr "... dette er en fejl (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du fandt en fejl ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1552
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1547
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
@@ -353,7 +353,7 @@ msgstr ""
 "Ikke nok tilf�ldige byte tilg�ngelig.  Please do some other work to give\n"
 "the OS a chance to collect more entropy! (Kr�ver %d byte mere)\n"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid ""
 "@Commands:\n"
 " "
@@ -361,170 +361,170 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "|[file]|make a signature"
 msgstr "|[filer]|opret en signatur"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "|[file]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "make a detached signature"
 msgstr "opret en separat signatur"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "encrypt data"
 msgstr "krypt�r data"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "encryption only with symmetric cipher"
 msgstr "krypt�r kun med symmetriske cifre"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "store only"
 msgstr "gem kun"
 
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "decrypt data (default)"
 msgstr "afkrypt�r data (standard)"
 
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "verify a signature"
 msgstr "godkend en signatur"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "list keys"
 msgstr "vis n�gler"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "list keys and signatures"
 msgstr "vis n�gler og signaturer"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "check key signatures"
 msgstr "tjek n�glesignaturer"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "list keys and fingerprints"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "list secret keys"
 msgstr "vis hemmelige n�gler"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "generate a new key pair"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/g10.c:297
+#: g10/g10.c:298
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "fjern n�gle fra den offentlige n�glering"
 
-#: g10/g10.c:299
+#: g10/g10.c:300
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/g10.c:300
+#: g10/g10.c:301
 msgid "sign a key"
 msgstr "sign�r en n�gle"
 
-#: g10/g10.c:301
+#: g10/g10.c:302
 msgid "sign a key locally"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/g10.c:302
+#: g10/g10.c:303
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/g10.c:303
+#: g10/g10.c:304
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/g10.c:304
+#: g10/g10.c:305
 msgid "sign or edit a key"
 msgstr "sign�r eller redig�r en n�gle"
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "generate a revocation certificate"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "export keys"
 msgstr "eksport�r n�gler"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "export keys to a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "import keys from a key server"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/g10.c:310
+#: g10/g10.c:311
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "import/merge keys"
 msgstr "import�r/fusion�r n�gler"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "list only the sequence of packets"
 msgstr "vis kun pakkesekvensen"
 
-#: g10/g10.c:320
+#: g10/g10.c:321
 msgid "export the ownertrust values"
 msgstr "eksport�r ejertillidsv�rdierne"
 
-#: g10/g10.c:322
+#: g10/g10.c:323
 msgid "import ownertrust values"
 msgstr "import�r ejertillidsv�rdierne"
 
-#: g10/g10.c:324
+#: g10/g10.c:325
 msgid "update the trust database"
 msgstr "opdat�r tillidsdatabasen"
 
-#: g10/g10.c:326
+#: g10/g10.c:327
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "opdat�r tillidsdatabasen"
 
-#: g10/g10.c:327
+#: g10/g10.c:328
 msgid "fix a corrupted trust database"
 msgstr "repar�r en �delagt tillidsdatabase"
 
-#: g10/g10.c:328
+#: g10/g10.c:329
 msgid "De-Armor a file or stdin"
 msgstr "De-beskydt en fil el. stdin"
 
-#: g10/g10.c:330
+#: g10/g10.c:331
 msgid "En-Armor a file or stdin"
 msgstr "Beskydt en fil el. stdin"
 
-#: g10/g10.c:332
+#: g10/g10.c:333
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|print meddelelsesresum�"
 
-#: g10/g10.c:336
+#: g10/g10.c:337
 msgid ""
 "@\n"
 "Options:\n"
@@ -534,208 +534,208 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/g10.c:338
+#: g10/g10.c:339
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
 
-#: g10/g10.c:340
+#: g10/g10.c:341
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|krypt�r for NAME"
 
-#: g10/g10.c:343
+#: g10/g10.c:344
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|brug NAME som standard modtager"
 
-#: g10/g10.c:345
+#: g10/g10.c:346
 msgid "use the default key as default recipient"
 msgstr "brug standard n�glen som standard modtager"
 
-#: g10/g10.c:350
+#: g10/g10.c:352
 msgid "use this user-id to sign or decrypt"
 msgstr "brug denne bruger-id til at signere eller dekryptere"
 
-#: g10/g10.c:351
+#: g10/g10.c:353
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|s�t kompresningsniveau N (0 = sl�et fra)"
 
-#: g10/g10.c:353
+#: g10/g10.c:355
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "verbose"
 msgstr "meddelsom"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "be somewhat more quiet"
 msgstr "v�r mere stille"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "don't use the terminal at all"
 msgstr "brug overhovedet ikke terminalen"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "force v3 signatures"
 msgstr "tving v3 signaturer"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "tving v3 signaturer"
 
-#: g10/g10.c:366
+#: g10/g10.c:368
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "tving v3 signaturer"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "tving v3 signaturer"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 msgid "always use a MDC for encryption"
 msgstr "brug altid en MDC for kryptering"
 
-#: g10/g10.c:370
+#: g10/g10.c:372
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "brug altid en MDC for kryptering"
 
-#: g10/g10.c:372
+#: g10/g10.c:374
 msgid "do not make any changes"
 msgstr "lav ingen �ndringer"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:374
+#: g10/g10.c:376
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "batch mode: never ask"
 msgstr "k�rselsmodus: sp�rg aldrig"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "assume yes on most questions"
 msgstr "forvent ja til de fleste spr�gsm�l"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "assume no on most questions"
 msgstr "forvent nej til de fleste spr�gsm�l"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "add this keyring to the list of keyrings"
 msgstr "tilf�j denne n�glering til n�gleringslisten"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "add this secret keyring to the list"
 msgstr "tilf�j denne hemmeligen�glering til listen"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|brug NAME som standard hemmelign�gle"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|brug denne n�gletjener til at sl� n�gler op"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|s�t terminal karakters�t til NAME"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "read options from file"
 msgstr "l�s indstillinger fra fil"
 
-#: g10/g10.c:391
+#: g10/g10.c:393
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinfo til denne FD"
 
-#: g10/g10.c:393
+#: g10/g10.c:395
 #, fuzzy
 msgid "|[file]|write status info to file"
 msgstr "|FD|skriv statusinfo til denne FD"
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "|KEYID|ultimately trust this key"
 msgstr ""
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "emulate the mode described in RFC1991"
 msgstr "emul�r modusen beskrevet i RFC1991"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 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:403
+#: g10/g10.c:405
 #, fuzzy
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "s�t alle pakker, cifre og resum� flag til OpenPGP standard"
 
-#: g10/g10.c:407
+#: g10/g10.c:409
 msgid "|N|use passphrase mode N"
 msgstr "|N|brug pasfrasemodus N"
 
-#: g10/g10.c:409
+#: g10/g10.c:411
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|brug meddelelses resum�algoritme NAME for pasfrase"
 
-#: g10/g10.c:411
+#: g10/g10.c:413
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|brug cifrealgoritme NAME for pasfrase"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|brug cifferalgoritme NAME"
 
-#: g10/g10.c:413
+#: g10/g10.c:415
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|brug meddelelsesresum� algoritme NAME"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|N|use compress algorithm N"
 msgstr "|N|brug kompresalgoritme N"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 
-#: g10/g10.c:416
+#: g10/g10.c:418
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:418
+#: g10/g10.c:420
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:419
+#: g10/g10.c:421
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=VALUE|brug denne notationsdata"
 
-#: g10/g10.c:422
+#: g10/g10.c:424
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid ""
 "@\n"
 "Examples:\n"
@@ -755,16 +755,16 @@ msgstr ""
 " --list-keys [navne]        vis n�gler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/g10.c:559
+#: g10/g10.c:561
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:565
 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:566
+#: g10/g10.c:568
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -774,7 +774,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: g10/g10.c:577
+#: g10/g10.c:579
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -782,253 +782,258 @@ msgstr ""
 "\n"
 "Underst�ttede algoritmer:\n"
 
-#: g10/g10.c:651
+#: g10/g10.c:653
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/g10.c:708
+#: g10/g10.c:710
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/g10.c:881
+#: g10/g10.c:883
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:887
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: g10/g10.c:892
+#: g10/g10.c:894
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/g10.c:1174
+#: g10/g10.c:1176
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/g10.c:1190
+#: g10/g10.c:1192
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1294
+#: g10/g10.c:1208
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr ""
+
+#: g10/g10.c:1309
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:1298
+#: g10/g10.c:1313
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:1305 g10/g10.c:1316
+#: g10/g10.c:1320 g10/g10.c:1331
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/g10.c:1307 g10/g10.c:1327
+#: g10/g10.c:1322 g10/g10.c:1342
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/g10.c:1310
+#: g10/g10.c:1325
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/g10.c:1336
+#: g10/g10.c:1351
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1342
+#: g10/g10.c:1357
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1348
+#: g10/g10.c:1363
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1361
+#: g10/g10.c:1376
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1375 g10/sign.c:614
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1390 g10/sign.c:614
 #: g10/sign.c:792
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr ""
 
-#: g10/g10.c:1414 g10/g10.c:1426
+#: g10/g10.c:1429 g10/g10.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/g10.c:1420 g10/g10.c:1432
+#: g10/g10.c:1435 g10/g10.c:1447
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/g10.c:1436
+#: g10/g10.c:1451
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/g10.c:1440
+#: g10/g10.c:1455
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/g10.c:1443
+#: g10/g10.c:1458
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr ""
 
-#: g10/g10.c:1445
+#: g10/g10.c:1460
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/g10.c:1447
+#: g10/g10.c:1462
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/g10.c:1449
+#: g10/g10.c:1464
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:1452
+#: g10/g10.c:1467
 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:1456
+#: g10/g10.c:1471
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/g10.c:1460
+#: g10/g10.c:1475
 #, fuzzy
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/g10.c:1463
+#: g10/g10.c:1478
 #, fuzzy
 msgid "invalid preferences\n"
 msgstr "vis pr�ferencer"
 
 # er det klogt at overs�tte TrustDB?
-#: g10/g10.c:1557
+#: g10/g10.c:1572
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/g10.c:1577
+#: g10/g10.c:1592
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/g10.c:1584
+#: g10/g10.c:1599
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:1592
+#: g10/g10.c:1607
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1624
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/g10.c:1622
+#: g10/g10.c:1637
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:1636
+#: g10/g10.c:1651
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:1645
+#: g10/g10.c:1660
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/g10.c:1663
+#: g10/g10.c:1678
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/g10.c:1674
+#: g10/g10.c:1689
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:1682
+#: g10/g10.c:1697
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/g10.c:1690
+#: g10/g10.c:1705
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:1698
+#: g10/g10.c:1713
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1721
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/encode.c:307 g10/g10.c:1762 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1777 g10/sign.c:703
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/g10.c:1777
+#: g10/g10.c:1792
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [bruger-id] [n�glering]"
 
-#: g10/g10.c:1860
+#: g10/g10.c:1875
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1883
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:1955
+#: g10/g10.c:1970
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/g10.c:2041
+#: g10/g10.c:2056
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2060
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2048 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2063 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �bne `%s'\n"
 
-#: g10/g10.c:2257
+#: g10/g10.c:2272
 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:2263
+#: g10/g10.c:2278
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:2269
+#: g10/g10.c:2284
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:2277
+#: g10/g10.c:2292
 msgid "a notation value must not use any control characters\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
@@ -1440,7 +1445,7 @@ msgstr "   (%d) DSA (sign�r kun)\n"
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keyedit.c:466 g10/keygen.c:776
+#: g10/keyedit.c:475 g10/keygen.c:776
 msgid "Your selection? "
 msgstr "Dit valg? "
 
@@ -1448,7 +1453,7 @@ msgstr "Dit valg? "
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 
-#: g10/keyedit.c:479 g10/keygen.c:810
+#: g10/keyedit.c:488 g10/keygen.c:810
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
@@ -1506,21 +1511,17 @@ msgid ""
 "vulnerable to attacks!\n"
 msgstr ""
 
-#: g10/keygen.c:870
-msgid "Do you really need such a large keysize? "
-msgstr ""
-
-#: g10/keygen.c:876
+#: g10/keygen.c:871
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:879 g10/keygen.c:883
+#: g10/keygen.c:874 g10/keygen.c:878
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:934
+#: g10/keygen.c:929
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1530,7 +1531,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:943
+#: g10/keygen.c:938
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1540,42 +1541,42 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:965
+#: g10/keygen.c:960
 msgid "Key is valid for? (0) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:967
+#: g10/keygen.c:962
 #, fuzzy
 msgid "Signature is valid for? (0) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:972
+#: g10/keygen.c:967
 msgid "invalid value\n"
 msgstr "ugyldig v�rdi\n"
 
-#: g10/keygen.c:977
+#: g10/keygen.c:972
 #, fuzzy, c-format
 msgid "%s does not expire at all\n"
 msgstr "N�glen udl�ber aldrig\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:984
+#: g10/keygen.c:979
 #, fuzzy, c-format
 msgid "%s expires at %s\n"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keygen.c:990
+#: g10/keygen.c:985
 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:995
+#: g10/keygen.c:990
 msgid "Is this correct (y/n)? "
 msgstr "Er dette korrekt (j/n)? "
 
-#: g10/keygen.c:1038
+#: g10/keygen.c:1033
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1585,44 +1586,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1045
 msgid "Real name: "
 msgstr "Rigtige navn: "
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1053
 msgid "Invalid character in name\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:1060
+#: g10/keygen.c:1055
 msgid "Name may not start with a digit\n"
 msgstr "Navn m� ikke starte med et tal\n"
 
-#: g10/keygen.c:1062
+#: g10/keygen.c:1057
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navn skal v�re mindst 5 bogstaver langt\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1065
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:1081
+#: g10/keygen.c:1076
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1084
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1095
+#: g10/keygen.c:1090
 msgid "Invalid character in comment\n"
 msgstr "Ugyldigt tegn i kommentar\n"
 
-#: g10/keygen.c:1118
+#: g10/keygen.c:1113
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruger '%s' tegns�ttet.\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1119
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1633,28 +1634,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1128
+#: g10/keygen.c:1123
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:1133
+#: g10/keygen.c:1128
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1143
+#: g10/keygen.c:1138
 #, 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:1144
+#: g10/keygen.c:1139
 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:1163
+#: g10/keygen.c:1158
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1202
+#: g10/keygen.c:1197
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1662,17 +1663,17 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/keyedit.c:655 g10/keygen.c:1210
+#: g10/keyedit.c:664 g10/keygen.c:1205
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
 
-#: g10/keygen.c:1211
+#: g10/keygen.c:1206
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1217
+#: g10/keygen.c:1212
 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"
@@ -1680,7 +1681,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1233
 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"
@@ -1688,80 +1689,80 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1723
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA n�glepar vil have 1024 bit.\n"
 
-#: g10/keygen.c:1782
+#: g10/keygen.c:1777
 msgid "Key generation canceled.\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: g10/keygen.c:1870 g10/keygen.c:1950
+#: g10/keygen.c:1865 g10/keygen.c:1945
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/keygen.c:1871 g10/keygen.c:1952
+#: g10/keygen.c:1866 g10/keygen.c:1947
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:1939
+#: g10/keygen.c:1934
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/keygen.c:1945
+#: g10/keygen.c:1940
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1954
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1961
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1981
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�gle oprettet og signeret.\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1982
 msgid "key marked as ultimately trusted.\n"
 msgstr ""
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1991
 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:2008 g10/keygen.c:2114
+#: g10/keygen.c:2003 g10/keygen.c:2109
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:2052 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2047 g10/sig-check.c:227 g10/sign.c:228
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:2054 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2049 g10/sig-check.c:229 g10/sign.c:230
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2058
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:2090
+#: g10/keygen.c:2085
 msgid "Really create? "
 msgstr "Vil du virkelig oprette?"
 
@@ -1809,32 +1810,32 @@ msgstr ""
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s krypteret for: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:142
+#: g10/delkey.c:69 g10/export.c:141
 #, fuzzy, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:162
+#: g10/delkey.c:77 g10/export.c:161
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/export.c:170
+#: g10/export.c:169
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:181
+#: g10/export.c:180
 #, fuzzy, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:189
+#: g10/export.c:188
 #, fuzzy, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:255
+#: g10/export.c:254
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
@@ -1851,7 +1852,7 @@ msgstr "[bruger ikke fundet]"
 
 #: g10/getkey.c:1362
 #, c-format
-msgid "Invalid key %08lX made valid by --always-trust\n"
+msgid "invalid key %08lX made valid by --always-trust\n"
 msgstr ""
 
 #: g10/getkey.c:1957
@@ -2197,12 +2198,12 @@ msgstr ""
 msgid "User ID \"%s\" is revoked.\n"
 msgstr ""
 
-#: g10/keyedit.c:330 g10/keyedit.c:1004
+#: g10/keyedit.c:330 g10/keyedit.c:1013
 #, fuzzy
 msgid "Are you sure you still want to sign it?\n"
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:335 g10/keyedit.c:409 g10/keyedit.c:519 g10/keyedit.c:1007
+#: g10/keyedit.c:335 g10/keyedit.c:418 g10/keyedit.c:528 g10/keyedit.c:1016
 msgid "Really sign? "
 msgstr "Vil du gerne signere? "
 
@@ -2217,726 +2218,740 @@ msgid ""
 "Do you want to promote it to a full exportable signature?\n"
 msgstr ""
 
-#. Fixme: see whether there is a revocation in which
-#. * case we should allow to sign it again.
-#: g10/keyedit.c:374
+#: g10/keyedit.c:379
+#, c-format
+msgid "\"%s\" was already locally signed by key %08lX\n"
+msgstr ""
+
+#: g10/keyedit.c:384
 #, c-format
 msgid "\"%s\" was already %ssigned by key %08lX\n"
 msgstr ""
 
-#: g10/keyedit.c:387
+#: g10/keyedit.c:396
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr ""
 
-#: g10/keyedit.c:402
+#: g10/keyedit.c:411
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Bem�rk: Denne n�gle er for�ldet!\n"
 
-#: g10/keyedit.c:406
+#: g10/keyedit.c:415
 #, fuzzy
 msgid "  Are you sure you still want to sign it?\n"
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:429
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:422
+#: g10/keyedit.c:431
 msgid "Do you want your signature to expire at the same time? (y/n) "
 msgstr ""
 
-#: g10/keyedit.c:450
+#: g10/keyedit.c:459
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:463
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:465
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:458
+#: g10/keyedit.c:467
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:485
+#: g10/keyedit.c:494
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr ""
 
-#: g10/keyedit.c:494
+#: g10/keyedit.c:503
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:507
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:512
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:507
+#: g10/keyedit.c:516
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:511
+#: g10/keyedit.c:520
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:552 g10/keyedit.c:2459 g10/keyedit.c:2521 g10/sign.c:273
+#: g10/keyedit.c:561 g10/keyedit.c:2476 g10/keyedit.c:2538 g10/sign.c:273
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:621
 msgid "This key is not protected.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:625
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:629
 msgid "Key is protected.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:640
+#: g10/keyedit.c:649
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan ikke redigere denne n�gle: %s\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:655
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:669
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:663
+#: g10/keyedit.c:672
 msgid "Do you really want to do this? "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:736
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:777
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
-#: g10/keyedit.c:769
+#: g10/keyedit.c:778
 msgid "q"
 msgstr "a"
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:779
 msgid "save"
 msgstr "gem"
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:779
 msgid "save and quit"
 msgstr "gem og afslut"
 
-#: g10/keyedit.c:771
+#: g10/keyedit.c:780
 msgid "help"
 msgstr "hj�lp"
 
-#: g10/keyedit.c:771
+#: g10/keyedit.c:780
 msgid "show this help"
 msgstr "vis denne hj�lp"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:782
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:782
 msgid "show fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:783
 msgid "list"
 msgstr "vis"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:783
 msgid "list key and user IDs"
 msgstr "vis n�gler og bruger-id'er"
 
-#: g10/keyedit.c:775
+#: g10/keyedit.c:784
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:785
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:785
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:786
 msgid "key"
 msgstr "n�gle"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:786
 msgid "select secondary key N"
 msgstr "v�lg sekund�r n�gle N"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:787
 msgid "check"
 msgstr "tjek"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:787
 msgid "list signatures"
 msgstr "vis signaturer"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:788
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:789
 msgid "sign"
 msgstr "sign�r"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:789
 msgid "sign the key"
 msgstr "sign�r n�glen"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:790
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:791
 msgid "lsign"
 msgstr "lsign�r"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:791
 msgid "sign the key locally"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:792
 #, fuzzy
 msgid "nrsign"
 msgstr "sign�r"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:792
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:793
 #, fuzzy
 msgid "nrlsign"
 msgstr "sign�r"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:793
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:794
 msgid "debug"
 msgstr "aflus"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:795
 msgid "adduid"
 msgstr "tilf�j-bid"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:795
 msgid "add a user ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:796
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:796
 #, fuzzy
 msgid "add a photo ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:797
 msgid "deluid"
 msgstr "sletbid"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:797
 msgid "delete user ID"
 msgstr "slet bruger id"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:790
+#: g10/keyedit.c:799
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:800
 msgid "addkey"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:800
 msgid "add a secondary key"
 msgstr "tilf�j sekund�r n�gle"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:801
 msgid "delkey"
 msgstr "sletn�gle"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:801
 msgid "delete a secondary key"
 msgstr "slet sekund�r n�gle"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:802
 msgid "delsig"
 msgstr "sletsig"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:802
 msgid "delete signatures"
 msgstr "slet signaturer"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:803
 msgid "expire"
 msgstr "udl�b"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:803
 msgid "change the expire date"
 msgstr "�ndr udl�bsdatoen"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:804
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:804
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:805
 msgid "toggle"
 msgstr "skift"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:805
 msgid "toggle between secret and public key listing"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:807
 msgid "t"
 msgstr "s"
 
-#: g10/keyedit.c:799
+#: g10/keyedit.c:808
 msgid "pref"
 msgstr "pr�f"
 
-#: g10/keyedit.c:799
+#: g10/keyedit.c:808
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:800
+#: g10/keyedit.c:809
 #, fuzzy
 msgid "showpref"
 msgstr "vispr�f"
 
-#: g10/keyedit.c:800
+#: g10/keyedit.c:809
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:810
 #, fuzzy
 msgid "setpref"
 msgstr "pr�f"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:810
 #, fuzzy
 msgid "set preference list"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:811
 #, fuzzy
 msgid "updpref"
 msgstr "pr�f"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:811
 #, fuzzy
 msgid "updated preferences"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:812
 msgid "passwd"
 msgstr "kodeord"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:812
 msgid "change the passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:813
 msgid "trust"
 msgstr "betro"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:813
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:814
 msgid "revsig"
 msgstr ""
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:814
 msgid "revoke signatures"
 msgstr ""
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:815
 msgid "revkey"
 msgstr ""
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:815
 msgid "revoke a secondary key"
 msgstr ""
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:816
 msgid "disable"
 msgstr "sl�fra"
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:816
 msgid "disable a key"
 msgstr "sl� n�gle fra"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:817
 msgid "enable"
 msgstr "sl�til"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:817
 msgid "enable a key"
 msgstr "sl� n�gle til"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:818
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:818
 msgid "show photo ID"
 msgstr ""
 
-#: g10/delkey.c:112 g10/keyedit.c:829
+#: g10/delkey.c:112 g10/keyedit.c:838
 msgid "can't do that in batchmode\n"
 msgstr ""
 
-#: g10/keyedit.c:866
+#: g10/keyedit.c:875
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:893
 msgid "Secret key is available.\n"
 msgstr ""
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:924
 msgid "Command> "
 msgstr ""
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:956
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:960
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1009
 #, fuzzy
 msgid "Key is revoked.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1025
 msgid "Really sign all user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:1017
+#: g10/keyedit.c:1026
 msgid "Hint: Select the user IDs to sign\n"
 msgstr ""
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1051
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1062 g10/keyedit.c:1083
+#: g10/keyedit.c:1071 g10/keyedit.c:1092
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1064
+#: g10/keyedit.c:1073
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1076
 msgid "Really remove all selected user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:1068
+#: g10/keyedit.c:1077
 msgid "Really remove this user ID? "
 msgstr ""
 
-#: g10/keyedit.c:1106 g10/keyedit.c:1128
+#: g10/keyedit.c:1115 g10/keyedit.c:1137
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1110
+#: g10/keyedit.c:1119
 msgid "Do you really want to delete the selected keys? "
 msgstr ""
 
-#: g10/keyedit.c:1111
+#: g10/keyedit.c:1120
 msgid "Do you really want to delete this key? "
 msgstr ""
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1141
 msgid "Do you really want to revoke the selected keys? "
 msgstr ""
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1142
 msgid "Do you really want to revoke this key? "
 msgstr ""
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1206
 msgid "Really update the preferences for the selected user IDs? "
 msgstr ""
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1208
 msgid "Really update the preferences? "
 msgstr ""
 
-#: g10/keyedit.c:1237
+#: g10/keyedit.c:1246
 msgid "Save changes? "
 msgstr "Gem �ndringer? "
 
-#: g10/keyedit.c:1240
+#: g10/keyedit.c:1249
 msgid "Quit without saving? "
 msgstr "Afslut uden at gemme? "
 
-#: g10/keyedit.c:1251
+#: g10/keyedit.c:1260
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1258
+#: g10/keyedit.c:1267
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1274
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1285
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1433
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s%s\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1436
 msgid " (sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:1432 g10/keyedit.c:1458
+#: g10/keyedit.c:1441 g10/keyedit.c:1467
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1450
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1454
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1483
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! undern�gle er blevet annulleret! %s\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1486
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1488
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1598
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
 msgstr ""
 
-#: g10/keyedit.c:1593 g10/keyedit.c:1620
+#: g10/keyedit.c:1602 g10/keyedit.c:1629
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/n) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:1601
+#: g10/keyedit.c:1610
 msgid "You may only have one photo ID on a key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1624
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1626
+#: g10/keyedit.c:1635
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1757
+#: g10/keyedit.c:1766
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:1770
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1774
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1780
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:1785
+#: g10/keyedit.c:1794
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettede %d signatur.\n"
 
-#: g10/keyedit.c:1786
+#: g10/keyedit.c:1795
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1798
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1867
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:1864
+#: g10/keyedit.c:1873
 msgid "Please select at most one secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1877
 msgid "Changing expiration time for a secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:1879
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1912
+#: g10/keyedit.c:1921
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1937
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2018
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:2184
+#: g10/keyedit.c:2193
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2239
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ingen sekund�r n�gle med indeks %d\n"
 
-#: g10/keyedit.c:2328
+#: g10/keyedit.c:2337
 msgid "user ID: \""
 msgstr "bruger-id: \""
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2342
 #, c-format
 msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2335
+#: g10/keyedit.c:2345
+#, c-format
+msgid ""
+"\"\n"
+"locally signed with your key %08lX at %s\n"
+msgstr ""
+
+#: g10/keyedit.c:2349
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr ""
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2373
 msgid "You have signed these user IDs:\n"
 msgstr ""
 
-#: g10/keyedit.c:2373
+#: g10/keyedit.c:2387
 #, c-format
-msgid "   signed by %08lX at %s%s\n"
+msgid "   signed by %08lX at %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:2380
+#: g10/keyedit.c:2395
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2415
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2425
 #, c-format
-msgid "   signed by %08lX at %s\n"
+msgid "   signed by %08lX at %s%s\n"
+msgstr ""
+
+#: g10/keyedit.c:2427
+msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:2418
+#: g10/keyedit.c:2434
 msgid "Really create the revocation certificates? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2464
 msgid "no secret key\n"
 msgstr ""
 
@@ -3137,12 +3152,12 @@ msgstr ""
 
 #: g10/misc.c:378
 #, c-format
-msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgid "warning: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
 #: g10/misc.c:410
 #, c-format
-msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgid "warning: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
 #: g10/misc.c:435
@@ -3975,7 +3990,7 @@ msgstr ""
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures fill be advanced by one second.\n"
+"self-signatures will be advanced by one second.\n"
 msgstr ""
 
 #: g10/helptext.c:238
diff --git a/po/de.glo b/po/de.glo
index b2745f246..28e3c1e0b 100644
--- a/po/de.glo
+++ b/po/de.glo
@@ -1,6 +1,6 @@
 # Glossary for GnuPG german translation
 # Zusammenstellung der Liste:
-# Copyright (C) 1998, 1999, 2000, 20001 Free Software Foundation, Inc.
+# Copyright (C) 1998 Free Software Foundation, Inc.
 # Walter Koch <[email protected]>, 1998.
 #
 # This is just a textfile for your information.
@@ -18,15 +18,16 @@
 # 5. (*) Uneinheitlich verwendet
 # 6.  - Gef�llt mir (Walter Koch) nicht so toll
 # 7. Die erste genannte �bersetzung ist die in de.po verwendete
+# 8. # - Wurde in fr�herere de.po-Version verwendet
 
 
-
-Agent			Agent 
+agent			Agent 
 aka			alias
 algorithm		Verfahren          
 anonymous		ungenannter
 argument    		> Argument
 armor			ASCII-H�lle
+assigned		zugewiesen
 associate with a person <einer Person zuordnen
 authentication  	Authentisierung
 available		vorhanden [besser?: verf�gbar, greifbar?]
@@ -34,7 +35,7 @@ bad [MPI]		fehlerhafte MPI
 bad [signature]		falsch[e] Unterschrift 
 break (the encryption)  <(Die Verschl�sselung) aufbrechen
 bug			"Bug (Programmfehler)"
-cache   		Lager  *Zwischenspeicher
+cache   		Cache, -#Lager  *Zwischenspeicher
 can't read		nicht lesbar
 cancelled		Abbruch, abgebrochen
 casual  		>zuf�llig, >gelegentlich >unregelm��ig
@@ -45,11 +46,13 @@ check (verb)		pr�fen, gepr�ft
 checking [sth.]		[sth-]-�berpr�fung
 checksum		Pr�fsumme
 cipher algorithm	Verschl�sselungsverfahren
+clearsign 
 clearsig header		Klartextsignatur-Einleitung
 created			erzeugt
 command			Befehl
 comment			Bemerkung
 compress algorithm      Komprimierverfahren,*Komprimierungsverfahren ?   
+compressed		komprimiert
 compromised             nicht mehr sicher
 core dump		core-dump-Datei
 , (Speicherauszug?)
@@ -61,18 +64,23 @@ created			erstellt
 creation    		<Erzeugung
 critical bit   		???
 dash escaped            mit Bindestrich \"escapte\", *m.Bindestrichen maskiert?
-decryption		Enschl�sselung
+decryption		Entschl�sselung
 default option  	<Standardoption
+default option file 	--voreingestellte Optionendatei
 DEK 			???
 delete  		entfernen, *>l�schen 
 depend on   		>sich verlassen auf,>angewiesen sein auf,>abh�ngen von
 depreciated		- taugt nicht mehr viel
+detached [sign]		abgetrennte [Unterschrift]
 determined attacker 	>zielbewusster,>entschlossener Angreifer
 digest algorithm	Hashmethode
+direct [key sig]        -"direct key"
 disabled		abgeschaltet
+duplicated (adj.)	doppelt
 encrypted		verschl�sselte
 enviorement variable  	Umgebungsvariable
 eventually  		>schlie�lich, endlich  Nicht: eventuell
+expand
 expiration date 	<Verfalldatum
 expire  		<verfallen
 expires			verf�llt
@@ -81,12 +89,15 @@ failed			fehlgeschlagen
 faked [RNG]             - *manipulierter Zufallszahlengenerator
 faked [certificate]     gef�lscht
 fingerprint  		Fingerabdruck
+flag [verb]  		-kennzeichnen
 found [xyz found]       entdeckt [xyz entdeckt]
 for-your-eyes-only	Vertraulichkeit (\"for-your-eyes-only\")
+, Verschlu�sache
 generated		erzeugter
 good certificate	Korrektes Zertifikat
-handle			benutzt
+handle [verb]		benutzen, behandeln, mit ... umgehen
 hint			Tip
+human readable          -nicht als Klartext darstellbar 
 ignored			unbeachtet
 include 		<enthalten
 init    		*initialisieren
@@ -97,10 +108,12 @@ key-ID                  Schl�ssel-ID, *Schl�sselkennung ?
 
 key binding		Schl�sselanbindung
 keyblock		Schl�sselblock
-keyserver   		Schl�sselserver, -*Schl�ssel-Server 
+keyserver   		Schl�sselserver, Schl�.server, -*Schl�ssel-Server 
 keysize			
 keyring 		Schl�sselbund
 lifetime    		>G�ltigkeitsdauer, >Geltungsdauer
+listed 
+locally                 (nur) f�r diesen Rechner, #(nur) auf diesem Rechner
 lookup			- Suche
 machine 		h�ufig: Computer, Rechner
 main key		Hauptschl�ssel
@@ -115,17 +128,26 @@ merge  (to) 		>zusammenf�hren, >vermischen ??
 message 		Botschaft
 mode			Modus, Methode   *
 move    		schieben, *verschieben
+multiple signature	Mehrfachunterschriften
 NAI
 network error		Netzwerkfehler
+non-revocably           nicht-widerrufbar, unwiderruflich??
 note			Hinweis
 okay			in Ordnung
 Ooops			Huch
 OpenPGP 		
-original		Urspr�nglicher
+option                  Option
+original		urspr�nglicher
+overrides		-ersetzt
 ownertrust  		\"Owner trust\"  *Vertrauensw�rdigkeit des Besitzers
 packet			Paket
 packet type		Pakettyp
+parse 			-zerlegen
 passphrase		Mantra
+permission [file]       Zugriffsrechte
+Photo-ID                Foto-ID
+policy			Richtlinie
+policy URL		Richtlinien-URL
 preference items	????
 preferences 		Einstellungen    *(die gesamten) Einstellungen
 preferred		bevorzugt
@@ -134,14 +156,15 @@ problem [to do sth.]    -Schwierigkeit
 prompt (to) 		auch: >abfragen, >anfordern, >verlangen
 protected
 protection algorithm	Schutzverfahren
-pubkey algorithm	Public-Key Verfahren	 (*)
+pubkey algorithm	Public-Key-Verfahren	 
 public key		�ffentlicher Sch�ssel
-public key algorithm    Public-Key Verfahren *Public-Key-Verfahren
+public key algorithm    Public-Key-Verfahren 
 quit    		*(Programm) verlassen, beenden
 radix64			radix64
 random 			Zufall
 random bytes		Zufallswerte
 reason			Grund (f�r revocation)
+[xyz] rebuild           [xyz]-Neuaufbau, neu erzeugt
 regular file		normale Datei
 response		Antwort (Reaktion?)
 retry			???? (Wiederholung?, Wiederaufnahme?)
@@ -150,14 +173,19 @@ reveal  		auch: <jemandem zeigen, >anderen zeigen
 revocation  		Widerruf <*>R�ckruf
 revocation certificate  *<R�ckrufurkunde *R�ckruf-Zertifikat
 revoke			widerrufen
+revocably               widerrufbar
 RNG			Zufallsgenerator
 secondary key		Zweitschl�ssel
 secret key		geheimer Schl�ssel
+secret keyring          geheimer Schl�sselbund, geh. Schl�sselbund
 secret parts		geheime Teile
 security need(s)	>Sicherheitsbed�fnis(se), >Sicherheitsbedarf
 self-signature		Eigenbeglaubigung     
 sender			Absender
+sensitive		- empfindlich
+set [sth.]              einstellen, festlegen
 session			Sitzung
+show			[an]zeigen, zeigen
 sign user id		User-ID beglaubigen   *
 signed			unterschriebene
 signature (files)	Unterschrift          *
@@ -167,6 +195,8 @@ skipped			�bergangen, �bersprungen, ignoriert
 so far 			bislang
 specify 		>spezifizieren, <angeben, ?festlegen
 stdin   		- stdin, *die Standardeingabe 
+string			Zeichenkette
+[PGP2-]style[ key]      [PGP2-] artiger [Schl�ssel]
 subkey			Unterschl�ssel
 superseeded		�berholt, veraltet
 terminal charset        - Terminalzeichensatz *Terminal-Zeichensatz(s.o.)
@@ -178,21 +208,31 @@ trusted			- vertrauensw�rdig
 trustvalues		- trustvalues >Vertrauensniveaus?? *Vertrauensma�? >Vertrauenswerte?
 trying			Versuch
 type [message]		[Botschaft] eintippen
-ulimately [trust]	uneingeschr�nktes [Vertrauen]
+ulimately [trust]	uneingeschr�nkt [vertrauen]
+ultimate trust          uneingeschr�nktes Vertrauen
+unable
+unattended              unbeaufsichtigt
+unavailble
 untrusted               - nichtvertrauensw�rdig, *nicht vertrauensw�rdig
+unusable		unbrauchbar
 update                  �ndern, �nderung >Aktualisieren, >Aktualisierung *auf den 
+URL                     (die) URL 
+[the] use [of]           
 User    		- User, *<Benutzer, *Teilnehmer
 user ID 		User-ID
 user IDs		User-IDs
 user interface  	>Benutzer-Schnittstelle
 username    		Username, *<Benutzername,  
 used			benutzt (no loger used)
+using xyz		verwende xyz
 valid 			g�ltig
 validate    		-- authentifizieren (>besser authentisieren ?? So im 
 W�rterbuch der neuen Rechtschreibung)
 validation  		-- >Authentisierung 
+verbose			ausf�hrlich
 verify  		< �berpr�fen
 warning			Warnung
 weak key		unsicherer Schl�ssel
+writeable		schreibbarer 
 wisely                  >klug, vern�nftig(erweise), >gescheit; m�glichst sinnvoll
 
diff --git a/po/de.po b/po/de.po
index c35790925..1885c3847 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.4\n"
-"POT-Creation-Date: 2002-03-03 15:18+0100\n"
-"PO-Revision-Date: 2001-04-16 14:20+0200\n"
+"POT-Creation-Date: 2002-04-06 17:29+0200\n"
+"PO-Revision-Date: 2002-03-16 14:20+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr "Warnung: Sensible Daten k�nnten auf Platte ausgelagert werden.\n"
 
 #: util/secmem.c:89
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
-msgstr ""
+msgstr "siehe http://www.gnupg.org/de/faq.html f�r weitere Informationen\n"
 
 # "  Um dies zu vermeiden, kann das Programm suid(root) installiert werden.\n"
 # "  Bitte wenden Sie sich hierzu an den Systemadministrator.\n"
@@ -47,7 +47,7 @@ msgstr "nein"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:768 util/miscutil.c:326
+#: g10/keyedit.c:777 util/miscutil.c:326
 msgid "quit"
 msgstr "quit"
 
@@ -69,7 +69,7 @@ msgstr "Unbekannte Version"
 
 #: util/errors.c:57
 msgid "unknown pubkey algorithm"
-msgstr "Unbekanntes Public-Key Verfahren"
+msgstr "Unbekanntes Public-Key-Verfahren"
 
 #: util/errors.c:58
 msgid "unknown digest algorithm"
@@ -161,7 +161,7 @@ msgstr "Ung�ltiges Mantra"
 
 #: util/errors.c:80
 msgid "unimplemented pubkey algorithm"
-msgstr "�ffentliches Schl�sselverfahren ist nicht implementiert."
+msgstr "nicht implementiertes �ffentliches Schl�sselverfahren"
 
 #: util/errors.c:81
 msgid "unimplemented cipher algorithm"
@@ -181,7 +181,7 @@ msgstr "Falsche MPI"
 
 #: util/errors.c:85
 msgid "resource limit"
-msgstr "festdefinierte Resourcenobergrenze erreicht"
+msgstr "festdefinierte Ressourcenobergrenze erreicht"
 
 #: util/errors.c:86
 msgid "invalid keyring"
@@ -261,9 +261,8 @@ msgid "unusable secret key"
 msgstr "unbrauchbarer geheimer Schl�ssel"
 
 #: util/errors.c:107
-#, fuzzy
 msgid "keyserver error"
-msgstr "Allgemeiner Fehler"
+msgstr "Schl�sselserverfehler"
 
 #: util/logger.c:249
 #, c-format
@@ -275,7 +274,7 @@ msgstr "... dies ist ein Bug (Programmfehler) (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1552
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1547
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
@@ -353,7 +352,7 @@ msgstr ""
 "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n"
 "(Es werden noch %d Byte ben�tigt.)\n"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid ""
 "@Commands:\n"
 " "
@@ -361,170 +360,163 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "|[file]|make a signature"
 msgstr "|[Datei]|Eine Unterschrift erzeugen"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "encrypt data"
 msgstr "Daten verschl�sseln"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "|[files]|encrypt files"
-msgstr ""
+msgstr "|[Dateien]|Dateien verschl�sseln"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschl�sseln"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "store only"
 msgstr "Nur speichern"
 
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "decrypt data (default)"
 msgstr "Daten entschl�sseln (Voreinstellung)"
 
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "|[files]|decrypt files"
-msgstr ""
+msgstr "|[Dateien]|Dateien entschl�sseln"
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "verify a signature"
 msgstr "Signatur pr�fen"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "list keys"
 msgstr "Liste der Schl�ssel"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "list keys and signatures"
 msgstr "Liste der Schl�ssel und ihrer Signaturen"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "check key signatures"
 msgstr "Signaturen der Schl�ssel pr�fen"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "list keys and fingerprints"
 msgstr "Liste der Schl�ssel und ihrer \"Fingerabdr�cke\""
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "list secret keys"
 msgstr "Liste der geheimen Schl�ssel"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "generate a new key pair"
 msgstr "Ein neues Schl�sselpaar erzeugen"
 
-#: g10/g10.c:297
-#, fuzzy
+#: g10/g10.c:298
 msgid "remove keys from the public keyring"
 msgstr "Schl�ssel aus dem �ff. Schl�sselbund entfernen"
 
-#: g10/g10.c:299
-#, fuzzy
+#: g10/g10.c:300
 msgid "remove keys from the secret keyring"
 msgstr "Schl�ssel aus dem geh. Schl�sselbund entfernen"
 
-#: g10/g10.c:300
+#: g10/g10.c:301
 msgid "sign a key"
 msgstr "Schl�ssel signieren"
 
-#: g10/g10.c:301
+#: g10/g10.c:302
 msgid "sign a key locally"
-msgstr "Schl�ssel nur auf diesem Rechner signieren"
+msgstr "Schl�ssel nur f�r diesen Rechner signieren"
 
-#: g10/g10.c:302
-#, fuzzy
+#: g10/g10.c:303
 msgid "sign a key non-revocably"
-msgstr "Schl�ssel nur auf diesem Rechner signieren"
+msgstr "Schl�ssel nicht widerrufbar signieren"
 
-#: g10/g10.c:303
-#, fuzzy
+#: g10/g10.c:304
 msgid "sign a key locally and non-revocably"
-msgstr "Schl�ssel nur auf diesem Rechner signieren"
+msgstr "Schl�ssel nur f�r diesen Rechner und nicht-widerrufbar signieren"
 
-#: g10/g10.c:304
+#: g10/g10.c:305
 msgid "sign or edit a key"
-msgstr "Unterschreiben oder Bearbeiten eines Schl."
+msgstr "Unterschreiben oder bearbeiten eines Schl."
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "generate a revocation certificate"
 msgstr "Ein Schl�sselwiderruf-Zertifikat erzeugen"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "export keys"
 msgstr "Schl�ssel exportieren"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "export keys to a key server"
 msgstr "Schl�ssel zu einem Schl�.server exportieren"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "import keys from a key server"
 msgstr "Schl�ssel von einem Schl�.server importieren"
 
-#: g10/g10.c:310
-#, fuzzy
+#: g10/g10.c:311
 msgid "search for keys on a key server"
-msgstr "Schl�ssel zu einem Schl�.server exportieren"
+msgstr "Schl�ssel auf einem Schl�.server suchen"
 
-#: g10/g10.c:312
-#, fuzzy
+#: g10/g10.c:313
 msgid "update all keys from a keyserver"
-msgstr "Schl�ssel von einem Schl�.server importieren"
+msgstr "alle Schl�ssel per Schl�.server aktualisieren"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "import/merge keys"
 msgstr "Schl�ssel importieren/kombinieren"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "list only the sequence of packets"
 msgstr "Lediglich Struktur der Datenpakete anzeigen"
 
-#: g10/g10.c:320
+#: g10/g10.c:321
 msgid "export the ownertrust values"
-msgstr "Exportieren der \"Owner trust\" Werte"
+msgstr "Exportieren der \"Owner trust\"-Werte"
 
-#: g10/g10.c:322
+#: g10/g10.c:323
 msgid "import ownertrust values"
-msgstr "Importieren der \"Owner trust\" Werte"
+msgstr "Importieren der \"Owner trust\"-Werte"
 
-#: g10/g10.c:324
+#: g10/g10.c:325
 msgid "update the trust database"
 msgstr "�ndern der \"Trust\"-Datenbank"
 
-#: g10/g10.c:326
-#, fuzzy
+#: g10/g10.c:327
 msgid "unattended trust database update"
-msgstr "�ndern der \"Trust\"-Datenbank"
+msgstr "unbeaufsichtigtes �ndern der \"Trust\"-Datenbank"
 
-#: g10/g10.c:327
+#: g10/g10.c:328
 msgid "fix a corrupted trust database"
 msgstr "Reparieren einer besch�digten \"Trust\"-Datenb."
 
-#: g10/g10.c:328
+#: g10/g10.c:329
 msgid "De-Armor a file or stdin"
 msgstr "Datei oder stdin von der ASCII-H�lle befreien"
 
-#: g10/g10.c:330
+#: g10/g10.c:331
 msgid "En-Armor a file or stdin"
 msgstr "Datei oder stdin in eine ASCII-H�lle einpacken"
 
-#: g10/g10.c:332
+#: g10/g10.c:333
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests f�r die Dateien ausgeben"
 
-#: g10/g10.c:336
+#: g10/g10.c:337
 msgid ""
 "@\n"
 "Options:\n"
@@ -534,209 +526,202 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/g10.c:338
+#: g10/g10.c:339
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-H�lle versehen"
 
-#: g10/g10.c:340
+#: g10/g10.c:341
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschl�sseln f�r NAME"
 
-#: g10/g10.c:343
+#: g10/g10.c:344
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|NAME als voreingestellten Empf�nger benutzen"
 
-#: g10/g10.c:345
+#: g10/g10.c:346
 msgid "use the default key as default recipient"
 msgstr ""
 "Den Standardschl�ssel als voreingestellten\n"
 "Empf�nger benutzen"
 
-#: g10/g10.c:350
+#: g10/g10.c:352
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/g10.c:351
+#: g10/g10.c:353
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/g10.c:353
+#: g10/g10.c:355
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "don't use the terminal at all"
 msgstr "das Terminal gar nicht benutzen"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "force v3 signatures"
 msgstr "v3 Signaturen erzwingen"
 
-#: g10/g10.c:365
-#, fuzzy
+#: g10/g10.c:367
 msgid "do not force v3 signatures"
-msgstr "v3 Signaturen erzwingen"
+msgstr "v3 Signaturen nicht erzwingen"
 
-#: g10/g10.c:366
-#, fuzzy
+#: g10/g10.c:368
 msgid "force v4 key signatures"
-msgstr "v3 Signaturen erzwingen"
+msgstr "v4 Signaturen erzwingen"
 
-#: g10/g10.c:367
-#, fuzzy
+#: g10/g10.c:369
 msgid "do not force v4 key signatures"
-msgstr "v3 Signaturen erzwingen"
+msgstr "v4 Signaturen nicht erzwingen"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 msgid "always use a MDC for encryption"
 msgstr "Beim Verschl�sseln ein Siegel (MDC) verwenden"
 
-#: g10/g10.c:370
-#, fuzzy
+#: g10/g10.c:372
 msgid "never use a MDC for encryption"
-msgstr "Beim Verschl�sseln ein Siegel (MDC) verwenden"
+msgstr "Beim Verschl�sseln niemals ein Siegel (MDC) verwenden"
 
-#: g10/g10.c:372
+#: g10/g10.c:374
 msgid "do not make any changes"
 msgstr "Keine wirklichen �nderungen durchf�hren"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:374
+#: g10/g10.c:376
 msgid "use the gpg-agent"
-msgstr "verwende den GPG-Agent"
+msgstr "den GPG-Agent verwenden"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "add this keyring to the list of keyrings"
 msgstr "Als �ffentlichen Schl�sselbund mitbenutzen"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "add this secret keyring to the list"
 msgstr "Als geheimen Schl�sselbund mitbenutzen"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "show which keyring a listed key is on"
-msgstr ""
+msgstr "Anzeigen des Schl�sselbundes, in dem ein Schl�ssel drin ist"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten Schl�ssel benutzen"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|Schl�ssel bei diesem Server nachschlagen"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|Terminalzeichensatz NAME benutzen"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "read options from file"
 msgstr "Optionen aus der Datei lesen"
 
-#: g10/g10.c:391
+#: g10/g10.c:393
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
-#: g10/g10.c:393
-#, fuzzy
+#: g10/g10.c:395
 msgid "|[file]|write status info to file"
-msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
+msgstr "|[Datei]|Statusinfo in Datei schreiben"
 
-#: g10/g10.c:399
-#, fuzzy
+#: g10/g10.c:401
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|diesem Schl�ssel uneingeschr�nkt vertrauen"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "|FILE|load extension module FILE"
 msgstr "|DATEI|Erweiterungsmodul DATEI laden"
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "emulate the mode described in RFC1991"
 msgstr "Den in RFC1991 beschriebenen Modus nachahmen"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 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:403
-#, fuzzy
+#: g10/g10.c:405
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "alle Paket-, Verschl�sselungs- und\n"
-"Hashoptionen auf OpenPGP-Verhalten einstellen"
+"Hashoptionen auf PGP 2.X-Verhalten einstellen"
 
-#: g10/g10.c:407
+#: g10/g10.c:409
 msgid "|N|use passphrase mode N"
 msgstr "|N|Verwenden des Mantra-Modus N"
 
-#: g10/g10.c:409
+#: g10/g10.c:411
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|Hashverfahren NAME f�r Mantras benutzen"
 
-#: g10/g10.c:411
+#: g10/g10.c:413
 msgid "|NAME|use cipher algorithm NAME for passphrases"
-msgstr "|NAME|Verschl�.verfahren NAME f�r Mantras benutzen"
+msgstr "|NAME|Verschl.verfahren NAME f�r Mantras benutzen"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NAME|Verschl�.verfahren NAME benutzen"
+msgstr "|NAME|Verschl.verfahren NAME benutzen"
 
-#: g10/g10.c:413
+#: g10/g10.c:415
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Hashverfahren NAME benutzen"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|N|use compress algorithm N"
 msgstr "|N|Komprimierverfahren N benutzen"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "throw keyid field of encrypted packets"
-msgstr "Entferne Empf�nger-ID verschl�sselter Pakete"
+msgstr "Empf�nger-ID verschl�sselter Pakete entfernen"
 
-#: g10/g10.c:416
+#: g10/g10.c:418
 msgid "Show Photo IDs"
-msgstr ""
+msgstr "Foto-IDs anzeigen"
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "Don't show Photo IDs"
-msgstr ""
+msgstr "Foto-IDs nicht anzeigen"
 
-#: g10/g10.c:418
+#: g10/g10.c:420
 msgid "Set command line to view Photo IDs"
-msgstr ""
+msgstr "Kommandozeilentext f�r den Foto-Betrachter setzen"
 
-#: g10/g10.c:419
+#: g10/g10.c:421
 msgid "|NAME=VALUE|use this notation data"
-msgstr "|NAME=WERT|verwende diese \"notation\"-Daten"
+msgstr "|NAME=WERT|diese \"notation\"-Daten verwenden"
 
-#: g10/g10.c:422
+#: g10/g10.c:424
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -745,7 +730,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollst�ndige Liste aller Kommandos und "
 "Optionen)\n"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid ""
 "@\n"
 "Examples:\n"
@@ -765,27 +750,27 @@ msgstr ""
 " --list-keys [Namen]        Schl�ssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdr�cke\" anzeigen\n"
 
-#: g10/g10.c:559
+#: g10/g10.c:561
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
-"Berichte �ber Bugs (Programmfehler) bitte an <[email protected]>.\n"
+"Berichte �ber Programmfehler bitte in englisch an <[email protected]>.\n"
 "Sinn- oder Schreibfehler in den deutschen Texten bitte an <[email protected]>.\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:565
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
 
-#: g10/g10.c:566
+#: g10/g10.c:568
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
 "default operation depends on the input data\n"
 msgstr ""
 "Aufruf: gpg [Optionen] [Dateien]\n"
-"Signieren, pr�fen, verschl�sseln, entschl�sseln\n"
-"Die voreingestellte Operation ist abh�ngig von den Eingabedaten\n"
+"Signieren, pr�fen, verschl�sseln, entschl�sseln.\n"
+"Die voreingestellte Operation ist abh�ngig von den Eingabedaten.\n"
 
-#: g10/g10.c:577
+#: g10/g10.c:579
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -793,242 +778,248 @@ msgstr ""
 "\n"
 "Unterst�tzte Verfahren:\n"
 
-#: g10/g10.c:651
+#: g10/g10.c:653
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/g10.c:708
+#: g10/g10.c:710
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/g10.c:881
+#: g10/g10.c:883
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:887
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/g10.c:892
+#: g10/g10.c:894
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:1174
+#: g10/g10.c:1176
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ist kein g�ltiger Zeichensatz.\n"
 
-#: g10/g10.c:1190
+#: g10/g10.c:1192
 msgid "could not parse keyserver URI\n"
+msgstr "Schl�sselserver-URI konnte nicht zerlegt werden\n"
+
+#: g10/g10.c:1208
+#, c-format
+msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1294
+#: g10/g10.c:1309
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm k�nnte eine core-dump-Datei schreiben!\n"
 
-#: g10/g10.c:1298
+#: g10/g10.c:1313
 #, c-format
 msgid "WARNING: %s overrides %s\n"
-msgstr ""
+msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/g10.c:1305 g10/g10.c:1316
+#: g10/g10.c:1320 g10/g10.c:1331
 #, 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:1307 g10/g10.c:1327
+#: g10/g10.c:1322 g10/g10.c:1342
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/g10.c:1310
+#: g10/g10.c:1325
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/g10.c:1336
+#: g10/g10.c:1351
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
+"Im --pgp2-Modus k�nnen Sie nur abgetrennte oder Klartextunterschriften "
+"machen\n"
 
-#: g10/g10.c:1342
+#: g10/g10.c:1357
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
+"Im --pgp2-Modus k�nnen Sie nicht gleichzeitig unterschreiben und "
+"verschl�sseln\n"
 
-#: g10/g10.c:1348
+#: g10/g10.c:1363
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
+"Im --pgp2-Modus m�ssen Sie Dateien benutzen und k�nnen keine Pipes "
+"verwenden.\n"
 
-#: g10/g10.c:1361
+#: g10/g10.c:1376
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
+"Verschl�ssen einer Botschaft ben�tigt im --pgp2-Modus die IDEA-"
+"Verschl�sselung\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1375 g10/sign.c:614
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1390 g10/sign.c:614
 #: g10/sign.c:792
 msgid "this message may not be usable by PGP 2.x\n"
-msgstr ""
+msgstr "Diese Botschaft k�nnte f�r PGP 2.x unbrauchbar sein\n"
 
-#: g10/g10.c:1414 g10/g10.c:1426
+#: g10/g10.c:1429 g10/g10.c:1441
 msgid "selected cipher algorithm is invalid\n"
-msgstr "Das ausgew�hlte Verschl�sslungsverfahren ist ung�ltig\n"
+msgstr "Das ausgew�hlte Verschl�sselungsverfahren ist ung�ltig\n"
 
-#: g10/g10.c:1420 g10/g10.c:1432
+#: g10/g10.c:1435 g10/g10.c:1447
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:1436
-#, fuzzy
+#: g10/g10.c:1451
 msgid "the given signature policy URL is invalid\n"
-msgstr "Die angegebene URL f�r Richtlinien ist ung�ltig\n"
+msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/g10.c:1440
-#, fuzzy
+#: g10/g10.c:1455
 msgid "the given certification policy URL is invalid\n"
-msgstr "Die angegebene URL f�r Richtlinien ist ung�ltig\n"
+msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/g10.c:1443
+#: g10/g10.c:1458
 #, 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:1445
+#: g10/g10.c:1460
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m�ssen gr��er als 0 sein\n"
 
-#: g10/g10.c:1447
+#: g10/g10.c:1462
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed m�ssen gr��er als 1 sein\n"
 
-#: g10/g10.c:1449
+#: g10/g10.c:1464
 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:1452
+#: g10/g10.c:1467
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:1456
+#: g10/g10.c:1471
 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:1460
-#, fuzzy
+#: g10/g10.c:1475
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
-msgstr "ung�ltiger \"simple S2K\"-Modus; Wert mu� 0, 1 oder 3 sein\n"
+msgstr "ung�ltiger \"default-check-level\"; Wert mu� 0, 1, 2 oder 3 sein\n"
 
-#: g10/g10.c:1463
-#, fuzzy
+#: g10/g10.c:1478
 msgid "invalid preferences\n"
-msgstr "Liste der Voreinstellungen"
+msgstr "ung�ltige Voreinstellungen\n"
 
-#: g10/g10.c:1557
+#: g10/g10.c:1572
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:1577
+#: g10/g10.c:1592
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:1584
+#: g10/g10.c:1599
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:1592
+#: g10/g10.c:1607
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1624
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:1622
+#: g10/g10.c:1637
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:1636
-#, fuzzy
+#: g10/g10.c:1651
 msgid "--sign --symmetric [filename]"
-msgstr "--symmetric [Dateiname]"
+msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/g10.c:1645
+#: g10/g10.c:1660
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:1663
+#: g10/g10.c:1678
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:1674
+#: g10/g10.c:1689
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/g10.c:1682
+#: g10/g10.c:1697
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/g10.c:1690
-#, fuzzy
+#: g10/g10.c:1705
 msgid "--nrsign-key user-id"
-msgstr "--sign-key User-ID"
+msgstr "--nrsign-key User-ID"
 
-#: g10/g10.c:1698
-#, fuzzy
+#: g10/g10.c:1713
 msgid "--nrlsign-key user-id"
-msgstr "--sign-key User-ID"
+msgstr "--nrlsign-key User-ID"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1721
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/encode.c:307 g10/g10.c:1762 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1777 g10/sign.c:703
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
 
-#: g10/g10.c:1777
+#: g10/g10.c:1792
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schl�sselbund]"
 
-#: g10/g10.c:1860
+#: g10/g10.c:1875
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1883
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1955
+#: g10/g10.c:1970
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ung�ltiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:2041
+#: g10/g10.c:2056
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2060
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2048 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2063 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht ge�ffnet werden\n"
 
-#: g10/g10.c:2257
+#: g10/g10.c:2272
 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:2263
+#: g10/g10.c:2278
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -1036,12 +1027,12 @@ msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und mu� mit einem '=' enden\n"
 
-#: g10/g10.c:2269
+#: g10/g10.c:2284
 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:2277
+#: g10/g10.c:2292
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
@@ -1151,19 +1142,18 @@ msgstr "Widerruf-Bemerkung: "
 #. a string with valid answers
 #: g10/pkclist.c:244
 msgid "iImMqQsS"
-msgstr ""
+msgstr "iImMqQsS"
 
 #: g10/pkclist.c:250
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "No trust value assigned to:\n"
 "%4u%c/%08lX %s \""
 msgstr ""
-"Es ist kein \"Owner trust\" f�r %lu definiert:\n"
+"Es ist kein \"trust value\" zugewiesen f�r:\n"
 "%4u%c/%08lX %s \""
 
 #: g10/pkclist.c:262
-#, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1171,44 +1161,39 @@ msgid ""
 "\n"
 msgstr ""
 "Bitte entscheiden Sie, in wieweit Sie diesem User zutrauen,\n"
-"den Schl�ssel eines anderen Users korrekt zu pr�fen (Vergleich mit\n"
-"Lichtbildausweisen, Vergleich der Fingerabdr�cke aus unterschiedlichen\n"
-"Quellen ...)?\n"
+"Schl�ssel anderer User korrekt zu pr�fen (durch Vergleich\n"
+"mit Lichtbildausweisen, Vergleich der Fingerabdr�cke aus\n"
+"unterschiedlichen Quellen ...)?\n"
 "\n"
-" 1 = Wei� nicht so recht\n"
-" 2 = Nee, dem traue ich das nicht zu\n"
-" 3 = Ich vertraue ihm normalerweise\n"
-" 4 = Ich vertraue ihm vollst�ndig\n"
-" s = Bitte weitere Information anzeigen\n"
 
 #: g10/pkclist.c:265
 #, c-format
 msgid " %d = Don't know\n"
-msgstr ""
+msgstr " %d = Wei� nicht so recht\n"
 
 #: g10/pkclist.c:266
-#, fuzzy, c-format
+#, c-format
 msgid " %d = I do NOT trust\n"
-msgstr "%08lX: Wir haben KEIN Vertrauen zu diesem Schl�ssel!\n"
+msgstr " %d = Nein, ihm traue ich NICHT\n"
 
 #: g10/pkclist.c:267
 #, c-format
 msgid " %d = I trust marginally\n"
-msgstr ""
+msgstr " %d = Ich vertraue ihm einigerma�en\n"
 
 #: g10/pkclist.c:268
-#, fuzzy, c-format
+#, c-format
 msgid " %d = I trust fully\n"
-msgstr "%s: keine trustdb Datei\n"
+msgstr " %d = Ich vertraue ihm vollst�ndig\n"
 
 #: g10/pkclist.c:270
 #, c-format
 msgid " %d = I trust ultimately\n"
-msgstr ""
+msgstr " %d = Ich vertraue ihm absolut\n"
 
 #: g10/pkclist.c:271
 msgid " i = please show me more information\n"
-msgstr ""
+msgstr " i = Bitte weitere Information anzeigen\n"
 
 #: g10/pkclist.c:273
 msgid " m = back to the main menu\n"
@@ -1216,7 +1201,7 @@ msgstr " m = Zur�ck zum Men�\n"
 
 #: g10/pkclist.c:276
 msgid " s = skip this key\n"
-msgstr ""
+msgstr " s = diesen Schl�ssel �berSpringen\n"
 
 #: g10/pkclist.c:277
 msgid " q = quit\n"
@@ -1227,9 +1212,8 @@ msgid "Your decision? "
 msgstr "Ihre Auswahl? "
 
 #: g10/pkclist.c:305
-#, fuzzy
 msgid "Do you really want to set this key to ultimate trust? "
-msgstr "M�chten Sie diesen Schl�ssel wirklich entfernen? "
+msgstr "M�chten Sie diesem Schl�ssel wirklich uneingeschr�nkt vertrauen? "
 
 #: g10/pkclist.c:317
 msgid "Certificates leading to an ultimately trusted key:\n"
@@ -1242,7 +1226,7 @@ msgstr "Schl�ssel %08lX: Schl�ssel wurde widerrufen\n"
 
 #: g10/pkclist.c:398 g10/pkclist.c:410 g10/pkclist.c:504
 msgid "Use this key anyway? "
-msgstr "Diesen Schl�ssel trotzdem benutzen?"
+msgstr "Diesen Schl�ssel trotzdem benutzen? "
 
 #: g10/pkclist.c:403
 #, c-format
@@ -1255,11 +1239,11 @@ msgid "%08lX: key has expired\n"
 msgstr "%08lX: Schl�ssel ist verfallen!\n"
 
 #: g10/pkclist.c:434
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%08lX: There is no indication that this key really belongs to the owner\n"
 msgstr ""
-"         Es gibt keinen Hinweis, da� die Signatur wirklich dem vorgeblichen "
+"%08lX: Es gibt keinen Hinweis, da� die Signatur wirklich dem vorgeblichen "
 "Besitzer geh�rt.\n"
 
 #: g10/pkclist.c:440
@@ -1315,9 +1299,8 @@ 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:566
-#, fuzzy
 msgid "Note: This key has been disabled.\n"
-msgstr "Hinweis: Dieser Schl�ssel ist abgeschaltet"
+msgstr "Hinweis: Dieser Schl�ssel wurde abgeschaltet.\n"
 
 #: g10/pkclist.c:571
 msgid "Note: This key has expired!\n"
@@ -1366,17 +1349,17 @@ msgid "%s: skipped: public key already present\n"
 msgstr "%s: �bersprungen: �ffentlicher Schl�ssel bereits vorhanden\n"
 
 #: g10/pkclist.c:744
-#, fuzzy
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
-"Sie haben keine User-ID angegeben (Benutzen Sie die Option \"-r\").\n"
-"\n"
+"Sie haben keine User-ID angegeben (Sie k�nnen die Option \"-r\" verwenden).\n"
 
 #: g10/pkclist.c:754
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
+"\n"
+"Geben Sie die User-ID ein. Beenden mit einer leeren Zeile: "
 
 #: g10/pkclist.c:768
 msgid "No such user ID.\n"
@@ -1392,9 +1375,8 @@ msgid "Public key is disabled.\n"
 msgstr "�ffentlicher Schl�ssel ist abgeschaltet.\n"
 
 #: g10/pkclist.c:798
-#, fuzzy
 msgid "skipped: public key already set\n"
-msgstr "%s: �bersprungen: �ffentlicher Schl�ssel bereits vorhanden\n"
+msgstr "�bersprungen: �ffentlicher Schl�ssel bereits gesetzt\n"
 
 #: g10/pkclist.c:841
 #, c-format
@@ -1413,22 +1395,21 @@ msgstr "Keine g�ltigen Adressaten\n"
 #: g10/keygen.c:179
 #, c-format
 msgid "preference %c%lu is not valid\n"
-msgstr ""
+msgstr "Voreinstellung %c%lu ist nicht g�ltig\n"
 
 #: g10/keygen.c:186
-#, fuzzy, c-format
+#, c-format
 msgid "preference %c%lu duplicated\n"
-msgstr "�bersprungen '%s': doppelt\n"
+msgstr "Voreinstellung %c%lu ist doppelt\n"
 
 #: g10/keygen.c:191
-#, fuzzy, c-format
+#, c-format
 msgid "too many `%c' preferences\n"
-msgstr "Liste der Voreinstellungen"
+msgstr "zu viele `%c' Voreinstellungen\n"
 
 #: g10/keygen.c:256
-#, fuzzy
 msgid "invalid character in string\n"
-msgstr "Ung�ltiges Zeichen im Namen\n"
+msgstr "Ung�ltiges Zeichen in der Zeichenkette\n"
 
 #: g10/keygen.c:386
 msgid "writing self signature\n"
@@ -1473,16 +1454,16 @@ msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signieren/beglaubigen und verschl�sseln)\n"
 
 #: g10/keygen.c:771
-#, fuzzy, c-format
+#, c-format
 msgid "   (%d) RSA (sign only)\n"
-msgstr "   (%d) DSA (nur signieren/beglaubigen)\n"
+msgstr "   (%d) RSA (nur signieren/beglaubigen)\n"
 
 #: g10/keygen.c:773
-#, fuzzy, c-format
+#, c-format
 msgid "   (%d) RSA (encrypt only)\n"
-msgstr "   (%d) ElGamal (nur verschl�sseln)\n"
+msgstr "   (%d) RSA (nur verschl�sseln)\n"
 
-#: g10/keyedit.c:466 g10/keygen.c:776
+#: g10/keyedit.c:475 g10/keygen.c:776
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
@@ -1491,7 +1472,7 @@ msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 "Von der Benutzung dieses Verfahrens ist abzuraten - Trotzdem erzeugen? "
 
-#: g10/keyedit.c:479 g10/keygen.c:810
+#: g10/keyedit.c:488 g10/keygen.c:810
 msgid "Invalid selection.\n"
 msgstr "Ung�ltige Auswahl.\n"
 
@@ -1557,21 +1538,17 @@ 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:870
-msgid "Do you really need such a large keysize? "
-msgstr "Brauchen Sie wirklich einen derartig langen Schl�ssel? "
-
-#: g10/keygen.c:876
+#: g10/keygen.c:871
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Die verlangte Schl�ssell�nge betr�gt %u Bit\n"
 
-#: g10/keygen.c:879 g10/keygen.c:883
+#: g10/keygen.c:874 g10/keygen.c:878
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "aufgerundet auf %u Bit\n"
 
-#: g10/keygen.c:934
+#: g10/keygen.c:929
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1587,8 +1564,7 @@ msgstr ""
 "      <n>m = Schl�ssel verf�llt nach n Monaten\n"
 "      <n>y = Schl�ssel verf�llt nach n Jahren\n"
 
-#: g10/keygen.c:943
-#, fuzzy
+#: g10/keygen.c:938
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1597,38 +1573,37 @@ msgid ""
 "      <n>m = signature expires in n months\n"
 "      <n>y = signature expires in n years\n"
 msgstr ""
-"Bitte w�hlen Sie, wie lange der Schl�ssel g�ltig bleiben soll.\n"
+"Bitte w�hlen Sie, wie lange die Beglaubigung g�ltig bleiben soll.\n"
 "         0 = Schl�ssel verf�llt nie\n"
 "      <n>  = Schl�ssel verf�llt nach n Tagen\n"
 "      <n>w = Schl�ssel verf�llt nach n Wochen\n"
 "      <n>m = Schl�ssel verf�llt nach n Monaten\n"
 "      <n>y = Schl�ssel verf�llt nach n Jahren\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:960
 msgid "Key is valid for? (0) "
-msgstr "Der Schl�ssel bleibt wie lange g�ltig? (0) "
+msgstr "Wie lange bleibt der Schl�ssel g�ltig? (0) "
 
-#: g10/keygen.c:967
-#, fuzzy
+#: g10/keygen.c:962
 msgid "Signature is valid for? (0) "
-msgstr "Der Schl�ssel bleibt wie lange g�ltig? (0) "
+msgstr "Wie lange bleibt die Beglaubigung g�ltig? (0) "
 
-#: g10/keygen.c:972
+#: g10/keygen.c:967
 msgid "invalid value\n"
 msgstr "Ung�ltiger Wert.\n"
 
-#: g10/keygen.c:977
-#, fuzzy, c-format
+#: g10/keygen.c:972
+#, c-format
 msgid "%s does not expire at all\n"
-msgstr "Der Schl�ssel verf�llt nie.\n"
+msgstr "%s verf�llt nie.\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:984
-#, fuzzy, c-format
+#: g10/keygen.c:979
+#, c-format
 msgid "%s expires at %s\n"
-msgstr "Der Schl�ssel verf�llt am %s\n"
+msgstr "%s verf�llt am %s\n"
 
-#: g10/keygen.c:990
+#: g10/keygen.c:985
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1636,11 +1611,11 @@ msgstr ""
 "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
 "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
 
-#: g10/keygen.c:995
+#: g10/keygen.c:990
 msgid "Is this correct (y/n)? "
 msgstr "Ist dies richtig? (j/n) "
 
-#: g10/keygen.c:1038
+#: g10/keygen.c:1033
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1656,44 +1631,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1045
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1053
 msgid "Invalid character in name\n"
 msgstr "Ung�ltiges Zeichen im Namen\n"
 
-#: g10/keygen.c:1060
+#: g10/keygen.c:1055
 msgid "Name may not start with a digit\n"
 msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
-#: g10/keygen.c:1062
+#: g10/keygen.c:1057
 msgid "Name must be at least 5 characters long\n"
 msgstr "Der Name mu� min. 5 Zeichen lang sein.\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1065
 msgid "Email address: "
 msgstr "E-Mail-Adresse: "
 
-#: g10/keygen.c:1081
+#: g10/keygen.c:1076
 msgid "Not a valid email address\n"
 msgstr "Diese E-Mail-Adresse ist ung�ltig\n"
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1084
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1095
+#: g10/keygen.c:1090
 msgid "Invalid character in comment\n"
 msgstr "Ung�ltiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:1118
+#: g10/keygen.c:1113
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Sie benutzen den Zeichensatz `%s'\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1119
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1704,27 +1679,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1128
+#: g10/keygen.c:1123
 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:1133
+#: g10/keygen.c:1128
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfBb"
 
-#: g10/keygen.c:1143
+#: g10/keygen.c:1138
 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:1144
+#: g10/keygen.c:1139
 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:1163
+#: g10/keygen.c:1158
 msgid "Please correct the error first\n"
 msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
 
-#: g10/keygen.c:1202
+#: g10/keygen.c:1197
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1732,17 +1707,16 @@ msgstr ""
 "Sie ben�tigen ein Mantra, um den geheimen Schl�ssel zu sch�tzen.\n"
 "\n"
 
-#: g10/keyedit.c:655 g10/keygen.c:1210
-#, fuzzy
+#: g10/keyedit.c:664 g10/keygen.c:1205
 msgid "passphrase not correctly repeated; try again"
-msgstr "Mantra wurde nicht richtig wiederholt; noch einmal versuchen.\n"
+msgstr "Mantra wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: g10/keygen.c:1211
+#: g10/keygen.c:1206
 #, c-format
 msgid "%s.\n"
-msgstr ""
+msgstr "%s.\n"
 
-#: g10/keygen.c:1217
+#: g10/keygen.c:1212
 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"
@@ -1755,7 +1729,7 @@ msgstr ""
 "aufrufen.\n"
 "\n"
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1233
 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"
@@ -1766,54 +1740,53 @@ 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:1728
+#: g10/keygen.c:1723
 msgid "DSA keypair will have 1024 bits.\n"
-msgstr "Der DSA Schl�ssel wird 1024 Bit haben.\n"
+msgstr "Das DSA-Schl�sselpaar wird 1024 Bit haben.\n"
 
-#: g10/keygen.c:1782
+#: g10/keygen.c:1777
 msgid "Key generation canceled.\n"
 msgstr "Schl�sselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:1870 g10/keygen.c:1950
+#: g10/keygen.c:1865 g10/keygen.c:1945
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "schreiben des �ffentlichen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:1871 g10/keygen.c:1952
+#: g10/keygen.c:1866 g10/keygen.c:1947
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:1939
-#, fuzzy, c-format
+#: g10/keygen.c:1934
+#, c-format
 msgid "no writable public keyring found: %s\n"
-msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel nicht gefunden: %s\n"
+msgstr "kein schreibbarer �ffentlicher Schl�sselbund gefunden: %s\n"
 
-#: g10/keygen.c:1945
-#, fuzzy, c-format
+#: g10/keygen.c:1940
+#, c-format
 msgid "no writable secret keyring found: %s\n"
-msgstr "Schl�ssel %08lX: geheimer Schl�ssel nicht gefunden: %s\n"
+msgstr "kein schreibbarer geheimer Schl�sselbund gefunden: %s\n"
 
-#: g10/keygen.c:1959
-#, fuzzy, c-format
+#: g10/keygen.c:1954
+#, c-format
 msgid "error writing public keyring `%s': %s\n"
-msgstr "Fehler beim Schreiben des Schl�sselbundes `%s': %s\n"
+msgstr "Fehler beim Schreiben des �ff. Schl�sselbundes `%s': %s\n"
 
-#: g10/keygen.c:1966
-#, fuzzy, c-format
+#: g10/keygen.c:1961
+#, c-format
 msgid "error writing secret keyring `%s': %s\n"
-msgstr "Fehler beim Schreiben des Schl�sselbundes `%s': %s\n"
+msgstr "Fehler beim Schreiben des geheimen Schl�sselbundes `%s': %s\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1981
 msgid "public and secret key created and signed.\n"
 msgstr "�ffentlichen und geheimen Schl�ssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:1987
-#, fuzzy
+#: g10/keygen.c:1982
 msgid "key marked as ultimately trusted.\n"
-msgstr "Zertifikate f�hren zu einem letztlich vertrauensw�rdigen Schl�ssel:\n"
+msgstr "Schl�ssel ist als uneingeschr�nkt vertrauensw�rdig gekennzeichnet.\n"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1991
 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"
@@ -1822,12 +1795,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:2008 g10/keygen.c:2114
+#: g10/keygen.c:2003 g10/keygen.c:2109
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:2052 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2047 g10/sig-check.c:227 g10/sign.c:228
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1835,7 +1808,7 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht �berein)\n"
 
-#: g10/keygen.c:2054 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2049 g10/sig-check.c:229 g10/sign.c:230
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1843,22 +1816,22 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht �berein)\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2058
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
-msgstr ""
+msgstr "HINWEIS: Unterschl�ssel f�r v3-Schl�ssen sind nicht OpenPGP-konform\n"
 
-#: g10/keygen.c:2090
+#: g10/keygen.c:2085
 msgid "Really create? "
 msgstr "Wirklich erzeugen? "
 
 #: g10/decrypt.c:92 g10/encode.c:590
 msgid "--output doesn't work for this command\n"
-msgstr ""
+msgstr "--output funktioniert nicht bei diesem Kommando\n"
 
 #: g10/encode.c:92 g10/encode.c:296
-#, fuzzy, c-format
+#, c-format
 msgid "`%s' already compressed\n"
-msgstr "%lu Schl�ssel bearbeitet\n"
+msgstr "`%s' ist bereits komprimiert\n"
 
 #: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
 #: g10/tdbio.c:552
@@ -1879,6 +1852,8 @@ msgstr "%s: WARNUNG: Leere Datei\n"
 #: g10/encode.c:285
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
+"Im --pgp2-Modus kann nur f�r RSA-Schl�ssel mit maximal 2048 Bit "
+"verschl�sselt werden\n"
 
 #: g10/encode.c:313
 #, c-format
@@ -1889,44 +1864,46 @@ msgstr "Lesen von '%s'\n"
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
+"Die IDEA-Verschl�sselung kann nicht mit allen Zielschl�sseln verwendet "
+"werden.\n"
 
 #: g10/encode.c:563
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s verschl�sselt f�r: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:142
-#, fuzzy, c-format
+#: g10/delkey.c:69 g10/export.c:141
+#, c-format
 msgid "key `%s' not found: %s\n"
-msgstr "Benutzer '%s' nicht gefunden: %s\n"
+msgstr "Schl�ssel `%s' nicht gefunden: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:162
-#, fuzzy, c-format
+#: g10/delkey.c:77 g10/export.c:161
+#, c-format
 msgid "error reading keyblock: %s\n"
-msgstr "Fehler beim Lesen von `%s': %s\n"
+msgstr "Fehler beim Lesen des Schl�sselblocks: %s\n"
 
-#: g10/export.c:170
+#: g10/export.c:169
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "Schl�ssel %08lX: dies ist kein RFC2440-Sch�ssel - �bersprungen\n"
 
-#: g10/export.c:181
+#: g10/export.c:180
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "Schl�ssel %08lX: ungesch�tzt - �bersprungen\n"
 
-#: g10/export.c:189
-#, fuzzy, c-format
+#: g10/export.c:188
+#, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
-msgstr "Schl�ssel %08lX: neuer Schl�ssel - �bersprungen\n"
+msgstr "Schl�ssel %08lX: PGP 2.x-artiger Schl�ssel - �bersprungen\n"
 
-#: g10/export.c:255
+#: g10/export.c:254
 msgid "WARNING: nothing exported\n"
 msgstr "WARNUNG: Nichts exportiert\n"
 
 #: g10/getkey.c:151
 msgid "too many entries in pk cache - disabled\n"
-msgstr "zu viele Eintr�ge im pk-Lager - abgeschaltet\n"
+msgstr "zu viele Eintr�ge im pk-Cache - abgeschaltet\n"
 
 #. fixme: returning translatable constants instead of a user ID is
 #. * not good because they are probably not utf-8 encoded.
@@ -1935,9 +1912,9 @@ msgid "[User id not found]"
 msgstr "[User-ID nicht gefunden]"
 
 #: g10/getkey.c:1362
-#, c-format
-msgid "Invalid key %08lX made valid by --always-trust\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "invalid key %08lX made valid by --always-trust\n"
+msgstr "Ung�ltiger Schl�ssel %08lX, g�ltig gemacht per --always-trust\n"
 
 #: g10/getkey.c:1957
 #, c-format
@@ -2052,9 +2029,9 @@ msgid "key %08lX: new key - skipped\n"
 msgstr "Schl�ssel %08lX: neuer Schl�ssel - �bersprungen\n"
 
 #: g10/import.c:480
-#, fuzzy, c-format
+#, c-format
 msgid "no writable keyring found: %s\n"
-msgstr "Fehler beim Schreiben des Schl�sselbundes `%s': %s\n"
+msgstr "kein schreibbarer Schl�sselbund gefunden: %s\n"
 
 #: g10/import.c:485 g10/openfile.c:244 g10/sign.c:642 g10/sign.c:811
 #, c-format
@@ -2125,9 +2102,9 @@ msgid "key %08lX: not changed\n"
 msgstr "Schl�ssel %08lX: Nicht ge�ndert\n"
 
 #: g10/import.c:655
-#, fuzzy, c-format
+#, c-format
 msgid "no default secret keyring: %s\n"
-msgstr "Kein voreingestellter �ffentlicher Schl�sselbund\n"
+msgstr "Kein voreingestellter geheimer Schl�sselbund: %s\n"
 
 #: g10/import.c:666
 #, c-format
@@ -2233,9 +2210,9 @@ msgid "key %08lX: revocation certificate added\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat hinzugef�gt\n"
 
 #: g10/import.c:1152
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX: direct key signature added\n"
-msgstr "Schl�ssel %08lX: %d neue Signaturen\n"
+msgstr "Schl�ssel %08lX: \"direct-key\"-Signaturen hinzugef�gt\n"
 
 #: g10/import.c:1266 g10/import.c:1319
 #, c-format
@@ -2289,14 +2266,13 @@ msgstr "%d User-IDs ohne g�ltige Eigenbeglaubigung entdeckt\n"
 #: g10/keyedit.c:325
 #, c-format
 msgid "User ID \"%s\" is revoked.\n"
-msgstr ""
+msgstr "User-ID \"%s\" ist widerrufen.\n"
 
-#: g10/keyedit.c:330 g10/keyedit.c:1004
-#, fuzzy
+#: g10/keyedit.c:330 g10/keyedit.c:1013
 msgid "Are you sure you still want to sign it?\n"
-msgstr "Sind Sie sicher, da� Sie diese Schl�ssell�nge w�nschen? "
+msgstr "Sind Sie sicher, da� Sie dies wiklich unterschreiben m�chten?\n"
 
-#: g10/keyedit.c:335 g10/keyedit.c:409 g10/keyedit.c:519 g10/keyedit.c:1007
+#: g10/keyedit.c:335 g10/keyedit.c:418 g10/keyedit.c:528 g10/keyedit.c:1016
 msgid "Really sign? "
 msgstr "Wirklich unterschreiben? "
 
@@ -2310,66 +2286,74 @@ msgid ""
 "\n"
 "Do you want to promote it to a full exportable signature?\n"
 msgstr ""
+"Die derzeitige Beglaubigung von \"%s\"\n"
+"ist nur f�r diesen Rechner g�ltig.\n"
+"\n"
+"Soll sie zu einer voll exportierbaren Beglaubigung erhoben werden?\n"
 
-#. Fixme: see whether there is a revocation in which
-#. * case we should allow to sign it again.
-#: g10/keyedit.c:374
+#: g10/keyedit.c:379
 #, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %08lX\n"
+msgstr "\"%s\" wurde %sbereits durch Schl�ssel %08lX beglaubigt\n"
+
+#: g10/keyedit.c:384
+#, c-format
 msgid "\"%s\" was already %ssigned by key %08lX\n"
-msgstr "Ist bereits durch Schl�ssel %08lX beglaubigt.\n"
+msgstr "\"%s\" wurde %sbereits durch Schl�ssel %08lX beglaubigt\n"
 
-#: g10/keyedit.c:387
+#: g10/keyedit.c:396
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nichts zu beglaubigen f�r Schl�ssel %08lX\n"
 
-#: g10/keyedit.c:402
-#, fuzzy
+#: g10/keyedit.c:411
 msgid "This key has expired!"
-msgstr "Hinweis: Dieser Schl�ssel ist verfallen!\n"
+msgstr "Dieser Schl�ssel ist verfallen!"
 
-#: g10/keyedit.c:406
-#, fuzzy
+#: g10/keyedit.c:415
 msgid "  Are you sure you still want to sign it?\n"
-msgstr "Sind Sie sicher, da� Sie diese Schl�ssell�nge w�nschen? "
+msgstr "  Sind Sie sicher, da� Sie dies immer noch unterschreiben wollen?\n"
 
-#: g10/keyedit.c:420
-#, fuzzy, c-format
+#: g10/keyedit.c:429
+#, c-format
 msgid "This key is due to expire on %s.\n"
-msgstr "Dieser Schl�ssel ist nicht gesch�tzt.\n"
+msgstr "Dieser Schl�ssel wird %s verfallen.\n"
 
-#: g10/keyedit.c:422
+#: g10/keyedit.c:431
 msgid "Do you want your signature to expire at the same time? (y/n) "
-msgstr ""
+msgstr "Soll Ihre Beglaubigung zur selben Zeit verfallen? (j/n) "
 
-#: g10/keyedit.c:450
+#: g10/keyedit.c:459
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
+"Wie genau haben Sie �berpr�ft, ob der Schl�ssel, den Sie jetzt beglaubigen\n"
+"wollen, wirklich der o.g. Person geh�rt?\n"
+"Wenn Sie darauf keine Antwort wissen, geben Sie \"0\" ein.\n"
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:463
 #, c-format
 msgid "   (0) I will not answer.%s\n"
-msgstr ""
+msgstr "   (0) Ich antworte nicht.%s\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:465
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
-msgstr ""
+msgstr "   (1) Ich habe es �berhaupt nicht �berpr�ft.%s\n"
 
-#: g10/keyedit.c:458
+#: g10/keyedit.c:467
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
-msgstr ""
+msgstr "   (2) Ich habe es fl�chtig �berpr�ft.%s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
-msgstr ""
+msgstr "   (3) Ich habe es sehr sorgf�ltig �berpr�ft.%s\n"
 
-#: g10/keyedit.c:485
+#: g10/keyedit.c:494
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2377,16 +2361,15 @@ msgstr ""
 "Sind Sie wirklich sicher, da� Sie vorstehenden Schl�ssel mit Ihrem\n"
 "Schl�ssel beglaubigen wollen: \""
 
-#: g10/keyedit.c:494
-#, fuzzy
+#: g10/keyedit.c:503
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
 msgstr ""
-"Die Unterschrift wird als nicht exportf�hig markiert werden.\n"
 "\n"
+"Die Unterschrift wird als nicht exportf�hig markiert werden.\n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:507
 #, fuzzy
 msgid ""
 "\n"
@@ -2395,47 +2378,53 @@ msgstr ""
 "Die Unterschrift wird als nicht exportf�hig markiert werden.\n"
 "\n"
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:512
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
+"\n"
+"Ich habe diesen Schl�ssel �berhaupt nicht �berpr�ft.\n"
 
-#: g10/keyedit.c:507
+#: g10/keyedit.c:516
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
+"\n"
+"Ich habe diesen Schl�ssel fl�chtig �berpr�ft.\n"
 
-#: g10/keyedit.c:511
+#: g10/keyedit.c:520
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
+"\n"
+"Ich habe diesen Schl�ssel sehr sorgf�ltig �berpr�ft.\n"
 
-#: g10/keyedit.c:552 g10/keyedit.c:2459 g10/keyedit.c:2521 g10/sign.c:273
+#: g10/keyedit.c:561 g10/keyedit.c:2476 g10/keyedit.c:2538 g10/sign.c:273
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:621
 msgid "This key is not protected.\n"
 msgstr "Dieser Schl�ssel ist nicht gesch�tzt.\n"
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:625
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Geheime Teile des Haupschl�ssels sind nicht vorhanden\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:629
 msgid "Key is protected.\n"
 msgstr "Schl�ssel ist gesch�tzt.\n"
 
-#: g10/keyedit.c:640
+#: g10/keyedit.c:649
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Dieser Schl�ssel kann nicht editiert werden: %s\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:655
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2443,7 +2432,7 @@ msgstr ""
 "Geben Sie das neue Mantra f�r diesen geheimen Schl�ssel ein.\n"
 "\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:669
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2451,559 +2440,549 @@ msgstr ""
 "Sie wollen kein Mantra - dies ist bestimmt *keine* gute Idee!\n"
 "\n"
 
-#: g10/keyedit.c:663
+#: g10/keyedit.c:672
 msgid "Do you really want to do this? "
 msgstr "M�chten Sie dies wirklich tun? "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:736
 msgid "moving a key signature to the correct place\n"
 msgstr "schiebe eine Beglaubigung an die richtige Stelle\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:777
 msgid "quit this menu"
 msgstr "Men� verlassen"
 
-#: g10/keyedit.c:769
+#: g10/keyedit.c:778
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:779
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:779
 msgid "save and quit"
 msgstr "speichern und Men� verlassen"
 
-#: g10/keyedit.c:771
+#: g10/keyedit.c:780
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:771
+#: g10/keyedit.c:780
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:782
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:782
 msgid "show fingerprint"
 msgstr "\"Fingerabdruck\" anzeigen"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:783
 msgid "list"
 msgstr "Liste der Schl�ssel"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:783
 msgid "list key and user IDs"
 msgstr "Schl�ssel und User-IDs auflisten"
 
-#: g10/keyedit.c:775
+#: g10/keyedit.c:784
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:785
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:785
 msgid "select user ID N"
 msgstr "User-ID N ausw�hlen"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:786
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:786
 msgid "select secondary key N"
 msgstr "Zweitschl�ssel N ausw�hlen"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:787
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:787
 msgid "list signatures"
 msgstr "Liste der Signaturen"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:788
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:789
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:789
 msgid "sign the key"
 msgstr "Den Schl�ssel signieren"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:790
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:791
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:791
 msgid "sign the key locally"
-msgstr "Den Schl�ssel nur auf diesem Rechner signieren"
+msgstr "Den Schl�ssel nur f�r diesen Rechner beglaubigen"
 
-#: g10/keyedit.c:783
-#, fuzzy
+#: g10/keyedit.c:792
 msgid "nrsign"
-msgstr "sign"
+msgstr "nrsign"
 
-#: g10/keyedit.c:783
-#, fuzzy
+#: g10/keyedit.c:792
 msgid "sign the key non-revocably"
-msgstr "Den Schl�ssel nur auf diesem Rechner signieren"
+msgstr "Den Schl�ssel nicht-widerrufbar beglaubigen"
 
-#: g10/keyedit.c:784
-#, fuzzy
+#: g10/keyedit.c:793
 msgid "nrlsign"
-msgstr "sign"
+msgstr "nrlsign"
 
-#: g10/keyedit.c:784
-#, fuzzy
+#: g10/keyedit.c:793
 msgid "sign the key locally and non-revocably"
-msgstr "Den Schl�ssel nur auf diesem Rechner signieren"
+msgstr "Den Schl�ssel nicht-widerrufbar und nur f�r diesen Rechner signieren"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:794
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:795
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:795
 msgid "add a user ID"
 msgstr "Eine User-ID hinzuf�gen"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:796
 msgid "addphoto"
-msgstr ""
+msgstr "addphoto"
 
-#: g10/keyedit.c:787
-#, fuzzy
+#: g10/keyedit.c:796
 msgid "add a photo ID"
-msgstr "Eine User-ID hinzuf�gen"
+msgstr "Eine Foto-ID hinzuf�gen"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:797
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:797
 msgid "delete user ID"
 msgstr "User-ID entfernen"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:790
+#: g10/keyedit.c:799
 msgid "delphoto"
-msgstr ""
+msgstr "delphoto"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:800
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:800
 msgid "add a secondary key"
 msgstr "Einen Zweitschl�ssel hinzuf�gen"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:801
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:801
 msgid "delete a secondary key"
 msgstr "Einen Zweitschl�ssel entfernen"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:802
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:802
 msgid "delete signatures"
 msgstr "Signatur entfernen"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:803
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:803
 msgid "change the expire date"
 msgstr "�ndern des Verfallsdatums"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:804
 msgid "primary"
-msgstr ""
+msgstr "primary"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:804
 msgid "flag user ID as primary"
-msgstr ""
+msgstr "User-ID als Haupt-User-ID kennzeichnen"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:805
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:805
 msgid "toggle between secret and public key listing"
 msgstr "Umschalten zwischen Anzeige geheimer und �ffentlicher Schl�ssel"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:807
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:799
+#: g10/keyedit.c:808
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:799
-#, fuzzy
+#: g10/keyedit.c:808
 msgid "list preferences (expert)"
-msgstr "Liste der Voreinstellungen"
+msgstr "Liste der Voreinstellungen (f�r Experten)"
 
-#: g10/keyedit.c:800
-#, fuzzy
+#: g10/keyedit.c:809
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:800
-#, fuzzy
+#: g10/keyedit.c:809
 msgid "list preferences (verbose)"
-msgstr "Liste der Voreinstellungen"
+msgstr "Liste der Voreinstellungen (ausf�hrlich)"
 
-#: g10/keyedit.c:801
-#, fuzzy
+#: g10/keyedit.c:810
 msgid "setpref"
-msgstr "pref"
+msgstr "setpref"
 
-#: g10/keyedit.c:801
-#, fuzzy
+#: g10/keyedit.c:810
 msgid "set preference list"
-msgstr "Liste der Voreinstellungen"
+msgstr "Liste der Voreinstellungen einstellen"
 
-#: g10/keyedit.c:802
-#, fuzzy
+#: g10/keyedit.c:811
 msgid "updpref"
-msgstr "pref"
+msgstr "updpref"
 
-#: g10/keyedit.c:802
-#, fuzzy
+#: g10/keyedit.c:811
 msgid "updated preferences"
-msgstr "Liste der Voreinstellungen"
+msgstr "ge�nderte Voreinstellungen"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:812
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:812
 msgid "change the passphrase"
 msgstr "Das Mantra �ndern"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:813
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:813
 msgid "change the ownertrust"
 msgstr "Den \"Owner trust\" �ndern"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:814
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:814
 msgid "revoke signatures"
 msgstr "Signaturen widerrufen"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:815
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:815
 msgid "revoke a secondary key"
 msgstr "Einen Zweitschl�ssel widerrufen"
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:816
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:816
 msgid "disable a key"
 msgstr "Schl�ssel abschalten"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:817
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:817
 msgid "enable a key"
 msgstr "Schl�ssel anschalten"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:818
 msgid "showphoto"
-msgstr ""
+msgstr "showphoto"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:818
 msgid "show photo ID"
-msgstr ""
+msgstr "Foto-ID anzeigen"
 
-#: g10/delkey.c:112 g10/keyedit.c:829
+#: g10/delkey.c:112 g10/keyedit.c:838
 msgid "can't do that in batchmode\n"
 msgstr "Dies kann im Batchmodus nicht durchgef�hrt werden.\n"
 
-#: g10/keyedit.c:866
-#, fuzzy, c-format
+#: g10/keyedit.c:875
+#, c-format
 msgid "error reading secret keyblock `%s': %s\n"
-msgstr "Fehler beim Lesen von `%s': %s\n"
+msgstr "Fehler beim Lesen des geheimen Schl�sselblocks `%s': %s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:893
 msgid "Secret key is available.\n"
 msgstr "Geheimer Schl�ssel ist vorhanden.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:924
 msgid "Command> "
 msgstr "Befehl> "
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:956
 msgid "Need the secret key to do this.\n"
 msgstr "Hierzu wird der geheime Schl�ssel ben�tigt.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:960
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bitte verwenden sie zun�chst den Befehl \"toggle\"\n"
 
-#: g10/keyedit.c:1000
-#, fuzzy
+#: g10/keyedit.c:1009
 msgid "Key is revoked.\n"
-msgstr "Schl�ssel ist gesch�tzt.\n"
+msgstr "Schl�ssel wurde widerrufen.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1025
 msgid "Really sign all user IDs? "
 msgstr "Wirklich alle User-IDs beglaubigen? "
 
-#: g10/keyedit.c:1017
+#: g10/keyedit.c:1026
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tip: W�hlen Sie die User-IDs, die beglaubigt werden sollen\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1051
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
-msgstr ""
+msgstr "Dieses Kommando ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/keyedit.c:1062 g10/keyedit.c:1083
+#: g10/keyedit.c:1071 g10/keyedit.c:1092
 msgid "You must select at least one user ID.\n"
 msgstr "Zumindestens eine User-ID mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:1064
+#: g10/keyedit.c:1073
 msgid "You can't delete the last user ID!\n"
 msgstr "Die letzte User-ID kann nicht gel�scht werden!\n"
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1076
 msgid "Really remove all selected user IDs? "
 msgstr "M�chten Sie alle ausgew�hlten User-IDs wirklich entfernen? "
 
-#: g10/keyedit.c:1068
+#: g10/keyedit.c:1077
 msgid "Really remove this user ID? "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: g10/keyedit.c:1106 g10/keyedit.c:1128
+#: g10/keyedit.c:1115 g10/keyedit.c:1137
 msgid "You must select at least one key.\n"
 msgstr "Zumindestens ein Schl�ssel mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:1110
+#: g10/keyedit.c:1119
 msgid "Do you really want to delete the selected keys? "
 msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich entfernen? "
 
-#: g10/keyedit.c:1111
+#: g10/keyedit.c:1120
 msgid "Do you really want to delete this key? "
 msgstr "M�chten Sie diesen Schl�ssel wirklich entfernen? "
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1141
 msgid "Do you really want to revoke the selected keys? "
 msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich widerrufen? "
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1142
 msgid "Do you really want to revoke this key? "
 msgstr "M�chten Sie diesen Schl�ssel wirklich wiederrufen? "
 
-#: g10/keyedit.c:1197
-#, fuzzy
+#: g10/keyedit.c:1206
 msgid "Really update the preferences for the selected user IDs? "
-msgstr "M�chten Sie alle ausgew�hlten User-IDs wirklich entfernen? "
+msgstr ""
+"M�chten Sie die Voreinstellungen der ausgew�hlten User-IDs wirklich �ndern? "
 
-#: g10/keyedit.c:1199
-#, fuzzy
+#: g10/keyedit.c:1208
 msgid "Really update the preferences? "
-msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
+msgstr "Die Voreinstellungen wirklich �ndern? "
 
-#: g10/keyedit.c:1237
+#: g10/keyedit.c:1246
 msgid "Save changes? "
 msgstr "�nderungen speichern? "
 
-#: g10/keyedit.c:1240
+#: g10/keyedit.c:1249
 msgid "Quit without saving? "
 msgstr "Beenden ohne zu speichern? "
 
-#: g10/keyedit.c:1251
+#: g10/keyedit.c:1260
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�nderung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1258
+#: g10/keyedit.c:1267
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "�nderung des Geheimnisses fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1274
 msgid "Key not changed so no update needed.\n"
 msgstr "Schl�ssel ist nicht ge�ndert worden, also ist kein Speichern n�tig.\n"
 
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1285
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ung�ltiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
-#: g10/keyedit.c:1424
-#, fuzzy, c-format
+#: g10/keyedit.c:1433
+#, c-format
 msgid "This key may be revoked by %s key %s%s\n"
-msgstr "WARNUNG: Dieser Schl�ssel wurde von seinem Besitzer widerrufen!\n"
+msgstr "Dieser Schl�ssel k�nnte von %s key %s%s widerrufen worden sein\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1436
 msgid " (sensitive)"
-msgstr ""
+msgstr "(empfindlich)"
 
-#: g10/keyedit.c:1432 g10/keyedit.c:1458
+#: g10/keyedit.c:1441 g10/keyedit.c:1467
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  erstellt: %s verf�llt: %s"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1450
 #, c-format
 msgid " trust: %c/%c"
 msgstr " Vertrauen: %c/%c"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1454
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schl�ssel ist abgeschaltet"
 
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1483
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! Unterschl�ssel wurde widerrufen: %s\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1486
 msgid "rev- faked revocation found\n"
 msgstr "rev- gef�lschter Schl�sselwiderruf entdeckt\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1488
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? Schwierigkeiten bei der Widerruf-�berpr�fung: %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1598
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
 msgstr ""
+"WARNUNG: Dieser Schl�ssel besitzt bereits eine Foto-ID.\n"
+"         Ein hinzugef�gte Foto-ID k�nnte einige Versionen von PGP "
+"verwirren.\n"
 
-#: g10/keyedit.c:1593 g10/keyedit.c:1620
-#, fuzzy
+#: g10/keyedit.c:1602 g10/keyedit.c:1629
 msgid "Are you sure you still want to add it? (y/n) "
-msgstr "Sind Sie sicher, da� Sie diese Schl�ssell�nge w�nschen? "
+msgstr "Wollen Sie ihn immmer noch hinzuf�gen? (j/n) "
 
-#: g10/keyedit.c:1601
+#: g10/keyedit.c:1610
 msgid "You may only have one photo ID on a key.\n"
-msgstr ""
+msgstr "Sie k�nnen nur eine Foto-ID f�r diesen Schl�ssel haben.\n"
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1624
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
+"WARNUNG: Dies ist ein PGP2-artiger Schl�ssel. Hinzuf�gen einer Foto-ID "
+"k�nnte\n"
+"         bei einigen PGP-Versionen zur Zur�ckweisung des Schl�ssels f�hren.\n"
 
-#: g10/keyedit.c:1626
+#: g10/keyedit.c:1635
 msgid "You may not add a photo ID to a PGP2-style key.\n"
-msgstr ""
+msgstr "Sie k�nnen einem PGP2-artigen Schl��sel keine Foto-ID hinzuf�gen.\n"
 
-#: g10/keyedit.c:1757
+#: g10/keyedit.c:1766
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:1770
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ung�ltige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1774
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1780
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:1785
+#: g10/keyedit.c:1794
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:1786
+#: g10/keyedit.c:1795
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1798
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1867
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schl�sseln.\n"
 
-#: g10/keyedit.c:1864
+#: g10/keyedit.c:1873
 msgid "Please select at most one secondary key.\n"
 msgstr "Bitte w�hlen Sie h�chstens einen Zweitschl�ssel aus.\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1877
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "�ndern des Verfallsdatums des Zweitschl�ssels.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:1879
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�ndern des Verfallsdatums des Hauptschl�ssels.\n"
 
-#: g10/keyedit.c:1912
+#: g10/keyedit.c:1921
 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:1928
+#: g10/keyedit.c:1937
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
 
-#: g10/keyedit.c:2009
-#, fuzzy
+#: g10/keyedit.c:2018
 msgid "Please select exactly one user ID.\n"
-msgstr "Zumindestens eine User-ID mu� ausgew�hlt werden.\n"
+msgstr "Bitte genau eine User-ID ausw�hlen.\n"
 
-#: g10/keyedit.c:2184
+#: g10/keyedit.c:2193
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2239
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Kein Zweitschl�ssel mit Index %d\n"
 
-#: g10/keyedit.c:2328
+#: g10/keyedit.c:2337
 msgid "user ID: \""
 msgstr "User-ID: \""
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2342
 #, c-format
 msgid ""
 "\"\n"
@@ -3012,47 +2991,59 @@ msgstr ""
 "\"\n"
 "unterschrieben mit Ihrem Schl�ssel %08lX um %s\n"
 
-#: g10/keyedit.c:2335
+#: g10/keyedit.c:2345
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"locally signed with your key %08lX at %s\n"
+msgstr ""
+"\"\n"
+"unterschrieben mit Ihrem Schl�ssel %08lX um %s\n"
+
+#: g10/keyedit.c:2349
 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:2359
+#: g10/keyedit.c:2373
 msgid "You have signed these user IDs:\n"
 msgstr "Sie haben folgende User-IDs beglaubigt:\n"
 
-#: g10/keyedit.c:2373
-#, fuzzy, c-format
-msgid "   signed by %08lX at %s%s\n"
-msgstr "   beglaubigt durch %08lX um %s\n"
+#: g10/keyedit.c:2387
+#, c-format
+msgid "   signed by %08lX at %s%s%s\n"
+msgstr "   beglaubigt durch %08lX um %s%s%s\n"
 
-#: g10/keyedit.c:2380
+#: g10/keyedit.c:2395
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   widerrufen durch %08lX um %s\n"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2415
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2425
 #, c-format
-msgid "   signed by %08lX at %s\n"
-msgstr "   beglaubigt durch %08lX um %s\n"
+msgid "   signed by %08lX at %s%s\n"
+msgstr "   beglaubigt durch %08lX am %s%s\n"
 
-#: g10/keyedit.c:2418
+#: g10/keyedit.c:2427
+msgid " (non-exportable)"
+msgstr ""
+
+#: g10/keyedit.c:2434
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2464
 msgid "no secret key\n"
 msgstr "Kein geheimer Schl�ssel\n"
 
 #. This isn't UTF8 as it is a URL(?)
 #: g10/keylist.c:82
-#, fuzzy
 msgid "Signature policy: "
-msgstr "%s Unterschrift von: %s\n"
+msgstr "Beglaubigungsrichtlinie: "
 
 #: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:717 g10/mainproc.c:726
 msgid "WARNING: invalid notation data found\n"
@@ -3060,17 +3051,16 @@ msgstr "WARNUNG: Ung�ltige \"Notation\"-Daten gefunden\n"
 
 #. This is UTF8
 #: g10/keylist.c:115
-#, fuzzy
 msgid "Signature notation: "
-msgstr "\"Notation\": "
+msgstr "Beglaubigungs-\"Notation\": "
 
 #: g10/keylist.c:122
 msgid "not human readable"
-msgstr ""
+msgstr "nicht als Klartext darstellbar"
 
 #: g10/keylist.c:187
 msgid "Keyring"
-msgstr ""
+msgstr "Schl�sselbund"
 
 #. of subkey
 #: g10/keylist.c:387 g10/mainproc.c:852
@@ -3090,9 +3080,8 @@ msgid "             Fingerprint:"
 msgstr "           Fingerabdruck:"
 
 #: g10/keylist.c:862
-#, fuzzy
 msgid "     Key fingerprint ="
-msgstr "           Fingerabdruck:"
+msgstr " Schl.-Fingerabdruck ="
 
 #: g10/encr-data.c:66 g10/mainproc.c:255
 #, c-format
@@ -3131,18 +3120,18 @@ msgid "public key decryption failed: %s\n"
 msgstr "Entschl�sselung mit �ffentlichem Schl�ssel fehlgeschlagen: %s\n"
 
 #: g10/mainproc.c:429 g10/mainproc.c:448
-#, fuzzy, c-format
+#, c-format
 msgid "assuming %s encrypted data\n"
-msgstr "%s verschl�sselte Daten\n"
+msgstr "vermutlich %s-verschl�sselte Daten\n"
 
 #: g10/mainproc.c:436
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
-msgstr ""
+msgstr "IDEA-Verschl�sselung nicht verf�gbar; versucht wird stattdessen %s\n"
 
 #: g10/mainproc.c:466
 msgid "decryption okay\n"
-msgstr "Enschl�sselung erfolgreich\n"
+msgstr "Entschl�sselung erfolgreich\n"
 
 #: g10/mainproc.c:471
 msgid "WARNING: encrypted message has been manipulated!\n"
@@ -3151,7 +3140,7 @@ msgstr "Warnung: Verschl�sselte Botschaft ist manipuliert worden!\n"
 #: g10/mainproc.c:476
 #, c-format
 msgid "decryption failed: %s\n"
-msgstr "Enschl�sselung fehlgeschlagen: %s\n"
+msgstr "Entschl�sselung fehlgeschlagen: %s\n"
 
 #: g10/mainproc.c:495
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
@@ -3196,9 +3185,8 @@ msgid "BAD signature from \""
 msgstr "FALSCHE Unterschrift von \""
 
 #: g10/mainproc.c:1292 g10/mainproc.c:1315
-#, fuzzy
 msgid "Expired signature from \""
-msgstr "Korrekte Unterschrift von \""
+msgstr "Verfallene Unterschrift von \""
 
 #: g10/mainproc.c:1293 g10/mainproc.c:1316
 msgid "Good signature from \""
@@ -3206,7 +3194,7 @@ msgstr "Korrekte Unterschrift von \""
 
 #: g10/mainproc.c:1318
 msgid "[uncertain]"
-msgstr ""
+msgstr "[ungewi�]  "
 
 #: g10/mainproc.c:1338
 msgid "                aka \""
@@ -3248,23 +3236,23 @@ msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr "Es ist davon abzuraten, diese Verschl�sselungsmethode zu benutzen!\n"
 
 #: g10/misc.c:378
-#, c-format
-msgid "Warning: unsafe ownership on %s \"%s\"\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "warning: unsafe ownership on %s \"%s\"\n"
+msgstr "Warnung: Unsicheres Besitzverh�ltnis von %s \"%s\"\n"
 
 #: g10/misc.c:410
-#, c-format
-msgid "Warning: unsafe permissions on %s \"%s\"\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "warning: unsafe permissions on %s \"%s\"\n"
+msgstr "Warnung: Unsicheres Einverst�ndnis �ber %s \"%s\"\n"
 
 #: g10/misc.c:435
 msgid "the IDEA cipher plugin is not present\n"
-msgstr ""
+msgstr "das IDEA-Verschl�sselungs-Plugin ist nicht vorhanden\n"
 
 #: g10/misc.c:436
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
-msgstr ""
+msgstr "F�r weitere Info siehe http://www.gnupg.org/why-not-idea.html\n"
 
 #: g10/parse-packet.c:119
 #, c-format
@@ -3282,24 +3270,24 @@ msgstr "GPG-Agent ist in dieser Sitzung nicht vorhanden\n"
 
 #: g10/passphrase.c:338
 msgid "can't set client pid for the agent\n"
-msgstr ""
+msgstr "Client-PID f�r den Agent kann nicht gesetzt werden\n"
 
 #: g10/passphrase.c:346
 msgid "can't get server read FD for the agent\n"
-msgstr ""
+msgstr "Server-Lese-Handle f�r den Agent nicht verf�gbar\n"
 
 #: g10/passphrase.c:353
 msgid "can't get server write FD for the agent\n"
-msgstr ""
+msgstr "Server-Schreib-Handle f�r den Agent nicht verf�gbar\n"
 
 #: g10/passphrase.c:386
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
 
 #: g10/passphrase.c:399
-#, fuzzy, c-format
+#, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
-msgstr "Schutzverfahren %d wird nicht unterst�tzt\n"
+msgstr "GPG-Agent-Protokoll-Version %d wird nicht unterst�tzt\n"
 
 #: g10/hkp.c:148 g10/passphrase.c:420
 #, c-format
@@ -3308,7 +3296,7 @@ msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
 
 #: g10/passphrase.c:442
 msgid "communication problem with gpg-agent\n"
-msgstr ""
+msgstr "Kommunikationsproblem mit GPG-Agent\n"
 
 #: g10/passphrase.c:511 g10/passphrase.c:897
 #, c-format
@@ -3352,9 +3340,9 @@ msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "Schwierigkeiten mit dem Agenten: Agent antwortet 0x%lx\n"
 
 #: g10/passphrase.c:691 g10/passphrase.c:799
-#, fuzzy
 msgid "problem with the agent - disabling agent use\n"
-msgstr "Schwierigkeiten mit dem Agenten: Agent antwortet 0x%lx\n"
+msgstr ""
+"Schwierigkeiten mit dem Agenten - Agent-Ansteuerung wird abgeschaltet\n"
 
 #: g10/passphrase.c:883
 msgid ""
@@ -3389,9 +3377,9 @@ msgstr ""
 "Daten wurden nicht gespeichert; verwenden Sie daf�r die Option \"--output\"\n"
 
 #: g10/plaintext.c:108
-#, fuzzy, c-format
+#, c-format
 msgid "error creating `%s': %s\n"
-msgstr "Fehler beim Lesen von `%s': %s\n"
+msgstr "Fehler beim Erstellen von `%s': %s\n"
 
 #: g10/plaintext.c:336
 msgid "Detached signature.\n"
@@ -3415,9 +3403,9 @@ msgid "can't open signed data `%s'\n"
 msgstr "kann signierte Datei '%s' nicht �ffnen.\n"
 
 #: g10/pubkey-enc.c:100
-#, fuzzy, c-format
+#, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
-msgstr "Ungenannter Empf�nger: Versuch mit geheimen Schl�ssel %08lX ...\n"
+msgstr "Ungenannter Empf�nger; Versuch mit geheimen Schl�ssel %08lX ...\n"
 
 #: g10/pubkey-enc.c:106
 msgid "okay, we are the anonymous recipient.\n"
@@ -3428,9 +3416,9 @@ msgid "old encoding of the DEK is not supported\n"
 msgstr "alte Kodierung des DEK wird nicht unterst�tzt\n"
 
 #: g10/pubkey-enc.c:177
-#, fuzzy, c-format
+#, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
-msgstr "Versch�sselungsverfahren %d ist unbekannt oder abgeschaltet\n"
+msgstr "Versch�sselungsverfahren %d%s ist unbekannt oder abgeschaltet\n"
 
 #: g10/pubkey-enc.c:220
 #, c-format
@@ -3444,9 +3432,9 @@ msgstr "Hinweis: geheimer Schl�ssel %08lX verf�llt am %s\n"
 
 #. HKP does not support v3 fingerprints
 #: g10/hkp.c:70
-#, fuzzy, c-format
+#, c-format
 msgid "requesting key %08lX from HKP keyserver %s\n"
-msgstr "Schl�ssel %08lX von %s wird angefordert ...\n"
+msgstr "Schl�ssel %08lX wird von HKP-Schl�sselserver %s angefordert\n"
 
 #: g10/hkp.c:94
 #, c-format
@@ -3471,31 +3459,30 @@ msgstr "Senden an `%s' erfolglos (status=%u)\n"
 #: g10/hkp.c:467
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
-msgstr ""
+msgstr "suche nach \"%s\" auf HKP-Server %s\n"
 
 #: g10/hkp.c:517
-#, fuzzy, c-format
+#, c-format
 msgid "can't search keyserver: %s\n"
-msgstr "Schl�ssel ist beim Schl�sselserver nicht erh�ltlich: %s\n"
+msgstr "kann Schl�sselserver nicht durchsuchen: %s\n"
 
 #: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "Teile des geheimen Schl�ssels sind nicht vorhanden\n"
 
 #: g10/seckey-cert.c:59
-#, fuzzy, c-format
+#, c-format
 msgid "protection algorithm %d%s is not supported\n"
-msgstr "Schutzverfahren %d wird nicht unterst�tzt\n"
+msgstr "Schutzverfahren %d%s wird nicht unterst�tzt\n"
 
 #: g10/seckey-cert.c:186
-#, fuzzy
 msgid "Invalid passphrase; please try again"
-msgstr "Ung�ltiges Mantra; versuchen Sie's doch noch einmal ...\n"
+msgstr "Ung�ltiges Mantra; versuchen Sie es bitte noch einmal"
 
 #: g10/seckey-cert.c:187
 #, c-format
 msgid "%s ...\n"
-msgstr ""
+msgstr "%s ...\n"
 
 #: g10/seckey-cert.c:244
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
@@ -3537,6 +3524,8 @@ msgstr ""
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr ""
+"WARNUNG: Richtlinien-URL kann nicht %%-erweitert werden (zu gro0). Verwende "
+"\"unerweiterte\".\n"
 
 #: g10/sign.c:268
 #, c-format
@@ -3556,6 +3545,8 @@ msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
 #: g10/sign.c:612
 msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
+"Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schl�sseln unterschrieben "
+"werden\n"
 
 #: g10/sign.c:637 g10/sign.c:806
 #, c-format
@@ -3569,11 +3560,13 @@ msgstr "unterschreibe:"
 #: g10/sign.c:790
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
+"Im --pgp2-Modus k�nnen Sie Klartextunterschriften nur mit PGP-2.x-artigen "
+"Schl�ssel machen\n"
 
 #: g10/sign.c:949
-#, fuzzy, c-format
+#, c-format
 msgid "%s encryption will be used\n"
-msgstr "Enschl�sselung fehlgeschlagen: %s\n"
+msgstr "%s Verschl�sselung wird verwendet\n"
 
 #: g10/textfilter.c:134
 #, c-format
@@ -3615,7 +3608,7 @@ msgid "%s: can't create lock\n"
 msgstr "%s: Sperre kann nicht erzeugt werden\n"
 
 #: g10/tdbio.c:480 g10/tdbio.c:544
-#, fuzzy, c-format
+#, c-format
 msgid "%s: can't make lock\n"
 msgstr "%s: Sperre kann nicht erzeugt werden\n"
 
@@ -3717,19 +3710,19 @@ msgstr ""
 "\".\n"
 
 #: g10/trustdb.c:202
-#, fuzzy, c-format
+#, c-format
 msgid "`%s' is not a valid long keyID\n"
-msgstr "'%s' ist keine g�ltige Schl�ssel-ID-L�nge\n"
+msgstr "'%s' ist keine g�ltige lange Schl�ssel-ID\n"
 
 #: g10/trustdb.c:237
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX: accepted as trusted key\n"
-msgstr "Schl�ssel %08lX: Akzeptiert als vertrauensw�rdiger Schl�ssel.\n"
+msgstr "Schl�ssel %08lX: Akzeptiert als vertrauensw�rdiger Schl�ssel\n"
 
 #: g10/trustdb.c:276
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX occurs more than once in the trustdb\n"
-msgstr "Schl�ssel %08lX kann nicht in die \"trustdb\" eingef�gt werden\n"
+msgstr "Schl�ssel %08lX tritt mehr als einmal in der \"trustdb\" auf\n"
 
 #: g10/trustdb.c:292
 #, c-format
@@ -3744,9 +3737,9 @@ msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "trust record %lu, req type %d: read failed: %s\n"
 
 #: g10/trustdb.c:340
-#, fuzzy, c-format
+#, c-format
 msgid "trust record %lu is not of requested type %d\n"
-msgstr "Vertrauenssatz %lu: l�schen fehlgeschlagen: %s\n"
+msgstr "Vertrauenssatz %lu ist nicht von der angeforderten Art %d\n"
 
 #: g10/trustdb.c:355
 #, c-format
@@ -3759,34 +3752,34 @@ msgid "trustdb: sync failed: %s\n"
 msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n"
 
 #: g10/trustdb.c:470
-#, fuzzy
 msgid "no need for a trustdb check\n"
-msgstr "%s: keine trustdb Datei\n"
+msgstr "\"Trust-DB\"-�berpr�fung nicht n�tig\n"
 
 #: g10/trustdb.c:476 g10/trustdb.c:1488
-#, fuzzy, c-format
+#, c-format
 msgid "next trustdb check due at %s\n"
-msgstr "trustdb Satz %lu: lseek fehlgeschlagen: %s\n"
+msgstr "n�chste \"Trust-DB\"-Pflicht�berpr�fung am %s\n"
 
 #: g10/trustdb.c:709
-#, fuzzy
 msgid "checking the trustdb\n"
-msgstr "Den \"Owner trust\" �ndern"
+msgstr "\"Trust-DB\" wird �berpr�ft\n"
 
 #: g10/trustdb.c:860
-#, fuzzy, c-format
+#, c-format
 msgid "public key %08lX not found: %s\n"
-msgstr "�ffentlicher Schl�ssel nicht gefunden"
+msgstr "�ffentlicher Schl�ssel %08lX nicht gefunden: %s\n"
 
 #: g10/trustdb.c:1363
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
 msgstr ""
+"�ff.Schl�ssel des uneingeschr�nkt vertrautem Schl�ssel %08lX nicht gefunden\n"
 
 #: g10/trustdb.c:1441
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
+"�berpr�fen, Tiefe %d, unterschrieben =%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 
 #: g10/verify.c:108
 msgid ""
@@ -3914,20 +3907,20 @@ msgid "This is a secret key! - really delete? "
 msgstr "Dies ist ein privater Schl�ssel! - Wirklich l�schen? "
 
 #: g10/delkey.c:156
-#, fuzzy, c-format
+#, c-format
 msgid "deleting keyblock failed: %s\n"
-msgstr "enumerate Schl�sselblock fehlgeschlagen: %s\n"
+msgstr "l�schen des Schl�sselblocks fehlgeschlagen: %s\n"
 
 #: g10/delkey.c:185
-#, fuzzy, c-format
+#, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
-msgstr "Es gibt einen privaten Schl�ssel zu diesem �ffentlichen Schl�ssel!\n"
+msgstr ""
+"Es gibt einen privaten Schl�ssel zu diesem �ffentlichen Schl�ssel \"%s\"!\n"
 
 #: g10/delkey.c:187
-#, fuzzy
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
-"Benutzen Sie das Kommando \"--delete-secret-key\", um ihn vorab zu "
+"Verwenden Sie zun�chst das Kommando \"--delete-secret-key\", um ihn zu "
 "entfernen.\n"
 
 #: g10/helptext.c:47
@@ -3948,6 +3941,10 @@ msgid ""
 "access to the secret key.  Answer \"yes\" to set this key to\n"
 "ultimately trusted\n"
 msgstr ""
+"Um das Web-of-Trust aufzubauen mu� GnuPG wissen, welchen Schl�sseln\n"
+"uneingeschr�nkt vertraut wird. Das sind �blicherweise die Schl�ssel\n"
+"auf deren geheimen Schl�ssel Sie Zugruff haben.\n"
+"Antworten Sie mit \"yes\" um diesen Schl�ssel uneingeschr�nkt zu vertrauen\n"
 
 #: g10/helptext.c:60
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
@@ -4116,6 +4113,40 @@ msgid ""
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
+"Wenn Sie die User-ID eines Schl�ssels beglaubigen wollen, sollten Sie "
+"zun�chst\n"
+"sicherstellen, da� der Schl�ssel demjenigen geh�rt, der in der User-ID "
+"genannt\n"
+"ist. F�r Dritte ist es hilfreich zu wissen, wie gut diese Zuordnung "
+"�berpr�ft\n"
+"wurde.\n"
+"\n"
+"\"0\" zeigt, da� Sie keine bestimmte Aussage �ber die Sorgfalt der \n"
+"    Schl�sselzuordnung machen.\n"
+"\n"
+"\"1\" Sie glauben, da� der Schl�ssel der benannten Person geh�rt,\n"
+"    aber Sie konnten oder nahmen die �berp�fung �berhaupt nicht vor.\n"
+"    Dies ist hilfreich f�r eine \"persona\"-�berpr�fung, wobei man den\n"
+"    Schl�ssel eines Pseudonym-Tr�gers beglaubigt\n"
+"\n"
+"\"2\" Sie nahmen eine fl�chtige �berpr�fung vor. Das heisst Sie haben z.B.\n"
+"    den Schl�sselfingerabdruck kontrolliert und die User-ID des Schl�ssels\n"
+"    anhand des Fotos gepr�ft.\n"
+"\n"
+"\"3\" Sie haben eine ausf�hrlich Kontrolle des Schl�ssels vorgenommen.\n"
+"    Das kann z.B. die Kontrolle des Schl�sselfingerabdrucks mit dem\n"
+"    Schl�sselinhaber pers�nlich vorgenommen haben; da� Sie die User-ID des\n"
+"    Schl�ssel anhand einer schwer zu f�lschenden Urkunde mit Foto (wie z.B.\n"
+"    einem Pa�) abgeglichen haben und schliesslich per E-Mail-Verkehr die\n"
+"    E-Mail-Adresse als zum Schl�sselbesitzer geh�rig erkannt haben.\n"
+"\n"
+"Beachten Sie, da� diese Beispiele f�r die Antworten 2 und 3 *nur* Beispiele "
+"sind.\n"
+"Schlu�endlich ist es Ihre Sache, was Sie unter \"fl�chtig\" oder "
+"\"ausf�hrlich\"\n"
+"verstehen, wenn Sie Schl�ssel Dritter beglaubigen.\n"
+"\n"
+"Wenn Sie nicht wissen, wie Sie antworten sollen, w�hlen Sie \"0\"."
 
 #: g10/helptext.c:194
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
@@ -4184,27 +4215,20 @@ msgstr ""
 "ist."
 
 #: g10/helptext.c:231
+#, fuzzy
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures fill be advanced by one second.\n"
+"self-signatures will be advanced by one second.\n"
 msgstr ""
+"�ndern der Voreinstellung aller User-IDs (oder nur der ausgew�hlten)\n"
+"auf die aktuelle Liste der Voreinstellung. Die Zeitangaben aller "
+"betroffenen\n"
+"Eigenbeglaubigen werden um eine Sekunde vorgestellt.\n"
 
 #: g10/helptext.c:238
-#, fuzzy
 msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr ""
-"Bitte geben Sie das Mantra ein. Dies ist ein geheimer Satz, der aus\n"
-"beliebigen Zeichen bestehen kann. Was Sie eingegeben wird nicht angezeigt.\n"
-"\n"
-"Zur ihrer eigenen Sicherbeit benutzen Sie bitte einen Satz, den sie sich\n"
-"gut merken k�nne, der aber nicht leicht zu erraten ist; Zitate und andere\n"
-"bekannte Texte sind eine SCHLECHTE Wahl, da diese mit Sicherheit online\n"
-"verf�gbar sind und durch entsprechende Programme zum Raten des Mantras\n"
-"benutzt werden.  S�tze mit pers�nlicher Bedeutung, die auch noch durch\n"
-"falsche Gro�-/Kleinschreibung und eingestreute Sonderzeichen ver�ndert "
-"werden,\n"
-"sind i.d.R. eine gute Wahl"
+msgstr "Bitte geben Sie das Mantra ein. Dies ist ein geheimer Satz \n"
 
 #: g10/helptext.c:244
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
@@ -4279,24 +4303,24 @@ msgid "No help available for `%s'"
 msgstr "Keine Hilfe f�r '%s' vorhanden."
 
 #: g10/keydb.c:177
-#, fuzzy, c-format
+#, c-format
 msgid "error creating keyring `%s': %s\n"
-msgstr "Fehler beim Schreiben des Schl�sselbundes `%s': %s\n"
+msgstr "Fehler beim Erzeugen des Schl�sselbundes `%s': %s\n"
 
 #: g10/keydb.c:188
 #, c-format
 msgid "changing permission of  `%s' failed: %s\n"
-msgstr ""
+msgstr "�ndern der Zugriffsrechte f�r `%s' ist fehlgeschlagen: %s\n"
 
 #: g10/keydb.c:197
-#, fuzzy, c-format
+#, c-format
 msgid "keyring `%s' created\n"
-msgstr "%s: Schl�sselbund erstellt\n"
+msgstr "Schl�sselbund `%s' erstellt\n"
 
 #: g10/keydb.c:587
-#, fuzzy, c-format
+#, c-format
 msgid "failed to rebuild keyring cache: %s\n"
-msgstr "%s: hashtable kann nicht erzeugt werden: %s\n"
+msgstr "Schl�sselbund-Cache konnte nicht neu erzeugt werden: %s\n"
 
 #: g10/keyring.c:1232
 msgid "WARNING: 2 files with confidential information exists.\n"
@@ -4317,25 +4341,31 @@ msgid "Please fix this possible security flaw\n"
 msgstr "Bitte diesen potentiellen Sicherheitsmangel beseitigen\n"
 
 #: g10/keyring.c:1334
-#, fuzzy, c-format
+#, c-format
 msgid "checking keyring `%s'\n"
-msgstr "Fehler beim Schreiben des Schl�sselbundes `%s': %s\n"
+msgstr "Pr�fen des Schl�sselbundes `%s'\n"
 
 #: g10/keyring.c:1365
-#, fuzzy, c-format
+#, c-format
 msgid "%lu keys so far checked (%lu signatures)\n"
-msgstr "%lu Schl�ssel bislang bearbeitet\n"
+msgstr "%lu Schl�ssel bislang gepr�ft (%lu Beglaubigungen)\n"
 
 #: g10/keyring.c:1376
-#, fuzzy, c-format
+#, c-format
 msgid "%lu keys checked (%lu signatures)\n"
-msgstr "Liste der Schl�ssel und ihrer Signaturen"
+msgstr "%lu Schl�ssel gepr�ft (%lu Beglaubigungen)\n"
 
 #: g10/keyring.c:1438
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: Schl�sselbund erstellt\n"
 
+#~ msgid "Do you really need such a large keysize? "
+#~ msgstr "Brauchen Sie wirklich einen derartig langen Schl�ssel? "
+
+#~ msgid "   signed by %08lX at %s\n"
+#~ msgstr "   beglaubigt durch %08lX um %s\n"
+
 #~ msgid "--delete-secret-key user-id"
 #~ msgstr "--delete-secret-key User-ID"
 
@@ -4353,7 +4383,6 @@ msgstr "%s: Schl�sselbund erstellt\n"
 #~ "�bersprungen: �ffentlicher Schl�ssel bereits mittels --encrypt-to "
 #~ "gesetzt\n"
 
-#, fuzzy
 #~ msgid ""
 #~ "\n"
 #~ "WARNING: This is a PGP2-style key\n"
@@ -4369,11 +4398,9 @@ msgstr "%s: Schl�sselbund erstellt\n"
 #~ msgid "%s: not a valid key ID\n"
 #~ msgstr "%s: Dies ist keine g�ltige Schl�ssel-ID\n"
 
-#, fuzzy
 #~ msgid "duplicate (short) key ID %08lX\n"
 #~ msgstr "�ffentlicher Schl�ssel ist %08lX\n"
 
-#, fuzzy
 #~ msgid "%lu key(s) to refresh\n"
 #~ msgstr "\t%lu Schl�ssel mit Fehlern\n"
 
diff --git a/po/eo.po b/po/eo.po
index 6b09b1922..0de2e2fb3 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.4\n"
-"POT-Creation-Date: 2002-03-03 15:18+0100\n"
+"POT-Creation-Date: 2002-04-06 17:29+0200\n"
 "PO-Revision-Date: 2001-04-23 20:55+01:00\n"
 "Last-Translator: Edmund GRIMLEY EVANS <[email protected]>\n"
 "Language-Team: Esperanto <[email protected]>\n"
@@ -45,7 +45,7 @@ msgstr "ne"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:768 util/miscutil.c:326
+#: g10/keyedit.c:777 util/miscutil.c:326
 msgid "quit"
 msgstr "fini"
 
@@ -275,7 +275,7 @@ msgstr "... �i tio estas cimo (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vi trovis cimon ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1552
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1547
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
@@ -351,7 +351,7 @@ msgstr ""
 "Nesufi�e da stokastaj datenoj. Bonvolu fari ion por ebligi al la\n"
 "mastruma sistemo kolekti pli da entropio! (Mankas %d bitokoj)\n"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid ""
 "@Commands:\n"
 " "
@@ -359,170 +359,170 @@ msgstr ""
 "@Komandoj:\n"
 " "
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "|[file]|make a signature"
 msgstr "|[dosiero]|fari subskribon"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "encrypt data"
 msgstr "�ifri datenojn"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "encryption only with symmetric cipher"
 msgstr "�ifri nur kun simetria �ifro"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "store only"
 msgstr "nur skribi"
 
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "decrypt data (default)"
 msgstr "mal�ifri datenojn (implicita elekto)"
 
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "list keys"
 msgstr "listigi �losilojn"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "list keys and signatures"
 msgstr "listigi �losilojn kaj subskribojn"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "check key signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "list keys and fingerprints"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "list secret keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "generate a new key pair"
 msgstr "krei novan �losilparon"
 
-#: g10/g10.c:297
+#: g10/g10.c:298
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "forigi �losilon de la publika �losilaro"
 
-#: g10/g10.c:299
+#: g10/g10.c:300
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "forigi �losilon de la sekreta �losilaro"
 
-#: g10/g10.c:300
+#: g10/g10.c:301
 msgid "sign a key"
 msgstr "subskribi �losilon"
 
-#: g10/g10.c:301
+#: g10/g10.c:302
 msgid "sign a key locally"
 msgstr "subskribi �losilon loke"
 
-#: g10/g10.c:302
+#: g10/g10.c:303
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "subskribi �losilon loke"
 
-#: g10/g10.c:303
+#: g10/g10.c:304
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "subskribi �losilon loke"
 
-#: g10/g10.c:304
+#: g10/g10.c:305
 msgid "sign or edit a key"
 msgstr "subskribi a� redakti �losilon"
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "export keys"
 msgstr "eksporti �losilojn"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "export keys to a key server"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "import keys from a key server"
 msgstr "importi �losilojn de �losilservilo"
 
-#: g10/g10.c:310
+#: g10/g10.c:311
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importi �losilojn de �losilservilo"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "import/merge keys"
 msgstr "importi/kunfandi �losilojn"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "list only the sequence of packets"
 msgstr "listigi nur la sinsekvon de paketoj"
 
-#: g10/g10.c:320
+#: g10/g10.c:321
 msgid "export the ownertrust values"
 msgstr "eksporti la posedantofido-valorojn"
 
-#: g10/g10.c:322
+#: g10/g10.c:323
 msgid "import ownertrust values"
 msgstr "importi posedantofido-valorojn"
 
-#: g10/g10.c:324
+#: g10/g10.c:325
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/g10.c:326
+#: g10/g10.c:327
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/g10.c:327
+#: g10/g10.c:328
 msgid "fix a corrupted trust database"
 msgstr "ripari fu�itan fido-datenaron"
 
-#: g10/g10.c:328
+#: g10/g10.c:329
 msgid "De-Armor a file or stdin"
 msgstr "elkirasigi dosieron a� la normalan enigon"
 
-#: g10/g10.c:330
+#: g10/g10.c:331
 msgid "En-Armor a file or stdin"
 msgstr "enkirasigi dosieron a� la normalan enigon"
 
-#: g10/g10.c:332
+#: g10/g10.c:333
 msgid "|algo [files]|print message digests"
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/g10.c:336
+#: g10/g10.c:337
 msgid ""
 "@\n"
 "Options:\n"
@@ -532,203 +532,203 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: g10/g10.c:338
+#: g10/g10.c:339
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/g10.c:340
+#: g10/g10.c:341
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMO|�ifri por NOMO"
 
-#: g10/g10.c:343
+#: g10/g10.c:344
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: g10/g10.c:345
+#: g10/g10.c:346
 msgid "use the default key as default recipient"
 msgstr "uzi la implicitan �losilon kiel implicitan ricevonton"
 
-#: g10/g10.c:350
+#: g10/g10.c:352
 msgid "use this user-id to sign or decrypt"
 msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
 
-#: g10/g10.c:351
+#: g10/g10.c:353
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/g10.c:353
+#: g10/g10.c:355
 msgid "use canonical text mode"
 msgstr "uzi tekstan re�imon"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "verbose"
 msgstr "detala eligo"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "don't use the terminal at all"
 msgstr "tute ne uzi la terminalon"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "force v3 signatures"
 msgstr "devigi v3-subskribojn"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "devigi v3-subskribojn"
 
-#: g10/g10.c:366
+#: g10/g10.c:368
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "devigi v3-subskribojn"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "devigi v3-subskribojn"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 msgid "always use a MDC for encryption"
 msgstr "�iam uzi sigelon (MDC) por �ifrado"
 
-#: g10/g10.c:370
+#: g10/g10.c:372
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "�iam uzi sigelon (MDC) por �ifrado"
 
-#: g10/g10.c:372
+#: g10/g10.c:374
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:374
+#: g10/g10.c:376
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "batch mode: never ask"
 msgstr "neinteraga re�imo: neniam demandi"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "assume yes on most questions"
 msgstr "supozi \"jes\" �e la plej multaj demandoj"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "assume no on most questions"
 msgstr "supozi \"ne\" �e la plej multaj demandoj"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "add this keyring to the list of keyrings"
 msgstr "aldoni �i tiun �losilaron al la listo de �losilaroj"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "add this secret keyring to the list"
 msgstr "aldoni �i tiun sekretan �losilaron al la listo"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVILO|uzi �i tiun �losilservilon por ser�i �losilojn"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "read options from file"
 msgstr "legi la opciojn el dosiero"
 
-#: g10/g10.c:391
+#: g10/g10.c:393
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
-#: g10/g10.c:393
+#: g10/g10.c:395
 #, fuzzy
 msgid "|[file]|write status info to file"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 #, fuzzy
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|fidi �i tiun �losilon absolute"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "|FILE|load extension module FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "emulate the mode described in RFC1991"
 msgstr "imiti la re�imon priskribitan en RFC 1991"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 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:403
+#: g10/g10.c:405
 #, fuzzy
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "�alti �iujn paket-, �ifrad- kaj kompendi-opciojn al OpenPGP-konduto"
 
-#: g10/g10.c:407
+#: g10/g10.c:409
 msgid "|N|use passphrase mode N"
 msgstr "|N|uzi pasfraz-re�imon N"
 
-#: g10/g10.c:409
+#: g10/g10.c:411
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOMO|uzi kompendi-metodon NOMO por pasfrazoj"
 
-#: g10/g10.c:411
+#: g10/g10.c:413
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO por pasfrazoj"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO"
 
-#: g10/g10.c:413
+#: g10/g10.c:415
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMO|uzi kompendi-metodon NOMO"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|N|use compress algorithm N"
 msgstr "|N|uzi densig-metodon N"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "throw keyid field of encrypted packets"
 msgstr "forigi la �losilidentigilon de �ifritaj paketoj"
 
-#: g10/g10.c:416
+#: g10/g10.c:418
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:418
+#: g10/g10.c:420
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:419
+#: g10/g10.c:421
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOMO=VALORO|uzi �i tiun notacian datenon"
 
-#: g10/g10.c:422
+#: g10/g10.c:424
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -736,7 +736,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid ""
 "@\n"
 "Examples:\n"
@@ -756,15 +756,15 @@ msgstr ""
 " --list-keys [nomoj]        montri �losilojn\n"
 " --fingerprint [nomoj]      montri fingro�purojn\n"
 
-#: g10/g10.c:559
+#: g10/g10.c:561
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:565
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/g10.c:566
+#: g10/g10.c:568
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -774,7 +774,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/g10.c:577
+#: g10/g10.c:579
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -782,240 +782,245 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/g10.c:651
+#: g10/g10.c:653
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/g10.c:708
+#: g10/g10.c:710
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/g10.c:881
+#: g10/g10.c:883
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:887
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: g10/g10.c:892
+#: g10/g10.c:894
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/g10.c:1174
+#: g10/g10.c:1176
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/g10.c:1190
+#: g10/g10.c:1192
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1294
+#: g10/g10.c:1208
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr ""
+
+#: g10/g10.c:1309
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/g10.c:1298
+#: g10/g10.c:1313
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:1305 g10/g10.c:1316
+#: g10/g10.c:1320 g10/g10.c:1331
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/g10.c:1307 g10/g10.c:1327
+#: g10/g10.c:1322 g10/g10.c:1342
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/g10.c:1310
+#: g10/g10.c:1325
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/g10.c:1336
+#: g10/g10.c:1351
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1342
+#: g10/g10.c:1357
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1348
+#: g10/g10.c:1363
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1361
+#: g10/g10.c:1376
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1375 g10/sign.c:614
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1390 g10/sign.c:614
 #: g10/sign.c:792
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr ""
 
-#: g10/g10.c:1414 g10/g10.c:1426
+#: g10/g10.c:1429 g10/g10.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/g10.c:1420 g10/g10.c:1432
+#: g10/g10.c:1435 g10/g10.c:1447
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:1436
+#: g10/g10.c:1451
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL ne validas\n"
 
-#: g10/g10.c:1440
+#: g10/g10.c:1455
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL ne validas\n"
 
-#: g10/g10.c:1443
+#: g10/g10.c:1458
 #, 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:1445
+#: g10/g10.c:1460
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/g10.c:1447
+#: g10/g10.c:1462
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/g10.c:1449
+#: g10/g10.c:1464
 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:1452
+#: g10/g10.c:1467
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/g10.c:1456
+#: g10/g10.c:1471
 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:1460
+#: g10/g10.c:1475
 #, fuzzy
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "nevalida S2K-re�imo; devas esti 0, 1 a� 3\n"
 
-#: g10/g10.c:1463
+#: g10/g10.c:1478
 #, fuzzy
 msgid "invalid preferences\n"
 msgstr "listigi preferojn"
 
-#: g10/g10.c:1557
+#: g10/g10.c:1572
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/g10.c:1577
+#: g10/g10.c:1592
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/g10.c:1584
+#: g10/g10.c:1599
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/g10.c:1592
+#: g10/g10.c:1607
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1624
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/g10.c:1622
+#: g10/g10.c:1637
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:1636
+#: g10/g10.c:1651
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/g10.c:1645
+#: g10/g10.c:1660
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/g10.c:1663
+#: g10/g10.c:1678
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/g10.c:1674
+#: g10/g10.c:1689
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/g10.c:1682
+#: g10/g10.c:1697
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/g10.c:1690
+#: g10/g10.c:1705
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/g10.c:1698
+#: g10/g10.c:1713
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1721
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/encode.c:307 g10/g10.c:1762 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1777 g10/sign.c:703
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/g10.c:1777
+#: g10/g10.c:1792
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [uzantidentigilo] [�losilaro]"
 
-#: g10/g10.c:1860
+#: g10/g10.c:1875
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1883
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:1955
+#: g10/g10.c:1970
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/g10.c:2041
+#: g10/g10.c:2056
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2060
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2048 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2063 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/g10.c:2257
+#: g10/g10.c:2272
 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:2263
+#: g10/g10.c:2278
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -1023,11 +1028,11 @@ msgstr ""
 "notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
 "kaj fini per '='\n"
 
-#: g10/g10.c:2269
+#: g10/g10.c:2284
 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:2277
+#: g10/g10.c:2292
 msgid "a notation value must not use any control characters\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
@@ -1459,7 +1464,7 @@ msgstr "   (%d) DSA (nur subskribi)\n"
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur �ifri)\n"
 
-#: g10/keyedit.c:466 g10/keygen.c:776
+#: g10/keyedit.c:475 g10/keygen.c:776
 msgid "Your selection? "
 msgstr "Via elekto? "
 
@@ -1467,7 +1472,7 @@ msgstr "Via elekto? "
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 
-#: g10/keyedit.c:479 g10/keygen.c:810
+#: g10/keyedit.c:488 g10/keygen.c:810
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
@@ -1533,21 +1538,17 @@ msgstr ""
 "Bone, sed pripensu, ke la elradiado de viaj ekrano kaj klavaro estas tre "
 "facile kaptebla!\n"
 
-#: g10/keygen.c:870
-msgid "Do you really need such a large keysize? "
-msgstr "�u vi vere bezonas tiom grandan �losilgrandon? "
-
-#: g10/keygen.c:876
+#: g10/keygen.c:871
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Petita �losilgrando estas %u bitoj\n"
 
-#: g10/keygen.c:879 g10/keygen.c:883
+#: g10/keygen.c:874 g10/keygen.c:878
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:934
+#: g10/keygen.c:929
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1563,7 +1564,7 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:943
+#: g10/keygen.c:938
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -1580,31 +1581,31 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:960
 msgid "Key is valid for? (0) "
 msgstr "�losilo validu ...? (0) "
 
-#: g10/keygen.c:967
+#: g10/keygen.c:962
 #, fuzzy
 msgid "Signature is valid for? (0) "
 msgstr "�losilo validu ...? (0) "
 
-#: g10/keygen.c:972
+#: g10/keygen.c:967
 msgid "invalid value\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keygen.c:977
+#: g10/keygen.c:972
 #, fuzzy, c-format
 msgid "%s does not expire at all\n"
 msgstr "�losilo neniam eksvalidi�os\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:984
+#: g10/keygen.c:979
 #, fuzzy, c-format
 msgid "%s expires at %s\n"
 msgstr "�losilo eksvalidi�os je %s\n"
 
-#: g10/keygen.c:990
+#: g10/keygen.c:985
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1612,11 +1613,11 @@ msgstr ""
 "Via sistemo ne povas montri datojn post 2038.\n"
 "Tamen, �i estos �uste traktata �is 2106.\n"
 
-#: g10/keygen.c:995
+#: g10/keygen.c:990
 msgid "Is this correct (y/n)? "
 msgstr "�u tio estas �usta (j/n)? "
 
-#: g10/keygen.c:1038
+#: g10/keygen.c:1033
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1631,44 +1632,44 @@ msgstr ""
 "    \"Heinrich Heine (la poeto) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1045
 msgid "Real name: "
 msgstr "Vera nomo: "
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1053
 msgid "Invalid character in name\n"
 msgstr "Nevalida signo en nomo\n"
 
-#: g10/keygen.c:1060
+#: g10/keygen.c:1055
 msgid "Name may not start with a digit\n"
 msgstr "Nomo ne povas komenci�i per cifero\n"
 
-#: g10/keygen.c:1062
+#: g10/keygen.c:1057
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nomo devas havi almena� 5 signojn\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1065
 msgid "Email address: "
 msgstr "Retadreso: "
 
-#: g10/keygen.c:1081
+#: g10/keygen.c:1076
 msgid "Not a valid email address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1084
 msgid "Comment: "
 msgstr "Komento: "
 
-#: g10/keygen.c:1095
+#: g10/keygen.c:1090
 msgid "Invalid character in comment\n"
 msgstr "Nevalida signo en komento\n"
 
-#: g10/keygen.c:1118
+#: g10/keygen.c:1113
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vi uzas la signaron '%s'.\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1119
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1679,27 +1680,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1128
+#: g10/keygen.c:1123
 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:1133
+#: g10/keygen.c:1128
 msgid "NnCcEeOoQq"
 msgstr "NnKkAaBbFf"
 
-#: g10/keygen.c:1143
+#: g10/keygen.c:1138
 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:1144
+#: g10/keygen.c:1139
 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:1163
+#: g10/keygen.c:1158
 msgid "Please correct the error first\n"
 msgstr "Bonvolu korekti la eraron unue\n"
 
-#: g10/keygen.c:1202
+#: g10/keygen.c:1197
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1707,17 +1708,17 @@ msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
 "\n"
 
-#: g10/keyedit.c:655 g10/keygen.c:1210
+#: g10/keyedit.c:664 g10/keygen.c:1205
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove.\n"
 
-#: g10/keygen.c:1211
+#: g10/keygen.c:1206
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1217
+#: g10/keygen.c:1212
 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"
@@ -1729,7 +1730,7 @@ msgstr ""
 "uzante �i tiun programon kun la opcio \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1233
 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"
@@ -1741,54 +1742,54 @@ msgstr ""
 "kreado de la primoj; tio donas al la stokastilo pli bonan �ancon\n"
 "akiri sufi�e da entropio.\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1723
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA-�losilparo havos 1024 bitojn.\n"
 
-#: g10/keygen.c:1782
+#: g10/keygen.c:1777
 msgid "Key generation canceled.\n"
 msgstr "Kreado de �losiloj nuligita.\n"
 
-#: g10/keygen.c:1870 g10/keygen.c:1950
+#: g10/keygen.c:1865 g10/keygen.c:1945
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/keygen.c:1871 g10/keygen.c:1952
+#: g10/keygen.c:1866 g10/keygen.c:1947
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:1939
+#: g10/keygen.c:1934
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n"
 
-#: g10/keygen.c:1945
+#: g10/keygen.c:1940
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "�losilo %08lX: sekreta �losilo ne trovita: %s\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1954
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1961
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1981
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1982
 #, fuzzy
 msgid "key marked as ultimately trusted.\n"
 msgstr "Atestiloj, kiuj kondukas al absolute fidata �losilo:\n"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1991
 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"
@@ -1796,12 +1797,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:2008 g10/keygen.c:2114
+#: g10/keygen.c:2003 g10/keygen.c:2109
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:2052 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2047 g10/sig-check.c:227 g10/sign.c:228
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1809,7 +1810,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:2054 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2049 g10/sig-check.c:229 g10/sign.c:230
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1817,11 +1818,11 @@ msgstr ""
 "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2058
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:2090
+#: g10/keygen.c:2085
 msgid "Really create? "
 msgstr "�u vere krei? "
 
@@ -1869,32 +1870,32 @@ msgstr ""
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s-�ifrita por: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:142
+#: g10/delkey.c:69 g10/export.c:141
 #, fuzzy, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "uzanto '%s' ne trovita: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:162
+#: g10/delkey.c:77 g10/export.c:161
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/export.c:170
+#: g10/export.c:169
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "�losilo %08lX: ne estas RFC-2440-�losilo - ignorita\n"
 
-#: g10/export.c:181
+#: g10/export.c:180
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "�losilo %08lX: ne protektita - ignorita\n"
 
-#: g10/export.c:189
+#: g10/export.c:188
 #, fuzzy, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "�losilo %08lX: nova �losilo - ignorita\n"
 
-#: g10/export.c:255
+#: g10/export.c:254
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
@@ -1910,7 +1911,7 @@ msgstr "[Uzantidentigilo ne trovita]"
 
 #: g10/getkey.c:1362
 #, c-format
-msgid "Invalid key %08lX made valid by --always-trust\n"
+msgid "invalid key %08lX made valid by --always-trust\n"
 msgstr ""
 
 #: g10/getkey.c:1957
@@ -2257,12 +2258,12 @@ msgstr "%d uzantidentigiloj sen valida mem-subskribo estis trovitaj\n"
 msgid "User ID \"%s\" is revoked.\n"
 msgstr ""
 
-#: g10/keyedit.c:330 g10/keyedit.c:1004
+#: g10/keyedit.c:330 g10/keyedit.c:1013
 #, fuzzy
 msgid "Are you sure you still want to sign it?\n"
 msgstr "�u vi estas certa, ke vi deziras �i tiun �losilgrandon? "
 
-#: g10/keyedit.c:335 g10/keyedit.c:409 g10/keyedit.c:519 g10/keyedit.c:1007
+#: g10/keyedit.c:335 g10/keyedit.c:418 g10/keyedit.c:528 g10/keyedit.c:1016
 msgid "Really sign? "
 msgstr "�u vere subskribi? "
 
@@ -2277,65 +2278,68 @@ msgid ""
 "Do you want to promote it to a full exportable signature?\n"
 msgstr ""
 
-#. Fixme: see whether there is a revocation in which
-#. * case we should allow to sign it again.
-#: g10/keyedit.c:374
+#: g10/keyedit.c:379
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %08lX\n"
+msgstr "Jam subskribita per �losilo %08lX\n"
+
+#: g10/keyedit.c:384
 #, fuzzy, c-format
 msgid "\"%s\" was already %ssigned by key %08lX\n"
 msgstr "Jam subskribita per �losilo %08lX\n"
 
-#: g10/keyedit.c:387
+#: g10/keyedit.c:396
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nenio por subskribi per �losilo %08lX\n"
 
-#: g10/keyedit.c:402
+#: g10/keyedit.c:411
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Noto: �i tiu �losilo eksvalidi�is!\n"
 
-#: g10/keyedit.c:406
+#: g10/keyedit.c:415
 #, fuzzy
 msgid "  Are you sure you still want to sign it?\n"
 msgstr "�u vi estas certa, ke vi deziras �i tiun �losilgrandon? "
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:429
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/keyedit.c:422
+#: g10/keyedit.c:431
 msgid "Do you want your signature to expire at the same time? (y/n) "
 msgstr ""
 
-#: g10/keyedit.c:450
+#: g10/keyedit.c:459
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:463
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:465
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:458
+#: g10/keyedit.c:467
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:485
+#: g10/keyedit.c:494
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2343,7 +2347,7 @@ msgstr ""
 "�u vi estas tute certa, ke vi volas subskribi �i tiun �losilon\n"
 "per via �losilo: \""
 
-#: g10/keyedit.c:494
+#: g10/keyedit.c:503
 #, fuzzy
 msgid ""
 "\n"
@@ -2352,7 +2356,7 @@ msgstr ""
 "La subskribo estos markita kiel neeksportebla.\n"
 "\n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:507
 #, fuzzy
 msgid ""
 "\n"
@@ -2361,47 +2365,47 @@ msgstr ""
 "La subskribo estos markita kiel neeksportebla.\n"
 "\n"
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:512
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:507
+#: g10/keyedit.c:516
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:511
+#: g10/keyedit.c:520
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:552 g10/keyedit.c:2459 g10/keyedit.c:2521 g10/sign.c:273
+#: g10/keyedit.c:561 g10/keyedit.c:2476 g10/keyedit.c:2538 g10/sign.c:273
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:621
 msgid "This key is not protected.\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:625
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:629
 msgid "Key is protected.\n"
 msgstr "�losilo estas protektita.\n"
 
-#: g10/keyedit.c:640
+#: g10/keyedit.c:649
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ne povas redakti �i tiun �losilon: %s\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:655
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2409,7 +2413,7 @@ msgstr ""
 "Donu la novan pasfrazon por �i tiu sekreta �losilo.\n"
 "\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:669
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2417,559 +2421,559 @@ msgstr ""
 "Vi ne deziras pasfrazon - tio ver�ajne estas *malbona* ideo!\n"
 "\n"
 
-#: g10/keyedit.c:663
+#: g10/keyedit.c:672
 msgid "Do you really want to do this? "
 msgstr "�u vi vere volas fari tion? "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:736
 msgid "moving a key signature to the correct place\n"
 msgstr "movas �losilsubskribon al la �usta loko\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:777
 msgid "quit this menu"
 msgstr "forlasi �i tiun menuon"
 
-#: g10/keyedit.c:769
+#: g10/keyedit.c:778
 msgid "q"
 msgstr "f"
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:779
 msgid "save"
 msgstr "skribi"
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:779
 msgid "save and quit"
 msgstr "skribi kaj fini"
 
-#: g10/keyedit.c:771
+#: g10/keyedit.c:780
 msgid "help"
 msgstr "helpo"
 
-#: g10/keyedit.c:771
+#: g10/keyedit.c:780
 msgid "show this help"
 msgstr "montri �i tiun helpon"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:782
 msgid "fpr"
 msgstr "fsp"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:782
 msgid "show fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:783
 msgid "list"
 msgstr "listo"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:783
 msgid "list key and user IDs"
 msgstr "listigi �losilojn kaj uzantidentigilojn"
 
-#: g10/keyedit.c:775
+#: g10/keyedit.c:784
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:785
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:785
 msgid "select user ID N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:786
 msgid "key"
 msgstr "�losilo"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:786
 msgid "select secondary key N"
 msgstr "elekti flankan �losilon N"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:787
 msgid "check"
 msgstr "kontroli"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:787
 msgid "list signatures"
 msgstr "listigi subskribojn"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:788
 msgid "c"
 msgstr "k"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:789
 msgid "sign"
 msgstr "subskribi"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:789
 msgid "sign the key"
 msgstr "subskribi la �losilon"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:790
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:791
 msgid "lsign"
 msgstr "lsub"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:791
 msgid "sign the key locally"
 msgstr "subskribi la �losilon loke"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:792
 #, fuzzy
 msgid "nrsign"
 msgstr "subskribi"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:792
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "subskribi la �losilon loke"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:793
 #, fuzzy
 msgid "nrlsign"
 msgstr "subskribi"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:793
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "subskribi la �losilon loke"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:794
 msgid "debug"
 msgstr "spuri"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:795
 msgid "adduid"
 msgstr "aluid"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:795
 msgid "add a user ID"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:796
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:796
 #, fuzzy
 msgid "add a photo ID"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:797
 msgid "deluid"
 msgstr "foruid"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:797
 msgid "delete user ID"
 msgstr "forvi�i uzantidentigilon"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:790
+#: g10/keyedit.c:799
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:800
 msgid "addkey"
 msgstr "al"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:800
 msgid "add a secondary key"
 msgstr "aldoni flankan �losilon"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:801
 msgid "delkey"
 msgstr "for"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:801
 msgid "delete a secondary key"
 msgstr "forvi�i flankan �losilon"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:802
 msgid "delsig"
 msgstr "forsig"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:802
 msgid "delete signatures"
 msgstr "forvi�i subskribojn"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:803
 msgid "expire"
 msgstr "eksval"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:803
 msgid "change the expire date"
 msgstr "�an�i la daton de eksvalidi�o"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:804
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:804
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:805
 msgid "toggle"
 msgstr "alia"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:805
 msgid "toggle between secret and public key listing"
 msgstr "de sekreta a� publika listo iri al la alia"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:807
 msgid "t"
 msgstr "a"
 
-#: g10/keyedit.c:799
+#: g10/keyedit.c:808
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:799
+#: g10/keyedit.c:808
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "listigi preferojn"
 
-#: g10/keyedit.c:800
+#: g10/keyedit.c:809
 #, fuzzy
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:800
+#: g10/keyedit.c:809
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "listigi preferojn"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:810
 #, fuzzy
 msgid "setpref"
 msgstr "pref"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:810
 #, fuzzy
 msgid "set preference list"
 msgstr "listigi preferojn"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:811
 #, fuzzy
 msgid "updpref"
 msgstr "pref"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:811
 #, fuzzy
 msgid "updated preferences"
 msgstr "listigi preferojn"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:812
 msgid "passwd"
 msgstr "pasf"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:812
 msgid "change the passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:813
 msgid "trust"
 msgstr "fido"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:813
 msgid "change the ownertrust"
 msgstr "�an�i la posedantofidon"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:814
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:814
 msgid "revoke signatures"
 msgstr "revoki subskribojn"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:815
 msgid "revkey"
 msgstr "rev"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:815
 msgid "revoke a secondary key"
 msgstr "revoki flankan �losilon"
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:816
 msgid "disable"
 msgstr "el"
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:816
 msgid "disable a key"
 msgstr "mal�alti �losilon"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:817
 msgid "enable"
 msgstr "en"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:817
 msgid "enable a key"
 msgstr "�alti �losilon"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:818
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:818
 msgid "show photo ID"
 msgstr ""
 
-#: g10/delkey.c:112 g10/keyedit.c:829
+#: g10/delkey.c:112 g10/keyedit.c:838
 msgid "can't do that in batchmode\n"
 msgstr "ne povas fari tion en neinteraga re�imo\n"
 
-#: g10/keyedit.c:866
+#: g10/keyedit.c:875
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:893
 msgid "Secret key is available.\n"
 msgstr "Sekreta �losilo estas havebla.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:924
 msgid "Command> "
 msgstr "Komando> "
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:956
 msgid "Need the secret key to do this.\n"
 msgstr "Bezonas la sekretan �losilon por fari tion.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:960
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1009
 #, fuzzy
 msgid "Key is revoked.\n"
 msgstr "�losilo estas protektita.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1025
 msgid "Really sign all user IDs? "
 msgstr "�u vere subskribi �iujn uzantidentigilojn? "
 
-#: g10/keyedit.c:1017
+#: g10/keyedit.c:1026
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1051
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1062 g10/keyedit.c:1083
+#: g10/keyedit.c:1071 g10/keyedit.c:1092
 msgid "You must select at least one user ID.\n"
 msgstr "Vi devas elekti almena� unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:1064
+#: g10/keyedit.c:1073
 msgid "You can't delete the last user ID!\n"
 msgstr "Vi ne povas forvi�i la lastan uzantidentigilon!\n"
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1076
 msgid "Really remove all selected user IDs? "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1068
+#: g10/keyedit.c:1077
 msgid "Really remove this user ID? "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1106 g10/keyedit.c:1128
+#: g10/keyedit.c:1115 g10/keyedit.c:1137
 msgid "You must select at least one key.\n"
 msgstr "Vi devas elekti almena� unu �losilon.\n"
 
-#: g10/keyedit.c:1110
+#: g10/keyedit.c:1119
 msgid "Do you really want to delete the selected keys? "
 msgstr "�u vi vere volas forvi�i la elektitajn �losilojn? "
 
-#: g10/keyedit.c:1111
+#: g10/keyedit.c:1120
 msgid "Do you really want to delete this key? "
 msgstr "�u vi vere volas forvi�i �i tiun �losilon? "
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1141
 msgid "Do you really want to revoke the selected keys? "
 msgstr "�u vi vere volas revoki la elektitajn �losilojn? "
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1142
 msgid "Do you really want to revoke this key? "
 msgstr "�u vi vere volas revoki �i tiun �losilon? "
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1206
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1208
 #, fuzzy
 msgid "Really update the preferences? "
 msgstr "�u vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:1237
+#: g10/keyedit.c:1246
 msgid "Save changes? "
 msgstr "�u skribi �an�ojn? "
 
-#: g10/keyedit.c:1240
+#: g10/keyedit.c:1249
 msgid "Quit without saving? "
 msgstr "�u fini sen skribi �an�ojn? "
 
-#: g10/keyedit.c:1251
+#: g10/keyedit.c:1260
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/keyedit.c:1258
+#: g10/keyedit.c:1267
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1274
 msgid "Key not changed so no update needed.\n"
 msgstr "�losilo ne �an�ita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1285
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1433
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s%s\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1436
 msgid " (sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:1432 g10/keyedit.c:1458
+#: g10/keyedit.c:1441 g10/keyedit.c:1467
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  kreita: %s eksvalidi�os: %s"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1450
 #, c-format
 msgid " trust: %c/%c"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1454
 msgid "This key has been disabled"
 msgstr "�i tiu �losilo estas mal�altita"
 
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1483
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! sub�losilo estas revokita: %s\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1486
 msgid "rev- faked revocation found\n"
 msgstr "rev- falsita revoko trovita\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1488
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problemo en kontrolo de revoko: %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1598
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
 msgstr ""
 
-#: g10/keyedit.c:1593 g10/keyedit.c:1620
+#: g10/keyedit.c:1602 g10/keyedit.c:1629
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/n) "
 msgstr "�u vi estas certa, ke vi deziras �i tiun �losilgrandon? "
 
-#: g10/keyedit.c:1601
+#: g10/keyedit.c:1610
 msgid "You may only have one photo ID on a key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1624
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1626
+#: g10/keyedit.c:1635
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1757
+#: g10/keyedit.c:1766
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:1770
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1774
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1780
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:1785
+#: g10/keyedit.c:1794
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Forvi�is %d subskribon.\n"
 
-#: g10/keyedit.c:1786
+#: g10/keyedit.c:1795
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Forvi�is %d subskribojn.\n"
 
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1798
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forvi�ita.\n"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1867
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bonvolu malelekti la sekretajn �losilojn.\n"
 
-#: g10/keyedit.c:1864
+#: g10/keyedit.c:1873
 msgid "Please select at most one secondary key.\n"
 msgstr "Bonvolu elekti maksimume unu flankan �losilon.\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1877
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:1879
 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:1912
+#: g10/keyedit.c:1921
 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:1928
+#: g10/keyedit.c:1937
 msgid "No corresponding signature in secret ring\n"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2018
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Vi devas elekti almena� unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:2184
+#: g10/keyedit.c:2193
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2239
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Mankas flanka �losilo kun indekso %d\n"
 
-#: g10/keyedit.c:2328
+#: g10/keyedit.c:2337
 msgid "user ID: \""
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2342
 #, c-format
 msgid ""
 "\"\n"
@@ -2978,39 +2982,52 @@ msgstr ""
 "\"\n"
 "subskribita per via �losilo %08lX je %s\n"
 
-#: g10/keyedit.c:2335
+#: g10/keyedit.c:2345
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"locally signed with your key %08lX at %s\n"
+msgstr ""
+"\"\n"
+"subskribita per via �losilo %08lX je %s\n"
+
+#: g10/keyedit.c:2349
 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:2359
+#: g10/keyedit.c:2373
 msgid "You have signed these user IDs:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:2373
+#: g10/keyedit.c:2387
 #, fuzzy, c-format
-msgid "   signed by %08lX at %s%s\n"
+msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   subskribita per %08lX je %s\n"
 
-#: g10/keyedit.c:2380
+#: g10/keyedit.c:2395
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2415
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:2410
-#, c-format
-msgid "   signed by %08lX at %s\n"
+#: g10/keyedit.c:2425
+#, fuzzy, c-format
+msgid "   signed by %08lX at %s%s\n"
 msgstr "   subskribita per %08lX je %s\n"
 
-#: g10/keyedit.c:2418
+#: g10/keyedit.c:2427
+msgid " (non-exportable)"
+msgstr ""
+
+#: g10/keyedit.c:2434
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "�u vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2464
 msgid "no secret key\n"
 msgstr "mankas sekreta �losilo\n"
 
@@ -3213,12 +3230,12 @@ msgstr "�i tiu �ifrad-metodo estas malrekomendata; bonvolu uzi pli normalan!\n"
 
 #: g10/misc.c:378
 #, c-format
-msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgid "warning: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
 #: g10/misc.c:410
 #, c-format
-msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgid "warning: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
 #: g10/misc.c:435
@@ -4122,7 +4139,7 @@ msgstr ""
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures fill be advanced by one second.\n"
+"self-signatures will be advanced by one second.\n"
 msgstr ""
 
 #: g10/helptext.c:238
@@ -4258,6 +4275,12 @@ msgstr "listigi �losilojn kaj subskribojn"
 msgid "%s: keyring created\n"
 msgstr "%s: �losilaro kreita\n"
 
+#~ msgid "Do you really need such a large keysize? "
+#~ msgstr "�u vi vere bezonas tiom grandan �losilgrandon? "
+
+#~ msgid "   signed by %08lX at %s\n"
+#~ msgstr "   subskribita per %08lX je %s\n"
+
 #~ msgid "--delete-secret-key user-id"
 #~ msgstr "--delete-secret-key uzantidentigilo"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 73f62d454..a38098130 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: 2002-03-03 15:18+0100\n"
+"POT-Creation-Date: 2002-04-06 17:29+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"
@@ -54,7 +54,7 @@ msgstr ""
 msgid "nN"
 msgstr ""
 
-#: g10/keyedit.c:768 util/miscutil.c:326
+#: g10/keyedit.c:777 util/miscutil.c:326
 msgid "quit"
 msgstr ""
 
@@ -285,7 +285,7 @@ msgstr "... esto es un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Ha encontrado Vd. un bug... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1552
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1547
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
@@ -363,7 +363,7 @@ msgstr ""
 "otro trabajo para que el sistema pueda recolectar m�s entrop�a\n"
 "(se necesitan %d bytes m�s).\n"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid ""
 "@Commands:\n"
 " "
@@ -371,170 +371,170 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "|[file]|make a signature"
 msgstr "|[file]|hace una firma"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|hace una firma en texto claro"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "make a detached signature"
 msgstr "hace una firma separada"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "store only"
 msgstr "s�lo almacenar"
 
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "check key signatures"
 msgstr "comprueba las firmas de las claves"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/g10.c:297
+#: g10/g10.c:298
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "elimina la clave del anillo p�blico"
 
-#: g10/g10.c:299
+#: g10/g10.c:300
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "elimina la clave del anillo p�blico"
 
-#: g10/g10.c:300
+#: g10/g10.c:301
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/g10.c:301
+#: g10/g10.c:302
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/g10.c:302
+#: g10/g10.c:303
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "firma la clave localmente"
 
-#: g10/g10.c:303
+#: g10/g10.c:304
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "firma la clave localmente"
 
-#: g10/g10.c:304
+#: g10/g10.c:305
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocaci�n"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/g10.c:310
+#: g10/g10.c:311
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "list only the sequence of packets"
 msgstr "lista s�lo la secuencia de paquetes"
 
-#: g10/g10.c:320
+#: g10/g10.c:321
 msgid "export the ownertrust values"
 msgstr "exporta los valores de confianza"
 
-#: g10/g10.c:322
+#: g10/g10.c:323
 msgid "import ownertrust values"
 msgstr "importa los valores de confianza"
 
-#: g10/g10.c:324
+#: g10/g10.c:325
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/g10.c:326
+#: g10/g10.c:327
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/g10.c:327
+#: g10/g10.c:328
 msgid "fix a corrupted trust database"
 msgstr "arregla una base de datos de confianza da�ada"
 
-#: g10/g10.c:328
+#: g10/g10.c:329
 msgid "De-Armor a file or stdin"
 msgstr "quita la armadura de un fichero o stdin"
 
-#: g10/g10.c:330
+#: g10/g10.c:331
 msgid "En-Armor a file or stdin"
 msgstr "crea la armadura a un fichero o stdin"
 
-#: g10/g10.c:332
+#: g10/g10.c:333
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime res�menes de mensaje"
 
-#: g10/g10.c:336
+#: g10/g10.c:337
 msgid ""
 "@\n"
 "Options:\n"
@@ -544,217 +544,217 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/g10.c:338
+#: g10/g10.c:339
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/g10.c:340
+#: g10/g10.c:341
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/g10.c:343
+#: g10/g10.c:344
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
 
-#: g10/g10.c:345
+#: g10/g10.c:346
 msgid "use the default key as default recipient"
 msgstr "usa la clave por defecto como destinatario"
 
-#: g10/g10.c:350
+#: g10/g10.c:352
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/g10.c:351
+#: g10/g10.c:353
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivel de compresi�n N (0 no comprime)"
 
-#: g10/g10.c:353
+#: g10/g10.c:355
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "verbose"
 msgstr "prolijo"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "be somewhat more quiet"
 msgstr "algo m�s discreto"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "don't use the terminal at all"
 msgstr "no usa la terminal en absoluto"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "force v3 signatures"
 msgstr "fuerza firmas v3"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "fuerza firmas v3"
 
-#: g10/g10.c:366
+#: g10/g10.c:368
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "fuerza firmas v3"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "fuerza firmas v3"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 msgid "always use a MDC for encryption"
 msgstr "siempre usa un MCD para cifrar"
 
-#: g10/g10.c:370
+#: g10/g10.c:372
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "siempre usa un MCD para cifrar"
 
-#: g10/g10.c:372
+#: g10/g10.c:374
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:374
+#: g10/g10.c:376
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "assume yes on most questions"
 msgstr "asume \"s�\" en casi todas las preguntas"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "add this keyring to the list of keyrings"
 msgstr "a�ade este anillo a la lista de anillos"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "add this secret keyring to the list"
 msgstr "a�ade este anillo secreto a la lista"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVIDOR|usa este servidor de claves"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "read options from file"
 msgstr "lee opciones del fichero"
 
-#: g10/g10.c:391
+#: g10/g10.c:393
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe informaci�n de estado en descriptor DF"
 
-#: g10/g10.c:393
+#: g10/g10.c:395
 #, fuzzy
 msgid "|[file]|write status info to file"
 msgstr "|DF|escribe informaci�n de estado en descriptor DF"
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 #, fuzzy
 msgid "|KEYID|ultimately trust this key"
 msgstr "|ID-CLAVE|conf�a plenamente en esta clave"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "emulate the mode described in RFC1991"
 msgstr "emula el modo descrito en la RFC1991"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 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:403
+#: g10/g10.c:405
 #, fuzzy
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "todas las opciones de paquete, cifrado y\n"
 "resumen tipo OpenPGP"
 
-#: g10/g10.c:407
+#: g10/g10.c:409
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa modo de contrase�a N"
 
-#: g10/g10.c:409
+#: g10/g10.c:411
 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:411
+#: g10/g10.c:413
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las\n"
 "contrase�as"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
 
-#: g10/g10.c:413
+#: g10/g10.c:415
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa el algoritmo de compresi�n N"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina campo keyid de los paquetes cifrados"
 
-#: g10/g10.c:416
+#: g10/g10.c:418
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:418
+#: g10/g10.c:420
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:419
+#: g10/g10.c:421
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOMBRE=VALOR|usa estos datos de notaci�n"
 
-#: g10/g10.c:422
+#: g10/g10.c:424
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid ""
 "@\n"
 "Examples:\n"
@@ -774,15 +774,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/g10.c:559
+#: g10/g10.c:561
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:565
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/g10.c:566
+#: g10/g10.c:568
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -792,7 +792,7 @@ msgstr ""
 "Firma, comprueba, cifra o descifra.\n"
 "La operaci�n por defecto depende del tipo de datos de entrada.\n"
 
-#: g10/g10.c:577
+#: g10/g10.c:579
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -800,240 +800,245 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/g10.c:651
+#: g10/g10.c:653
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/g10.c:708
+#: g10/g10.c:710
 msgid "conflicting commands\n"
 msgstr "comandos incompatibles\n"
 
-#: g10/g10.c:881
+#: g10/g10.c:883
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:887
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/g10.c:892
+#: g10/g10.c:894
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/g10.c:1174
+#: g10/g10.c:1176
 #, 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:1190
+#: g10/g10.c:1192
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1294
+#: g10/g10.c:1208
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr ""
+
+#: g10/g10.c:1309
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a crear un fichero core dump!\n"
 
-#: g10/g10.c:1298
+#: g10/g10.c:1313
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:1305 g10/g10.c:1316
+#: g10/g10.c:1320 g10/g10.c:1331
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/g10.c:1307 g10/g10.c:1327
+#: g10/g10.c:1322 g10/g10.c:1342
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/g10.c:1310
+#: g10/g10.c:1325
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/g10.c:1336
+#: g10/g10.c:1351
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1342
+#: g10/g10.c:1357
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1348
+#: g10/g10.c:1363
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1361
+#: g10/g10.c:1376
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1375 g10/sign.c:614
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1390 g10/sign.c:614
 #: g10/sign.c:792
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr ""
 
-#: g10/g10.c:1414 g10/g10.c:1426
+#: g10/g10.c:1429 g10/g10.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado no es v�lido\n"
 
-#: g10/g10.c:1420 g10/g10.c:1432
+#: g10/g10.c:1435 g10/g10.c:1447
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no es v�lido\n"
 
-#: g10/g10.c:1436
+#: g10/g10.c:1451
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de pol�tica no v�lida\n"
 
-#: g10/g10.c:1440
+#: g10/g10.c:1455
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de pol�tica no v�lida\n"
 
-#: g10/g10.c:1443
+#: g10/g10.c:1458
 #, 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:1445
+#: g10/g10.c:1460
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/g10.c:1447
+#: g10/g10.c:1462
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/g10.c:1449
+#: g10/g10.c:1464
 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:1452
+#: g10/g10.c:1467
 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:1456
+#: g10/g10.c:1471
 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:1460
+#: g10/g10.c:1475
 #, fuzzy
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
 
-#: g10/g10.c:1463
+#: g10/g10.c:1478
 #, fuzzy
 msgid "invalid preferences\n"
 msgstr "muestra preferencias"
 
-#: g10/g10.c:1557
+#: g10/g10.c:1572
 #, 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:1577
+#: g10/g10.c:1592
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/g10.c:1584
+#: g10/g10.c:1599
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:1592
+#: g10/g10.c:1607
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1624
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/g10.c:1622
+#: g10/g10.c:1637
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:1636
+#: g10/g10.c:1651
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:1645
+#: g10/g10.c:1660
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/g10.c:1663
+#: g10/g10.c:1678
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/g10.c:1674
+#: g10/g10.c:1689
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/g10.c:1682
+#: g10/g10.c:1697
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/g10.c:1690
+#: g10/g10.c:1705
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/g10.c:1698
+#: g10/g10.c:1713
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1721
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [comandos]"
 
-#: g10/encode.c:307 g10/g10.c:1762 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1777 g10/sign.c:703
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: g10/g10.c:1777
+#: g10/g10.c:1792
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/g10.c:1860
+#: g10/g10.c:1875
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1883
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:1955
+#: g10/g10.c:1970
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n no v�lido `%s'\n"
 
-#: g10/g10.c:2041
+#: g10/g10.c:2056
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2060
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2048 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2063 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no puede abrirse `%s'\n"
 
-#: g10/g10.c:2257
+#: g10/g10.c:2272
 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:2263
+#: g10/g10.c:2278
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -1041,11 +1046,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:2269
+#: g10/g10.c:2284
 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:2277
+#: g10/g10.c:2292
 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"
 
@@ -1480,7 +1485,7 @@ msgstr "   (%d) DSA (s�lo firma)\n"
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (s�lo cifrado)\n"
 
-#: g10/keyedit.c:466 g10/keygen.c:776
+#: g10/keyedit.c:475 g10/keygen.c:776
 msgid "Your selection? "
 msgstr "Su elecci�n: "
 
@@ -1488,7 +1493,7 @@ msgstr "Su elecci�n: "
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 
-#: g10/keyedit.c:479 g10/keygen.c:810
+#: g10/keyedit.c:488 g10/keygen.c:810
 msgid "Invalid selection.\n"
 msgstr "Elecci�n no v�lida.\n"
 
@@ -1556,21 +1561,17 @@ msgstr ""
 "teclado\n"
 "tambi�n son vulnerables a un ataque!\n"
 
-#: g10/keygen.c:870
-msgid "Do you really need such a large keysize? "
-msgstr "�De verdad necesita una clave tan grande? "
-
-#: g10/keygen.c:876
+#: g10/keygen.c:871
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "El tama�o requerido es de %u bits\n"
 
-#: g10/keygen.c:879 g10/keygen.c:883
+#: g10/keygen.c:874 g10/keygen.c:878
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:934
+#: g10/keygen.c:929
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1586,7 +1587,7 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:943
+#: g10/keygen.c:938
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -1603,41 +1604,41 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:960
 msgid "Key is valid for? (0) "
 msgstr "�Validez de la clave (0)? "
 
-#: g10/keygen.c:967
+#: g10/keygen.c:962
 #, fuzzy
 msgid "Signature is valid for? (0) "
 msgstr "�Validez de la clave (0)? "
 
-#: g10/keygen.c:972
+#: g10/keygen.c:967
 msgid "invalid value\n"
 msgstr "valor no v�lido\n"
 
-#: g10/keygen.c:977
+#: g10/keygen.c:972
 #, fuzzy, c-format
 msgid "%s does not expire at all\n"
 msgstr "La clave nunca caduca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:984
+#: g10/keygen.c:979
 #, fuzzy, c-format
 msgid "%s expires at %s\n"
 msgstr "La clave caduca el %s\n"
 
-#: g10/keygen.c:990
+#: g10/keygen.c:985
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:995
+#: g10/keygen.c:990
 msgid "Is this correct (y/n)? "
 msgstr "�Es correcto (s/n)? "
 
-#: g10/keygen.c:1038
+#: g10/keygen.c:1033
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1655,44 +1656,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1045
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1053
 msgid "Invalid character in name\n"
 msgstr "Caracter no v�lido en el nombre\n"
 
-#: g10/keygen.c:1060
+#: g10/keygen.c:1055
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un n�mero\n"
 
-#: g10/keygen.c:1062
+#: g10/keygen.c:1057
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1065
 msgid "Email address: "
 msgstr "Direcci�n de correo electr�nico: "
 
-#: g10/keygen.c:1081
+#: g10/keygen.c:1076
 msgid "Not a valid email address\n"
 msgstr "Direcci�n no v�lida\n"
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1084
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1095
+#: g10/keygen.c:1090
 msgid "Invalid character in comment\n"
 msgstr "Caracter no v�lido en el comentario\n"
 
-#: g10/keygen.c:1118
+#: g10/keygen.c:1113
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� usando el juego de caracteres `%s'.\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1119
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1703,28 +1704,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1128
+#: g10/keygen.c:1123
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:1133
+#: g10/keygen.c:1128
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:1143
+#: g10/keygen.c:1138
 #, 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:1144
+#: g10/keygen.c:1139
 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:1163
+#: g10/keygen.c:1158
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1202
+#: g10/keygen.c:1197
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1732,17 +1733,17 @@ msgstr ""
 "Necesita una contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:655 g10/keygen.c:1210
+#: g10/keyedit.c:664 g10/keygen.c:1205
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "contrase�a repetida incorrecta, int�ntelo de nuevo.\n"
 
-#: g10/keygen.c:1211
+#: g10/keygen.c:1206
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1217
+#: g10/keygen.c:1212
 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"
@@ -1754,7 +1755,7 @@ msgstr ""
 "la opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1233
 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"
@@ -1767,54 +1768,54 @@ msgstr ""
 "generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n"
 "entrop�a.\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1723
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "El par de claves DSA tendr� 1024 bits.\n"
 
-#: g10/keygen.c:1782
+#: g10/keygen.c:1777
 msgid "Key generation canceled.\n"
 msgstr "Creaci�n de claves cancelada.\n"
 
-#: g10/keygen.c:1870 g10/keygen.c:1950
+#: g10/keygen.c:1865 g10/keygen.c:1945
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escribiendo certificado p�blico en `%s'\n"
 
-#: g10/keygen.c:1871 g10/keygen.c:1952
+#: g10/keygen.c:1866 g10/keygen.c:1947
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escribiendo certificado privado en `%s'\n"
 
-#: g10/keygen.c:1939
+#: g10/keygen.c:1934
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "clave %08lX: clave p�blica no encontrada: %s\n"
 
-#: g10/keygen.c:1945
+#: g10/keygen.c:1940
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "no puede bloquearse el anillo secreto: %s\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1954
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1961
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1981
 msgid "public and secret key created and signed.\n"
 msgstr "Claves p�blica y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1982
 #, fuzzy
 msgid "key marked as ultimately trusted.\n"
 msgstr "Certificados que llevan a una clave de confianza absoluta:\n"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1991
 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"
@@ -1823,12 +1824,12 @@ msgstr ""
 "el comando \"--edit-key\" para crear una clave secundaria con este "
 "prop�sito.\n"
 
-#: g10/keygen.c:2008 g10/keygen.c:2114
+#: g10/keygen.c:2003 g10/keygen.c:2109
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: g10/keygen.c:2052 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2047 g10/sig-check.c:227 g10/sign.c:228
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1836,7 +1837,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:2054 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2049 g10/sig-check.c:229 g10/sign.c:230
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1844,11 +1845,11 @@ msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2058
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:2090
+#: g10/keygen.c:2085
 msgid "Really create? "
 msgstr "�Crear de verdad? "
 
@@ -1896,32 +1897,32 @@ msgstr ""
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s cifrado para: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:142
+#: g10/delkey.c:69 g10/export.c:141
 #, fuzzy, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "usuario '%s' no encontrado: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:162
+#: g10/delkey.c:77 g10/export.c:161
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: g10/export.c:170
+#: g10/export.c:169
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "clave %08lX: no es conforme a rfc2440 - ignorada\n"
 
-#: g10/export.c:181
+#: g10/export.c:180
 #, fuzzy, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "clave %08lX: no es conforme a rfc2440 - ignorada\n"
 
-#: g10/export.c:189
+#: g10/export.c:188
 #, fuzzy, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "clave %08lX: no es conforme a rfc2440 - ignorada\n"
 
-#: g10/export.c:255
+#: g10/export.c:254
 msgid "WARNING: nothing exported\n"
 msgstr "ATENCI�N: no se ha exportado nada\n"
 
@@ -1938,7 +1939,7 @@ msgstr "[usuario no encontrado]"
 
 #: g10/getkey.c:1362
 #, c-format
-msgid "Invalid key %08lX made valid by --always-trust\n"
+msgid "invalid key %08lX made valid by --always-trust\n"
 msgstr ""
 
 #: g10/getkey.c:1957
@@ -2287,12 +2288,12 @@ msgstr "Detectados %d identificativos de usuario sin autofirma v�lida\n"
 msgid "User ID \"%s\" is revoked.\n"
 msgstr ""
 
-#: g10/keyedit.c:330 g10/keyedit.c:1004
+#: g10/keyedit.c:330 g10/keyedit.c:1013
 #, fuzzy
 msgid "Are you sure you still want to sign it?\n"
 msgstr "�Seguro que quiere una clave de este tama�o? "
 
-#: g10/keyedit.c:335 g10/keyedit.c:409 g10/keyedit.c:519 g10/keyedit.c:1007
+#: g10/keyedit.c:335 g10/keyedit.c:418 g10/keyedit.c:528 g10/keyedit.c:1016
 msgid "Really sign? "
 msgstr "�Firmar de verdad? "
 
@@ -2307,65 +2308,68 @@ msgid ""
 "Do you want to promote it to a full exportable signature?\n"
 msgstr ""
 
-#. Fixme: see whether there is a revocation in which
-#. * case we should allow to sign it again.
-#: g10/keyedit.c:374
+#: g10/keyedit.c:379
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %08lX\n"
+msgstr "Ya firmada por la clave %08lX\n"
+
+#: g10/keyedit.c:384
 #, fuzzy, c-format
 msgid "\"%s\" was already %ssigned by key %08lX\n"
 msgstr "Ya firmada por la clave %08lX\n"
 
-#: g10/keyedit.c:387
+#: g10/keyedit.c:396
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada que firmar con la clave %08lX\n"
 
-#: g10/keyedit.c:402
+#: g10/keyedit.c:411
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Nota: �Esta clave est� caducada!\n"
 
-#: g10/keyedit.c:406
+#: g10/keyedit.c:415
 #, fuzzy
 msgid "  Are you sure you still want to sign it?\n"
 msgstr "�Seguro que quiere una clave de este tama�o? "
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:429
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta clave no est� protegida.\n"
 
-#: g10/keyedit.c:422
+#: g10/keyedit.c:431
 msgid "Do you want your signature to expire at the same time? (y/n) "
 msgstr ""
 
-#: g10/keyedit.c:450
+#: g10/keyedit.c:459
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:463
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:465
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:458
+#: g10/keyedit.c:467
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:485
+#: g10/keyedit.c:494
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2373,7 +2377,7 @@ msgstr ""
 "�Est� realmente seguro de querer firmar esta clave\n"
 "con su clave: \""
 
-#: g10/keyedit.c:494
+#: g10/keyedit.c:503
 #, fuzzy
 msgid ""
 "\n"
@@ -2382,7 +2386,7 @@ msgstr ""
 "La firma se marcar� como no exportable.\n"
 "\n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:507
 #, fuzzy
 msgid ""
 "\n"
@@ -2391,48 +2395,48 @@ msgstr ""
 "La firma se marcar� como no exportable.\n"
 "\n"
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:512
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:507
+#: g10/keyedit.c:516
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:511
+#: g10/keyedit.c:520
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:552 g10/keyedit.c:2459 g10/keyedit.c:2521 g10/sign.c:273
+#: g10/keyedit.c:561 g10/keyedit.c:2476 g10/keyedit.c:2538 g10/sign.c:273
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:621
 msgid "This key is not protected.\n"
 msgstr "Esta clave no est� protegida.\n"
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:625
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Clave secreta no disponible"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:629
 msgid "Key is protected.\n"
 msgstr "La clave est� protegida.\n"
 
-#: g10/keyedit.c:640
+#: g10/keyedit.c:649
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No puede editarse esta clave: %s\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:655
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2440,7 +2444,7 @@ msgstr ""
 "Introduzca la nueva contrase�a para esta clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:669
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2448,555 +2452,555 @@ msgstr ""
 "No ha especificado contrase�a. Esto es probablemente una *mala* idea.\n"
 "\n"
 
-#: g10/keyedit.c:663
+#: g10/keyedit.c:672
 msgid "Do you really want to do this? "
 msgstr "�Realmente quiere hacer esto? "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:736
 msgid "moving a key signature to the correct place\n"
 msgstr "moviendo la firma de la clave al lugar correcto\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:777
 msgid "quit this menu"
 msgstr "sale de este men�"
 
-#: g10/keyedit.c:769
+#: g10/keyedit.c:778
 msgid "q"
 msgstr ""
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:779
 msgid "save"
 msgstr ""
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:779
 msgid "save and quit"
 msgstr "graba y sale"
 
-#: g10/keyedit.c:771
+#: g10/keyedit.c:780
 msgid "help"
 msgstr ""
 
-#: g10/keyedit.c:771
+#: g10/keyedit.c:780
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:782
 msgid "fpr"
 msgstr ""
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:782
 msgid "show fingerprint"
 msgstr "muestra huella dactilar"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:783
 msgid "list"
 msgstr ""
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:783
 msgid "list key and user IDs"
 msgstr "lista clave e identificativos de usuario"
 
-#: g10/keyedit.c:775
+#: g10/keyedit.c:784
 msgid "l"
 msgstr ""
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:785
 msgid "uid"
 msgstr ""
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:785
 msgid "select user ID N"
 msgstr "selecciona identificativo de usuario N"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:786
 msgid "key"
 msgstr ""
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:786
 msgid "select secondary key N"
 msgstr "selecciona clave secundaria N"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:787
 msgid "check"
 msgstr ""
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:787
 msgid "list signatures"
 msgstr "lista firmas"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:788
 msgid "c"
 msgstr ""
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:789
 msgid "sign"
 msgstr ""
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:789
 msgid "sign the key"
 msgstr "firma la clave"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:790
 msgid "s"
 msgstr ""
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:791
 msgid "lsign"
 msgstr ""
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:791
 msgid "sign the key locally"
 msgstr "firma la clave localmente"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:792
 msgid "nrsign"
 msgstr ""
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:792
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "firma la clave localmente"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:793
 msgid "nrlsign"
 msgstr ""
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:793
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "firma la clave localmente"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:794
 msgid "debug"
 msgstr ""
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:795
 msgid "adduid"
 msgstr ""
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:795
 msgid "add a user ID"
 msgstr "a�ade un identificativo de usuario"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:796
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:796
 #, fuzzy
 msgid "add a photo ID"
 msgstr "a�ade un identificativo de usuario"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:797
 msgid "deluid"
 msgstr ""
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:797
 msgid "delete user ID"
 msgstr "borra un identificativo de usuario"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:790
+#: g10/keyedit.c:799
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:800
 msgid "addkey"
 msgstr ""
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:800
 msgid "add a secondary key"
 msgstr "a�ade una clave secundaria"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:801
 msgid "delkey"
 msgstr ""
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:801
 msgid "delete a secondary key"
 msgstr "borra una clave secundaria"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:802
 msgid "delsig"
 msgstr ""
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:802
 msgid "delete signatures"
 msgstr "borra firmas"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:803
 msgid "expire"
 msgstr ""
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:803
 msgid "change the expire date"
 msgstr "cambia fecha de caducidad"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:804
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:804
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:805
 msgid "toggle"
 msgstr ""
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:805
 msgid "toggle between secret and public key listing"
 msgstr "cambia entre lista de claves secretas y p�blicas"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:807
 msgid "t"
 msgstr ""
 
-#: g10/keyedit.c:799
+#: g10/keyedit.c:808
 msgid "pref"
 msgstr ""
 
-#: g10/keyedit.c:799
+#: g10/keyedit.c:808
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "muestra preferencias"
 
-#: g10/keyedit.c:800
+#: g10/keyedit.c:809
 msgid "showpref"
 msgstr ""
 
-#: g10/keyedit.c:800
+#: g10/keyedit.c:809
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "muestra preferencias"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:810
 msgid "setpref"
 msgstr ""
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:810
 #, fuzzy
 msgid "set preference list"
 msgstr "muestra preferencias"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:811
 msgid "updpref"
 msgstr ""
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:811
 #, fuzzy
 msgid "updated preferences"
 msgstr "muestra preferencias"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:812
 msgid "passwd"
 msgstr ""
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:812
 msgid "change the passphrase"
 msgstr "cambia la contrase�a"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:813
 msgid "trust"
 msgstr ""
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:813
 msgid "change the ownertrust"
 msgstr "cambia valores de confianza"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:814
 msgid "revsig"
 msgstr ""
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:814
 msgid "revoke signatures"
 msgstr "revoca firmas"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:815
 msgid "revkey"
 msgstr ""
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:815
 msgid "revoke a secondary key"
 msgstr "revoca una clave secundaria"
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:816
 msgid "disable"
 msgstr ""
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:816
 msgid "disable a key"
 msgstr "deshabilita una clave"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:817
 msgid "enable"
 msgstr ""
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:817
 msgid "enable a key"
 msgstr "habilita una clave"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:818
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:818
 msgid "show photo ID"
 msgstr ""
 
-#: g10/delkey.c:112 g10/keyedit.c:829
+#: g10/delkey.c:112 g10/keyedit.c:838
 msgid "can't do that in batchmode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
-#: g10/keyedit.c:866
+#: g10/keyedit.c:875
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:893
 msgid "Secret key is available.\n"
 msgstr "Clave secreta disponible.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:924
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:956
 msgid "Need the secret key to do this.\n"
 msgstr "Se necesita la clave secreta para hacer esto.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:960
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1009
 #, fuzzy
 msgid "Key is revoked.\n"
 msgstr "La clave est� protegida.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1025
 msgid "Really sign all user IDs? "
 msgstr "�Firmar realmente todos los identificativos de usuario? "
 
-#: g10/keyedit.c:1017
+#: g10/keyedit.c:1026
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugerencia: seleccione los identificativos de usuario a firmar\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1051
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1062 g10/keyedit.c:1083
+#: g10/keyedit.c:1071 g10/keyedit.c:1092
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar por lo menos un identificativo de usuario.\n"
 
-#: g10/keyedit.c:1064
+#: g10/keyedit.c:1073
 msgid "You can't delete the last user ID!\n"
 msgstr "�No puede borrar el �ltimo identificativo de usuario!\n"
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1076
 msgid "Really remove all selected user IDs? "
 msgstr "�Borrar realmente todos los identificativos seleccionados? "
 
-#: g10/keyedit.c:1068
+#: g10/keyedit.c:1077
 msgid "Really remove this user ID? "
 msgstr "�Borrar realmente este identificativo? "
 
-#: g10/keyedit.c:1106 g10/keyedit.c:1128
+#: g10/keyedit.c:1115 g10/keyedit.c:1137
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar por lo menos una clave.\n"
 
-#: g10/keyedit.c:1110
+#: g10/keyedit.c:1119
 msgid "Do you really want to delete the selected keys? "
 msgstr "�Borrar realmente las claves seleccionadas? "
 
-#: g10/keyedit.c:1111
+#: g10/keyedit.c:1120
 msgid "Do you really want to delete this key? "
 msgstr "�Borrar realmente esta clave? "
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1141
 msgid "Do you really want to revoke the selected keys? "
 msgstr "�Revocar realmente las claves seleccionadas? "
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1142
 msgid "Do you really want to revoke this key? "
 msgstr "�Revocar realmente esta clave? "
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1206
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "�Borrar realmente todos los identificativos seleccionados? "
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1208
 #, fuzzy
 msgid "Really update the preferences? "
 msgstr "�Crear los certificados de revocaci�n realmente? (s/N)"
 
-#: g10/keyedit.c:1237
+#: g10/keyedit.c:1246
 msgid "Save changes? "
 msgstr "�Grabar cambios? "
 
-#: g10/keyedit.c:1240
+#: g10/keyedit.c:1249
 msgid "Quit without saving? "
 msgstr "�Salir sin grabar? "
 
-#: g10/keyedit.c:1251
+#: g10/keyedit.c:1260
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: g10/keyedit.c:1258
+#: g10/keyedit.c:1267
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1274
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
 
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1285
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando no v�lido (pruebe \"help\")\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1433
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s%s\n"
 msgstr "ATENCI�N: �Esta clave ha sido revocada por su propietario!\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1436
 msgid " (sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:1432 g10/keyedit.c:1458
+#: g10/keyedit.c:1441 g10/keyedit.c:1467
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1450
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1454
 msgid "This key has been disabled"
 msgstr "Esta clave est� deshabilitada"
 
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1483
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! �esta subclave ha sido revocada! %s\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1486
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "rev-  incorrectas revocaciones\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1488
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1598
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
 msgstr ""
 
-#: g10/keyedit.c:1593 g10/keyedit.c:1620
+#: g10/keyedit.c:1602 g10/keyedit.c:1629
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/n) "
 msgstr "�Seguro que quiere una clave de este tama�o? "
 
-#: g10/keyedit.c:1601
+#: g10/keyedit.c:1610
 msgid "You may only have one photo ID on a key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1624
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1626
+#: g10/keyedit.c:1635
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1757
+#: g10/keyedit.c:1766
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:1770
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta firma no v�lida? (s/N/q)"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1774
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1780
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:1785
+#: g10/keyedit.c:1794
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/keyedit.c:1786
+#: g10/keyedit.c:1795
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas borradas\n"
 
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1798
 msgid "Nothing deleted.\n"
 msgstr "No se borr� nada\n"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1867
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite la selecci�n de las claves secretas.\n"
 
-#: g10/keyedit.c:1864
+#: g10/keyedit.c:1873
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1877
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambiando caducidad de clave secundaria.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:1879
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:1912
+#: g10/keyedit.c:1921
 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:1928
+#: g10/keyedit.c:1937
 msgid "No corresponding signature in secret ring\n"
 msgstr "No hay firma correspondiente en anillo secreto\n"
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2018
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Debe seleccionar por lo menos un identificativo de usuario.\n"
 
-#: g10/keyedit.c:2184
+#: g10/keyedit.c:2193
 #, 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:2230
+#: g10/keyedit.c:2239
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "No hay ninguna clave secundaria con el �ndice %d\n"
 
-#: g10/keyedit.c:2328
+#: g10/keyedit.c:2337
 msgid "user ID: \""
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2342
 #, c-format
 msgid ""
 "\"\n"
@@ -3005,39 +3009,52 @@ msgstr ""
 "\"\n"
 "firmada con su clave %08lX el %s\n"
 
-#: g10/keyedit.c:2335
+#: g10/keyedit.c:2345
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"locally signed with your key %08lX at %s\n"
+msgstr ""
+"\"\n"
+"firmada con su clave %08lX el %s\n"
+
+#: g10/keyedit.c:2349
 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:2359
+#: g10/keyedit.c:2373
 msgid "You have signed these user IDs:\n"
 msgstr "Ha firmado los siguientes IDs de usuario:\n"
 
-#: g10/keyedit.c:2373
+#: g10/keyedit.c:2387
 #, fuzzy, c-format
-msgid "   signed by %08lX at %s%s\n"
+msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   firmada por %08lX el %s\n"
 
-#: g10/keyedit.c:2380
+#: g10/keyedit.c:2395
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revocada por %08lX el %s\n"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2415
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va Vd. a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:2410
-#, c-format
-msgid "   signed by %08lX at %s\n"
+#: g10/keyedit.c:2425
+#, fuzzy, c-format
+msgid "   signed by %08lX at %s%s\n"
 msgstr "   firmada por %08lX el %s\n"
 
-#: g10/keyedit.c:2418
+#: g10/keyedit.c:2427
+msgid " (non-exportable)"
+msgstr ""
+
+#: g10/keyedit.c:2434
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "�Crear los certificados de revocaci�n realmente? (s/N)"
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2464
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
@@ -3242,12 +3259,12 @@ msgstr ""
 
 #: g10/misc.c:378
 #, c-format
-msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgid "warning: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
 #: g10/misc.c:410
 #, c-format
-msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgid "warning: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
 #: g10/misc.c:435
@@ -4153,7 +4170,7 @@ msgstr ""
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures fill be advanced by one second.\n"
+"self-signatures will be advanced by one second.\n"
 msgstr ""
 
 #: g10/helptext.c:238
@@ -4273,6 +4290,12 @@ msgstr "lista claves y firmas"
 msgid "%s: keyring created\n"
 msgstr "%s: anillo creado\n"
 
+#~ msgid "Do you really need such a large keysize? "
+#~ msgstr "�De verdad necesita una clave tan grande? "
+
+#~ msgid "   signed by %08lX at %s\n"
+#~ msgstr "   firmada por %08lX el %s\n"
+
 #~ msgid "--delete-secret-key user-id"
 #~ msgstr "--delete-secret-key id-usuario"
 
diff --git a/po/et.po b/po/et.po
index 1a8cdd60a..430d6c360 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1,12 +1,12 @@
 # Estonian translations for gnupg.
-# Copyright (C) 2001 Free Software Foundation, Inc.
-# Toomas Soome <[email protected]>, 2000.
+# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Toomas Soome <[email protected]>, 2002.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.0.4\n"
-"POT-Creation-Date: 2002-03-03 15:18+0100\n"
-"PO-Revision-Date: 2001-01-04 12:01+02:00\n"
+"Project-Id-Version: gnupg 1.0.6d\n"
+"POT-Creation-Date: 2002-04-06 17:29+0200\n"
+"PO-Revision-Date: 2002-03-08 11:47+0200\n"
 "Last-Translator: Toomas Soome <[email protected]>\n"
 "Language-Team: Estonian <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr "Hoiatus: kasutan ebaturvalist m�lu!\n"
 
 #: util/secmem.c:89
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
-msgstr ""
+msgstr "Lisainfot leiate lehelt http://www.gnupg.org/faq.html\n"
 
 #: util/secmem.c:326
 msgid "operation is not possible without initialized secure memory\n"
@@ -45,7 +45,7 @@ msgstr "ei"
 msgid "nN"
 msgstr "eE"
 
-#: g10/keyedit.c:768 util/miscutil.c:326
+#: g10/keyedit.c:777 util/miscutil.c:326
 msgid "quit"
 msgstr "v�lju"
 
@@ -99,7 +99,7 @@ msgstr "ei leia avalikku v�tit"
 
 #: util/errors.c:65
 msgid "unknown cipher algorithm"
-msgstr "tundmatu �iffri algoritm"
+msgstr "tundmatu �ifri algoritm"
 
 #: util/errors.c:66
 msgid "can't open the keyring"
@@ -143,7 +143,7 @@ msgstr "viga faili kirjutamisel"
 
 #: util/errors.c:76
 msgid "unknown compress algorithm"
-msgstr "tundmatu pakkimise algoritm"
+msgstr "tundmatu pakkimisalgoritm"
 
 #: util/errors.c:77
 msgid "file open error"
@@ -163,7 +163,7 @@ msgstr "realiseerimata avaliku v�tme algoritm"
 
 #: util/errors.c:81
 msgid "unimplemented cipher algorithm"
-msgstr "realiseerimata �iffri algoritm"
+msgstr "realiseerimata �ifri algoritm"
 
 #: util/errors.c:82
 msgid "unknown signature class"
@@ -251,19 +251,16 @@ msgstr "ei t��deldud"
 
 #. the key cannot be used for a specific usage
 #: util/errors.c:105
-#, fuzzy
 msgid "unusable public key"
-msgstr "halb avalik v�ti"
+msgstr "mittekasutatav avalik v�ti"
 
 #: util/errors.c:106
-#, fuzzy
 msgid "unusable secret key"
-msgstr "halb salajane v�ti"
+msgstr "mittekasutatav salajane v�ti"
 
 #: util/errors.c:107
-#, fuzzy
 msgid "keyserver error"
-msgstr "�ldine viga"
+msgstr "v�tmeserveri viga"
 
 #: util/logger.c:249
 #, c-format
@@ -275,10 +272,10 @@ msgstr "... see on viga (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "te leidsite vea ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1552
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1547
 #, c-format
 msgid "can't open `%s': %s\n"
-msgstr "`%s' ei saa avada: %s\n"
+msgstr "`%s' ei �nnestu avada: %s\n"
 
 #: cipher/random.c:324
 #, c-format
@@ -301,7 +298,7 @@ msgstr "hoiatus: vigane random_seed faili suurus - ei kasuta\n"
 #: cipher/random.c:348
 #, c-format
 msgid "can't read `%s': %s\n"
-msgstr "`%s' ei saa lugeda: %s\n"
+msgstr "`%s' ei �nnestu lugeda: %s\n"
 
 #: cipher/random.c:386
 msgid "note: random_seed file not updated\n"
@@ -310,17 +307,17 @@ msgstr "m�rkus: random_seed faili ei uuendatud\n"
 #: cipher/random.c:406
 #, c-format
 msgid "can't create `%s': %s\n"
-msgstr "`%s' ei saa luua: %s\n"
+msgstr "`%s' ei �nnestu luua: %s\n"
 
 #: cipher/random.c:413
 #, c-format
 msgid "can't write `%s': %s\n"
-msgstr "`%s' ei saa kirjutada: %s\n"
+msgstr "`%s' ei �nnestu kirjutada: %s\n"
 
 #: cipher/random.c:416
 #, c-format
 msgid "can't close `%s': %s\n"
-msgstr "`%s' ei saa sulgeda: %s\n"
+msgstr "`%s' ei �nnestu sulgeda: %s\n"
 
 #: cipher/random.c:662
 msgid "WARNING: using insecure random number generator!!\n"
@@ -335,9 +332,9 @@ msgid ""
 "\n"
 msgstr ""
 "Juhuarvude generaator on ainult t�hi kest, et programmid\n"
-"k�iks - see EI OLE tugev juhuargude generaator!\n"
+"k�iks - see EI OLE tugev juhuarvude generaator!\n"
 "\n"
-"�RGE KASUTAGE SELLE PROGRAMMI PIILT GENEREERITUD ANDMEID!!\n"
+"�RGE KASUTAGE SELLE PROGRAMMI POOLT GENEREERITUD ANDMEID!!\n"
 "\n"
 
 #: cipher/rndlinux.c:142
@@ -351,7 +348,7 @@ msgstr ""
 "Juhuslikke baite ei ole piisavalt. Palun tehke arvutiga muid t�id,\n"
 "et anda masinal v�imalust koguda enam entroopiat! (Vajatakse %d baiti)\n"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid ""
 "@Commands:\n"
 " "
@@ -359,170 +356,163 @@ msgstr ""
 "@K�sud:\n"
 " "
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "|[file]|make a signature"
 msgstr "|[fail]|loo allkiri"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "|[file]|make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "make a detached signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "encrypt data"
-msgstr "kr�pti andmed"
+msgstr "kr�pteeri andmed"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "|[files]|encrypt files"
-msgstr ""
+msgstr "|[failid]|kr�pteeri failid"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "encryption only with symmetric cipher"
-msgstr "kr�ptimine kasutades s�mmeetrilist �iffrit"
+msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "store only"
-msgstr "salvesta ainult"
+msgstr "ainult salvesta"
 
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "decrypt data (default)"
-msgstr "dekr�pti andmed (vaikimisi)"
+msgstr "dekr�pteeri andmed (vaikimisi)"
 
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "|[files]|decrypt files"
-msgstr ""
+msgstr "|[failid]|dekr�pteeri failid"
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "verify a signature"
 msgstr "kontrolli allkirja"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "list keys"
 msgstr "n�ita v�tmeid"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "list keys and signatures"
 msgstr "n�ita v�tmeid ja allkirju"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "check key signatures"
 msgstr "kontrolli v�tmete allkirju"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "list keys and fingerprints"
 msgstr "n�ita v�tmeid ja s�rmej�lgi"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "list secret keys"
 msgstr "n�ita salajasi v�tmeid"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "generate a new key pair"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/g10.c:297
-#, fuzzy
+#: g10/g10.c:298
 msgid "remove keys from the public keyring"
-msgstr "eemalda v�ti avalike v�tmete hoidlast"
+msgstr "eemalda v�tmed avalike v�tmete hoidlast"
 
-#: g10/g10.c:299
-#, fuzzy
+#: g10/g10.c:300
 msgid "remove keys from the secret keyring"
-msgstr "eemalda v�ti salajaste v�tmete hoidlast"
+msgstr "eemalda v�tmed salajaste v�tmete hoidlast"
 
-#: g10/g10.c:300
+#: g10/g10.c:301
 msgid "sign a key"
 msgstr "allkirjasta v�ti"
 
-#: g10/g10.c:301
+#: g10/g10.c:302
 msgid "sign a key locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/g10.c:302
-#, fuzzy
+#: g10/g10.c:303
 msgid "sign a key non-revocably"
-msgstr "allkirjasta v�ti lokaalselt"
+msgstr "allkirjasta v�ti mitte-t�histatavana"
 
-#: g10/g10.c:303
-#, fuzzy
+#: g10/g10.c:304
 msgid "sign a key locally and non-revocably"
-msgstr "allkirjasta v�ti lokaalselt"
+msgstr "allkirjasta v�ti lokaalselt ja mitte-t�histatavana"
 
-#: g10/g10.c:304
+#: g10/g10.c:305
 msgid "sign or edit a key"
 msgstr "allkirjasta v�i toimeta v�tit"
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "generate a revocation certificate"
 msgstr "genereeri t�histamise sertifikaat"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "export keys"
 msgstr "ekspordi v�tmed"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "export keys to a key server"
 msgstr "ekspordi v�tmed v�tmeserverisse"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "import keys from a key server"
 msgstr "impordi v�tmed v�tmeserverist"
 
-#: g10/g10.c:310
-#, fuzzy
+#: g10/g10.c:311
 msgid "search for keys on a key server"
-msgstr "ekspordi v�tmed v�tmeserverisse"
+msgstr "otsi v�tmeid v�tmeserverist"
 
-#: g10/g10.c:312
-#, fuzzy
+#: g10/g10.c:313
 msgid "update all keys from a keyserver"
-msgstr "impordi v�tmed v�tmeserverist"
+msgstr "uuenda v�tmeid v�tmeserverist"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "import/merge keys"
 msgstr "impordi/mesti v�tmed"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "list only the sequence of packets"
 msgstr "n�ita ainult pakettide j�rjendeid"
 
-#: g10/g10.c:320
+#: g10/g10.c:321
 msgid "export the ownertrust values"
 msgstr "ekspordi usalduse v��rtused"
 
-#: g10/g10.c:322
+#: g10/g10.c:323
 msgid "import ownertrust values"
 msgstr "impordi usalduse v��rtused"
 
-#: g10/g10.c:324
+#: g10/g10.c:325
 msgid "update the trust database"
 msgstr "uuenda usalduse andmebaasi"
 
-#: g10/g10.c:326
-#, fuzzy
+#: g10/g10.c:327
 msgid "unattended trust database update"
-msgstr "uuenda usalduse andmebaasi"
+msgstr "hooldusvaba usalduse andmebaasi uuendamine"
 
-#: g10/g10.c:327
+#: g10/g10.c:328
 msgid "fix a corrupted trust database"
 msgstr "paranda vigane usalduse andmebaas"
 
-#: g10/g10.c:328
+#: g10/g10.c:329
 msgid "De-Armor a file or stdin"
 msgstr "Pakenda fail v�i standardsisend lahti"
 
-#: g10/g10.c:330
+#: g10/g10.c:331
 msgid "En-Armor a file or stdin"
 msgstr "Pakenda fail v�i standardsisend"
 
-#: g10/g10.c:332
+#: g10/g10.c:333
 msgid "|algo [files]|print message digests"
 msgstr "|algo [failid]|tr�ki teatel�hendid"
 
-#: g10/g10.c:336
+#: g10/g10.c:337
 msgid ""
 "@\n"
 "Options:\n"
@@ -532,203 +522,196 @@ msgstr ""
 "V�tmed:\n"
 " "
 
-#: g10/g10.c:338
+#: g10/g10.c:339
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis v�ljund"
 
-#: g10/g10.c:340
+#: g10/g10.c:341
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|kr�pti NIMEle"
 
-#: g10/g10.c:343
+#: g10/g10.c:344
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: g10/g10.c:345
+#: g10/g10.c:346
 msgid "use the default key as default recipient"
 msgstr "kasuta vaikimisi saajana vaikimisi v�tit"
 
-#: g10/g10.c:350
+#: g10/g10.c:352
 msgid "use this user-id to sign or decrypt"
 msgstr "kasuta seda kasutaja IDd"
 
-#: g10/g10.c:351
+#: g10/g10.c:353
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
 
-#: g10/g10.c:353
+#: g10/g10.c:355
 msgid "use canonical text mode"
 msgstr "kasuta kanoonilist tekstimoodi"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "use as output file"
 msgstr "kasuta v�ljundfailina"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "verbose"
 msgstr "ole jutukas"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "be somewhat more quiet"
 msgstr "ole m�nev�rra vaiksem"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "don't use the terminal at all"
 msgstr "�ra kasuta terminali"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "force v3 signatures"
 msgstr "kasuta v3 allkirju"
 
-#: g10/g10.c:365
-#, fuzzy
+#: g10/g10.c:367
 msgid "do not force v3 signatures"
-msgstr "kasuta v3 allkirju"
+msgstr "�ra kasuta v3 allkirju"
 
-#: g10/g10.c:366
-#, fuzzy
+#: g10/g10.c:368
 msgid "force v4 key signatures"
-msgstr "kasuta v3 allkirju"
+msgstr "kasuta v4 v�tme allkirju"
 
-#: g10/g10.c:367
-#, fuzzy
+#: g10/g10.c:369
 msgid "do not force v4 key signatures"
-msgstr "kasuta v3 allkirju"
+msgstr "�ra kasuta v3 v�tme allkirju"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 msgid "always use a MDC for encryption"
 msgstr "kr�ptimisel kasuta alati MDC"
 
-#: g10/g10.c:370
-#, fuzzy
+#: g10/g10.c:372
 msgid "never use a MDC for encryption"
-msgstr "kr�ptimisel kasuta alati MDC"
+msgstr "kr�ptimisel �ra kasuta kunagi MDC"
 
-#: g10/g10.c:372
+#: g10/g10.c:374
 msgid "do not make any changes"
-msgstr "�ra tee mingeid muutuseid"
+msgstr "�ra tee mingeid muutusi"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:374
+#: g10/g10.c:376
 msgid "use the gpg-agent"
-msgstr ""
+msgstr "kasuta gpg-agenti"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "batch mode: never ask"
 msgstr "pakettmood: �ra k�si kunagi"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "assume yes on most questions"
 msgstr "eelda enamus k�simustele jah vastust"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "assume no on most questions"
 msgstr "eelda enamus k�simustele ei vastust"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "add this keyring to the list of keyrings"
 msgstr "lisa see v�tmehoidla v�tmehoidlate nimekirja"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "add this secret keyring to the list"
 msgstr "lisa see salajaste v�tmete hoidla nimekirja"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "show which keyring a listed key is on"
-msgstr ""
+msgstr "n�ita millisesse v�tmehoidlasse n�idatud v�ti kuulub"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NIMI|kasuta NIME vaikimisi salajase v�tmena"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|kasuta seda v�tmeserverit"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NIMI|terminali kooditabel on NIMI"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "read options from file"
 msgstr "loe v�tmed failist"
 
-#: g10/g10.c:391
+#: g10/g10.c:393
 msgid "|FD|write status info to this FD"
 msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
 
-#: g10/g10.c:393
-#, fuzzy
+#: g10/g10.c:395
 msgid "|[file]|write status info to file"
-msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
+msgstr "|[fail]|kirjuta olekuinfo faili"
 
-#: g10/g10.c:399
-#, fuzzy
+#: g10/g10.c:401
 msgid "|KEYID|ultimately trust this key"
 msgstr "|V�TMEID|usalda seda v�tit t�ielikult"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "|FILE|load extension module FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "emulate the mode described in RFC1991"
 msgstr "emuleeri dokumendis RFC1991 kirjeldatud moodi"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "kasuta k�ikides tegevustes OpenPGP v�tmeid"
 
-#: g10/g10.c:403
-#, fuzzy
+#: g10/g10.c:405
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
-msgstr "kasuta k�ikides tegevustes OpenPGP v�tmeid"
+msgstr "kasuta k�ikide pakettide, �iffrite ja l�hendi seadeid PGP 2.x moodis"
 
-#: g10/g10.c:407
+#: g10/g10.c:409
 msgid "|N|use passphrase mode N"
 msgstr "|N|kasuta parooli moodi N"
 
-#: g10/g10.c:409
+#: g10/g10.c:411
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NIMI|kasuta paroolidega l�hendialgoritmi NIMI"
 
-#: g10/g10.c:411
+#: g10/g10.c:413
 msgid "|NAME|use cipher algorithm NAME for passphrases"
-msgstr "|NIMI|kasuta paroolidega �iffri algoritmi NIMI"
+msgstr "|NIMI|kasuta paroolidega �ifri algoritmi NIMI"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use cipher algorithm NAME"
-msgstr "|NIMI|kasuta �iffri algoritmi NIMI"
+msgstr "|NIMI|kasuta �ifri algoritmi NIMI"
 
-#: g10/g10.c:413
+#: g10/g10.c:415
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|kasuta teatel�hendi algoritmi NIMI"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|N|use compress algorithm N"
 msgstr "|N|kasuta pakkimisalgoritmi N"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "throw keyid field of encrypted packets"
 msgstr "�ra lisa kr�ptimisel v�tme id"
 
-#: g10/g10.c:416
+#: g10/g10.c:418
 msgid "Show Photo IDs"
-msgstr ""
+msgstr "Esita foto IDd"
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "Don't show Photo IDs"
-msgstr ""
+msgstr "Ei esita foto IDd"
 
-#: g10/g10.c:418
+#: g10/g10.c:420
 msgid "Set command line to view Photo IDs"
-msgstr ""
+msgstr "Sea k�surida foto ID vaatamiseks"
 
-#: g10/g10.c:419
+#: g10/g10.c:421
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NIMI=V��RTUS|kasuta neid noteerimise andmeid"
 
-#: g10/g10.c:422
+#: g10/g10.c:424
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -736,7 +719,7 @@ msgstr ""
 "@\n"
 "(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid ""
 "@\n"
 "Examples:\n"
@@ -756,15 +739,15 @@ msgstr ""
 " --list-keys [nimed]        n�ita v�tmeid\n"
 " --fingerprint [nimed]      n�ita s�rmej�lgi\n"
 
-#: g10/g10.c:559
+#: g10/g10.c:561
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:565
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: g10/g10.c:566
+#: g10/g10.c:568
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -774,7 +757,7 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: g10/g10.c:577
+#: g10/g10.c:579
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -782,240 +765,239 @@ msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
-#: g10/g10.c:651
+#: g10/g10.c:653
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: g10/g10.c:708
+#: g10/g10.c:710
 msgid "conflicting commands\n"
-msgstr "konfliktsed k�sud\n"
+msgstr "vastuolulised k�sud\n"
 
-#: g10/g10.c:881
+#: g10/g10.c:883
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:887
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: g10/g10.c:892
+#: g10/g10.c:894
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/g10.c:1174
+#: g10/g10.c:1176
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/g10.c:1190
+#: g10/g10.c:1192
 msgid "could not parse keyserver URI\n"
+msgstr "ei saa parsida v�tmeserveri URI\n"
+
+#: g10/g10.c:1208
+#, c-format
+msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:1294
+#: g10/g10.c:1309
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
-#: g10/g10.c:1298
+#: g10/g10.c:1313
 #, c-format
 msgid "WARNING: %s overrides %s\n"
-msgstr ""
+msgstr "HOIATUS: %s m��rab �le %s\n"
 
-#: g10/g10.c:1305 g10/g10.c:1316
+#: g10/g10.c:1320 g10/g10.c:1331
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
 
-#: g10/g10.c:1307 g10/g10.c:1327
+#: g10/g10.c:1322 g10/g10.c:1342
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/g10.c:1310
+#: g10/g10.c:1325
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos m�tet!\n"
 
-#: g10/g10.c:1336
+#: g10/g10.c:1351
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
+"--pgp2 moodis saate luua ainult eraldiseisvaid v�i avateksti allkirju\n"
 
-#: g10/g10.c:1342
+#: g10/g10.c:1357
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
-msgstr ""
+msgstr "--pgp2 moodis ei saa korraga allkirjastada ja kr�pteerida\n"
 
-#: g10/g10.c:1348
+#: g10/g10.c:1363
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
-msgstr ""
+msgstr "--pgp2 moodis peate kasutama faile (ja mitte toru).\n"
 
-#: g10/g10.c:1361
+#: g10/g10.c:1376
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
-msgstr ""
+msgstr "teate kr�pteerimine --pgp2 moodis n�uab IDEA �iffrit\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1375 g10/sign.c:614
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1390 g10/sign.c:614
 #: g10/sign.c:792
 msgid "this message may not be usable by PGP 2.x\n"
-msgstr ""
+msgstr "see teade ei pruugi olla PGP 2.x programmidega kasutatav\n"
 
-#: g10/g10.c:1414 g10/g10.c:1426
+#: g10/g10.c:1429 g10/g10.c:1441
 msgid "selected cipher algorithm is invalid\n"
-msgstr "valitud �iffri algoritm ei ole lubatud\n"
+msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/g10.c:1420 g10/g10.c:1432
+#: g10/g10.c:1435 g10/g10.c:1447
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/g10.c:1436
-#, fuzzy
+#: g10/g10.c:1451
 msgid "the given signature policy URL is invalid\n"
-msgstr "anti vigane poliisi URL\n"
+msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/g10.c:1440
-#, fuzzy
+#: g10/g10.c:1455
 msgid "the given certification policy URL is invalid\n"
-msgstr "anti vigane poliisi URL\n"
+msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/g10.c:1443
+#: g10/g10.c:1458
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "pakkimise algoritm peab olema vahemikust %d..%d\n"
 
-#: g10/g10.c:1445
+#: g10/g10.c:1460
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/g10.c:1447
+#: g10/g10.c:1462
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/g10.c:1449
+#: g10/g10.c:1464
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n"
 
-#: g10/g10.c:1452
+#: g10/g10.c:1467
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/g10.c:1456
+#: g10/g10.c:1471
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "vigane S2K mood; peab olema 0, 1 v�i 3\n"
 
-#: g10/g10.c:1460
-#, fuzzy
+#: g10/g10.c:1475
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
-msgstr "vigane S2K mood; peab olema 0, 1 v�i 3\n"
+msgstr "vigane vaikimisi kontrolli mood; peab olema 0, 1, 2 v�i 3\n"
 
-#: g10/g10.c:1463
-#, fuzzy
+#: g10/g10.c:1478
 msgid "invalid preferences\n"
-msgstr "n�ita eelistusi"
+msgstr "vigased eelistused\n"
 
-#: g10/g10.c:1557
+#: g10/g10.c:1572
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/g10.c:1577
+#: g10/g10.c:1592
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/g10.c:1584
+#: g10/g10.c:1599
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/g10.c:1592
+#: g10/g10.c:1607
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1624
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/g10.c:1622
+#: g10/g10.c:1637
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/g10.c:1636
-#, fuzzy
+#: g10/g10.c:1651
 msgid "--sign --symmetric [filename]"
-msgstr "--symmetric [failinimi]"
+msgstr "--sign --symmetric [failinimi]"
 
-#: g10/g10.c:1645
+#: g10/g10.c:1660
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/g10.c:1663
+#: g10/g10.c:1678
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/g10.c:1674
+#: g10/g10.c:1689
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/g10.c:1682
+#: g10/g10.c:1697
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/g10.c:1690
-#, fuzzy
+#: g10/g10.c:1705
 msgid "--nrsign-key user-id"
-msgstr "--sign-key kasutaja-id"
+msgstr "--nrsign-key kasutaja-id"
 
-#: g10/g10.c:1698
-#, fuzzy
+#: g10/g10.c:1713
 msgid "--nrlsign-key user-id"
-msgstr "--sign-key kasutaja-id"
+msgstr "--nrlsign-key kasutaja-id"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1721
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/encode.c:307 g10/g10.c:1762 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1777 g10/sign.c:703
 #, c-format
 msgid "can't open %s: %s\n"
-msgstr "%s ei saa avada: %s\n"
+msgstr "%s ei �nnestu avada: %s\n"
 
-#: g10/g10.c:1777
+#: g10/g10.c:1792
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kasutaja-id] [v�tmehoidla]"
 
-#: g10/g10.c:1860
+#: g10/g10.c:1875
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1883
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/g10.c:1955
+#: g10/g10.c:1970
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane teatel�hendi algoritm `%s'\n"
 
-#: g10/g10.c:2041
+#: g10/g10.c:2056
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2060
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage n��d oma teade ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2048 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2063 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
-msgstr "`%s' ei saa avada\n"
+msgstr "`%s' ei �nnestu avada\n"
 
-#: g10/g10.c:2257
+#: g10/g10.c:2272
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "esimene s�mbol noteerimise nimes peab olema t�ht v�i alakriips\n"
 
-#: g10/g10.c:2263
+#: g10/g10.c:2278
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -1023,12 +1005,12 @@ msgstr ""
 "noteerimise nimes v�ivad olla ainult t�hed, numbrid, punktid ja alakriipsud\n"
 "ning l�pus peab olema '='\n"
 
-#: g10/g10.c:2269
+#: g10/g10.c:2284
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "punktid noteerimise nimes peavad olema �mbritsetud teiste s�mbolitega\n"
 
-#: g10/g10.c:2277
+#: g10/g10.c:2292
 msgid "a notation value must not use any control characters\n"
 msgstr "noteerimise v��rtus ei v�i sisaldada kontroll s�mboleid\n"
 
@@ -1064,7 +1046,7 @@ msgstr "ootamatu pakend:"
 #: g10/armor.c:667 g10/armor.c:1234
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
-msgstr "j�tsin vigase radix64 s�mboli %02x vahele\n"
+msgstr "vigane radix64 s�mbol %02x vahele j�etud\n"
 
 #: g10/armor.c:710
 msgid "premature eof (no CRC)\n"
@@ -1093,7 +1075,7 @@ msgstr "viga l�petaval real\n"
 
 #: g10/armor.c:1049
 msgid "no valid OpenPGP data found.\n"
-msgstr "OpenPGP andmeid pole.\n"
+msgstr "ei leia OpenPGP andmeid.\n"
 
 #: g10/armor.c:1054
 #, c-format
@@ -1137,19 +1119,18 @@ msgstr "T�histamise kommentaar: "
 #. a string with valid answers
 #: g10/pkclist.c:244
 msgid "iImMqQsS"
-msgstr ""
+msgstr "iItTvVjJ"
 
 #: g10/pkclist.c:250
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "No trust value assigned to:\n"
 "%4u%c/%08lX %s \""
 msgstr ""
-"%lu usalduse v��rtus puudub:\n"
+"Usalduse v��rtus puudub:\n"
 "%4u%c/%08lX %s \""
 
 #: g10/pkclist.c:262
-#, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -1157,50 +1138,46 @@ msgid ""
 "\n"
 msgstr ""
 "Palun otsustage, kuiv�rd te usaldate seda kasutajat\n"
-"teiste kasutajate v�tmete kontrollimisel.\n"
+"teiste kasutajate v�tmete kontrollimisel (kontrollige\n"
+"passe, kontrollige erinevatest allikatest n�puj�lgi...)?\n"
 "\n"
-" 1 = Ma ei tea\n"
-" 2 = Ma EI usalda\n"
-" 3 = Ma usaldan m�neti\n"
-" 4 = Ma usaldan t�iesti\n"
-" i = palun n�ita mulle veel informatsiooni\n"
 
 #: g10/pkclist.c:265
 #, c-format
 msgid " %d = Don't know\n"
-msgstr ""
+msgstr " %d = Ei tea\n"
 
 #: g10/pkclist.c:266
-#, fuzzy, c-format
+#, c-format
 msgid " %d = I do NOT trust\n"
-msgstr "%08lX: Me EI usalda seda v�tit\n"
+msgstr " %d = EI usalda\n"
 
 #: g10/pkclist.c:267
 #, c-format
 msgid " %d = I trust marginally\n"
-msgstr ""
+msgstr " %d = Usaldan v�hesel m��ral\n"
 
 #: g10/pkclist.c:268
-#, fuzzy, c-format
+#, c-format
 msgid " %d = I trust fully\n"
-msgstr "%s: ei ole trustdb fail\n"
+msgstr " %d = Usaldan t�iesti\n"
 
 #: g10/pkclist.c:270
 #, c-format
 msgid " %d = I trust ultimately\n"
-msgstr ""
+msgstr " %d = Usaldan absoluutselt\n"
 
 #: g10/pkclist.c:271
 msgid " i = please show me more information\n"
-msgstr ""
+msgstr " i = esita palun t�iendavat infot\n"
 
 #: g10/pkclist.c:273
 msgid " m = back to the main menu\n"
-msgstr " m = tagasi p�himen��sse\n"
+msgstr " t = tagasi p�himen��sse\n"
 
 #: g10/pkclist.c:276
 msgid " s = skip this key\n"
-msgstr ""
+msgstr " j = j�ta see v�ti vahele\n"
 
 #: g10/pkclist.c:277
 msgid " q = quit\n"
@@ -1211,9 +1188,8 @@ msgid "Your decision? "
 msgstr "Teie otsus? "
 
 #: g10/pkclist.c:305
-#, fuzzy
 msgid "Do you really want to set this key to ultimate trust? "
-msgstr "Kas te t�esti soovite seda v�tit kustutada? "
+msgstr "Kas te t�esti soovite seda v�tit absoluutselt usaldada? "
 
 #: g10/pkclist.c:317
 msgid "Certificates leading to an ultimately trusted key:\n"
@@ -1239,10 +1215,10 @@ msgid "%08lX: key has expired\n"
 msgstr "%08lX: v�ti on aegunud\n"
 
 #: g10/pkclist.c:434
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%08lX: There is no indication that this key really belongs to the owner\n"
-msgstr "         Ei ole midagi, mis n�itaks, et allkiri kuulub omanikule.\n"
+msgstr "%08lX: Ei ole midagi, mis n�itaks, et see v�ti kuulub omanikule\n"
 
 #: g10/pkclist.c:440
 #, c-format
@@ -1260,7 +1236,7 @@ msgstr ""
 
 #: g10/pkclist.c:452
 msgid "This key probably belongs to the owner\n"
-msgstr "See v�ti kuulub ilmselt omanikule\n"
+msgstr "See v�ti kuulub t�en�oliselt omanikule\n"
 
 #: g10/pkclist.c:457
 msgid "This key belongs to us\n"
@@ -1295,9 +1271,8 @@ msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "HOIATUS: See alamv�ti on omaniku poolt t�histatud!\n"
 
 #: g10/pkclist.c:566
-#, fuzzy
 msgid "Note: This key has been disabled.\n"
-msgstr "See v�ti on blokeeritud"
+msgstr "M�rkus: See v�ti on blokeeritud.\n"
 
 #: g10/pkclist.c:571
 msgid "Note: This key has expired!\n"
@@ -1305,7 +1280,7 @@ msgstr "M�rkus: See v�ti on aegunud!\n"
 
 #: g10/pkclist.c:582
 msgid "WARNING: This key is not certified with a trusted signature!\n"
-msgstr "HOIATUS: seda v�tit ei ole sertifitseeritud usaldatava allkirjaga\n"
+msgstr "HOIATUS: Seda v�tit ei ole sertifitseeritud usaldatava allkirjaga!\n"
 
 #: g10/pkclist.c:584
 msgid ""
@@ -1324,7 +1299,8 @@ msgstr "         Allkiri on t�en�oliselt V�LTSING.\n"
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
-"HOIATUS: Seda v�tit ei ole sertifitseerinud piisavalt usaldatav allkiri!\n"
+"HOIATUS: Seda v�tit ei ole sertifitseeritud piisavalt usaldatava "
+"allkirjaga!\n"
 
 #: g10/pkclist.c:603
 msgid "         It is not certain that the signature belongs to the owner.\n"
@@ -1341,21 +1317,20 @@ msgid "%s: skipped: public key already present\n"
 msgstr "%s: j�tsin vahele: avalik v�ti on juba olemas\n"
 
 #: g10/pkclist.c:744
-#, fuzzy
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
-msgstr ""
-"Te ei m��ranud kasutaja IDd. (te v�ite kasutada v�tit \"-r\")\n"
-"\n"
+msgstr "Te ei m��ranud kasutaja IDd. (v�ite kasutada v�tit \"-r\")\n"
 
 #: g10/pkclist.c:754
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
+"\n"
+"Sisestage kasutaja ID.  L�petage t�hja reaga: "
 
 #: g10/pkclist.c:768
 msgid "No such user ID.\n"
-msgstr "Sellist kasutaja ID pole.\n"
+msgstr "Tundmatu kasutaja ID.\n"
 
 #: g10/pkclist.c:773
 msgid "skipped: public key already set as default recipient\n"
@@ -1366,9 +1341,8 @@ msgid "Public key is disabled.\n"
 msgstr "Avalik v�ti on blokeeritud.\n"
 
 #: g10/pkclist.c:798
-#, fuzzy
 msgid "skipped: public key already set\n"
-msgstr "%s: j�tsin vahele: avalik v�ti on juba olemas\n"
+msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
 #: g10/pkclist.c:841
 #, c-format
@@ -1387,22 +1361,21 @@ msgstr "kehtivaid aadresse pole\n"
 #: g10/keygen.c:179
 #, c-format
 msgid "preference %c%lu is not valid\n"
-msgstr ""
+msgstr "eelistus %c%lu ei ole lubatud\n"
 
 #: g10/keygen.c:186
-#, fuzzy, c-format
+#, c-format
 msgid "preference %c%lu duplicated\n"
-msgstr "j�i vahele %s: dubleeritud\n"
+msgstr "eelistus %c%lu on duplikaat\n"
 
 #: g10/keygen.c:191
-#, fuzzy, c-format
+#, c-format
 msgid "too many `%c' preferences\n"
-msgstr "n�ita eelistusi"
+msgstr "liiga palju `%c' eelistusi\n"
 
 #: g10/keygen.c:256
-#, fuzzy
 msgid "invalid character in string\n"
-msgstr "Lubamatu s�mbol nimes\n"
+msgstr "lubamatu s�mbol s�nes\n"
 
 #: g10/keygen.c:386
 msgid "writing self signature\n"
@@ -1447,24 +1420,24 @@ msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (allkirjastamiseks ja kr�ptimiseks)\n"
 
 #: g10/keygen.c:771
-#, fuzzy, c-format
+#, c-format
 msgid "   (%d) RSA (sign only)\n"
-msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
+msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
 
 #: g10/keygen.c:773
-#, fuzzy, c-format
+#, c-format
 msgid "   (%d) RSA (encrypt only)\n"
-msgstr "   (%d) ElGamal (ainult kr�ptimiseks)\n"
+msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keyedit.c:466 g10/keygen.c:776
+#: g10/keyedit.c:475 g10/keygen.c:776
 msgid "Your selection? "
 msgstr "Teie valik? "
 
 #: g10/keygen.c:796
 msgid "The use of this algorithm is deprecated - create anyway? "
-msgstr ""
+msgstr "Selle algoritmi kasutamine ei ole soovitatav - loon ikkagi? "
 
-#: g10/keyedit.c:479 g10/keygen.c:810
+#: g10/keyedit.c:488 g10/keygen.c:810
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
@@ -1487,7 +1460,7 @@ msgstr "Millist v�tmepikkust te soovite? (1024) "
 
 #: g10/keygen.c:837
 msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "DSA lubab v�tmepikkuseid ainult alates 512 kuni 1024\n"
+msgstr "DSA lubab v�tmepikkuseid ainult vahemikus 512 kuni 1024\n"
 
 #: g10/keygen.c:839
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
@@ -1495,7 +1468,7 @@ msgstr "v�tmepikkus on liiga v�ike; RSA korral on v�ikseim v��rtus 1024.\n"
 
 #: g10/keygen.c:842
 msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr "v�tmepikkus on liiga v�ike; 768 on v�ikseim lubatud v��rtus.\n"
+msgstr "v�tmepikkus on liiga v�ike; v�ikseim lubatud v��rtus on 768.\n"
 
 #. It is ridiculous and an annoyance to use larger key sizes!
 #. * GnuPG can handle much larger sizes; but it takes an eternity
@@ -1508,7 +1481,7 @@ msgstr "v�tmepikkus on liiga v�ike; 768 on v�ikseim lubatud v��rtus.\n"
 #: g10/keygen.c:853
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "v�rmepikkus on liiga suur; suurim lubatud v��rtus on %d.\n"
+msgstr "v�tmepikkus on liiga suur; suurim lubatud v��rtus on %d.\n"
 
 #: g10/keygen.c:858
 msgid ""
@@ -1530,21 +1503,17 @@ msgstr ""
 "Olgu, kuid pidage meeles, et ka teie monitor ja klaviatuur on samuti\n"
 "v�imalikud r�ndeobjektid!\n"
 
-#: g10/keygen.c:870
-msgid "Do you really need such a large keysize? "
-msgstr "Kas te t�esti soovite nii pikka v�tit? "
-
-#: g10/keygen.c:876
+#: g10/keygen.c:871
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Soovitud v�tmepikkus on %u bitti\n"
 
-#: g10/keygen.c:879 g10/keygen.c:883
+#: g10/keygen.c:874 g10/keygen.c:878
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "�mardatud �les %u bitini\n"
 
-#: g10/keygen.c:934
+#: g10/keygen.c:929
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1560,8 +1529,7 @@ msgstr ""
 "      <n>m = v�ti aegub n kuuga\n"
 "      <n>y = v�ti aegub n aastaga\n"
 
-#: g10/keygen.c:943
-#, fuzzy
+#: g10/keygen.c:938
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1570,38 +1538,37 @@ msgid ""
 "      <n>m = signature expires in n months\n"
 "      <n>y = signature expires in n years\n"
 msgstr ""
-"Palun m��rake, kui kaua on v�ti kehtiv.\n"
-"         0 = v�ti ei aegu\n"
-"      <n>  = v�ti aegub n p�evaga\n"
-"      <n>w = v�ti aegub n n�dalaga\n"
-"      <n>m = v�ti aegub n kuuga\n"
-"      <n>y = v�ti aegub n aastaga\n"
+"Palun m��rake, kui kaua allkiri kehtib.\n"
+"         0 = allkiri ei aegu\n"
+"      <n>  = allkiri aegub n p�evaga\n"
+"      <n>w = allkiri aegub n n�dalaga\n"
+"      <n>m = allkiri aegub n kuuga\n"
+"      <n>y = allkiri aegub n aastaga\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:960
 msgid "Key is valid for? (0) "
 msgstr "V�ti on kehtiv kuni? (0) "
 
-#: g10/keygen.c:967
-#, fuzzy
+#: g10/keygen.c:962
 msgid "Signature is valid for? (0) "
-msgstr "V�ti on kehtiv kuni? (0) "
+msgstr "Allkiri on kehtiv kuni? (0) "
 
-#: g10/keygen.c:972
+#: g10/keygen.c:967
 msgid "invalid value\n"
 msgstr "vigane v��rtus\n"
 
-#: g10/keygen.c:977
-#, fuzzy, c-format
+#: g10/keygen.c:972
+#, c-format
 msgid "%s does not expire at all\n"
-msgstr "V�ti ei aegu kunagi\n"
+msgstr "%s ei aegu kunagi\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:984
-#, fuzzy, c-format
+#: g10/keygen.c:979
+#, c-format
 msgid "%s expires at %s\n"
-msgstr "V�ti aegub %s\n"
+msgstr "%s aegub %s\n"
 
-#: g10/keygen.c:990
+#: g10/keygen.c:985
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1609,11 +1576,11 @@ msgstr ""
 "Teie s�steem ei saa esitada kuup�evi peale aastat 2038.\n"
 "Siiski k�sitletakse neid korrektselt aastani 2106.\n"
 
-#: g10/keygen.c:995
+#: g10/keygen.c:990
 msgid "Is this correct (y/n)? "
 msgstr "On see �ige (j/e)? "
 
-#: g10/keygen.c:1038
+#: g10/keygen.c:1033
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1628,44 +1595,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1045
 msgid "Real name: "
 msgstr "P�risnimi: "
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1053
 msgid "Invalid character in name\n"
 msgstr "Lubamatu s�mbol nimes\n"
 
-#: g10/keygen.c:1060
+#: g10/keygen.c:1055
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei v�i alata numbriga\n"
 
-#: g10/keygen.c:1062
+#: g10/keygen.c:1057
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimes peab olema v�hemalt 5 s�mbolit\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1065
 msgid "Email address: "
 msgstr "E-posti aadress: "
 
-#: g10/keygen.c:1081
+#: g10/keygen.c:1076
 msgid "Not a valid email address\n"
-msgstr "See ei ole kehtiv e-posti aadress\n"
+msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1084
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:1095
+#: g10/keygen.c:1090
 msgid "Invalid character in comment\n"
 msgstr "Lubamatu s�mbol kommentaaris\n"
 
-#: g10/keygen.c:1118
+#: g10/keygen.c:1113
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Te kasutate kooditabelit `%s'.\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1119
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1676,27 +1643,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1128
+#: g10/keygen.c:1123
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�rge palun kirjutage e-posti aadressi p�risnimesse ega kommentaari\n"
 
-#: g10/keygen.c:1133
+#: g10/keygen.c:1128
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoVv"
 
-#: g10/keygen.c:1143
+#: g10/keygen.c:1138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (V)�lju? "
 
-#: g10/keygen.c:1144
+#: g10/keygen.c:1139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muuda (N)ime, (K)ommentaari, (E)posti v�i (O)k/(V)�lju? "
 
-#: g10/keygen.c:1163
+#: g10/keygen.c:1158
 msgid "Please correct the error first\n"
 msgstr "Palun parandage k�igepealt viga\n"
 
-#: g10/keygen.c:1202
+#: g10/keygen.c:1197
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1704,17 +1671,16 @@ msgstr ""
 "Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
 "\n"
 
-#: g10/keyedit.c:655 g10/keygen.c:1210
-#, fuzzy
+#: g10/keyedit.c:664 g10/keygen.c:1205
 msgid "passphrase not correctly repeated; try again"
-msgstr "parooli ei korratud �ieti; proovige uuesti.\n"
+msgstr "parooli ei korratud �ieti; proovige uuesti"
 
-#: g10/keygen.c:1211
+#: g10/keygen.c:1206
 #, c-format
 msgid "%s.\n"
-msgstr ""
+msgstr "%s.\n"
 
-#: g10/keygen.c:1217
+#: g10/keygen.c:1212
 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"
@@ -1726,7 +1692,7 @@ msgstr ""
 "kasutades seda programmi v�tmega \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1233
 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"
@@ -1738,54 +1704,53 @@ msgstr ""
 "kasutada kettaid jne), see annaks juhuarvude generaatorile v�imaluse\n"
 "koguda paremat entroopiat.\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1723
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA v�tmepaari pikkuseks saab 1024 bitti.\n"
 
-#: g10/keygen.c:1782
+#: g10/keygen.c:1777
 msgid "Key generation canceled.\n"
 msgstr "V�tme genereerimine katkestati.\n"
 
-#: g10/keygen.c:1870 g10/keygen.c:1950
+#: g10/keygen.c:1865 g10/keygen.c:1945
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjutan avaliku v�tme faili `%s'\n"
 
-#: g10/keygen.c:1871 g10/keygen.c:1952
+#: g10/keygen.c:1866 g10/keygen.c:1947
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:1939
-#, fuzzy, c-format
+#: g10/keygen.c:1934
+#, c-format
 msgid "no writable public keyring found: %s\n"
-msgstr "v�ti %08lX: avalikku v�tit ei leitud: %s\n"
+msgstr "kirjutatavat avalike v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:1945
-#, fuzzy, c-format
+#: g10/keygen.c:1940
+#, c-format
 msgid "no writable secret keyring found: %s\n"
-msgstr "v�ti %08lX: salajast v�tit ei leitud: %s\n"
+msgstr "kirjutatavat salajaste v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:1959
-#, fuzzy, c-format
+#: g10/keygen.c:1954
+#, c-format
 msgid "error writing public keyring `%s': %s\n"
-msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
+msgstr "viga avaliku v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:1966
-#, fuzzy, c-format
+#: g10/keygen.c:1961
+#, c-format
 msgid "error writing secret keyring `%s': %s\n"
-msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
+msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1981
 msgid "public and secret key created and signed.\n"
 msgstr "avalik ja salajane v�ti on loodud ja allkirjastatud.\n"
 
-#: g10/keygen.c:1987
-#, fuzzy
+#: g10/keygen.c:1982
 msgid "key marked as ultimately trusted.\n"
-msgstr "Sertifikaadid t�iesti usaldatava v�tmeni:\n"
+msgstr "v�ti on m�rgitud abslouutselt usaldatuks.\n"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1991
 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"
@@ -1794,45 +1759,45 @@ msgstr ""
 "Kr�ptimiseks tuleb genereerida teine v�ti, seda saate teha\n"
 "kasutades v�tit \"--edit-key\".\n"
 
-#: g10/keygen.c:2008 g10/keygen.c:2114
+#: g10/keygen.c:2003 g10/keygen.c:2109
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/keygen.c:2052 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2047 g10/sig-check.c:227 g10/sign.c:228
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekund tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/keygen.c:2054 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2049 g10/sig-check.c:229 g10/sign.c:230
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "v�ti loodi %lu sekundit tulevikus (ajah�pe v�i kella probleem)\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2058
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
-msgstr ""
+msgstr "M�RKUS: v3 v�tmetele alamv�tmete loomine ei ole OpenPGP �hilduv\n"
 
-#: g10/keygen.c:2090
+#: g10/keygen.c:2085
 msgid "Really create? "
 msgstr "Loon t�esti? "
 
 #: g10/decrypt.c:92 g10/encode.c:590
 msgid "--output doesn't work for this command\n"
-msgstr ""
+msgstr "v�ti --output ei t��ta selle k�suga\n"
 
 #: g10/encode.c:92 g10/encode.c:296
-#, fuzzy, c-format
+#, c-format
 msgid "`%s' already compressed\n"
-msgstr "%lu v�tit on t��deldud\n"
+msgstr "`%s' on juba pakitud\n"
 
 #: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
 #: g10/tdbio.c:552
 #, c-format
 msgid "%s: can't open: %s\n"
-msgstr "%s: ei saa avada: %s\n"
+msgstr "%s: ei �nnestu avada: %s\n"
 
 #: g10/encode.c:122 g10/sign.c:955
 #, c-format
@@ -1847,6 +1812,7 @@ msgstr "%s: HOIATUS: t�hi fail\n"
 #: g10/encode.c:285
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
+"RSA v�tmeid pikkusega kuni 2048 bitti saab kr�pteerida ainult --pgp2 moodis\n"
 
 #: g10/encode.c:313
 #, c-format
@@ -1856,39 +1822,39 @@ msgstr "loen failist `%s'\n"
 #: g10/encode.c:347
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
-msgstr ""
+msgstr "k�ikide kr�pteeritavate v�tmetega ei saa IDEA �iffrit kasutada.\n"
 
 #: g10/encode.c:563
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s kr�ptitud kasutajale: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:142
-#, fuzzy, c-format
+#: g10/delkey.c:69 g10/export.c:141
+#, c-format
 msgid "key `%s' not found: %s\n"
-msgstr "kasutajat '%s' ei leitud: %s\n"
+msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:162
-#, fuzzy, c-format
+#: g10/delkey.c:77 g10/export.c:161
+#, c-format
 msgid "error reading keyblock: %s\n"
-msgstr "viga `%s' lugemisel: %s\n"
+msgstr "viga v�tmebloki lugemisel: %s\n"
 
-#: g10/export.c:170
+#: g10/export.c:169
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "v�ti %08lX: ei ole rfc2440 v�ti - j�tsin vahele\n"
 
-#: g10/export.c:181
+#: g10/export.c:180
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "v�ti %08lX: ei ole kaitstud - j�tsin vahele\n"
 
-#: g10/export.c:189
-#, fuzzy, c-format
+#: g10/export.c:188
+#, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
-msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
+msgstr "v�ti %08lX: PGP 2.x stiilis v�ti - j�tsin vahele\n"
 
-#: g10/export.c:255
+#: g10/export.c:254
 msgid "WARNING: nothing exported\n"
 msgstr "HOIATUS: midagi ei eksporditud\n"
 
@@ -1900,12 +1866,13 @@ msgstr "avalike v�tmete puhvris on liiga palju v�tmeid - blokeerin\n"
 #. * not good because they are probably not utf-8 encoded.
 #: g10/getkey.c:186 g10/getkey.c:2234
 msgid "[User id not found]"
-msgstr "[Kasutaja id ei leitud]"
+msgstr "[Kasutaja id puudub]"
 
 #: g10/getkey.c:1362
-#, c-format
-msgid "Invalid key %08lX made valid by --always-trust\n"
+#, fuzzy, c-format
+msgid "invalid key %08lX made valid by --always-trust\n"
 msgstr ""
+"Vigane v�ti %08lX muudeti kehtivaks v�tme --always-trust kasutamisega\n"
 
 #: g10/getkey.c:1957
 #, c-format
@@ -2017,9 +1984,9 @@ msgid "key %08lX: new key - skipped\n"
 msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
 
 #: g10/import.c:480
-#, fuzzy, c-format
+#, c-format
 msgid "no writable keyring found: %s\n"
-msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
+msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
 
 #: g10/import.c:485 g10/openfile.c:244 g10/sign.c:642 g10/sign.c:811
 #, c-format
@@ -2049,7 +2016,7 @@ msgstr "v�ti %08lX: ei leia algset v�tmeblokki: %s\n"
 #: g10/import.c:537 g10/import.c:733
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
-msgstr "v�ti %08lX: ei saa lugeda algset v�tmeblokki: %s\n"
+msgstr "v�ti %08lX: ei �nnestu lugeda algset v�tmeblokki: %s\n"
 
 #: g10/import.c:564
 #, c-format
@@ -2087,9 +2054,9 @@ msgid "key %08lX: not changed\n"
 msgstr "v�ti %08lX: ei muudetud\n"
 
 #: g10/import.c:655
-#, fuzzy, c-format
+#, c-format
 msgid "no default secret keyring: %s\n"
-msgstr "puudub avalike v�tmete vaikimisi v�tmehoidla\n"
+msgstr "puudub salajaste v�tmete vaikimisi v�tmehoidla: %s\n"
 
 #: g10/import.c:666
 #, c-format
@@ -2193,9 +2160,9 @@ msgid "key %08lX: revocation certificate added\n"
 msgstr "v�ti %08lX: t�histamise sertifikaat lisatud\n"
 
 #: g10/import.c:1152
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX: direct key signature added\n"
-msgstr "v�ti %08lX: %d uut allkirja\n"
+msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
 
 #: g10/import.c:1266 g10/import.c:1319
 #, c-format
@@ -2249,14 +2216,13 @@ msgstr "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
 #: g10/keyedit.c:325
 #, c-format
 msgid "User ID \"%s\" is revoked.\n"
-msgstr ""
+msgstr "Kasutaja ID \"%s\" on t�histatud.\n"
 
-#: g10/keyedit.c:330 g10/keyedit.c:1004
-#, fuzzy
+#: g10/keyedit.c:330 g10/keyedit.c:1013
 msgid "Are you sure you still want to sign it?\n"
-msgstr "Olete kindel, et soovite sellist v�tmepikkust? "
+msgstr "Olete kindel, et soovite seda ikka allkirjastada?\n"
 
-#: g10/keyedit.c:335 g10/keyedit.c:409 g10/keyedit.c:519 g10/keyedit.c:1007
+#: g10/keyedit.c:335 g10/keyedit.c:418 g10/keyedit.c:528 g10/keyedit.c:1016
 msgid "Really sign? "
 msgstr "Allkirjastan t�esti? "
 
@@ -2270,66 +2236,74 @@ msgid ""
 "\n"
 "Do you want to promote it to a full exportable signature?\n"
 msgstr ""
+"Teie praegune allkiri \"%s\"\n"
+"on lokaalne allkiri.\n"
+"\n"
+"Kas te soovite seda edutada t�ielikuks eksporditavaks allkirjaks?\n"
 
-#. Fixme: see whether there is a revocation in which
-#. * case we should allow to sign it again.
-#: g10/keyedit.c:374
+#: g10/keyedit.c:379
 #, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %08lX\n"
+msgstr "\"%s\" on juba %sallkirjastatud v�tmega %08lX\n"
+
+#: g10/keyedit.c:384
+#, c-format
 msgid "\"%s\" was already %ssigned by key %08lX\n"
-msgstr "On juba allkirjastatud v�tmega %08lX\n"
+msgstr "\"%s\" on juba %sallkirjastatud v�tmega %08lX\n"
 
-#: g10/keyedit.c:387
+#: g10/keyedit.c:396
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "V�tmega %08lX pole midagi allkirjastada\n"
 
-#: g10/keyedit.c:402
-#, fuzzy
+#: g10/keyedit.c:411
 msgid "This key has expired!"
-msgstr "M�rkus: See v�ti on aegunud!\n"
+msgstr "See v�ti on aegunud!"
 
-#: g10/keyedit.c:406
-#, fuzzy
+#: g10/keyedit.c:415
 msgid "  Are you sure you still want to sign it?\n"
-msgstr "Olete kindel, et soovite sellist v�tmepikkust? "
+msgstr "  Olete kindel, et soovite seda ikkagi allkirjastada?\n"
 
-#: g10/keyedit.c:420
-#, fuzzy, c-format
+#: g10/keyedit.c:429
+#, c-format
 msgid "This key is due to expire on %s.\n"
-msgstr "See v�ti ei ole kaitstud.\n"
+msgstr "See v�ti aegub %s.\n"
 
-#: g10/keyedit.c:422
+#: g10/keyedit.c:431
 msgid "Do you want your signature to expire at the same time? (y/n) "
-msgstr ""
+msgstr "Soovite et teie allkiri aeguks samal ajal? (j/e) "
 
-#: g10/keyedit.c:450
+#: g10/keyedit.c:459
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
+"Kui hoolikalt te olete kontrollinud et v�ti, mida te asute allkirjastama,\n"
+"kuulub ka tegelikult �lal mainitud isikule? Kui te ei tea, mida vastata,\n"
+"sisestage \"0\".\n"
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:463
 #, c-format
 msgid "   (0) I will not answer.%s\n"
-msgstr ""
+msgstr "   (0) Ma ei vasta.%s\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:465
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
-msgstr ""
+msgstr "   (1) Ma ei ole �ldse kontrollinud.%s\n"
 
-#: g10/keyedit.c:458
+#: g10/keyedit.c:467
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
-msgstr ""
+msgstr "   (2) Ma olen teinud pealiskaudset kontrolli.%s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
-msgstr ""
+msgstr "   (3) Ma olen kontrollinud v�ga hoolikalt.%s\n"
 
-#: g10/keyedit.c:485
+#: g10/keyedit.c:494
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2337,65 +2311,69 @@ msgstr ""
 "Olete t�esti kindel, et soovite seda v�tit oma\n"
 "v�tmega allkirjastada: \""
 
-#: g10/keyedit.c:494
-#, fuzzy
+#: g10/keyedit.c:503
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
 msgstr ""
-"Allkiri m�rgitakse mitte-eksporditavaks.\n"
 "\n"
+"Allkiri m�rgitakse mitte-eksporditavaks.\n"
 
-#: g10/keyedit.c:498
-#, fuzzy
+#: g10/keyedit.c:507
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
 msgstr ""
-"Allkiri m�rgitakse mitte-eksporditavaks.\n"
 "\n"
+"Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:512
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
+"\n"
+"Ma ei ole seda v�tit �ldse kontrollinud.\n"
 
-#: g10/keyedit.c:507
+#: g10/keyedit.c:516
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
+"\n"
+"Ma olen seda v�tit kontrollinud ainult pealiskaudselt.\n"
 
-#: g10/keyedit.c:511
+#: g10/keyedit.c:520
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
+"\n"
+"Ma olen kontrollinud seda v�tit v�ga hoolikalt.\n"
 
-#: g10/keyedit.c:552 g10/keyedit.c:2459 g10/keyedit.c:2521 g10/sign.c:273
+#: g10/keyedit.c:561 g10/keyedit.c:2476 g10/keyedit.c:2538 g10/sign.c:273
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:621
 msgid "This key is not protected.\n"
 msgstr "See v�ti ei ole kaitstud.\n"
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:625
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:629
 msgid "Key is protected.\n"
 msgstr "V�ti on kaitstud.\n"
 
-#: g10/keyedit.c:640
+#: g10/keyedit.c:649
 #, c-format
 msgid "Can't edit this key: %s\n"
-msgstr "Seda v�tit ei saa toimetada: %s\n"
+msgstr "Seda v�tit ei �nnestu toimetada: %s\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:655
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2403,7 +2381,7 @@ msgstr ""
 "Sisestage sellele salajasele v�tmele uus parool.\n"
 "\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:669
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2411,559 +2389,547 @@ msgstr ""
 "Te ei soovi parooli - see on t�en�oliselt *halb* idee!\n"
 "\n"
 
-#: g10/keyedit.c:663
+#: g10/keyedit.c:672
 msgid "Do you really want to do this? "
 msgstr "Kas te t�esti soovite seda teha? "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:736
 msgid "moving a key signature to the correct place\n"
 msgstr "t�stan v�tme allkirja �igesse kohta\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:777
 msgid "quit this menu"
 msgstr "v�lju sellest men��st"
 
-#: g10/keyedit.c:769
+#: g10/keyedit.c:778
 msgid "q"
 msgstr "v"
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:779
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:779
 msgid "save and quit"
 msgstr "salvesta ja v�lju"
 
-#: g10/keyedit.c:771
+#: g10/keyedit.c:780
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:771
+#: g10/keyedit.c:780
 msgid "show this help"
 msgstr "n�ita seda abiinfot"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:782
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:782
 msgid "show fingerprint"
 msgstr "n�ita s�rmej�lge"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:783
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:783
 msgid "list key and user IDs"
 msgstr "n�ita v�tit ja kasutaja IDd"
 
-#: g10/keyedit.c:775
+#: g10/keyedit.c:784
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:785
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:785
 msgid "select user ID N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:786
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:786
 msgid "select secondary key N"
 msgstr "vali sekundaarne v�ti N"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:787
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:787
 msgid "list signatures"
 msgstr "n�ita allkirju"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:788
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:789
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:789
 msgid "sign the key"
 msgstr "allkirjasta v�ti"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:790
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:791
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:791
 msgid "sign the key locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/keyedit.c:783
-#, fuzzy
+#: g10/keyedit.c:792
 msgid "nrsign"
-msgstr "sign"
+msgstr "nrsign"
 
-#: g10/keyedit.c:783
-#, fuzzy
+#: g10/keyedit.c:792
 msgid "sign the key non-revocably"
-msgstr "allkirjasta v�ti lokaalselt"
+msgstr "allkirjasta v�ti kehtetuks mitte-tunnistatavana"
 
-#: g10/keyedit.c:784
-#, fuzzy
+#: g10/keyedit.c:793
 msgid "nrlsign"
-msgstr "sign"
+msgstr "nrlsign"
 
-#: g10/keyedit.c:784
-#, fuzzy
+#: g10/keyedit.c:793
 msgid "sign the key locally and non-revocably"
-msgstr "allkirjasta v�ti lokaalselt"
+msgstr "allkirjasta v�ti lokaalselt ja kehtetuks mitte-tunnistatavana"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:794
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:795
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:795
 msgid "add a user ID"
 msgstr "lisa kasutaja ID"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:796
 msgid "addphoto"
-msgstr ""
+msgstr "lisa foto"
 
-#: g10/keyedit.c:787
-#, fuzzy
+#: g10/keyedit.c:796
 msgid "add a photo ID"
-msgstr "lisa kasutaja ID"
+msgstr "lisa foto ID"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:797
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:797
 msgid "delete user ID"
 msgstr "kustuta kasutaja ID"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:790
+#: g10/keyedit.c:799
 msgid "delphoto"
-msgstr ""
+msgstr "delphoto"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:800
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:800
 msgid "add a secondary key"
 msgstr "lisa sekundaarne v�ti"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:801
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:801
 msgid "delete a secondary key"
 msgstr "kustuta sekundaarne v�ti"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:802
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:802
 msgid "delete signatures"
 msgstr "kustuta allkirjad"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:803
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:803
 msgid "change the expire date"
 msgstr "muuda aegumise kuup�eva"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:804
 msgid "primary"
-msgstr ""
+msgstr "primaarne"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:804
 msgid "flag user ID as primary"
-msgstr ""
+msgstr "m�rgi kasutaja ID primaarseks"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:805
 msgid "toggle"
-msgstr "toggle"
+msgstr "l�lita"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:805
 msgid "toggle between secret and public key listing"
 msgstr "l�lita salajaste v�i avalike v�tmete loendi vahel"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:807
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:799
+#: g10/keyedit.c:808
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:799
-#, fuzzy
+#: g10/keyedit.c:808
 msgid "list preferences (expert)"
-msgstr "n�ita eelistusi"
+msgstr "n�ita eelistusi (ekspert)"
 
-#: g10/keyedit.c:800
-#, fuzzy
+#: g10/keyedit.c:809
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:800
-#, fuzzy
+#: g10/keyedit.c:809
 msgid "list preferences (verbose)"
-msgstr "n�ita eelistusi"
+msgstr "n�ita eelistusi (detailsena)"
 
-#: g10/keyedit.c:801
-#, fuzzy
+#: g10/keyedit.c:810
 msgid "setpref"
-msgstr "pref"
+msgstr "setpref"
 
-#: g10/keyedit.c:801
-#, fuzzy
+#: g10/keyedit.c:810
 msgid "set preference list"
-msgstr "n�ita eelistusi"
+msgstr "sea eelistuste nimekiri"
 
-#: g10/keyedit.c:802
-#, fuzzy
+#: g10/keyedit.c:811
 msgid "updpref"
-msgstr "pref"
+msgstr "updpref"
 
-#: g10/keyedit.c:802
-#, fuzzy
+#: g10/keyedit.c:811
 msgid "updated preferences"
-msgstr "n�ita eelistusi"
+msgstr "uuendatud eelistused"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:812
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:812
 msgid "change the passphrase"
 msgstr "muuda parooli"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:813
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:813
 msgid "change the ownertrust"
 msgstr "muuda omaniku usaldust"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:814
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:814
 msgid "revoke signatures"
 msgstr "t�hista allkirjad"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:815
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:815
 msgid "revoke a secondary key"
 msgstr "t�hista sekundaarne v�ti"
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:816
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:816
 msgid "disable a key"
 msgstr "blokeeri v�ti"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:817
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:817
 msgid "enable a key"
 msgstr "luba v�ti"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:818
 msgid "showphoto"
-msgstr ""
+msgstr "showphoto"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:818
 msgid "show photo ID"
-msgstr ""
+msgstr "n�ita foto ID"
 
-#: g10/delkey.c:112 g10/keyedit.c:829
+#: g10/delkey.c:112 g10/keyedit.c:838
 msgid "can't do that in batchmode\n"
 msgstr "seda ei saa teha pakettmoodis\n"
 
-#: g10/keyedit.c:866
-#, fuzzy, c-format
+#: g10/keyedit.c:875
+#, c-format
 msgid "error reading secret keyblock `%s': %s\n"
-msgstr "viga `%s' lugemisel: %s\n"
+msgstr "viga salajase v�tmebloki `%s' lugemisel: %s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:893
 msgid "Secret key is available.\n"
 msgstr "Salajane v�ti on kasutatav.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:924
 msgid "Command> "
 msgstr "K�sklus> "
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:956
 msgid "Need the secret key to do this.\n"
 msgstr "Selle tegamiseks on vaja salajast v�tit.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:960
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Palun kasutage k�igepealt k�sku \"toggle\".\n"
 
-#: g10/keyedit.c:1000
-#, fuzzy
+#: g10/keyedit.c:1009
 msgid "Key is revoked.\n"
-msgstr "V�ti on kaitstud.\n"
+msgstr "V�ti on t�histatud.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1025
 msgid "Really sign all user IDs? "
 msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1017
+#: g10/keyedit.c:1026
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1051
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
-msgstr ""
+msgstr "See k�sklus ei ole %s moodis lubatud.\n"
 
-#: g10/keyedit.c:1062 g10/keyedit.c:1083
+#: g10/keyedit.c:1071 g10/keyedit.c:1092
 msgid "You must select at least one user ID.\n"
 msgstr "Te peate valima v�hemalt �he kasutaja ID.\n"
 
-#: g10/keyedit.c:1064
+#: g10/keyedit.c:1073
 msgid "You can't delete the last user ID!\n"
 msgstr "Viimast kasutaja ID ei saa kustutada!\n"
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1076
 msgid "Really remove all selected user IDs? "
 msgstr "Kas kustutan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1068
+#: g10/keyedit.c:1077
 msgid "Really remove this user ID? "
 msgstr "Kas eemaldan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:1106 g10/keyedit.c:1128
+#: g10/keyedit.c:1115 g10/keyedit.c:1137
 msgid "You must select at least one key.\n"
 msgstr "Te peata valima v�hemalt �he v�tme.\n"
 
-#: g10/keyedit.c:1110
+#: g10/keyedit.c:1119
 msgid "Do you really want to delete the selected keys? "
 msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
 
-#: g10/keyedit.c:1111
+#: g10/keyedit.c:1120
 msgid "Do you really want to delete this key? "
 msgstr "Kas te t�esti soovite seda v�tit kustutada? "
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1141
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Kas te t�esti soovite valitud v�tmeid t�histada? "
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1142
 msgid "Do you really want to revoke this key? "
 msgstr "Kas te t�esti soovite seda v�tit t�histada? "
 
-#: g10/keyedit.c:1197
-#, fuzzy
+#: g10/keyedit.c:1206
 msgid "Really update the preferences for the selected user IDs? "
-msgstr "Kas kustutan t�esti k�ik kasutaja IDd? "
+msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1199
-#, fuzzy
+#: g10/keyedit.c:1208
 msgid "Really update the preferences? "
-msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E)"
+msgstr "Kas t�esti uuendan seaded? "
 
-#: g10/keyedit.c:1237
+#: g10/keyedit.c:1246
 msgid "Save changes? "
 msgstr "Salvestan muutused? "
 
-#: g10/keyedit.c:1240
+#: g10/keyedit.c:1249
 msgid "Quit without saving? "
 msgstr "V�ljun salvestamata? "
 
-#: g10/keyedit.c:1251
+#: g10/keyedit.c:1260
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:1258
+#: g10/keyedit.c:1267
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1274
 msgid "Key not changed so no update needed.\n"
 msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
 
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1285
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane k�sklus (proovige \"help\")\n"
 
-#: g10/keyedit.c:1424
-#, fuzzy, c-format
+#: g10/keyedit.c:1433
+#, c-format
 msgid "This key may be revoked by %s key %s%s\n"
-msgstr "HOIATUS: See v�ti on omaniku poolt t�histatud!\n"
+msgstr "Selle v�tme v�ib olla t�histanud %s v�ti %s%s\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1436
 msgid " (sensitive)"
-msgstr ""
+msgstr " (tundlik)"
 
-#: g10/keyedit.c:1432 g10/keyedit.c:1458
+#: g10/keyedit.c:1441 g10/keyedit.c:1467
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  loodud: %s aegub: %s"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1450
 #, c-format
 msgid " trust: %c/%c"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1454
 msgid "This key has been disabled"
 msgstr "See v�ti on blokeeritud"
 
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1483
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! alamv�ti on t�histatud: %s\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1486
 msgid "rev- faked revocation found\n"
 msgstr "rev- leitud v�ltsitud t�histamine\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1488
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? probleem t�histamise kontrollimisel: %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1598
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
 msgstr ""
+"HOIATUS: Sellel v�tmel on juba foto ID.\n"
+"         J�rgmise foto ID lisamine v�ib tekitada segadusi m�ne PGP\n"
+"         versiooni kasutamisel.\n"
 
-#: g10/keyedit.c:1593 g10/keyedit.c:1620
-#, fuzzy
+#: g10/keyedit.c:1602 g10/keyedit.c:1629
 msgid "Are you sure you still want to add it? (y/n) "
-msgstr "Olete kindel, et soovite sellist v�tmepikkust? "
+msgstr "Olete kindel, et soovite seda ikka lisada? (j/e) "
 
-#: g10/keyedit.c:1601
+#: g10/keyedit.c:1610
 msgid "You may only have one photo ID on a key.\n"
-msgstr ""
+msgstr "V�tmel v�ib olla ainult �ks foto ID.\n"
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1624
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
+"HOIATUS: See on PGP2-stiilis v�ti. Foto ID lisamine v�ib sundida m�ningaid\n"
+"         PGP versioone seda v�tit tagasi l�kkama.\n"
 
-#: g10/keyedit.c:1626
+#: g10/keyedit.c:1635
 msgid "You may not add a photo ID to a PGP2-style key.\n"
-msgstr ""
+msgstr "Foto IDd ei saa PGP2 v�tmele lisada.\n"
 
-#: g10/keyedit.c:1757
+#: g10/keyedit.c:1766
 msgid "Delete this good signature? (y/N/q)"
-msgstr "Kustutan selle hea allkirja? (j/E/v)"
+msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
 
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:1770
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1774
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1780
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
 
-#: g10/keyedit.c:1785
+#: g10/keyedit.c:1794
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Kustutatud %d allkiri.\n"
 
-#: g10/keyedit.c:1786
+#: g10/keyedit.c:1795
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Kustutatud %d allkirja.\n"
 
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1798
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1867
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Palun eemaldage salajastelt v�tmetelt valikud.\n"
 
-#: g10/keyedit.c:1864
+#: g10/keyedit.c:1873
 msgid "Please select at most one secondary key.\n"
 msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1877
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:1879
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:1912
+#: g10/keyedit.c:1921
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1937
 msgid "No corresponding signature in secret ring\n"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/keyedit.c:2009
-#, fuzzy
+#: g10/keyedit.c:2018
 msgid "Please select exactly one user ID.\n"
-msgstr "Te peate valima v�hemalt �he kasutaja ID.\n"
+msgstr "Palun valige t�pselt �ks kasutaja ID.\n"
 
-#: g10/keyedit.c:2184
+#: g10/keyedit.c:2193
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2239
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Sekundaarne v�ti numbriga %d puudub\n"
 
-#: g10/keyedit.c:2328
+#: g10/keyedit.c:2337
 msgid "user ID: \""
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2342
 #, c-format
 msgid ""
 "\"\n"
@@ -2972,47 +2938,59 @@ msgstr ""
 "\"\n"
 "allkirjastatud teie v�tmega %08lX %s\n"
 
-#: g10/keyedit.c:2335
+#: g10/keyedit.c:2345
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"locally signed with your key %08lX at %s\n"
+msgstr ""
+"\"\n"
+"allkirjastatud teie v�tmega %08lX %s\n"
+
+#: g10/keyedit.c:2349
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2373
 msgid "You have signed these user IDs:\n"
 msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
 
-#: g10/keyedit.c:2373
+#: g10/keyedit.c:2387
 #, fuzzy, c-format
-msgid "   signed by %08lX at %s%s\n"
-msgstr "   allkirjastanud %08lX %s\n"
+msgid "   signed by %08lX at %s%s%s\n"
+msgstr "   allkirjastanud %08lX %s%s\n"
 
-#: g10/keyedit.c:2380
+#: g10/keyedit.c:2395
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   t�histanud %08lX %s\n"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2415
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute t�histama j�rgmisi allkirju:\n"
 
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2425
 #, c-format
-msgid "   signed by %08lX at %s\n"
-msgstr "   allkirjastanud %08lX %s\n"
+msgid "   signed by %08lX at %s%s\n"
+msgstr "   allkirjastanud %08lX %s%s\n"
+
+#: g10/keyedit.c:2427
+msgid " (non-exportable)"
+msgstr ""
 
-#: g10/keyedit.c:2418
+#: g10/keyedit.c:2434
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E)"
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2464
 msgid "no secret key\n"
 msgstr "salajast v�tit pole\n"
 
 #. This isn't UTF8 as it is a URL(?)
 #: g10/keylist.c:82
-#, fuzzy
 msgid "Signature policy: "
-msgstr "%s allkiri kasutajalt: %s\n"
+msgstr "Allkirja poliitika: "
 
 #: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:717 g10/mainproc.c:726
 msgid "WARNING: invalid notation data found\n"
@@ -3020,17 +2998,16 @@ msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
 
 #. This is UTF8
 #: g10/keylist.c:115
-#, fuzzy
 msgid "Signature notation: "
-msgstr "Noteering: "
+msgstr "Allkirja noteerimine: "
 
 #: g10/keylist.c:122
 msgid "not human readable"
-msgstr ""
+msgstr "pole inimese poolt loetav"
 
 #: g10/keylist.c:187
 msgid "Keyring"
-msgstr ""
+msgstr "V�tmehoidla"
 
 #. of subkey
 #: g10/keylist.c:387 g10/mainproc.c:852
@@ -3050,19 +3027,18 @@ msgid "             Fingerprint:"
 msgstr "               S�rmej�lg:"
 
 #: g10/keylist.c:862
-#, fuzzy
 msgid "     Key fingerprint ="
-msgstr "               S�rmej�lg:"
+msgstr "     V�tme s�rmej�lg ="
 
 #: g10/encr-data.c:66 g10/mainproc.c:255
 #, c-format
 msgid "%s encrypted data\n"
-msgstr "%s kr�ptitud andmed\n"
+msgstr "%s kr�pteeritud andmed\n"
 
 #: g10/encr-data.c:68 g10/mainproc.c:257
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
-msgstr "kr�ptitud tundmatu algoritmiga %d\n"
+msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
 
 #: g10/mainproc.c:280
 #, c-format
@@ -3071,45 +3047,45 @@ msgstr "avalik v�ti on %08lX\n"
 
 #: g10/mainproc.c:326
 msgid "public key encrypted data: good DEK\n"
-msgstr "avaliku v�tmega kr�ptitud andmed: hea DEK\n"
+msgstr "avaliku v�tmega kr�pteeritud andmed: hea DEK\n"
 
 #: g10/mainproc.c:378
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
-msgstr "kr�ptitud %u-bitise %s v�tmega, ID %08lX, loodud %s\n"
+msgstr "kr�pteeritud %u-bitise %s v�tmega, ID %08lX, loodud %s\n"
 
 #: g10/mainproc.c:388
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
-msgstr "kr�ptitud %s v�tmega, ID %08lX\n"
+msgstr "kr�pteeritud %s v�tmega, ID %08lX\n"
 
 #: g10/mainproc.c:402
 #, c-format
 msgid "public key decryption failed: %s\n"
-msgstr "avaliku v�tmega lahtikr�ptimine eba�nnestus: %s\n"
+msgstr "avaliku v�tmega lahtikr�pteerimine eba�nnestus: %s\n"
 
 #: g10/mainproc.c:429 g10/mainproc.c:448
-#, fuzzy, c-format
+#, c-format
 msgid "assuming %s encrypted data\n"
-msgstr "%s kr�ptitud andmed\n"
+msgstr "eeldan %s kr�pteeritud andmeid\n"
 
 #: g10/mainproc.c:436
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
-msgstr ""
+msgstr "IDEA �iffer pole saadaval, loodan kasutada selle asemel %s\n"
 
 #: g10/mainproc.c:466
 msgid "decryption okay\n"
-msgstr "lahtikr�ptimine �nnestus\n"
+msgstr "lahtikr�pteerimine �nnestus\n"
 
 #: g10/mainproc.c:471
 msgid "WARNING: encrypted message has been manipulated!\n"
-msgstr "HOIATUS: kr�ptitud teadet on muudetud!\n"
+msgstr "HOIATUS: kr�pteeritud teadet on muudetud!\n"
 
 #: g10/mainproc.c:476
 #, c-format
 msgid "decryption failed: %s\n"
-msgstr "lahtikr�ptimine eba�nnestus: %s\n"
+msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
 #: g10/mainproc.c:495
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
@@ -3138,9 +3114,8 @@ msgstr "allkirja kontroll j�eti �ra\n"
 
 #. plaintext before signatures but no one-pass packets
 #: g10/mainproc.c:1236 g10/mainproc.c:1246
-#, fuzzy
 msgid "can't handle these multiple signatures\n"
-msgstr "avateksti allkirjad �ksteise sees\n"
+msgstr "neid allkirju ei �nnestu t��delda\n"
 
 #: g10/mainproc.c:1257
 #, c-format
@@ -3152,17 +3127,16 @@ msgid "BAD signature from \""
 msgstr "HALB allkiri kasutajalt \""
 
 #: g10/mainproc.c:1292 g10/mainproc.c:1315
-#, fuzzy
 msgid "Expired signature from \""
-msgstr "Hea allkiri kasutajalt \""
+msgstr "Aegunud allkiri kasutajalt \""
 
 #: g10/mainproc.c:1293 g10/mainproc.c:1316
 msgid "Good signature from \""
-msgstr "Hea allkiri kasutajalt \""
+msgstr "Korrektne allkiri kasutajalt \""
 
 #: g10/mainproc.c:1318
 msgid "[uncertain]"
-msgstr ""
+msgstr "[ebakindel]"
 
 #: g10/mainproc.c:1338
 msgid "                aka \""
@@ -3174,9 +3148,8 @@ msgid "Can't check signature: %s\n"
 msgstr "Allkirja ei saa kontrollida: %s\n"
 
 #: g10/mainproc.c:1467 g10/mainproc.c:1483 g10/mainproc.c:1545
-#, fuzzy
 msgid "not a detached signature\n"
-msgstr "loo eraldiseisev allkiri"
+msgstr "ei ole eraldiseisev allkiri\n"
 
 #: g10/mainproc.c:1494
 #, c-format
@@ -3201,29 +3174,28 @@ msgid "Experimental algorithms should not be used!\n"
 msgstr "Eksperimentaalseid algoritme ei peaks kasutama!\n"
 
 #: g10/misc.c:241
-#, fuzzy
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr ""
-"see �iffri algoritm ei ole soovitatav; kasutage palun m�nd standardsemat!\n"
+"see �ifri algoritm ei ole soovitatav; kasutage palun m�nd standardsemat!\n"
 
 #: g10/misc.c:378
-#, c-format
-msgid "Warning: unsafe ownership on %s \"%s\"\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "warning: unsafe ownership on %s \"%s\"\n"
+msgstr "Hoiatus: Ebaturvaline omanik %s \"%s\"\n"
 
 #: g10/misc.c:410
-#, c-format
-msgid "Warning: unsafe permissions on %s \"%s\"\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "warning: unsafe permissions on %s \"%s\"\n"
+msgstr "Hoiatus: Ebaturvalised �igused %s \"%s\"\n"
 
 #: g10/misc.c:435
 msgid "the IDEA cipher plugin is not present\n"
-msgstr ""
+msgstr "IDEA �ifri lisandprogrammi pole\n"
 
 #: g10/misc.c:436
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
-msgstr ""
+msgstr "lisainfot leiate lehelt http://www.gnupg.org/why-not-idea.html\n"
 
 #: g10/parse-packet.c:119
 #, c-format
@@ -3237,28 +3209,28 @@ msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
 
 #: g10/passphrase.c:330 g10/passphrase.c:377
 msgid "gpg-agent is not available in this session\n"
-msgstr ""
+msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
 #: g10/passphrase.c:338
 msgid "can't set client pid for the agent\n"
-msgstr ""
+msgstr "agendile ei �nnestu seada kliendi pid\n"
 
 #: g10/passphrase.c:346
 msgid "can't get server read FD for the agent\n"
-msgstr ""
+msgstr "agendiga suhtlemiseks ei �nnestu saada lugemise FD\n"
 
 #: g10/passphrase.c:353
 msgid "can't get server write FD for the agent\n"
-msgstr ""
+msgstr "agendiga suhtlemiseks ei �nnestu saada kirjutamise FD\n"
 
 #: g10/passphrase.c:386
 msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr ""
+msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
 
 #: g10/passphrase.c:399
-#, fuzzy, c-format
+#, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
-msgstr "algoritm %d ei ole toetatud\n"
+msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
 
 #: g10/hkp.c:148 g10/passphrase.c:420
 #, c-format
@@ -3267,7 +3239,7 @@ msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
 
 #: g10/passphrase.c:442
 msgid "communication problem with gpg-agent\n"
-msgstr ""
+msgstr "probleem gpg-agent programmiga suhtlemisel\n"
 
 #: g10/passphrase.c:511 g10/passphrase.c:897
 #, c-format
@@ -3275,47 +3247,44 @@ msgid " (main key ID %08lX)"
 msgstr " (peamise v�tme ID %08lX)"
 
 #: g10/passphrase.c:521
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, created %s%s\n"
 msgstr ""
-"\n"
-"Te vajate kasutaja salajase v�tme lahtilukustamiseks\n"
-"parooli: \"%*.s\"\n"
-"%u-bit %s key, ID %08lX, created %s%s\n"
+"Te vajate kasutaja salajase v�tme lahtilukustamiseks parooli:\n"
+"\"%.*s\"\n"
+"%u-bitti %s v�ti, ID %08lX, loodud %s%s\n"
 
 #: g10/passphrase.c:542
-#, fuzzy
 msgid "Enter passphrase\n"
-msgstr "Sisestage parool: "
+msgstr "Sisestage parool\n"
 
 #: g10/passphrase.c:544
-#, fuzzy
 msgid "Repeat passphrase\n"
-msgstr "Korrake parooli: "
+msgstr "Korrake parooli\n"
 
 #: g10/passphrase.c:585
 msgid "passphrase too long\n"
-msgstr ""
+msgstr "liiga pikk parool\n"
 
 #: g10/passphrase.c:598
 msgid "invalid response from agent\n"
-msgstr ""
+msgstr "vigane vastus agendilt\n"
 
 #: g10/passphrase.c:607 g10/passphrase.c:688
 msgid "cancelled by user\n"
-msgstr ""
+msgstr "katkestatud kasutaja poolt\n"
 
 #: g10/passphrase.c:609 g10/passphrase.c:770
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr ""
+msgstr "probleem agendiga: agent tagastas 0x%lx\n"
 
 #: g10/passphrase.c:691 g10/passphrase.c:799
 msgid "problem with the agent - disabling agent use\n"
-msgstr ""
+msgstr "probleem agendiga - blokeerin agendi kasutamise\n"
 
 #: g10/passphrase.c:883
 msgid ""
@@ -3349,9 +3318,9 @@ msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "andmeid ei salvestatud; salvestamiseks kasutage v�tit \"--output\"\n"
 
 #: g10/plaintext.c:108
-#, fuzzy, c-format
+#, c-format
 msgid "error creating `%s': %s\n"
-msgstr "viga `%s' lugemisel: %s\n"
+msgstr "viga `%s' loomisel: %s\n"
 
 #: g10/plaintext.c:336
 msgid "Detached signature.\n"
@@ -3367,7 +3336,7 @@ msgstr "loen standardsisendit ...\n"
 
 #: g10/plaintext.c:395
 msgid "no signed data\n"
-msgstr ""
+msgstr "allkirjastatud andmeid pole\n"
 
 #: g10/plaintext.c:403
 #, c-format
@@ -3375,7 +3344,7 @@ msgid "can't open signed data `%s'\n"
 msgstr "allkirjastatud andmete avamine eba�nnestus `%s'\n"
 
 #: g10/pubkey-enc.c:100
-#, fuzzy, c-format
+#, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "anon��mne saaja; proovin salajast v�tit %08lX ...\n"
 
@@ -3388,14 +3357,14 @@ msgid "old encoding of the DEK is not supported\n"
 msgstr "vana DEK kodeerimine ei ole toetatud\n"
 
 #: g10/pubkey-enc.c:177
-#, fuzzy, c-format
+#, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
-msgstr "�iffri algoritm %d on tundmatu v�i blokeeritud\n"
+msgstr "�ifri algoritm %d%s on tundmatu v�i blokeeritud\n"
 
 #: g10/pubkey-enc.c:220
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
-msgstr "M�RKUS: �iffri algoritm %d puudub eelistustes\n"
+msgstr "M�RKUS: �ifri algoritm %d puudub eelistustes\n"
 
 #: g10/pubkey-enc.c:242
 #, c-format
@@ -3404,9 +3373,9 @@ msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
 
 #. HKP does not support v3 fingerprints
 #: g10/hkp.c:70
-#, fuzzy, c-format
+#, c-format
 msgid "requesting key %08lX from HKP keyserver %s\n"
-msgstr "k�sin v�tit %08lX serverist %s ...\n"
+msgstr "k�sin v�tit %08lX HKP v�tmeserverist %s\n"
 
 #: g10/hkp.c:94
 #, c-format
@@ -3431,31 +3400,30 @@ msgstr "teate saatmine serverile `%s' eba�nnestus: olek=%u\n"
 #: g10/hkp.c:467
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
-msgstr ""
+msgstr "otsin \"%s\" HKP serverist %s\n"
 
 #: g10/hkp.c:517
-#, fuzzy, c-format
+#, c-format
 msgid "can't search keyserver: %s\n"
-msgstr "v�tmeserverist ei saa v�tit: %s\n"
+msgstr "v�tmeserverist ei saa otsida: %s\n"
 
 #: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "salajase v�tme komponendid ei ole k�ttesaadavad\n"
 
 #: g10/seckey-cert.c:59
-#, fuzzy, c-format
+#, c-format
 msgid "protection algorithm %d%s is not supported\n"
-msgstr "algoritm %d ei ole toetatud\n"
+msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
 #: g10/seckey-cert.c:186
-#, fuzzy
 msgid "Invalid passphrase; please try again"
-msgstr "Vigane parool; palun proovige uuesti ...\n"
+msgstr "Vigane parool; palun proovige uuesti"
 
 #: g10/seckey-cert.c:187
 #, c-format
 msgid "%s ...\n"
-msgstr ""
+msgstr "%s ...\n"
 
 #: g10/seckey-cert.c:244
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
@@ -3478,7 +3446,7 @@ msgid "public key is %lu seconds newer than the signature\n"
 msgstr "avalik v�ti on %lu sekundit uuem, kui allkiri\n"
 
 #: g10/sig-check.c:240
-#, fuzzy, c-format
+#, c-format
 msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "M�RKUS: allkirja v�ti %08lX aegus %s\n"
 
@@ -3491,11 +3459,13 @@ msgstr "eeldan tundmatu kriitilise biti t�ttu vigast allkirja\n"
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr ""
+"HOIATUS: poliisi urli %%-asendus eba�nnestus (liiga suur). Kasutan "
+"kompaktset.\n"
 
 #: g10/sign.c:268
-#, fuzzy, c-format
+#, c-format
 msgid "checking created signature failed: %s\n"
-msgstr "Allkirja ei saa kontrollida: %s\n"
+msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
 
 #: g10/sign.c:277
 #, c-format
@@ -3509,12 +3479,12 @@ msgstr "HOIATUS: `%s' on t�hi fail\n"
 
 #: g10/sign.c:612
 msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
-msgstr ""
+msgstr "PGP 2.x stiilis v�tmetega saab allkirjastada ainult --pgp2 moodis\n"
 
 #: g10/sign.c:637 g10/sign.c:806
 #, c-format
 msgid "can't create %s: %s\n"
-msgstr "%s ei saa luua: %s\n"
+msgstr "%s ei �nnestu luua: %s\n"
 
 #: g10/sign.c:698
 msgid "signing:"
@@ -3523,11 +3493,12 @@ msgstr "allkirjastan:"
 #: g10/sign.c:790
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
+"PGP 2.x stiilis v�tmetega saab avateksti allkirjastada ainult --pgp2 moodis\n"
 
 #: g10/sign.c:949
-#, fuzzy, c-format
+#, c-format
 msgid "%s encryption will be used\n"
-msgstr "lahtikr�ptimine eba�nnestus: %s\n"
+msgstr "kasutatakse %s kr�pteerimist\n"
 
 #: g10/textfilter.c:134
 #, c-format
@@ -3556,7 +3527,7 @@ msgstr "trustdb transaktsioon on liiga suur\n"
 #: g10/tdbio.c:454
 #, c-format
 msgid "%s: can't access: %s\n"
-msgstr "%s: ei saa kasutada: %s\n"
+msgstr "%s: ei �nnestu kasutada: %s\n"
 
 #: g10/tdbio.c:468
 #, c-format
@@ -3566,17 +3537,17 @@ msgstr "%s: kataloogi ei ole!\n"
 #: g10/tdbio.c:478 g10/tdbio.c:498 g10/tdbio.c:541
 #, c-format
 msgid "%s: can't create lock\n"
-msgstr "%s: lukku ei �nnestu luua\n"
+msgstr "%s: ei �nnestu luua lukku\n"
 
 #: g10/tdbio.c:480 g10/tdbio.c:544
-#, fuzzy, c-format
+#, c-format
 msgid "%s: can't make lock\n"
-msgstr "%s: lukku ei �nnestu luua\n"
+msgstr "%s: ei �nnestu seada lukku\n"
 
 #: g10/keyring.c:1433 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:484
 #, c-format
 msgid "%s: can't create: %s\n"
-msgstr "%s: ei saa luua: %s\n"
+msgstr "%s: ei �nnestu luua: %s\n"
 
 #: g10/tdbio.c:503
 #, c-format
@@ -3669,19 +3640,19 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb on vigane; palun k�ivitage \"gpg --fix-trustdb\".\n"
 
 #: g10/trustdb.c:202
-#, fuzzy, c-format
+#, c-format
 msgid "`%s' is not a valid long keyID\n"
-msgstr "'%s' ei ole kehtiv pikk v�tmeID\n"
+msgstr "`%s' ei ole kehtiv pikk v�tmeID\n"
 
 #: g10/trustdb.c:237
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX: accepted as trusted key\n"
-msgstr "v�ti %08lX: aktsepteerin usaldusv��rse v�tmena.\n"
+msgstr "v�ti %08lX: aktsepteerin usaldusv��rse v�tmena\n"
 
 #: g10/trustdb.c:276
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX occurs more than once in the trustdb\n"
-msgstr "v�ti %08lX: trustdb faili lisamine ei �nnestu\n"
+msgstr "v�ti %08lX esineb trustdb failis enam kui korra\n"
 
 #: g10/trustdb.c:292
 #, c-format
@@ -3694,9 +3665,9 @@ msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "usalduse kirje %lu, p�ringu t��p %d: lugemine eba�nnestus: %s\n"
 
 #: g10/trustdb.c:340
-#, fuzzy, c-format
+#, c-format
 msgid "trust record %lu is not of requested type %d\n"
-msgstr "usalduse kirje %lu: kustutamine eba�nnestus: %s\n"
+msgstr "usalduse kirje %lu ei oma soovitud t��pi %d\n"
 
 #: g10/trustdb.c:355
 #, c-format
@@ -3709,34 +3680,33 @@ msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync eba�nnestus: %s\n"
 
 #: g10/trustdb.c:470
-#, fuzzy
 msgid "no need for a trustdb check\n"
-msgstr "%s: ei ole trustdb fail\n"
+msgstr "trustdb kontrolliks puudub vajadus\n"
 
 #: g10/trustdb.c:476 g10/trustdb.c:1488
-#, fuzzy, c-format
+#, c-format
 msgid "next trustdb check due at %s\n"
-msgstr "trustdb kirje %lu: lseek eba�nnestus: %s\n"
+msgstr "trustdb j�rgmine kontroll %s\n"
 
 #: g10/trustdb.c:709
-#, fuzzy
 msgid "checking the trustdb\n"
-msgstr "muuda omaniku usaldust"
+msgstr "kontrollin trustdb faili\n"
 
 #: g10/trustdb.c:860
-#, fuzzy, c-format
+#, c-format
 msgid "public key %08lX not found: %s\n"
-msgstr "ei leia avalikku v�tit"
+msgstr "ei leia avalikku v�tit %08lX: %s\n"
 
 #: g10/trustdb.c:1363
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
-msgstr ""
+msgstr "puudub absoluutselt usaldatava v�tme %08lX avalik v�ti\n"
 
 #: g10/trustdb.c:1441
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
+"kontrollin s�gavusel %d allkirjastatud=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 
 #: g10/verify.c:108
 msgid ""
@@ -3759,17 +3729,16 @@ msgstr ""
 "v�ti ei ole m�rgitud ebaturvaliseks - sellega ei saa v�lts RNGd kasutada!\n"
 
 #: g10/skclist.c:138
-#, fuzzy, c-format
+#, c-format
 msgid "skipped `%s': duplicated\n"
-msgstr "j�i vahele %s: dubleeritud\n"
+msgstr "`%s' j�tsin vahele: duplikaat\n"
 
 #: g10/skclist.c:145 g10/skclist.c:153
 #, c-format
 msgid "skipped `%s': %s\n"
-msgstr "`%s' j�i vahele: %s\n"
+msgstr "`%s' j�tsin vahele: %s\n"
 
 #: g10/skclist.c:149
-#, fuzzy
 msgid "skipped: secret key already present\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
@@ -3818,7 +3787,7 @@ msgstr "%s: uus omaduste fail on loodud\n"
 #: g10/openfile.c:350
 #, c-format
 msgid "%s: can't create directory: %s\n"
-msgstr "%s: kataloogi ei saa luua: %s\n"
+msgstr "%s: kataloogi ei �nnestu luua: %s\n"
 
 #: g10/openfile.c:353
 #, c-format
@@ -3832,12 +3801,11 @@ msgstr "te peate GnuPG uuesti k�ivitama, siis v�etakse uued v�tmed arvesse\n"
 #: g10/encr-data.c:91
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
-msgstr "HOIATUS: teade on kr�ptitud s�mmeetrilise �iffri n�rga v�tmega.\n"
+msgstr "HOIATUS: teade on kr�ptitud s�mmeetrilise �ifri n�rga v�tmega.\n"
 
 #: g10/encr-data.c:98
-#, fuzzy
 msgid "problem handling encrypted packet\n"
-msgstr "�ra lisa kr�ptimisel v�tme id"
+msgstr "probleem kr�ptitud paketi k�sitlemisel\n"
 
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
@@ -3847,11 +3815,12 @@ msgstr "loodi n�rk v�ti - proovin uuesti\n"
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
-"s�mmeetrilises �iffris ei �nnestu v�ltida n�rka v�tit; proovisin %d korda!\n"
+"s�mmeetrilises �ifris ei �nnestu v�ltida n�rga v�tme kasutamist; proovisin %"
+"d korda!\n"
 
 #: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
-msgstr "pakettmoodis ei saa seda teha ilma v�tmeta \"--yes\"\n"
+msgstr "pakettmoodis ei �nnestu seda v�tmeta teha \"--yes\"\n"
 
 #: g10/delkey.c:138
 msgid "Delete this key from the keyring? "
@@ -3862,19 +3831,18 @@ msgid "This is a secret key! - really delete? "
 msgstr "See on salajane v�ti! - kas kustutan t�esti? "
 
 #: g10/delkey.c:156
-#, fuzzy, c-format
+#, c-format
 msgid "deleting keyblock failed: %s\n"
-msgstr "v�tmeblokkide loendamine eba�nnestus: %s\n"
+msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
 #: g10/delkey.c:185
-#, fuzzy, c-format
+#, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
-msgstr "selle avaliku v�tme jaoks on salajane v�ti!\n"
+msgstr "avaliku v�tme \"%s\" jaoks on salajane v�ti!\n"
 
 #: g10/delkey.c:187
-#, fuzzy
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
-msgstr "selle kustutamiseks kasutage v�tit \"--delete-secret-key\".\n"
+msgstr "selle kustutamiseks kasutage v�tit \"--delete-secret-keys\".\n"
 
 #: g10/helptext.c:47
 msgid ""
@@ -3892,6 +3860,10 @@ msgid ""
 "access to the secret key.  Answer \"yes\" to set this key to\n"
 "ultimately trusted\n"
 msgstr ""
+"Usalduse v�rgu loomiseks peab GnuPG teadma, millised v�tmed on\n"
+"absoluutselt usaldatavad. Need on tavaliselt v�tmed, mille puhul\n"
+"on teil juurdep��s ka nende salajastele v�tmetele. Kui soovite\n"
+"m��rata seda v�tit absoluutselt usaldatavaks, vastake \"jah\"\n"
 
 #: g10/helptext.c:60
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
@@ -3927,7 +3899,7 @@ msgid ""
 "this is the reason why the encryption only ElGamal key is not available in\n"
 "this menu."
 msgstr ""
-"Valige algoritmi, mida kasutada.\n"
+"Valige kasutatav algoritm.\n"
 "\n"
 "DSA (ka DSS) on digitaalallkirja algoritm, mida saab kasutada ainult\n"
 "allkirjades. See on soovitatav algoritm, kuna DSA allkirjade kontroll\n"
@@ -3985,7 +3957,7 @@ msgstr "palun e-posti aadress, aadress ei ole kohustuslik, aga v�ga soovitav"
 
 #: g10/helptext.c:134
 msgid "Please enter an optional comment"
-msgstr "Te s�ite n��d sisestada kommentaari"
+msgstr "Te v�ite n��d sisestada kommentaari"
 
 #: g10/helptext.c:139
 msgid ""
@@ -4045,6 +4017,36 @@ msgid ""
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
+"Kui te allkirjastate v�tme kasutaja ID, kontrollige k�igepealt, kas v�ti\n"
+"ikka kuulub antud ID-ga n�idatud isikule. Teistel inimestel on hea teada,\n"
+"kui hoolikalt te seda kontrolli olete teostanud.\n"
+"\n"
+"\"0\" t�hendab, et te ei v�ida oma kontrollimise kohta midagi.\n"
+"\n"
+"\"1\" t�hendab, et te usute, et v�tit omab isik, kes seda v�idab omavat, "
+"kuid\n"
+"    te ei saanud v�i ei soovinud seda v�idet t�iendavalt kontrollida. See\n"
+"    on kasulik \"persooni\" kontrolliks, kui te allkirjastate isiku pseudo-\n"
+"    n��mi v�tit.\n"
+"\n"
+"\"2\" t�hendab, et te teostasite v�tme pealiskaudset kontrolli. See v�ib\n"
+"    n�iteks t�hendada, et te kontrollisite v�tme s�rmej�lge ja "
+"kontrollisite\n"
+"    v�tme kasutaja ID foto ID vastu.\n"
+"\n"
+"\"3\" t�hendab, et te teostasite v�tme p�hjalikku kontrolli. See v�ib "
+"n�iteks\n"
+"    t�hendada, et v�rdlesite v�tme s�rmej�lge v�rme omanikuga otse suheldes\n"
+"    ja et te kontrollisite raskesti v�ltsitavast allikast (nt. pass) et\n"
+"    v�tme omaniku nimi vastab v�tmel n�idatud kasutaja IDle ja te kontrol-\n"
+"    lisite, et v�tmel n�idatud e-posti aadress kuulub v�tme omanikule.\n"
+"\n"
+"pange t�hele, et n�ited tasemete 2 ja 3 juures on *ainult* n�ited. S�ltub\n"
+"ainult teist, milline on \"pealiskaudse\" ja \"p�hjaliku\" kontrolli "
+"t�hendus,\n"
+"kui te allkirjastate teisi v�tmeid.\n"
+"\n"
+"Kui te ei tea �iget vastust, vastake \"0\"."
 
 #: g10/helptext.c:194
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
@@ -4105,18 +4107,19 @@ msgstr ""
 "olemas ka teine allkiri, mis kasutajat v�tmega seob."
 
 #: g10/helptext.c:231
+#, fuzzy
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures fill be advanced by one second.\n"
+"self-signatures will be advanced by one second.\n"
 msgstr ""
+"Muuda k�ikide kasutaja ID-de seadeid (v�i ainult valitud ID omi)\n"
+"vastavaks hetkel m��ratud seadetele. K�ikide asjasse puutuvate\n"
+"ise loodud allkirjade ajatempleid suurendatakse �he sekundi v�rra.\n"
 
 #: g10/helptext.c:238
-#, fuzzy
 msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr ""
-"Palun sisestage parool; see on salajane tekst\n"
-"  Bl��, bl��,.... "
+msgstr "Palun sisestage parool; see on salajane tekst \n"
 
 #: g10/helptext.c:244
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
@@ -4163,7 +4166,7 @@ msgstr ""
 "  \"V�ti ei ole enam kasutusel\"\n"
 "      Kasutage seda, kui te ei kasuta enam seda v�tit.\n"
 "  \"Kasutaja ID ei ole enam kehtiv\"\n"
-"      Kasutage seda m�rkimaks, et konkreetser kasutaja ID ei peaks enam\n"
+"      Kasutage seda m�rkimaks, et konkreetset kasutaja ID ei peaks enam\n"
 "      kasutama; seda kasutatakse tavaliselt m�rkimaks vigast e-posti "
 "aadressi.\n"
 
@@ -4187,24 +4190,24 @@ msgid "No help available for `%s'"
 msgstr "`%s' kohta abiinfo puudub"
 
 #: g10/keydb.c:177
-#, fuzzy, c-format
+#, c-format
 msgid "error creating keyring `%s': %s\n"
-msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
+msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
 
 #: g10/keydb.c:188
 #, c-format
 msgid "changing permission of  `%s' failed: %s\n"
-msgstr ""
+msgstr "`%s' �iguste muutmine eba�nnestus: %s\n"
 
 #: g10/keydb.c:197
-#, fuzzy, c-format
+#, c-format
 msgid "keyring `%s' created\n"
-msgstr "%s: v�tmehoidla on loodud\n"
+msgstr "v�tmehoidla `%s' on loodud\n"
 
 #: g10/keydb.c:587
-#, fuzzy, c-format
+#, c-format
 msgid "failed to rebuild keyring cache: %s\n"
-msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
+msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
 
 #: g10/keyring.c:1232
 msgid "WARNING: 2 files with confidential information exists.\n"
@@ -4225,305 +4228,27 @@ msgid "Please fix this possible security flaw\n"
 msgstr "Palun parandage see v�imalik turvaprobleem\n"
 
 #: g10/keyring.c:1334
-#, fuzzy, c-format
+#, c-format
 msgid "checking keyring `%s'\n"
-msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
+msgstr "kontrollin v�tmehoidlat `%s'\n"
 
 #: g10/keyring.c:1365
-#, fuzzy, c-format
+#, c-format
 msgid "%lu keys so far checked (%lu signatures)\n"
-msgstr "%lu v�tit on seni t��deldud\n"
+msgstr "seni on kontrollitud %lu v�tit (%lu allkirja)\n"
 
 #: g10/keyring.c:1376
-#, fuzzy, c-format
+#, c-format
 msgid "%lu keys checked (%lu signatures)\n"
-msgstr "n�ita v�tmeid ja allkirju"
+msgstr "kontrollitud %lu v�tit (%lu allkirja)\n"
 
 #: g10/keyring.c:1438
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: v�tmehoidla on loodud\n"
 
-#~ msgid "--delete-secret-key user-id"
-#~ msgstr "--delete-secret-key kasutaja-id"
-
-#~ msgid "--delete-key user-id"
-#~ msgstr "--delete-key kasutaja-id"
-
-#, fuzzy
-#~ msgid "--delete-secret-and-public-key user-id"
-#~ msgstr "--delete-secret-and-public-key kasutaja-id"
-
-#~ msgid "Enter the user ID: "
-#~ msgstr "Sisestage kasutaja ID: "
-
-#~ msgid "skipped: public key already set with --encrypt-to\n"
-#~ msgstr "j�tsin vahele: avalik v�ti on juba seatud v�tmega --encrypt-to\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "WARNING: This is a PGP2-style key\n"
-#~ msgstr "HOIATUS: `%s' on t�hi fail\n"
-
-#~ msgid "sSmMqQ"
-#~ msgstr "iImMvV"
-
-#~ msgid "no keyserver known (use option --keyserver)\n"
-#~ msgstr "v�tmeserver puudub (kasutage v�tit --keyserver)\n"
-
-#~ msgid "%s: not a valid key ID\n"
-#~ msgstr "%s: ei ole kehtiv v�tme ID\n"
-
-#, fuzzy
-#~ msgid "duplicate (short) key ID %08lX\n"
-#~ msgstr "avalik v�ti on %08lX\n"
-
-#, fuzzy
-#~ msgid "%lu key(s) to refresh\n"
-#~ msgstr "\t%lu vigadega v�tit\n"
-
-#~ msgid "|[NAMES]|check the trust database"
-#~ msgstr "|[NIMED]|kontrolli usalduse andmebaasi"
-
-#~ 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 ""
-#~ "Ei leia kehtivat usaldusteed teie v�tmeni. Vaatame, kas on\n"
-#~ "v�imalik lisada m�ni puuduv usalduse v��rtus.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "No path leading to one of our keys found.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Ei leia teed �he meie v�tmeni.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "No certificates with undefined trust found.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "M��ramata usaldusev��rtusega sertifikaate pole.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "No trust values changed.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Usalduse v��rtust ei muudetud.\n"
-#~ "\n"
-
-#~ msgid "%08lX: no info to calculate a trust probability\n"
-#~ msgstr "%08lX: usaldusv��rsuse arvutamiseks napib infot\n"
-
-#~ msgid "%s: error checking key: %s\n"
-#~ msgstr "%s: viga v�tme kontrollimisel: %s\n"
-
-#~ msgid "too many entries in unk cache - disabled\n"
-#~ msgstr "unk puhvris on liiga palju elemente - blokeerin\n"
-
-#~ msgid "update of trustdb failed: %s\n"
-#~ msgstr "trustdb uuendamine eba�nnestus: %s\n"
-
-#~ msgid "assuming bad MDC due to an unknown critical bit\n"
-#~ msgstr "oletan tundmatu kriitilise biti t�ttu vigast MDC\n"
-
-#~ msgid "error reading dir record for LID %lu: %s\n"
-#~ msgstr "viga LID %lu kataloogikirje lugemisel: %s\n"
-
-#~ msgid "lid %lu: expected dir record, got type %d\n"
-#~ msgstr "lid %lu: ootasin kataloogikirjet, sain t��bi %d\n"
-
-#~ msgid "no primary key for LID %lu\n"
-#~ msgstr "LID %lu primaarne v�ti puudub\n"
-
-#~ msgid "error reading primary key for LID %lu: %s\n"
-#~ msgstr "viga LID %lu primaarse v�tme lugemisel: %s\n"
-
-#~ msgid "get_dir_record: search_record failed: %s\n"
-#~ msgstr "get_dir_record: search_record eba�nnestus: %s\n"
-
-#~ msgid "key %08lX: query record failed\n"
-#~ msgstr "v�ti %08lX: kirje otsing eba�nnestus\n"
-
-#~ msgid "key %08lX: already in trusted key table\n"
-#~ msgstr "v�ti %08lX: on juba usaldatavate v�tmete tabelis\n"
-
-#~ msgid "NOTE: secret key %08lX is NOT protected.\n"
-#~ msgstr "M�RKUS: salajane v�ti %08lX EI OLE kaitstud.\n"
-
-#~ msgid "key %08lX: secret and public key don't match\n"
-#~ msgstr "v�ti %08lX: salajane ja avalik v�ti ei sobi\n"
-
-#~ msgid "enumerate secret keys failed: %s\n"
-#~ msgstr "salajaste v�tmete loendamine eba�nnestus: %s\n"
-
-#~ msgid "key %08lX.%lu: Good subkey binding\n"
-#~ msgstr "v�ti %08lX.%lu: Hea alamv�tme seos\n"
-
-#~ msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
-#~ msgstr "v�ti %08lX.%lu: Vigane alamv�tme seos: %s\n"
-
-#~ msgid "key %08lX.%lu: Valid key revocation\n"
-#~ msgstr "v�ti %08lX.%lu: kehtiv v�tme t�histamine\n"
-
-#~ msgid "key %08lX.%lu: Invalid key revocation: %s\n"
-#~ msgstr "v�ti %08lX.%lu: Vigane v�tme t�histamine: %s\n"
-
-#~ msgid "key %08lX.%lu: Valid subkey revocation\n"
-#~ msgstr "v�ti %08lX.%lu: Kehtiv alamv�tme t�histamine\n"
-
-#~ msgid "Good self-signature"
-#~ msgstr "Hea iseenda allkiri"
-
-#~ msgid "Invalid self-signature"
-#~ msgstr "Vigane iseenda allkiri"
-
-#~ msgid "Valid user ID revocation skipped due to a newer self signature"
-#~ msgstr ""
-#~ "J�tsin kehtiva kasutaja ID t�histuse vahele, kuna leidub uuem iseenda "
-#~ "allkiri"
-
-#~ msgid "Valid user ID revocation"
-#~ msgstr "Kehtiv kasutaja ID t�histamine"
-
-#~ msgid "Invalid user ID revocation"
-#~ msgstr "Vigane kasutaja ID t�histamine"
-
-#~ msgid "Valid certificate revocation"
-#~ msgstr "Kehtiv sertifikaadi t�histus"
-
-#~ msgid "Good certificate"
-#~ msgstr "Hea sertifikaat"
-
-#~ msgid "Invalid certificate revocation"
-#~ msgstr "Vigane sertifikaadi t�histus"
-
-#~ msgid "Invalid certificate"
-#~ msgstr "Vigane sertifikaat"
-
-#~ msgid "sig record %lu[%d] points to wrong record.\n"
-#~ msgstr "allkirjakirje %lu[%d] viitab valele kirjele.\n"
-
-#~ msgid "duplicated certificate - deleted"
-#~ msgstr "duplikaat sertifikaat - kustutasin"
-
-#~ msgid "tdbio_search_dir failed: %s\n"
-#~ msgstr "tdbio_search_dir eba�nnestus: %s\n"
-
-#~ msgid "lid ?: insert failed: %s\n"
-#~ msgstr "lid ?: lisamine eba�nnestus: %s\n"
-
-#~ msgid "lid %lu: insert failed: %s\n"
-#~ msgstr "lid %lu: lisamine eba�nnestus: %s\n"
-
-#~ msgid "lid %lu: inserted\n"
-#~ msgstr "lid %lu: lisatud\n"
-
-#~ msgid "error reading dir record: %s\n"
-#~ msgstr "viga kataloogikirje lugemisel: %s\n"
-
-#~ msgid "\t%lu keys inserted\n"
-#~ msgstr "\t%lu v�tit lisatud\n"
-
-#~ msgid "enumerate keyblocks failed: %s\n"
-#~ msgstr "v�tmeblokkide loendamine eba�nnestus: %s\n"
-
-#~ msgid "lid %lu: dir record w/o key - skipped\n"
-#~ msgstr "lid %lu: kataloogikirje ilma v�tmeta - j�tsin vahele\n"
-
-#~ msgid "\t%lu due to new pubkeys\n"
-#~ msgstr "\t%lu uut avalikku v�tit\n"
-
-#~ msgid "\t%lu keys skipped\n"
-#~ msgstr "\t%lu v�tit j�etud vahele\n"
-
-#~ msgid "\t%lu keys updated\n"
-#~ msgstr "\t%lu v�tit uuendatud\n"
-
-#~ msgid "Ooops, no keys\n"
-#~ msgstr "Ooops, v�tmeid pole\n"
-
-#~ msgid "Ooops, no user IDs\n"
-#~ msgstr "Ooops, puudub kasutaja ID\n"
-
-#~ msgid "check_trust: search dir record failed: %s\n"
-#~ msgstr "check_trust: kataloogikirje otsimine eba�nnestus: %s\n"
-
-#~ msgid "key %08lX: insert trust record failed: %s\n"
-#~ msgstr "v�ti %08lX: usalduse kirje lisamine eba�nnestus: %s\n"
-
-#~ msgid "key %08lX.%lu: inserted into trustdb\n"
-#~ msgstr "v�ti %08lX.%lu: lisatud trustdb faili\n"
-
-#~ msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
-#~ msgstr "v�ti %08lX.%lu: loodud tulevikus (aja h�pe v�i kella probleem)\n"
-
-#~ msgid "key %08lX.%lu: expired at %s\n"
-#~ msgstr "v�ti %08lX.%lu: aegus %s\n"
-
-#~ msgid "key %08lX.%lu: trust check failed: %s\n"
-#~ msgstr "v�ti %08lX.%lu: usalduse kontroll eba�nnestus: %s\n"
-
-#~ msgid "user '%s' not found: %s\n"
-#~ msgstr "kasutajat '%s' ei leitud: %s\n"
-
-#~ msgid "problem finding '%s' in trustdb: %s\n"
-#~ msgstr "probleem '%s' trustdbst leidmisel: %s\n"
-
-#~ msgid "user '%s' not in trustdb - inserting\n"
-#~ msgstr "kasutaja '%s' puudub trustdb failis - lisan\n"
-
-#~ msgid "failed to put '%s' into trustdb: %s\n"
-#~ msgstr "'%s' trustdb faili lisamine eba�nnestus: %s\n"
-
-#~ msgid "too many random bits requested; the limit is %d\n"
-#~ msgstr "sooviti liiga palju juhuslikke bitte; piirang on %d\n"
-
-#~ msgid "For info see http://www.gnupg.org"
-#~ msgstr "Infot saate lehelt http://www.gnupg.org"
-
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (allkirjastamiseks ja kr�ptimiseks)\n"
-
-#~ msgid "Do you really want to create a sign and encrypt key? "
-#~ msgstr "Kas te soovite t�esti luua allkirjastamise ja kr�ptimise v�tit? "
-
-#~ msgid "%s: user not found: %s\n"
-#~ msgstr "%s: kasutajat ei leitud: %s\n"
-
-#~ msgid "certificate read problem: %s\n"
-#~ msgstr "probleem sertifikaadi lugemisel: %s\n"
-
-#~ msgid "can't lock keyring `%s': %s\n"
-#~ msgstr "v�tmehoidlat `%s' ei saa lukustada: %s\n"
-
-#~ msgid "%s: user not found\n"
-#~ msgstr "%s: kasutajat ei leitud\n"
-
-#~ msgid "WARNING: can't yet handle long pref records\n"
-#~ msgstr "HOIATUS: ei k�sitle veel pikki eelistuste kirjeid\n"
-
-#~ msgid "%s: can't create keyring: %s\n"
-#~ msgstr "%s: v�tmehoidlat ei �nnestu luua: %s\n"
-
-#~ msgid "RSA key cannot be used in this version\n"
-#~ msgstr "selles versioonis ei saa RSA v�tit kasutada\n"
-
-#~ msgid "No key for user ID\n"
-#~ msgstr "See kasutaja ID ei oma v�tit\n"
-
-#~ msgid "No user ID for key\n"
-#~ msgstr "Sel v�tmel ei ole kasutaja ID\n"
-
-#~ msgid "invalid"
-#~ msgstr "vigane"
-
-#~ msgid "revoked"
-#~ msgstr "t�histatud"
+#~ msgid "Do you really need such a large keysize? "
+#~ msgstr "Kas te t�esti soovite nii pikka v�tit? "
 
-#~ msgid "no secret key for decryption available\n"
-#~ msgstr "lahtikr�ptimiseks puudub salajane v�ti\n"
+#~ msgid "   signed by %08lX at %s\n"
+#~ msgstr "   allkirjastanud %08lX %s\n"
diff --git a/po/fr.po b/po/fr.po
index 0e3bf465b..d2bacaccf 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,6 +1,6 @@
 # GnuPG French translation
-# Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-# Ga�l Qu�ri <[email protected]>, 1998.
+# Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+# Ga�l Qu�ri <[email protected]>, 1998.
 #
 # Thanks to R�mi Guyomarch <[email protected]> and <[email protected]>
 # for pointing me out some errors.
@@ -9,10 +9,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.0.4t\n"
+"Project-Id-Version: gnupg 1.0.6d\n"
 "POT-Creation-Date: 2002-03-03 15:18+0100\n"
-"PO-Revision-Date: 2001-04-24 17:46+02:00\n"
-"Last-Translator: Ga�l Qu�ri <[email protected]>\n"
+"PO-Revision-Date: 2002-03-28 23:43+01:00\n"
+"Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -24,7 +24,7 @@ msgstr "Avertissement: l'utilisation de la m�moire n'est pas s�re !\n"
 
 #: util/secmem.c:89
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
-msgstr ""
+msgstr "voir http://www.gnupg.org/fr/faq.html pour plus d'informations\n"
 
 #: util/secmem.c:326
 msgid "operation is not possible without initialized secure memory\n"
@@ -266,9 +266,8 @@ msgid "unusable secret key"
 msgstr "cl� secr�te inutilisable"
 
 #: util/errors.c:107
-#, fuzzy
 msgid "keyserver error"
-msgstr "erreur g�n�rale"
+msgstr "erreur du serveur de cl�s"
 
 #: util/logger.c:249
 #, c-format
@@ -385,7 +384,7 @@ msgstr "chiffrer les donn�es"
 
 #: g10/g10.c:283
 msgid "|[files]|encrypt files"
-msgstr ""
+msgstr "[fichier]|chiffrer les fichiers"
 
 #: g10/g10.c:284
 msgid "encryption only with symmetric cipher"
@@ -401,7 +400,7 @@ msgstr "d�chiffrer les donn�es (d�faut)"
 
 #: g10/g10.c:287
 msgid "|[files]|decrypt files"
-msgstr ""
+msgstr "|[fichiers]|d�chiffrer les fichiers"
 
 #: g10/g10.c:288
 msgid "verify a signature"
@@ -432,14 +431,12 @@ msgid "generate a new key pair"
 msgstr "g�n�rer une nouvelle paire de cl�s"
 
 #: g10/g10.c:297
-#, fuzzy
 msgid "remove keys from the public keyring"
-msgstr "enlever la cl� du porte-cl�s public"
+msgstr "enlever les cl�s du porte-cl�s public"
 
 #: g10/g10.c:299
-#, fuzzy
 msgid "remove keys from the secret keyring"
-msgstr "enlever la cl� du porte-cl�s secret"
+msgstr "enlever les cl�s du porte-cl�s secret"
 
 #: g10/g10.c:300
 msgid "sign a key"
@@ -450,14 +447,12 @@ msgid "sign a key locally"
 msgstr "signer une cl� localement"
 
 #: g10/g10.c:302
-#, fuzzy
 msgid "sign a key non-revocably"
-msgstr "signer une cl� localement"
+msgstr "signer une cl� irr�vocablement"
 
 #: g10/g10.c:303
-#, fuzzy
 msgid "sign a key locally and non-revocably"
-msgstr "signer une cl� localement"
+msgstr "signer une cl� localement et irr�vocablement"
 
 #: g10/g10.c:304
 msgid "sign or edit a key"
@@ -480,14 +475,12 @@ msgid "import keys from a key server"
 msgstr "importer les cl�s d'un serveur de cl�s"
 
 #: g10/g10.c:310
-#, fuzzy
 msgid "search for keys on a key server"
-msgstr "exporter les cl�s vers un serveur de cl�s"
+msgstr "chercher les cl�s avec un serveur de cl�s"
 
 #: g10/g10.c:312
-#, fuzzy
 msgid "update all keys from a keyserver"
-msgstr "importer les cl�s d'un serveur de cl�s"
+msgstr "mettre � jour les cl�s depuis un serveur"
 
 #: g10/g10.c:316
 msgid "import/merge keys"
@@ -510,9 +503,8 @@ msgid "update the trust database"
 msgstr "mettre la base de confiance � jour"
 
 #: g10/g10.c:326
-#, fuzzy
 msgid "unattended trust database update"
-msgstr "mettre la base de confiance � jour"
+msgstr "mise � jour inattendue de la base de confiance"
 
 #: g10/g10.c:327
 msgid "fix a corrupted trust database"
@@ -589,28 +581,26 @@ msgid "force v3 signatures"
 msgstr "forcer les signatures en v3"
 
 #: g10/g10.c:365
-#, fuzzy
 msgid "do not force v3 signatures"
-msgstr "forcer les signatures en v3"
+msgstr "ne pas forcer les signatures en v3"
 
 #: g10/g10.c:366
-#, fuzzy
 msgid "force v4 key signatures"
-msgstr "forcer les signatures en v3"
+msgstr "forcer les signatures en v4"
 
 #: g10/g10.c:367
-#, fuzzy
 msgid "do not force v4 key signatures"
-msgstr "forcer les signatures en v3"
+msgstr "ne pas forcer les signatures en v4"
 
 #: g10/g10.c:368
 msgid "always use a MDC for encryption"
 msgstr "toujours utiliser un sceau pour le chiffrement"
 
 #: g10/g10.c:370
-#, fuzzy
 msgid "never use a MDC for encryption"
-msgstr "toujours utiliser un sceau pour le chiffrement"
+msgstr ""
+"ne jamais utiliser de sceau pour le\n"
+"chiffrement"
 
 #: g10/g10.c:372
 msgid "do not make any changes"
@@ -643,7 +633,7 @@ msgstr "ajouter ce porte-cl�s secret � la liste"
 
 #: g10/g10.c:382
 msgid "show which keyring a listed key is on"
-msgstr ""
+msgstr "indiquer o� est une cl� list�e"
 
 #: g10/g10.c:383
 msgid "|NAME|use NAME as default secret key"
@@ -666,12 +656,10 @@ msgid "|FD|write status info to this FD"
 msgstr "|FD|�crire l'�tat sur ce descripteur"
 
 #: g10/g10.c:393
-#, fuzzy
 msgid "|[file]|write status info to file"
-msgstr "|FD|�crire l'�tat sur ce descripteur"
+msgstr "|[fichier]|�crire les informations d'�tat vers ce fichier"
 
 #: g10/g10.c:399
-#, fuzzy
 msgid "|KEYID|ultimately trust this key"
 msgstr "|IDCL�|donner une confiance ultime � cette cl�"
 
@@ -688,9 +676,11 @@ msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "utiliser le comportement d�fini par OpenPGP"
 
 #: g10/g10.c:403
-#, fuzzy
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
-msgstr "utiliser le comportement d�fini par OpenPGP"
+msgstr ""
+"utiliser le comportement de PGP 2.x\n"
+"pour toutes les options de paquets,\n"
+"de hachage et de chiffrement"
 
 #: g10/g10.c:407
 msgid "|N|use passphrase mode N"
@@ -722,15 +712,17 @@ msgstr "supprimer l'ident. des paquets chiffr�s"
 
 #: g10/g10.c:416
 msgid "Show Photo IDs"
-msgstr ""
+msgstr "Montrer les photos d'identit�"
 
 #: g10/g10.c:417
 msgid "Don't show Photo IDs"
-msgstr ""
+msgstr "Ne pas montrer les photos d'identit�"
 
 #: g10/g10.c:418
 msgid "Set command line to view Photo IDs"
 msgstr ""
+"Choisir la ligne de commande servant �\n"
+"afficher les photos d'identit�"
 
 #: g10/g10.c:419
 msgid "|NAME=VALUE|use this notation data"
@@ -822,7 +814,7 @@ msgstr "%s n'est pas une table de caract�res valide\n"
 
 #: g10/g10.c:1190
 msgid "could not parse keyserver URI\n"
-msgstr ""
+msgstr "impossible d'interpr�ter l'URI du serveur de cl�s\n"
 
 #: g10/g10.c:1294
 msgid "WARNING: program may create a core file!\n"
@@ -831,7 +823,7 @@ msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 #: g10/g10.c:1298
 #, c-format
 msgid "WARNING: %s overrides %s\n"
-msgstr ""
+msgstr "ATTENTION: %s remplace %s\n"
 
 #: g10/g10.c:1305 g10/g10.c:1316
 #, c-format
@@ -851,23 +843,28 @@ msgstr "%s n'a aucun sens avec %s !\n"
 #: g10/g10.c:1336
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
+"il n'est possible de faire une signature d�tach�e ou en texte clair\n"
+"qu'en mode --pgp2\n"
 
 #: g10/g10.c:1342
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
-msgstr ""
+msgstr "vous ne pouvez pas signer et chiffrer en m�me temps en mode --pgp2\n"
 
 #: g10/g10.c:1348
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
+"vous devez utiliser des fichiers (et pas un tube) lorsque --pgp2\n"
+"est activ�.\n"
 
 #: g10/g10.c:1361
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
+"chiffrer un message en mode --pgp2 n�cessite l'algorithme de chiffrage IDEA\n"
 
 #: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1375 g10/sign.c:614
 #: g10/sign.c:792
 msgid "this message may not be usable by PGP 2.x\n"
-msgstr ""
+msgstr "ce message ne sera pas forc�ment utilisable par PGP 2.x\n"
 
 #: g10/g10.c:1414 g10/g10.c:1426
 msgid "selected cipher algorithm is invalid\n"
@@ -878,14 +875,12 @@ msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
 #: g10/g10.c:1436
-#, fuzzy
 msgid "the given signature policy URL is invalid\n"
-msgstr "l'URL de politique donn�e est invalide\n"
+msgstr "l'URL de politique de signature donn�e est invalide\n"
 
 #: g10/g10.c:1440
-#, fuzzy
 msgid "the given certification policy URL is invalid\n"
-msgstr "l'URL de politique donn�e est invalide\n"
+msgstr "l'URL de politique de certification donn�e est invalide\n"
 
 #: g10/g10.c:1443
 #, c-format
@@ -913,14 +908,12 @@ 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:1460
-#, fuzzy
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
-msgstr "mode S2K invalide; ce doit �tre 0, 1 ou 3\n"
+msgstr "default-check-level invalide; ce doit �tre 0, 1, 2 ou 3\n"
 
 #: g10/g10.c:1463
-#, fuzzy
 msgid "invalid preferences\n"
-msgstr "lister les pr�f�rences"
+msgstr "pr�f�rences invalides\n"
 
 #: g10/g10.c:1557
 #, c-format
@@ -948,9 +941,8 @@ msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
 #: g10/g10.c:1636
-#, fuzzy
 msgid "--sign --symmetric [filename]"
-msgstr "--symmetric [nom du fichier]"
+msgstr "--sign --symmetric [nom du fichier]"
 
 #: g10/g10.c:1645
 msgid "--clearsign [filename]"
@@ -969,14 +961,12 @@ msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
 #: g10/g10.c:1690
-#, fuzzy
 msgid "--nrsign-key user-id"
-msgstr "--sign-key utilisateur"
+msgstr "--nrsign-key utilisateur"
 
 #: g10/g10.c:1698
-#, fuzzy
 msgid "--nrlsign-key user-id"
-msgstr "--sign-key utilisateur"
+msgstr "--nrlsign-key utilisateur"
 
 #: g10/g10.c:1706
 msgid "--edit-key user-id [commands]"
@@ -1152,65 +1142,56 @@ msgstr "Commentaire de r�vocation: "
 #. a string with valid answers
 #: g10/pkclist.c:244
 msgid "iImMqQsS"
-msgstr ""
+msgstr "iImMqQsS"
 
 #: g10/pkclist.c:250
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "No trust value assigned to:\n"
 "%4u%c/%08lX %s \""
 msgstr ""
-"Pas de confiance d�finie pour %lu:\n"
+"Pas de confiance d�finie pour :\n"
 "%4u%c/%08lX %s \""
 
 #: g10/pkclist.c:262
-#, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
 "checking fingerprints from different sources...)?\n"
 "\n"
 msgstr ""
-"� quel point avez-vous confiance en cet utilisateur pour v�rifier "
-"correctement\n"
-"les cl�s des autres utilisateurs (vous pouvez v�rifier son passeport, "
-"v�rifier\n"
-"les empreintes de diverses sources...) ?\n"
-"\n"
-" 1 = je ne sais pas\n"
-" 2 = je ne lui fais pas confiance\n"
-" 3 = je le crois marginalement\n"
-" 4 = je le crois totalement\n"
-" s = montrez-moi plus d'informations\n"
+"� quel point avez-vous confiance en cet utilisateur pour la v�rification\n"
+"des cl�s des autres utilisateurs (vous pouvez v�rifier son passeport,\n"
+"v�rifier les empreintes de diverses sources...) ?\n"
 
 #: g10/pkclist.c:265
 #, c-format
 msgid " %d = Don't know\n"
-msgstr ""
+msgstr " %d = ne sait pas\n"
 
 #: g10/pkclist.c:266
-#, fuzzy, c-format
+#, c-format
 msgid " %d = I do NOT trust\n"
-msgstr "%08lX: Nous ne faisons PAS confiance � cette cl�\n"
+msgstr " %d = je ne fais PAS confiance\n"
 
 #: g10/pkclist.c:267
 #, c-format
 msgid " %d = I trust marginally\n"
-msgstr ""
+msgstr " %d = je crois marginalement\n"
 
 #: g10/pkclist.c:268
-#, fuzzy, c-format
+#, c-format
 msgid " %d = I trust fully\n"
-msgstr "%s: ce n'est pas un fichier de base de confiance\n"
+msgstr " %d = je fais enti�rement confiance\n"
 
 #: g10/pkclist.c:270
 #, c-format
 msgid " %d = I trust ultimately\n"
-msgstr ""
+msgstr " %d = je donne une confiance ultime\n"
 
 #: g10/pkclist.c:271
 msgid " i = please show me more information\n"
-msgstr ""
+msgstr " i = donnez-moi plus d'informations\n"
 
 #: g10/pkclist.c:273
 msgid " m = back to the main menu\n"
@@ -1218,7 +1199,7 @@ msgstr " m = retour au menu principal\n"
 
 #: g10/pkclist.c:276
 msgid " s = skip this key\n"
-msgstr ""
+msgstr " s = sauter cette cl�\n"
 
 #: g10/pkclist.c:277
 msgid " q = quit\n"
@@ -1229,9 +1210,8 @@ msgid "Your decision? "
 msgstr "Votre d�cision ? "
 
 #: g10/pkclist.c:305
-#, fuzzy
 msgid "Do you really want to set this key to ultimate trust? "
-msgstr "Voulez-vous vraiment supprimer cette cl� ? "
+msgstr "Voulez-vous vraiment donner une confiance ultime � cette cl� ?"
 
 #: g10/pkclist.c:317
 msgid "Certificates leading to an ultimately trusted key:\n"
@@ -1257,11 +1237,10 @@ msgid "%08lX: key has expired\n"
 msgstr "%08lX: la cl� a expir�\n"
 
 #: g10/pkclist.c:434
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%08lX: There is no indication that this key really belongs to the owner\n"
-msgstr ""
-"           Rien ne dit que la signature appartient � son propri�taire.\n"
+msgstr "%08lX: Rien ne dit que la cl� appartient vraiment au propri�taire.\n"
 
 #: g10/pkclist.c:440
 #, c-format
@@ -1314,9 +1293,8 @@ 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:566
-#, fuzzy
 msgid "Note: This key has been disabled.\n"
-msgstr "Cette cl� a �t� d�sactiv�e"
+msgstr "Note: cette cl� a �t� d�sactiv�e.\n"
 
 #: g10/pkclist.c:571
 msgid "Note: This key has expired!\n"
@@ -1364,17 +1342,17 @@ msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignor�: cl� publique d�j� pr�sente\n"
 
 #: g10/pkclist.c:744
-#, fuzzy
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
-"Vous n'avez pas sp�cifi� de nom d'utilisateur. (vous pouvez utiliser �-r�)\n"
+"Vous n'avez pas sp�cifi� de nom d'utilisateur. (vous pouvez\n"
+"utiliser �-r�)\n"
 "\n"
 
 #: g10/pkclist.c:754
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
-msgstr ""
+msgstr "\nEntrez le nom d'utilisateur, en terminant par une ligne vide: "
 
 #: g10/pkclist.c:768
 msgid "No such user ID.\n"
@@ -1389,9 +1367,8 @@ msgid "Public key is disabled.\n"
 msgstr "La cl� publique est d�sactiv�e.\n"
 
 #: g10/pkclist.c:798
-#, fuzzy
 msgid "skipped: public key already set\n"
-msgstr "%s: ignor�: cl� publique d�j� pr�sente\n"
+msgstr "ignor�: cl� publique d�j� activ�e\n"
 
 #: g10/pkclist.c:841
 #, c-format
@@ -1410,22 +1387,21 @@ msgstr "pas de destinataire valide\n"
 #: g10/keygen.c:179
 #, c-format
 msgid "preference %c%lu is not valid\n"
-msgstr ""
+msgstr "la pr�f�rence %c%lu n'est pas valide\n"
 
 #: g10/keygen.c:186
-#, fuzzy, c-format
+#, c-format
 msgid "preference %c%lu duplicated\n"
-msgstr "`%s' a �t� ignor�: dupliqu�\n"
+msgstr "pr�f�rence %c%lu dupliqu�e\n"
 
 #: g10/keygen.c:191
-#, fuzzy, c-format
+#, c-format
 msgid "too many `%c' preferences\n"
-msgstr "lister les pr�f�rences"
+msgstr "trop de pr�f�rences `%c'\n"
 
 #: g10/keygen.c:256
-#, fuzzy
 msgid "invalid character in string\n"
-msgstr "Caract�re invalide dans le nom\n"
+msgstr "Caract�re invalide dans la cha�ne\n"
 
 # g10/keygen.c:123 ???
 #: g10/keygen.c:386
@@ -1472,14 +1448,14 @@ msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signature et chiffrement)\n"
 
 #: g10/keygen.c:771
-#, fuzzy, c-format
+#, c-format
 msgid "   (%d) RSA (sign only)\n"
-msgstr "   (%d) DSA (signature seule)\n"
+msgstr "   (%d) RSA (signature seule)\n"
 
 #: g10/keygen.c:773
-#, fuzzy, c-format
+#, c-format
 msgid "   (%d) RSA (encrypt only)\n"
-msgstr "   (%d) ElGamal (chiffrement seul)\n"
+msgstr "   (%d) RSA (chiffrement seul)\n"
 
 #: g10/keyedit.c:466 g10/keygen.c:776
 msgid "Your selection? "
@@ -1585,10 +1561,9 @@ msgstr ""
 "      <n>  = la cl� expire dans n jours\n"
 "      <n>w = la cl� expire dans n semaines\n"
 "      <n>m = la cl� expire dans n mois\n"
-"      <n>y = la cl� expire dans n ans\n"
+"      <n>y = la cl� expire dans n ann�es\n"
 
 #: g10/keygen.c:943
-#, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1597,36 +1572,35 @@ msgid ""
 "      <n>m = signature expires in n months\n"
 "      <n>y = signature expires in n years\n"
 msgstr ""
-"Sp�cifiez combien de temps cette cl� devrait �tre valide.\n"
-"         0 = la cl� n'expire pas\n"
-"      <n>  = la cl� expire dans n jours\n"
-"      <n>w = la cl� expire dans n semaines\n"
-"      <n>m = la cl� expire dans n mois\n"
-"      <n>y = la cl� expire dans n ans\n"
+"Sp�cifiez combien de temps la signature devrait �tre valide.\n"
+"         0 = la signature n'expire pas\n"
+"      <n>  = la signature expire dans n jours\n"
+"      <n>w = la signature expire dans n semaines\n"
+"      <n>m = la signature expire dans n mois\n"
+"      <n>y = la signature expire dans n ann�es\n"
 
 #: g10/keygen.c:965
 msgid "Key is valid for? (0) "
 msgstr "La cl� est valide pour ? (0) "
 
 #: g10/keygen.c:967
-#, fuzzy
 msgid "Signature is valid for? (0) "
-msgstr "La cl� est valide pour ? (0) "
+msgstr "La signature est valide pour ? (0) "
 
 #: g10/keygen.c:972
 msgid "invalid value\n"
 msgstr "valeur invalide\n"
 
 #: g10/keygen.c:977
-#, fuzzy, c-format
+#, c-format
 msgid "%s does not expire at all\n"
-msgstr "La cl� n'expire pas du tout\n"
+msgstr "%s n'expire pas du tout\n"
 
 #. print the date when the key expires
 #: g10/keygen.c:984
-#, fuzzy, c-format
+#, c-format
 msgid "%s expires at %s\n"
-msgstr "La cl� expire le %s\n"
+msgstr "%s expire le %s\n"
 
 #: g10/keygen.c:990
 msgid ""
@@ -1734,14 +1708,13 @@ msgstr ""
 "\n"
 
 #: g10/keyedit.c:655 g10/keygen.c:1210
-#, fuzzy
 msgid "passphrase not correctly repeated; try again"
-msgstr "le mot de passe n'a pas �t� r�p�t� � l'identique; recommencez.\n"
+msgstr "le mot de passe n'a pas �t� correctement r�p�t� ; recommencez."
 
 #: g10/keygen.c:1211
 #, c-format
 msgid "%s.\n"
-msgstr ""
+msgstr "%s.\n"
 
 #: g10/keygen.c:1217
 msgid ""
@@ -1786,33 +1759,34 @@ msgid "writing secret key to `%s'\n"
 msgstr "�criture de la cl� secr�te vers `%s'\n"
 
 #: g10/keygen.c:1939
-#, fuzzy, c-format
+#, c-format
 msgid "no writable public keyring found: %s\n"
-msgstr "cl� %08lX: cl� publique pas trouv�e: %s\n"
+msgstr ""
+"aucun portes-cl�s public n'a �t� trouv� avec des droits d'�criture : %s\n"
 
 #: g10/keygen.c:1945
-#, fuzzy, c-format
+#, c-format
 msgid "no writable secret keyring found: %s\n"
-msgstr "cl� %08lX: cl� secr�te pas trouv�e: %s\n"
+msgstr ""
+"aucun portes-cl�s secret n'a �t� trouv� avec des droits d'�criture : %s\n"
 
 #: g10/keygen.c:1959
-#, fuzzy, c-format
+#, c-format
 msgid "error writing public keyring `%s': %s\n"
-msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
+msgstr "erreur durant l'�criture du porte-cl�s public `%s': %s\n"
 
 #: g10/keygen.c:1966
-#, fuzzy, c-format
+#, c-format
 msgid "error writing secret keyring `%s': %s\n"
-msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
+msgstr "erreur durant l'�criture du porte-cl�s secret `%s': %s\n"
 
 #: g10/keygen.c:1986
 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:1987
-#, fuzzy
 msgid "key marked as ultimately trusted.\n"
-msgstr "Certificats conduisant vers une cl� � confiance ultime:\n"
+msgstr "cl� marqu�e comme ayant une confiance ultime.\n"
 
 #: g10/keygen.c:1996
 msgid ""
@@ -1848,6 +1822,7 @@ msgstr ""
 #: g10/keygen.c:2063
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
+"NOTE: cr�er des sous-cl�s pour des cl�s v3 n'est pas conforme � OpenPGP\n"
 
 #: g10/keygen.c:2090
 msgid "Really create? "
@@ -1855,12 +1830,12 @@ msgstr "Cr�er vraiment ? "
 
 #: g10/decrypt.c:92 g10/encode.c:590
 msgid "--output doesn't work for this command\n"
-msgstr ""
+msgstr "--output n'est pas compatible avec cette commande\n"
 
 #: g10/encode.c:92 g10/encode.c:296
-#, fuzzy, c-format
+#, c-format
 msgid "`%s' already compressed\n"
-msgstr "%lu cl�s trait�es\n"
+msgstr "`%s' d�j� compress�\n"
 
 #: g10/encode.c:100 g10/openfile.c:180 g10/openfile.c:300 g10/tdbio.c:492
 #: g10/tdbio.c:552
@@ -1881,6 +1856,8 @@ msgstr "%s: ATTENTION: fichier vide\n"
 #: g10/encode.c:285
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
+"le chiffrement RSA ne se fait qu'avec des cl�s de moins de 2048 bits\n"
+"en mode --pgp2\n"
 
 #: g10/encode.c:313
 #, c-format
@@ -1891,6 +1868,8 @@ msgstr "lecture de `%s'\n"
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr ""
+"impossible d'utiliser le chiffre IDEA pour toutes les cl�s vers\n"
+"lesquelles vous chiffrez.\n"
 
 #: g10/encode.c:563
 #, c-format
@@ -1898,14 +1877,14 @@ msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s chiffr� pour: %s\n"
 
 #: g10/delkey.c:69 g10/export.c:142
-#, fuzzy, c-format
+#, c-format
 msgid "key `%s' not found: %s\n"
-msgstr "l'utilisateur '%s' n'a pas �t� trouv�: %s\n"
+msgstr "cl� '%s' introuvable: %s\n"
 
 #: g10/delkey.c:77 g10/export.c:162
-#, fuzzy, c-format
+#, c-format
 msgid "error reading keyblock: %s\n"
-msgstr "erreur pendant la lecture de `%s': %s\n"
+msgstr "erreur pendant la lecture du bloc de cl� : %s\n"
 
 #: g10/export.c:170
 #, c-format
@@ -1918,9 +1897,9 @@ msgid "key %08lX: not protected - skipped\n"
 msgstr "cl� %08lX: non prot�g�e - ignor�e\n"
 
 #: g10/export.c:189
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
-msgstr "cl� %08lX: nouvelle cl� - ignor�e\n"
+msgstr "cl� %08lX: cl� de style PGP 2.x - ignor�e\n"
 
 #: g10/export.c:255
 msgid "WARNING: nothing exported\n"
@@ -1939,7 +1918,7 @@ msgstr "[Nom utilisateur introuvable]"
 #: g10/getkey.c:1362
 #, c-format
 msgid "Invalid key %08lX made valid by --always-trust\n"
-msgstr ""
+msgstr "La cl� invalide %08lX a �t� rendu valide par --always-trust\n"
 
 #: g10/getkey.c:1957
 #, c-format
@@ -2053,9 +2032,9 @@ msgid "key %08lX: new key - skipped\n"
 msgstr "cl� %08lX: nouvelle cl� - ignor�e\n"
 
 #: g10/import.c:480
-#, fuzzy, c-format
+#, c-format
 msgid "no writable keyring found: %s\n"
-msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
+msgstr "aucun porte-cl� n'a �t� trouv� avec des droits d'�criture : %s\n"
 
 #: g10/import.c:485 g10/openfile.c:244 g10/sign.c:642 g10/sign.c:811
 #, c-format
@@ -2123,9 +2102,9 @@ msgid "key %08lX: not changed\n"
 msgstr "cl� %08lX: n'a pas chang�\n"
 
 #: g10/import.c:655
-#, fuzzy, c-format
+#, c-format
 msgid "no default secret keyring: %s\n"
-msgstr "pas de porte-cl�s public par d�faut\n"
+msgstr "pas de porte-cl�s par d�faut: %s\n"
 
 #: g10/import.c:666
 #, c-format
@@ -2230,9 +2209,9 @@ msgid "key %08lX: revocation certificate added\n"
 msgstr "cl� %08lX: certificat de r�vocation ajout�\n"
 
 #: g10/import.c:1152
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX: direct key signature added\n"
-msgstr "cl� %08lX: %d nouvelles signatures\n"
+msgstr "cl� %08lX: ajout de la signature de cl� directe\n"
 
 #: g10/import.c:1266 g10/import.c:1319
 #, c-format
@@ -2286,12 +2265,11 @@ msgstr "%d nom d'utilisateurs sans auto-signature valide d�tect�\n"
 #: g10/keyedit.c:325
 #, c-format
 msgid "User ID \"%s\" is revoked.\n"
-msgstr ""
+msgstr "Le nom d'utilisateur \"%s\" est r�voqu�.\n"
 
 #: g10/keyedit.c:330 g10/keyedit.c:1004
-#, fuzzy
 msgid "Are you sure you still want to sign it?\n"
-msgstr "Etes-vous s�r de vouloir cette taille ? "
+msgstr "�tes-vous s�r de vouloir le signer ?\n"
 
 #: g10/keyedit.c:335 g10/keyedit.c:409 g10/keyedit.c:519 g10/keyedit.c:1007
 msgid "Really sign? "
@@ -2307,13 +2285,17 @@ msgid ""
 "\n"
 "Do you want to promote it to a full exportable signature?\n"
 msgstr ""
+"Votre signature actuelle sur \"%s\"\n"
+"est locale.\n"
+"\n"
+"Voulez vous la rendre compl�tement exportable ?\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
 #: g10/keyedit.c:374
-#, fuzzy, c-format
+#, c-format
 msgid "\"%s\" was already %ssigned by key %08lX\n"
-msgstr "D�j� sign� par la cl� %08lX\n"
+msgstr "\"%s\" a d�j� �t� %ssign� par la cl� %08lX\n"
 
 #: g10/keyedit.c:387
 #, c-format
@@ -2321,23 +2303,21 @@ msgid "Nothing to sign with key %08lX\n"
 msgstr "Rien � signer avec la cl� %08lX\n"
 
 #: g10/keyedit.c:402
-#, fuzzy
 msgid "This key has expired!"
-msgstr "Note: Cette cl� a expir� !\n"
+msgstr "Cette cl� a expir� !"
 
 #: g10/keyedit.c:406
-#, fuzzy
 msgid "  Are you sure you still want to sign it?\n"
-msgstr "Etes-vous s�r de vouloir cette taille ? "
+msgstr " �tes-vous s�r de vouloir la signer ?\n"
 
 #: g10/keyedit.c:420
-#, fuzzy, c-format
+#, c-format
 msgid "This key is due to expire on %s.\n"
-msgstr "Cette cl� n'est pas prot�g�e.\n"
+msgstr "Cette cl� va expirer le %s.\n"
 
 #: g10/keyedit.c:422
 msgid "Do you want your signature to expire at the same time? (y/n) "
-msgstr ""
+msgstr "Voulez-vous que votre signature expire en m�me temps ? (o/n) "
 
 #: g10/keyedit.c:450
 msgid ""
@@ -2345,26 +2325,29 @@ msgid ""
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
+"Avec quel soin avez-vous v�rifi� que la cl� que vous allez signer\n"
+"appartient r�ellement � la personne sus-nomm�e ? Si vous ne savez\n"
+"quoi r�pondre, entrez \"0\".\n"
 
 #: g10/keyedit.c:454
 #, c-format
 msgid "   (0) I will not answer.%s\n"
-msgstr ""
+msgstr "   (0) Je ne r�pondrai pas.%s\n"
 
 #: g10/keyedit.c:456
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
-msgstr ""
+msgstr "   (1) Je n'ai pas v�rifi� du tout.%s\n"
 
 #: g10/keyedit.c:458
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
-msgstr ""
+msgstr "   (2) J'ai un peu v�rifi�.%s\n"
 
 #: g10/keyedit.c:460
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
-msgstr ""
+msgstr "   (3) J'ai v�rifi� tr�s soigneusement.%s\n"
 
 #: g10/keyedit.c:485
 msgid ""
@@ -2375,40 +2358,44 @@ msgstr ""
 "avec la v�tre: \""
 
 #: g10/keyedit.c:494
-#, fuzzy
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
 msgstr ""
-"La signature sera marqu�e comme non-exportable.\n"
 "\n"
+"La signature sera marqu�e comme non-exportable.\n"
 
 #: g10/keyedit.c:498
-#, fuzzy
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
 msgstr ""
-"La signature sera marqu�e comme non-exportable.\n"
 "\n"
+"La signature sera marqu�e comme non-r�vocable.\n"
 
 #: g10/keyedit.c:503
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
+"\n"
+"Je n'ai pas du tout v�rifi� cette cl�.\n"
 
 #: g10/keyedit.c:507
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
+"\n"
+"J'ai un peu v�rifi� cette cl�.\n"
 
 #: g10/keyedit.c:511
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
+"\n"
+"J'ai v�rifi� cette cl� avec grand soin.\n"
 
 #: g10/keyedit.c:552 g10/keyedit.c:2459 g10/keyedit.c:2521 g10/sign.c:273
 #, c-format
@@ -2549,24 +2536,20 @@ msgid "sign the key locally"
 msgstr "signer la cl� localement"
 
 #: g10/keyedit.c:783
-#, fuzzy
 msgid "nrsign"
-msgstr "signer"
+msgstr "nrsigner"
 
 #: g10/keyedit.c:783
-#, fuzzy
 msgid "sign the key non-revocably"
-msgstr "signer la cl� localement"
+msgstr "signer la cl� de fa�on non-r�vocable"
 
 #: g10/keyedit.c:784
-#, fuzzy
 msgid "nrlsign"
-msgstr "signer"
+msgstr "nrlsigner"
 
 #: g10/keyedit.c:784
-#, fuzzy
 msgid "sign the key locally and non-revocably"
-msgstr "signer la cl� localement"
+msgstr "signer la cl� de fa�on locale et non-r�vocable"
 
 #: g10/keyedit.c:785
 msgid "debug"
@@ -2582,12 +2565,11 @@ msgstr "ajouter un utilisateur"
 
 #: g10/keyedit.c:787
 msgid "addphoto"
-msgstr ""
+msgstr "aj.photo"
 
 #: g10/keyedit.c:787
-#, fuzzy
 msgid "add a photo ID"
-msgstr "ajouter un utilisateur"
+msgstr "ajouter une photo d'identit�"
 
 #: g10/keyedit.c:788
 msgid "deluid"
@@ -2600,7 +2582,7 @@ msgstr "enlever un utilisateur"
 #. delphoto is really deluid in disguise
 #: g10/keyedit.c:790
 msgid "delphoto"
-msgstr ""
+msgstr "suppr.photo"
 
 #: g10/keyedit.c:791
 msgid "addkey"
@@ -2636,11 +2618,11 @@ msgstr "changer la date d'expiration"
 
 #: g10/keyedit.c:795
 msgid "primary"
-msgstr ""
+msgstr "principale"
 
 #: g10/keyedit.c:795
 msgid "flag user ID as primary"
-msgstr ""
+msgstr "marquer le nom d'utilisateur comme principal"
 
 #: g10/keyedit.c:796
 msgid "toggle"
@@ -2659,38 +2641,32 @@ msgid "pref"
 msgstr "pr�f"
 
 #: g10/keyedit.c:799
-#, fuzzy
 msgid "list preferences (expert)"
-msgstr "lister les pr�f�rences"
+msgstr "lister les pr�f�rences (expert)"
 
 #: g10/keyedit.c:800
 msgid "showpref"
-msgstr ""
+msgstr "montr.pr�f"
 
 #: g10/keyedit.c:800
-#, fuzzy
 msgid "list preferences (verbose)"
-msgstr "lister les pr�f�rences"
+msgstr "lister les pr�f�rences (bavard)"
 
 #: g10/keyedit.c:801
-#, fuzzy
 msgid "setpref"
-msgstr "pr�f"
+msgstr "mettre.pr�f"
 
 #: g10/keyedit.c:801
-#, fuzzy
 msgid "set preference list"
-msgstr "lister les pr�f�rences"
+msgstr "donner la liste de pr�f�rences"
 
 #: g10/keyedit.c:802
-#, fuzzy
 msgid "updpref"
-msgstr "pr�f"
+msgstr "pr�f.m�j"
 
 #: g10/keyedit.c:802
-#, fuzzy
 msgid "updated preferences"
-msgstr "lister les pr�f�rences"
+msgstr "pr�f�rences mises � jour"
 
 #: g10/keyedit.c:803
 msgid "passwd"
@@ -2742,20 +2718,20 @@ msgstr "activer une cl�"
 
 #: g10/keyedit.c:809
 msgid "showphoto"
-msgstr ""
+msgstr "montr.photo"
 
 #: g10/keyedit.c:809
 msgid "show photo ID"
-msgstr ""
+msgstr "montrer la photo d'identit�"
 
 #: g10/delkey.c:112 g10/keyedit.c:829
 msgid "can't do that in batchmode\n"
 msgstr "impossible de faire cela en mode automatique\n"
 
 #: g10/keyedit.c:866
-#, fuzzy, c-format
+#, c-format
 msgid "error reading secret keyblock `%s': %s\n"
-msgstr "erreur pendant la lecture de `%s': %s\n"
+msgstr "erreur pendant la lecture du bloc de cl� secr�te `%s': %s\n"
 
 #: g10/keyedit.c:884
 msgid "Secret key is available.\n"
@@ -2774,9 +2750,8 @@ msgid "Please use the command \"toggle\" first.\n"
 msgstr "Utilisez la commande �toggle� d'abord.\n"
 
 #: g10/keyedit.c:1000
-#, fuzzy
 msgid "Key is revoked.\n"
-msgstr "La cl� est prot�g�e.\n"
+msgstr "La cl� est r�voqu�e.\n"
 
 #: g10/keyedit.c:1016
 msgid "Really sign all user IDs? "
@@ -2789,7 +2764,7 @@ msgstr "Aide: S�lectionner les utilisateurs � signer\n"
 #: g10/keyedit.c:1042
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
-msgstr ""
+msgstr "Cette commande n'est pas admise en mode %s.\n"
 
 #: g10/keyedit.c:1062 g10/keyedit.c:1083
 msgid "You must select at least one user ID.\n"
@@ -2828,14 +2803,12 @@ msgid "Do you really want to revoke this key? "
 msgstr "Voulez-vous vraiment r�voquer cette cl� ? "
 
 #: g10/keyedit.c:1197
-#, fuzzy
 msgid "Really update the preferences for the selected user IDs? "
-msgstr "Enlever r�ellement tous les utilisateurs s�lectionn�s ? "
+msgstr "Enlever r�ellement les pr�f�rences des utilisateurs s�lectionn�s ? "
 
 #: g10/keyedit.c:1199
-#, fuzzy
 msgid "Really update the preferences? "
-msgstr "Faut-il vraiment g�n�rer les certificats de r�vocation ? (o/N)"
+msgstr "Faut-il vraiment mettre � jour les pr�f�rences ? "
 
 #: g10/keyedit.c:1237
 msgid "Save changes? "
@@ -2864,13 +2837,13 @@ msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez �help�)\n"
 
 #: g10/keyedit.c:1424
-#, fuzzy, c-format
+#, c-format
 msgid "This key may be revoked by %s key %s%s\n"
-msgstr "ATTENTION: Cette cl� � �t� r�voqu�e par son propri�taire !\n"
+msgstr "Cette cl� peut �tre r�voqu�e par la cl� %s %s%s\n"
 
 #: g10/keyedit.c:1427
 msgid " (sensitive)"
-msgstr ""
+msgstr " (sensible)"
 
 #: g10/keyedit.c:1432 g10/keyedit.c:1458
 #, c-format
@@ -2905,15 +2878,17 @@ msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
 msgstr ""
+"ATTENTION: Cette cl� poss�de d�j� une photo d'identit�.\n"
+"           Ajouter une autre photo d'identit� peut poser des\n"
+"           probl�mes avec certaines versions de PGP.\n"
 
 #: g10/keyedit.c:1593 g10/keyedit.c:1620
-#, fuzzy
 msgid "Are you sure you still want to add it? (y/n) "
-msgstr "Etes-vous s�r de vouloir cette taille ? "
+msgstr "Channel #bsdfr is +k, but has no key.  This server is broken"
 
 #: g10/keyedit.c:1601
 msgid "You may only have one photo ID on a key.\n"
-msgstr ""
+msgstr "Vous ne pouvez avoir qu'une seule photo d'identit� par cl�.\n"
 
 #: g10/keyedit.c:1615
 msgid ""
@@ -2921,10 +2896,13 @@ msgid ""
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
+"ATTENTION: C'est une cl� du style PGP2.  Ajouter une photo\n"
+"d'identit� peut emp�cher certaines versions de PGP d'accepter\n"
+"cette cl�\n"
 
 #: g10/keyedit.c:1626
 msgid "You may not add a photo ID to a PGP2-style key.\n"
-msgstr ""
+msgstr "Vous ne pouvez pas ajouter de photo d'identit� � une cl� du style PGP2.\n"
 
 #: g10/keyedit.c:1757
 msgid "Delete this good signature? (y/N/q)"
@@ -2981,9 +2959,8 @@ msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
 #: g10/keyedit.c:2009
-#, fuzzy
 msgid "Please select exactly one user ID.\n"
-msgstr "Vous devez s�lectionner au moins un utilisateur.\n"
+msgstr "Vous devez s�lectionner exactement un utilisateur.\n"
 
 #: g10/keyedit.c:2184
 #, c-format
@@ -3018,9 +2995,9 @@ msgid "You have signed these user IDs:\n"
 msgstr "Vous avez sign� ces noms d'utilisateurs:\n"
 
 #: g10/keyedit.c:2373
-#, fuzzy, c-format
+#, c-format
 msgid "   signed by %08lX at %s%s\n"
-msgstr "   sign� par %08lX � %s\n"
+msgstr "   sign� par %08lX � %s%s\n"
 
 #: g10/keyedit.c:2380
 #, c-format
@@ -3046,9 +3023,8 @@ msgstr "pas de cl� secr�te\n"
 
 #. This isn't UTF8 as it is a URL(?)
 #: g10/keylist.c:82
-#, fuzzy
 msgid "Signature policy: "
-msgstr "Signature %s de: %s\n"
+msgstr "Politique de signature: "
 
 #: g10/keylist.c:107 g10/keylist.c:127 g10/mainproc.c:717 g10/mainproc.c:726
 msgid "WARNING: invalid notation data found\n"
@@ -3056,17 +3032,16 @@ msgstr "ATTENTION: des donn�es de notation invalides ont �t� d�tect�es\n"
 
 #. This is UTF8
 #: g10/keylist.c:115
-#, fuzzy
 msgid "Signature notation: "
-msgstr "Notation: "
+msgstr "Notation de signature: "
 
 #: g10/keylist.c:122
 msgid "not human readable"
-msgstr ""
+msgstr "illisible par un humain"
 
 #: g10/keylist.c:187
 msgid "Keyring"
-msgstr ""
+msgstr "Porte-cl�s"
 
 #. of subkey
 #: g10/keylist.c:387 g10/mainproc.c:852
@@ -3083,12 +3058,11 @@ msgstr "Empreinte:"
 #. * data is properly aligned with the user ID
 #: g10/keylist.c:858
 msgid "             Fingerprint:"
-msgstr "               Empreinte:"
+msgstr "              Empreinte :"
 
 #: g10/keylist.c:862
-#, fuzzy
 msgid "     Key fingerprint ="
-msgstr "               Empreinte:"
+msgstr " Empreinte de la cl� ="
 
 #: g10/encr-data.c:66 g10/mainproc.c:255
 #, c-format
@@ -3125,14 +3099,16 @@ msgid "public key decryption failed: %s\n"
 msgstr "le d�chiffrement par cl� publique a �chou�: %s\n"
 
 #: g10/mainproc.c:429 g10/mainproc.c:448
-#, fuzzy, c-format
+#, c-format
 msgid "assuming %s encrypted data\n"
-msgstr "donn�es chiffr�es avec %s\n"
+msgstr "on suppose des donn�es chiffr�es avec %s\n"
 
 #: g10/mainproc.c:436
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
+"L'algorithme IDEA n'est pas disponible, avec un peu de chance %s marchera\n"
+"peut-�tre\n"
 
 #: g10/mainproc.c:466
 msgid "decryption okay\n"
@@ -3187,9 +3163,8 @@ msgid "BAD signature from \""
 msgstr "MAUVAISE signature de \""
 
 #: g10/mainproc.c:1292 g10/mainproc.c:1315
-#, fuzzy
 msgid "Expired signature from \""
-msgstr "Bonne signature de \""
+msgstr "Signature expir�e de \""
 
 #: g10/mainproc.c:1293 g10/mainproc.c:1316
 msgid "Good signature from \""
@@ -3197,7 +3172,7 @@ msgstr "Bonne signature de \""
 
 #: g10/mainproc.c:1318
 msgid "[uncertain]"
-msgstr ""
+msgstr "[incertain]"
 
 #: g10/mainproc.c:1338
 msgid "                aka \""
@@ -3235,7 +3210,6 @@ msgid "Experimental algorithms should not be used!\n"
 msgstr "Les algorithmes exp�rimentaux ne devraient pas �tre utilis�s !\n"
 
 #: g10/misc.c:241
-#, fuzzy
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
 msgstr ""
 "Cet algorithme de chiffrement est d�conseill�; utilisez-en un\n"
@@ -3244,21 +3218,22 @@ msgstr ""
 #: g10/misc.c:378
 #, c-format
 msgid "Warning: unsafe ownership on %s \"%s\"\n"
-msgstr ""
+msgstr "Attention: propri�taire de %s \"%s\" peu s�r\n"
 
 #: g10/misc.c:410
 #, c-format
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
-msgstr ""
+msgstr "Attention: permissions de %s \"%s\" peu s�res\n"
 
 #: g10/misc.c:435
 msgid "the IDEA cipher plugin is not present\n"
-msgstr ""
+msgstr "le module de chiffrement IDEA n'est pas pr�sent\n"
 
 #: g10/misc.c:436
 msgid ""
 "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
+"voir http://www.gnupg.org/fr/why-not-idea.html pour plus d'informations\n"
 
 #: g10/parse-packet.c:119
 #, c-format
@@ -3276,24 +3251,27 @@ msgstr "gpg-agent n'est pas disponible dans cette session\n"
 
 #: g10/passphrase.c:338
 msgid "can't set client pid for the agent\n"
-msgstr ""
+msgstr "impossible d'obtenir le pid du client pour l'agent\n"
 
 #: g10/passphrase.c:346
 msgid "can't get server read FD for the agent\n"
 msgstr ""
+"impossible d'obtenir le descripteur de lecture du serveur\n"
+"pour l'agent\n"
 
 #: g10/passphrase.c:353
 msgid "can't get server write FD for the agent\n"
 msgstr ""
+"impossible d'obtenir le descripteur d'�criture du serveur pour l'agent\n"
 
 #: g10/passphrase.c:386
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'environnement GPG_AGENT_INFO est mal d�finie\n"
 
 #: g10/passphrase.c:399
-#, fuzzy, c-format
+#, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
-msgstr "l'algorithme de protection %d n'est pas support�\n"
+msgstr "le protocole gpg-agent version %d n'est pas support�\n"
 
 #: g10/hkp.c:148 g10/passphrase.c:420
 #, c-format
@@ -3302,7 +3280,7 @@ msgstr "impossible de se connecter � `%s': %s\n"
 
 #: g10/passphrase.c:442
 msgid "communication problem with gpg-agent\n"
-msgstr ""
+msgstr "probl�me de communication avec ssh-agent\n"
 
 #: g10/passphrase.c:511 g10/passphrase.c:897
 #, c-format
@@ -3347,9 +3325,8 @@ msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "probl�me avec l'agent : l'agent renvoie 0x%lx\n"
 
 #: g10/passphrase.c:691 g10/passphrase.c:799
-#, fuzzy
 msgid "problem with the agent - disabling agent use\n"
-msgstr "probl�me avec l'agent : l'agent renvoie 0x%lx\n"
+msgstr "probl�me avec l'agent - arr�t d'utilisation de l'agent\n"
 
 #: g10/passphrase.c:883
 msgid ""
@@ -3385,9 +3362,9 @@ msgstr ""
 "les enregistrer\n"
 
 #: g10/plaintext.c:108
-#, fuzzy, c-format
+#, c-format
 msgid "error creating `%s': %s\n"
-msgstr "erreur pendant la lecture de `%s': %s\n"
+msgstr "erreur pendant la cr�ation de `%s': %s\n"
 
 #: g10/plaintext.c:336
 msgid "Detached signature.\n"
@@ -3411,7 +3388,7 @@ msgid "can't open signed data `%s'\n"
 msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
 
 #: g10/pubkey-enc.c:100
-#, fuzzy, c-format
+#, c-format
 msgid "anonymous recipient; trying secret key %08lX ...\n"
 msgstr "destinataire anonyme; essai de la cl� secr�te %08lX...\n"
 
@@ -3424,9 +3401,9 @@ 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:177
-#, fuzzy, c-format
+#, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
-msgstr "l'algorithme de chiffrement %d est inconnu ou d�sactiv�\n"
+msgstr "l'algorithme de chiffrement %d%s est inconnu ou d�sactiv�\n"
 
 #: g10/pubkey-enc.c:220
 #, c-format
@@ -3442,9 +3419,9 @@ msgstr "NOTE: la cl� secr�te %08lX a expir� le %s\n"
 
 #. HKP does not support v3 fingerprints
 #: g10/hkp.c:70
-#, fuzzy, c-format
+#, c-format
 msgid "requesting key %08lX from HKP keyserver %s\n"
-msgstr "requ�te de la cl� %08lX de %s...\n"
+msgstr "requ�te de la cl� %08lX du serveur de cl�s HKP %s\n"
 
 #: g10/hkp.c:94
 #, c-format
@@ -3469,31 +3446,30 @@ msgstr "l'envoi � `%s' a �chou�: le r�sultat est %u\n"
 #: g10/hkp.c:467
 #, c-format
 msgid "searching for \"%s\" from HKP server %s\n"
-msgstr ""
+msgstr "recherche de \"%s\" du serveur HKP %s\n"
 
 #: g10/hkp.c:517
-#, fuzzy, c-format
+#, c-format
 msgid "can't search keyserver: %s\n"
-msgstr "impossible d'obtenir les cl�s du serveur: %s\n"
+msgstr "impossible de chercher une cl� dans le serveur : %s\n"
 
 #: g10/seckey-cert.c:53
 msgid "secret key parts are not available\n"
 msgstr "les parties secr�tes ne sont pas disponibles\n"
 
 #: g10/seckey-cert.c:59
-#, fuzzy, c-format
+#, c-format
 msgid "protection algorithm %d%s is not supported\n"
-msgstr "l'algorithme de protection %d n'est pas support�\n"
+msgstr "l'algorithme de protection %d%s n'est pas support�\n"
 
 #: g10/seckey-cert.c:186
-#, fuzzy
 msgid "Invalid passphrase; please try again"
-msgstr "Mot de passe invalide; r�essayez...\n"
+msgstr "Mot de passe invalide ; r�essayez"
 
 #: g10/seckey-cert.c:187
 #, c-format
 msgid "%s ...\n"
-msgstr ""
+msgstr "%s ...\n"
 
 #: g10/seckey-cert.c:244
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
@@ -3532,6 +3508,8 @@ msgstr ""
 msgid ""
 "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr ""
+"AVERTISSEMENT: impossible de faire une expansion � base de %% de l'url\n"
+"de politique (trop grande). Utilisation de la version non expans�e.\n"
 
 #: g10/sign.c:268
 #, c-format
@@ -3546,11 +3524,13 @@ msgstr "Signature %s de: %s\n"
 #: g10/sign.c:424
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
-msgstr "ATTENTION: `%s' est un fichier vide\n"
+msgstr "AVERTISSEMENT: `%s' est un fichier vide\n"
 
 #: g10/sign.c:612
 msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
+"il n'est possible de signer avec des cl�s de style PGP 2.x uniquement\n"
+"en mode --pgp2\n"
 
 #: g10/sign.c:637 g10/sign.c:806
 #, c-format
@@ -3564,11 +3544,13 @@ msgstr "signature:"
 #: g10/sign.c:790
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
+"il n'est possible de faire une signature en texte clair avec des cl�s\n"
+"de style PGP 2.x qu'en mode --pgp2\n"
 
 #: g10/sign.c:949
-#, fuzzy, c-format
+#, c-format
 msgid "%s encryption will be used\n"
-msgstr "le d�chiffrement a �chou�: %s\n"
+msgstr "le chiffrement %s sera utilis�\n"
 
 #: g10/textfilter.c:134
 #, c-format
@@ -3611,9 +3593,9 @@ msgid "%s: can't create lock\n"
 msgstr "%s: impossible de cr�er le verrouillage\n"
 
 #: g10/tdbio.c:480 g10/tdbio.c:544
-#, fuzzy, c-format
+#, c-format
 msgid "%s: can't make lock\n"
-msgstr "%s: impossible de cr�er le verrouillage\n"
+msgstr "%s: impossible de cr�er le verrou\n"
 
 #: g10/keyring.c:1433 g10/openfile.c:240 g10/openfile.c:307 g10/tdbio.c:484
 #, c-format
@@ -3713,19 +3695,19 @@ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "la base de confiance est corrompue; ex�cutez �gpg --fix-trustdb�.\n"
 
 #: g10/trustdb.c:202
-#, fuzzy, c-format
+#, c-format
 msgid "`%s' is not a valid long keyID\n"
-msgstr "'%s' n'est pas une identification de cl� longue valide\n"
+msgstr "`%s' n'est pas une identification de cl� longue valide\n"
 
 #: g10/trustdb.c:237
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX: accepted as trusted key\n"
-msgstr "cl� %08lX: accept�e comme cl� certifi�e.\n"
+msgstr "cl� %08lX: accept�e comme cl� de confiance.\n"
 
 #: g10/trustdb.c:276
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX occurs more than once in the trustdb\n"
-msgstr "cl� %08lX: impossible de la mettre dans la base de confiance\n"
+msgstr "la cl� %08lX appara�t plusieurs fois dans la base de confiance\n"
 
 #: g10/trustdb.c:292
 #, c-format
@@ -3740,9 +3722,9 @@ msgstr ""
 "s\n"
 
 #: g10/trustdb.c:340
-#, fuzzy, c-format
+#, c-format
 msgid "trust record %lu is not of requested type %d\n"
-msgstr "enregistrement de confiance %lu: la suppression a �chou�: %s\n"
+msgstr "l'enregistrement de confiance %lu: n'est pas du type demand� %d\n"
 
 #: g10/trustdb.c:355
 #, c-format
@@ -3755,34 +3737,33 @@ msgid "trustdb: sync failed: %s\n"
 msgstr "base de confiance: la synchronisation a �chou�: %s\n"
 
 #: g10/trustdb.c:470
-#, fuzzy
 msgid "no need for a trustdb check\n"
-msgstr "%s: ce n'est pas un fichier de base de confiance\n"
+msgstr "v�rification de la base de confiance inutile\n"
 
 #: g10/trustdb.c:476 g10/trustdb.c:1488
-#, fuzzy, c-format
+#, c-format
 msgid "next trustdb check due at %s\n"
-msgstr "enregistrement de base de confiance %lu: lseek a �chou�: %s\n"
+msgstr "la prochaine v�rification de la base de confiance aura lieu le %s\n"
 
 #: g10/trustdb.c:709
-#, fuzzy
 msgid "checking the trustdb\n"
-msgstr "changer la confiance"
+msgstr "v�rifier la base de confiance\n"
 
 #: g10/trustdb.c:860
-#, fuzzy, c-format
+#, c-format
 msgid "public key %08lX not found: %s\n"
-msgstr "cl� publique non trouv�e"
+msgstr "cl� publique %08lX non trouv�e : %s\n"
 
 #: g10/trustdb.c:1363
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
-msgstr ""
+msgstr "la cl� publique de la cl� de confiace ultime %08lX est introuvable\n"
 
 #: g10/trustdb.c:1441
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 msgstr ""
+"v�rification � la profondeur %d sign�=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 
 #: g10/verify.c:108
 msgid ""
@@ -3914,19 +3895,18 @@ msgid "This is a secret key! - really delete? "
 msgstr "C'est une cl� secr�te - faut-il vraiment l'effacer ? "
 
 #: g10/delkey.c:156
-#, fuzzy, c-format
+#, c-format
 msgid "deleting keyblock failed: %s\n"
-msgstr "l'�num�ration des blocs de cl�s a �chou�: %s\n"
+msgstr "la suppression du bloc de cl�s a �chou� : %s\n"
 
 #: g10/delkey.c:185
-#, fuzzy, c-format
+#, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
-msgstr "il y a une cl� secr�te pour cette cl� publique !\n"
+msgstr "il y a une cl� secr�te pour la cl� publique \"%s\" !\n"
 
 #: g10/delkey.c:187
-#, fuzzy
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
-msgstr "utiliser l'option �--delete-secret-key� pour l'effacer d'abord.\n"
+msgstr "utiliser l'option �--delete-secret-keys� pour l'effacer d'abord.\n"
 
 #: g10/helptext.c:47
 msgid ""
@@ -3946,6 +3926,10 @@ msgid ""
 "access to the secret key.  Answer \"yes\" to set this key to\n"
 "ultimately trusted\n"
 msgstr ""
+"Pour mettre en place le R�seau de confiance (Web of Trust), GnuPG a\n"
+"besoin de savoir en quelles cl�s votre confiance est ultime - ce sont\n"
+"en g�n�ral les cl�s dont vous avez acc�s � la cl� secr�te. R�pondez\n"
+"\"oui\" pour indiquer que votre confiance en cette cl� est ultime\n"
 
 #: g10/helptext.c:60
 msgid "If you want to use this revoked key anyway, answer \"yes\"."
@@ -4101,6 +4085,32 @@ msgid ""
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
+"Quand vous signez un nom d'utilisateur d'une cl�, vous devriez d'abord\n"
+"v�rifier que la cl� appartient � la personne nomm�e. Il est utile que\n"
+"les autres personnes sachent avec quel soin vous l'avez v�rifi�.\n"
+"\n"
+"\"0\" signifie que vous n'avez pas d'opinon.\n"
+"\n"
+"\"1\" signifie que vous croyez que la cl� appartient � la personne qui\n"
+"dit la poss�der mais vous n'avez pas pu v�rifier du tout la cl�.\n"
+"C'est utile lorsque vous signez la cl� d'un pseudonyme.\n"
+"\n"
+"\"2\" signifie que vous avez un peu v�rifi� la cl�. Par exemple, cela\n"
+"pourrait �tre un v�rification de l'empreinte et du nom de\n"
+"l'utilisateur avec la photo.\n"
+"\n"
+"\"3\" signifie que vous avez compl�tement v�rifi� la cl�. Par exemple,\n"
+"cela pourrait �tre une v�rification de l'empreinte, du nom de\n"
+"l'utilisateur avec un document difficile � contrefaire (comme un\n"
+"passeport) et de son adresse e-mail (v�rifi� par un �change de\n"
+"courrier �lectronique).\n"
+"\n"
+"Notez bien que les exemples donn�s ci-dessus pour les niveaux 2 et\n"
+"3 ne sont *que* des exemples.\n"
+"C'est � vous de d�cider quelle valeur mettre quand vous signez\n"
+"les cl�s des autres personnes.\n"
+"\n"
+"Si vous ne savez pas quelle r�ponse est la bonne, r�pondez \"0\"."
 
 #: g10/helptext.c:194
 msgid "Answer \"yes\" is you want to sign ALL the user IDs"
@@ -4169,13 +4179,13 @@ msgid ""
 "to the current list of preferences.  The timestamp of all affected\n"
 "self-signatures fill be advanced by one second.\n"
 msgstr ""
+"Changer les pr�f�rences de tous les noms d'utilisateurs (ou juste\n"
+"ceux qui sont s�lectionn�s) vers la liste actuelle. La date de toutes\n"
+"les auto-signatures seront avanc�es d'une seconde.\n"
 
 #: g10/helptext.c:238
-#, fuzzy
 msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr ""
-"Entrez le mot de passe; c'est une phrase secr�te \n"
-"  Blurb, blurb,.... "
+msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
 #: g10/helptext.c:244
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
@@ -4247,24 +4257,24 @@ msgid "No help available for `%s'"
 msgstr "Pas d'aide disponible pour `%s'"
 
 #: g10/keydb.c:177
-#, fuzzy, c-format
+#, c-format
 msgid "error creating keyring `%s': %s\n"
-msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
+msgstr "erreur durant la cr�ation du porte-cl�s `%s' : %s\n"
 
 #: g10/keydb.c:188
 #, c-format
 msgid "changing permission of  `%s' failed: %s\n"
-msgstr ""
+msgstr "le changement de permission de `%s' a �chou�: %s\n"
 
 #: g10/keydb.c:197
-#, fuzzy, c-format
+#, c-format
 msgid "keyring `%s' created\n"
-msgstr "%s: porte-cl�s cr��\n"
+msgstr "le porte-cl�s `%s` a �t� cr��\n"
 
 #: g10/keydb.c:587
-#, fuzzy, c-format
+#, c-format
 msgid "failed to rebuild keyring cache: %s\n"
-msgstr "%s: la cr�ation de la table de hachage a �chou�: %s\n"
+msgstr "la reconstruction du cache de porte-cl�s a �chou� : %s\n"
 
 #: g10/keyring.c:1232
 msgid "WARNING: 2 files with confidential information exists.\n"
@@ -4286,19 +4296,19 @@ msgid "Please fix this possible security flaw\n"
 msgstr "R�parez ce probl�me de s�curit� possible\n"
 
 #: g10/keyring.c:1334
-#, fuzzy, c-format
+#, c-format
 msgid "checking keyring `%s'\n"
-msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
+msgstr "v�rification du porte-cl�s `%s'\n"
 
 #: g10/keyring.c:1365
-#, fuzzy, c-format
+#, c-format
 msgid "%lu keys so far checked (%lu signatures)\n"
-msgstr "%lu cl�s trait�es jusqu'ici\n"
+msgstr "%lu cl�s trait�es jusqu'ici (%lu signatures)\n"
 
 #: g10/keyring.c:1376
-#, fuzzy, c-format
+#, c-format
 msgid "%lu keys checked (%lu signatures)\n"
-msgstr "lister les cl�s et les signatures"
+msgstr "%lu cl�s v�rifi�es (%lu signatures)\n"
 
 #: g10/keyring.c:1438
 #, c-format
@@ -4320,272 +4330,9 @@ msgstr "%s: porte-cl�s cr��\n"
 #~ msgid "skipped: public key already set with --encrypt-to\n"
 #~ msgstr "ignor�: cl� publique configur�e par --encrypt-to\n"
 
-#, fuzzy
 #~ msgid ""
 #~ "\n"
 #~ "WARNING: This is a PGP2-style key\n"
-#~ msgstr "ATTENTION: `%s' est un fichier vide\n"
-
-#~ msgid "sSmMqQ"
-#~ msgstr "sSmMqQ"
-
-#~ msgid "no keyserver known (use option --keyserver)\n"
 #~ msgstr ""
-#~ "aucun serveur de cl�s n'est connu (utilisez l'option �--keyserver�)\n"
-
-#~ msgid "%s: not a valid key ID\n"
-#~ msgstr "%s: l'identification de la cl� est invalide\n"
-
-#, fuzzy
-#~ msgid "duplicate (short) key ID %08lX\n"
-#~ msgstr "la cl� publique est %08lX\n"
-
-#, fuzzy
-#~ msgid "%lu key(s) to refresh\n"
-#~ msgstr "\t%lu cl�s avec erreurs\n"
-
-#~ msgid "|[NAMES]|check the trust database"
-#~ msgstr "|[NOMS]|v�rifier la base de confiance"
-
-#~ 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 ""
-#~ "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"
-
-#~ msgid ""
-#~ "No path leading to one of our keys found.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Aucun chemin menant vers une de nos cl�s n'a �t� trouv�.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "No certificates with undefined trust found.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Aucun certificat � confiance ind�finie n'a �t� trouv�.\n"
-#~ "\n"
-
-#~ msgid ""
-#~ "No trust values changed.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Pas d'indice de confiance chang�.\n"
-#~ "\n"
-
-#~ msgid "%08lX: no info to calculate a trust probability\n"
-#~ msgstr ""
-#~ "%08lX: pas d'information pour calculer une probabilit� de confiance\n"
-
-#~ msgid "%s: error checking key: %s\n"
-#~ msgstr "%s: erreur pendant la v�rification de la cl�: %s\n"
-
-#~ msgid "too many entries in unk cache - disabled\n"
-#~ msgstr "trop d'entr�es dans le cache unk - d�sactiv�\n"
-
-#~ msgid "secret key %08lX not imported (use %s to allow for it)\n"
-#~ msgstr "cl� secr�te %08lX non import�e (utilisez %s pour l'accepter)\n"
-
-#~ msgid "update of trustdb failed: %s\n"
-#~ msgstr "la mise � jour de la base de confiance a �chou�: %s\n"
-
-#~ 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 "error reading dir record for LID %lu: %s\n"
-#~ msgstr ""
-#~ "erreur pendant la lecture de l'enregistrement de r�pertoire pour\n"
-#~ "le LID %lu: %s\n"
-
-#~ msgid "lid %lu: expected dir record, got type %d\n"
-#~ msgstr "lid %lu: enregistrement de r�pertoire attendu, a re�u le type %d\n"
-
-#~ msgid "no primary key for LID %lu\n"
-#~ msgstr "pas de cl� principale pour le LID %lu\n"
-
-#~ msgid "error reading primary key for LID %lu: %s\n"
-#~ msgstr ""
-#~ "erreur pendant la lecture de la cl� principale pour le LID %lu: %s\n"
-
-#~ msgid "get_dir_record: search_record failed: %s\n"
-#~ msgstr "get_dir_record: search_record a �chou�: %s\n"
-
-#~ msgid "key %08lX: query record failed\n"
-#~ msgstr "cl� %08lX: l'enregistrement de requ�te a �chou�\n"
-
-#~ msgid "key %08lX: already in trusted key table\n"
-#~ msgstr "cl� %08lX: d�j� dans la table des cl�s certifi�es\n"
-
-#~ msgid "NOTE: secret key %08lX is NOT protected.\n"
-#~ msgstr "NOTE: la cl� secr�te %08lX n'est PAS prot�g�e.\n"
-
-#~ msgid "key %08lX: secret and public key don't match\n"
-#~ msgstr "cl� %08lX: les cl�s secr�te et publique ne correspondent pas\n"
-
-#~ msgid "enumerate secret keys failed: %s\n"
-#~ msgstr "l'�num�ration des cl�s secr�tes a �chou�: %s\n"
-
-#~ msgid "key %08lX.%lu: Good subkey binding\n"
-#~ msgstr "cl� %08lX.%lu: bonne liaison avec la sous-cl�\n"
-
-#~ msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
-#~ msgstr "cl� %08lX.%lu: liaison avec la sous-cl� invalide: %s\n"
-
-#~ msgid "key %08lX.%lu: Valid key revocation\n"
-#~ msgstr "cl� %08lX.%lu: r�vocation de cl� valide\n"
-
-#~ msgid "key %08lX.%lu: Invalid key revocation: %s\n"
-#~ msgstr "cl� %08lX.%lu: r�vocation de sous-cl� invalide: %s\n"
-
-#~ msgid "key %08lX.%lu: Valid subkey revocation\n"
-#~ msgstr "cl� %08lX.%lu: r�vocation de sous-cl� valide\n"
-
-#~ msgid "Good self-signature"
-#~ msgstr "Bonne auto-signature"
-
-#~ msgid "Invalid self-signature"
-#~ msgstr "Auto-signature invalide"
-
-#~ 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"
-
-#~ msgid "Valid user ID revocation"
-#~ msgstr "R�vocation de nom d'utilisateur valide"
-
-#~ msgid "Invalid user ID revocation"
-#~ msgstr "R�vocation de nom d'utilisateur invalide"
-
-#~ msgid "Valid certificate revocation"
-#~ msgstr "Certificat de r�vocation valide"
-
-#~ msgid "Good certificate"
-#~ msgstr "Bon certificat"
-
-#~ msgid "Invalid certificate revocation"
-#~ msgstr "R�vocation de certificat invalide"
-
-#~ msgid "Invalid certificate"
-#~ msgstr "Certificat invalide"
-
-#~ 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"
-
-#~ msgid "duplicated certificate - deleted"
-#~ msgstr "certificat dupliqu� - supprim�"
-
-#~ msgid "tdbio_search_dir failed: %s\n"
-#~ msgstr "tdbio_search_dir a �chou�: %s\n"
-
-#~ msgid "lid ?: insert failed: %s\n"
-#~ msgstr "lid ?: l'insertion a �chou�: %s\n"
-
-#~ msgid "lid %lu: insert failed: %s\n"
-#~ msgstr "lid %lu: l'insertion a �chou�: %s\n"
-
-#~ msgid "lid %lu: inserted\n"
-#~ msgstr "lid %lu: ins�r�\n"
-
-#~ msgid "error reading dir record: %s\n"
-#~ msgstr "erreur pendant la lecture de l'enregistrement de r�pertoire: %s\n"
-
-#~ msgid "\t%lu keys inserted\n"
-#~ msgstr "\t%lu cl�s ins�r�es\n"
-
-#~ msgid "enumerate keyblocks failed: %s\n"
-#~ msgstr "l'�num�ration des blocs de cl�s a �chou�: %s\n"
-
-#~ msgid "lid %lu: dir record w/o key - skipped\n"
-#~ msgstr "lid %lu: enregistrement de r�pertoire sans cl� - ignor�\n"
-
-#~ msgid "\t%lu due to new pubkeys\n"
-#~ msgstr "\t%lu � cause de nouvelles cl�s publiques\n"
-
-#~ msgid "\t%lu keys skipped\n"
-#~ msgstr "\t%lu cl�s ignor�es\n"
-
-#~ msgid "\t%lu keys updated\n"
-#~ msgstr "\t%lu cl�s mises � jour\n"
-
-#~ msgid "Ooops, no keys\n"
-#~ msgstr "Ooops, pas de cl�\n"
-
-#~ msgid "Ooops, no user IDs\n"
-#~ msgstr "Ooops, pas de nom d'utilisateur\n"
-
-#~ msgid "check_trust: search dir record failed: %s\n"
-#~ msgstr ""
-#~ "check_trust: la recherche d'enregistrement de r�pertoire a �chou�: %s\n"
-
-#~ msgid "key %08lX: insert trust record failed: %s\n"
-#~ msgstr "cl� %08lX: l'insertion d'enregistrement de confiance a �chou�: %s\n"
-
-#~ msgid "key %08lX.%lu: inserted into trustdb\n"
-#~ msgstr "cl� %08lX.%lu: ins�r�e dans la base de confiance\n"
-
-#~ 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"
-
-#~ msgid "key %08lX.%lu: expired at %s\n"
-#~ msgstr "cl� %08lX.%lu: a expir� le %s\n"
-
-#~ msgid "key %08lX.%lu: trust check failed: %s\n"
-#~ msgstr "cl� %08lX.%lu: la v�rification de confiance a �chou�: %s\n"
-
-#~ msgid "user '%s' not found: %s\n"
-#~ msgstr "l'utilisateur '%s' n'a pas �t� trouv�: %s\n"
-
-#~ msgid "problem finding '%s' in trustdb: %s\n"
-#~ msgstr "probl�me de recherche de '%s' dans la base de confiance: %s\n"
-
-#~ msgid "user '%s' not in trustdb - inserting\n"
-#~ msgstr ""
-#~ "l'utilisateur '%s' n'est pas dans la base de confiance - insertion\n"
-
-#~ msgid "failed to put '%s' into trustdb: %s\n"
-#~ msgstr "impossible d'ins�rer '%s' dans la base de confiance: %s\n"
-
-#~ msgid "too many random bits requested; the limit is %d\n"
-#~ msgstr ""
-#~ "une quantit� de donn�es al�atoires trop importante a �t� demand�e.\n"
-#~ "La limite est %d bits.\n"
-
-#~ msgid "For info see http://www.gnupg.org"
-#~ msgstr "Pour information voir http://www.gnupg.org"
-
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (signature et chiffrement)\n"
-
-#~ msgid "Do you really want to create a sign and encrypt key? "
-#~ msgstr ""
-#~ "Voulez-vous vraiment cr�er une cl� de signature et de chiffrement ? "
-
-#~ msgid "%s: user not found: %s\n"
-#~ msgstr "%s: utilisateur non trouv�: %s\n"
-
-#~ msgid "certificate read problem: %s\n"
-#~ msgstr "probl�me lors de lecture du certificat: %s\n"
-
-#~ msgid "can't lock keyring `%s': %s\n"
-#~ msgstr "impossible de verrouiller le porte-cl�s `%s': %s\n"
-
-#~ msgid "%s: user not found\n"
-#~ msgstr "%s: utilisateur non trouv�\n"
-
-#~ msgid "WARNING: can't yet handle long pref records\n"
-#~ msgstr ""
-#~ "ATTENTION: les enregistrements de pr�f�rences longs ne sont pas encore\n"
-#~ "support�s\n"
-
-#~ msgid "%s: can't create keyring: %s\n"
-#~ msgstr "%s: impossible de cr�er le porte-cl�s: %s\n"
+#~ "ATTENTION: c'est une cl� de style PGP2\n"
diff --git a/po/id.po b/po/id.po
index 6239d6f62..68a06a1b5 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNUPG 1.0.7\n"
-"POT-Creation-Date: 2002-03-03 15:18+0100\n"
+"POT-Creation-Date: 2002-04-06 17:29+0200\n"
 "PO-Revision-Date: 2002-03-05 07:33GMT+0700\n"
 "Last-Translator: Tedi Heriyanto <[email protected]>\n"
 "Language-Team: Indonesian <[email protected]>\n"
@@ -20,7 +20,8 @@ msgstr "Peringatan: menggunakan memori yang tidak aman!\n"
 
 #: util/secmem.c:89
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
-msgstr "silakan lihat http://www.gnupg.org/faq.html untuk informasi lebih lanjut\n"
+msgstr ""
+"silakan lihat http://www.gnupg.org/faq.html untuk informasi lebih lanjut\n"
 
 #: util/secmem.c:326
 msgid "operation is not possible without initialized secure memory\n"
@@ -46,7 +47,7 @@ msgstr "tidak"
 msgid "nN"
 msgstr "tT"
 
-#: g10/keyedit.c:768 util/miscutil.c:326
+#: g10/keyedit.c:777 util/miscutil.c:326
 msgid "quit"
 msgstr "keluar"
 
@@ -273,7 +274,7 @@ msgstr "... kesalahan (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "anda menemukan kesalahan ...(%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1552
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1547
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
@@ -349,7 +350,7 @@ msgstr ""
 "Tidak tersedia cukup byte random. Silakan melakukan aktivitas lain agar\n"
 "memungkinkan SO mengumpulkan lebih banyak entropi! (Perlu %d byte lagi)\n"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid ""
 "@Commands:\n"
 " "
@@ -357,163 +358,163 @@ msgstr ""
 "@Perintah:\n"
 " "
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "|[file]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "|[files]|encrypt files"
 msgstr "|[files]|enkripsi file"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "store only"
 msgstr "hanya disimpan"
 
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "|[files]|decrypt files"
 msgstr "|[files]|dekripsi file"
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/g10.c:297
+#: g10/g10.c:298
 msgid "remove keys from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/g10.c:299
+#: g10/g10.c:300
 msgid "remove keys from the secret keyring"
 msgstr "hapus kunci dari keyring pribadi"
 
-#: g10/g10.c:300
+#: g10/g10.c:301
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/g10.c:301
+#: g10/g10.c:302
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/g10.c:302
+#: g10/g10.c:303
 msgid "sign a key non-revocably"
 msgstr "tandai kunci tidak dapat di-revoke"
 
-#: g10/g10.c:303
+#: g10/g10.c:304
 msgid "sign a key locally and non-revocably"
 msgstr "tandai kunci secara lokal dan tidak dapat di-revoke"
 
-#: g10/g10.c:304
+#: g10/g10.c:305
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
-#: g10/g10.c:310
+#: g10/g10.c:311
 msgid "search for keys on a key server"
 msgstr "cari kunci di key server"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 msgid "update all keys from a keyserver"
 msgstr "update semua kunci dari keyserver"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "list only the sequence of packets"
 msgstr "tampilkan hanya urutan paket"
 
-#: g10/g10.c:320
+#: g10/g10.c:321
 msgid "export the ownertrust values"
 msgstr "ekspor nilai ownertrust"
 
-#: g10/g10.c:322
+#: g10/g10.c:323
 msgid "import ownertrust values"
 msgstr "impor nilai ownertrust"
 
-#: g10/g10.c:324
+#: g10/g10.c:325
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/g10.c:326
+#: g10/g10.c:327
 msgid "unattended trust database update"
 msgstr "perbarui database trust secara otomatis"
 
-#: g10/g10.c:327
+#: g10/g10.c:328
 msgid "fix a corrupted trust database"
 msgstr "perbaiki database trust yang terkorupsi"
 
-#: g10/g10.c:328
+#: g10/g10.c:329
 msgid "De-Armor a file or stdin"
 msgstr "De-Armor file atau stdin"
 
-#: g10/g10.c:330
+#: g10/g10.c:331
 msgid "En-Armor a file or stdin"
 msgstr "En-Armor file atau stdin"
 
-#: g10/g10.c:332
+#: g10/g10.c:333
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/g10.c:336
+#: g10/g10.c:337
 msgid ""
 "@\n"
 "Options:\n"
@@ -523,196 +524,196 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: g10/g10.c:338
+#: g10/g10.c:339
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/g10.c:340
+#: g10/g10.c:341
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/g10.c:343
+#: g10/g10.c:344
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: g10/g10.c:345
+#: g10/g10.c:346
 msgid "use the default key as default recipient"
 msgstr "gunakan kunci baku sebagai penerima baku"
 
-#: g10/g10.c:350
+#: g10/g10.c:352
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/g10.c:351
+#: g10/g10.c:353
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/g10.c:353
+#: g10/g10.c:355
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "verbose"
 msgstr "detil"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "don't use the terminal at all"
 msgstr "jangan menggunakan terminal"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "force v3 signatures"
 msgstr "paksa signature v3"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "do not force v3 signatures"
 msgstr "jangan paksa signature v3"
 
-#: g10/g10.c:366
+#: g10/g10.c:368
 msgid "force v4 key signatures"
 msgstr "paksa signature kunci v4"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "do not force v4 key signatures"
 msgstr "jangan paksa signature kunci v4"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 msgid "always use a MDC for encryption"
 msgstr "selalu gunakan MDC untuk enkripsi"
 
-#: g10/g10.c:370
+#: g10/g10.c:372
 msgid "never use a MDC for encryption"
 msgstr "jangan gunakan MDC untuk enkripsi"
 
-#: g10/g10.c:372
+#: g10/g10.c:374
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:374
+#: g10/g10.c:376
 msgid "use the gpg-agent"
 msgstr "gunakan gpg-agent"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "batch mode: never ask"
 msgstr "mode batch: tanpa tanya"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "assume yes on most questions"
 msgstr "asumsikan ya untuk seluruh pertanyaan"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "assume no on most questions"
 msgstr "asumsikan tidak untuk seluruh pertanyaan"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "add this keyring to the list of keyrings"
 msgstr "tambah keyring ini ke daftar keyring"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "add this secret keyring to the list"
 msgstr "tambah keyring rahasia ini ke daftar"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "show which keyring a listed key is on"
 msgstr "tampilkan keyring tempat kunci yang dipilih berada"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMA|set charset terminal ke NAMA"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "read options from file"
 msgstr "baca pilihan dari file"
 
-#: g10/g10.c:391
+#: g10/g10.c:393
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
-#: g10/g10.c:393
+#: g10/g10.c:395
 msgid "|[file]|write status info to file"
 msgstr "|[file]|tulis status info ke file"
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|sangat percayai kunci ini"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "emulate the mode described in RFC1991"
 msgstr "emulasikan mode seperti dalam RFC1991"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "set pilihan semua paket, cipher, digest ke perilaku OpenPGP"
 
-#: g10/g10.c:403
+#: g10/g10.c:405
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "set pilihan semua paket, cipher, digest ke perilaku PGP 2.x"
 
-#: g10/g10.c:407
+#: g10/g10.c:409
 msgid "|N|use passphrase mode N"
 msgstr "|N|gunakan passphrase mode N"
 
-#: g10/g10.c:409
+#: g10/g10.c:411
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma digest NAMA utk passphrase"
 
-#: g10/g10.c:411
+#: g10/g10.c:413
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMA|gunakan algoritma cipher NAMA"
 
-#: g10/g10.c:413
+#: g10/g10.c:415
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|N|use compress algorithm N"
 msgstr "|N|gunakan algoritma kompresi N"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "throw keyid field of encrypted packets"
 msgstr "buang field keyid paket terenkripsi"
 
-#: g10/g10.c:416
+#: g10/g10.c:418
 msgid "Show Photo IDs"
 msgstr "Tampilkan Photo IDs"
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "Don't show Photo IDs"
 msgstr "Jangan tampilkan Photo IDs"
 
-#: g10/g10.c:418
+#: g10/g10.c:420
 msgid "Set command line to view Photo IDs"
 msgstr "Set perintah baris untuk melihat Photo IDs"
 
-#: g10/g10.c:419
+#: g10/g10.c:421
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=VALUE|gunakan notasi data ini"
 
-#: g10/g10.c:422
+#: g10/g10.c:424
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -720,7 +721,7 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid ""
 "@\n"
 "Examples:\n"
@@ -740,15 +741,15 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/g10.c:559
+#: g10/g10.c:561
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Silakan laporkan kesalahan ke <[email protected]>.\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:565
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/g10.c:566
+#: g10/g10.c:568
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -758,7 +759,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/g10.c:577
+#: g10/g10.c:579
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -766,232 +767,244 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/g10.c:651
+#: g10/g10.c:653
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/g10.c:708
+#: g10/g10.c:710
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/g10.c:881
+#: g10/g10.c:883
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:887
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: g10/g10.c:892
+#: g10/g10.c:894
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/g10.c:1174
+#: g10/g10.c:1176
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/g10.c:1190
+#: g10/g10.c:1192
 msgid "could not parse keyserver URI\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1208
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr ""
+
+#: g10/g10.c:1309
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/g10.c:1298
+#: g10/g10.c:1313
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/g10.c:1305 g10/g10.c:1316
+#: g10/g10.c:1320 g10/g10.c:1331
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/g10.c:1307 g10/g10.c:1327
+#: g10/g10.c:1322 g10/g10.c:1342
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/g10.c:1310
+#: g10/g10.c:1325
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/g10.c:1336
+#: g10/g10.c:1351
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
-msgstr "anda hanya dapat membuat signature detached atau clear saat dalam mode --pgp2\n"
+msgstr ""
+"anda hanya dapat membuat signature detached atau clear saat dalam mode --"
+"pgp2\n"
 
-#: g10/g10.c:1342
+#: g10/g10.c:1357
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
-msgstr "anda tidak dapat menandai dan mengenkripsi pada saat bersamaan dalam mode --pgp2\n"
+msgstr ""
+"anda tidak dapat menandai dan mengenkripsi pada saat bersamaan dalam mode --"
+"pgp2\n"
 
-#: g10/g10.c:1348
+#: g10/g10.c:1363
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
-msgstr "anda harus menggunakan file (dan bukan pipe) saat bekerja dengan opsi --pgpg2\n"
+msgstr ""
+"anda harus menggunakan file (dan bukan pipe) saat bekerja dengan opsi --"
+"pgpg2\n"
 
-#: g10/g10.c:1361
+#: g10/g10.c:1376
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1375 g10/sign.c:614
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1390 g10/sign.c:614
 #: g10/sign.c:792
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "pesan ini mungkin tidak dapat digunakan oleh PGP 2.x\n"
 
-#: g10/g10.c:1414 g10/g10.c:1426
+#: g10/g10.c:1429 g10/g10.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:1420 g10/g10.c:1432
+#: g10/g10.c:1435 g10/g10.c:1447
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:1436
+#: g10/g10.c:1451
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/g10.c:1440
+#: g10/g10.c:1455
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/g10.c:1443
+#: g10/g10.c:1458
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "algoritma kompresi harus di antara %d..%d\n"
 
-#: g10/g10.c:1445
+#: g10/g10.c:1460
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/g10.c:1447
+#: g10/g10.c:1462
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/g10.c:1449
+#: g10/g10.c:1464
 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:1452
+#: g10/g10.c:1467
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/g10.c:1456
+#: g10/g10.c:1471
 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:1460
+#: g10/g10.c:1475
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "default-check-level tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/g10.c:1463
+#: g10/g10.c:1478
 msgid "invalid preferences\n"
 msgstr "preferensi tidak valid\n"
 
-#: g10/g10.c:1557
+#: g10/g10.c:1572
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/g10.c:1577
+#: g10/g10.c:1592
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/g10.c:1584
+#: g10/g10.c:1599
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/g10.c:1592
+#: g10/g10.c:1607
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1624
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/g10.c:1622
+#: g10/g10.c:1637
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:1636
+#: g10/g10.c:1651
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/g10.c:1645
+#: g10/g10.c:1660
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/g10.c:1663
+#: g10/g10.c:1678
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/g10.c:1674
+#: g10/g10.c:1689
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/g10.c:1682
+#: g10/g10.c:1697
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/g10.c:1690
+#: g10/g10.c:1705
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:1698
+#: g10/g10.c:1713
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1721
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/encode.c:307 g10/g10.c:1762 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1777 g10/sign.c:703
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "tidak dapat membuka %s: %s\n"
 
-#: g10/g10.c:1777
+#: g10/g10.c:1792
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/g10.c:1860
+#: g10/g10.c:1875
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1883
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/g10.c:1955
+#: g10/g10.c:1970
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/g10.c:2041
+#: g10/g10.c:2056
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2060
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2048 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2063 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/g10.c:2257
-msgid "the first character of a notation name must be a letter or an underscore\n"
+#: g10/g10.c:2272
+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:2263
+#: g10/g10.c:2278
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -999,11 +1012,11 @@ msgstr ""
 "nama notasi hanya terdiri dari huruf, digit, titik atau garis bawah dan "
 "diakhiri dengan sebuah '='\n"
 
-#: g10/g10.c:2269
+#: g10/g10.c:2284
 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:2277
+#: g10/g10.c:2292
 msgid "a notation value must not use any control characters\n"
 msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
@@ -1076,8 +1089,11 @@ msgid "invalid armor: line longer than %d characters\n"
 msgstr "armor tidak valid: baris melebihi %d karakter\n"
 
 #: g10/armor.c:1058
-msgid "quoted printable character in armor - probably a buggy MTA has been used\n"
-msgstr "karakter yang dapat dicetak dalam armor - mungkin telah digunakan MTA yang mengandung bug\n"
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
+msgstr ""
+"karakter yang dapat dicetak dalam armor - mungkin telah digunakan MTA yang "
+"mengandung bug\n"
 
 #: g10/pkclist.c:61
 msgid "No reason specified"
@@ -1207,8 +1223,10 @@ msgstr "%08lX: kunci telah berakhir\n"
 
 #: g10/pkclist.c:434
 #, c-format
-msgid "%08lX: There is no indication that this key really belongs to the owner\n"
-msgstr "%08lX: Tidak ada indikasi bahwa kunci ini benar-benar milik pemiliknya\n"
+msgid ""
+"%08lX: There is no indication that this key really belongs to the owner\n"
+msgstr ""
+"%08lX: Tidak ada indikasi bahwa kunci ini benar-benar milik pemiliknya\n"
 
 #: g10/pkclist.c:440
 #, c-format
@@ -1270,10 +1288,12 @@ msgstr "Catatan: Kunci ini telah berakhir!\n"
 
 #: g10/pkclist.c:582
 msgid "WARNING: This key is not certified with a trusted signature!\n"
-msgstr "PERINGATAN: Kunci ini tidak disertifikasi dengan sig yang terpercaya!\n"
+msgstr ""
+"PERINGATAN: Kunci ini tidak disertifikasi dengan sig yang terpercaya!\n"
 
 #: g10/pkclist.c:584
-msgid "         There is no indication that the signature belongs to the owner.\n"
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
 msgstr "  Tidak ada indikasi signature milik pemilik.\n"
 
 #: g10/pkclist.c:592
@@ -1285,8 +1305,10 @@ msgid "         The signature is probably a FORGERY.\n"
 msgstr "        Signature mungkin palsu.\n"
 
 #: g10/pkclist.c:601
-msgid "WARNING: This key is not certified with sufficiently trusted signatures!\n"
-msgstr "PERINGATAN: Kunci tdk disertifikasi dg signature terpercaya yg cukup!\n"
+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:603
 msgid "         It is not certain that the signature belongs to the owner.\n"
@@ -1415,7 +1437,7 @@ msgstr "  (%d) RSA (hanya menandai)\n"
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keyedit.c:466 g10/keygen.c:776
+#: g10/keyedit.c:475 g10/keygen.c:776
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
@@ -1423,7 +1445,7 @@ msgstr "Pilihan anda? "
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "Penggunaan algoritma ini didepresiasi - tetap ciptakan?"
 
-#: g10/keyedit.c:479 g10/keygen.c:810
+#: g10/keyedit.c:488 g10/keygen.c:810
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
@@ -1450,7 +1472,8 @@ msgstr "DSA hanya membolehkan keysize dari 512 hingga 1024\n"
 
 #: g10/keygen.c:839
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "keysize terlalu kecil; 1024 adalah nilai terendah yang diijinkan untuk RSA.\n"
+msgstr ""
+"keysize terlalu kecil; 1024 adalah nilai terendah yang diijinkan untuk RSA.\n"
 
 #: g10/keygen.c:842
 msgid "keysize too small; 768 is smallest value allowed.\n"
@@ -1489,21 +1512,17 @@ msgstr ""
 "Oke, tetapi ingat bahwa radiasi monitor dan keyboard anda juga sangat mudah "
 "diserang!\n"
 
-#: g10/keygen.c:870
-msgid "Do you really need such a large keysize? "
-msgstr "Apakah anda perlu keysize sebesar itu? "
-
-#: g10/keygen.c:876
+#: g10/keygen.c:871
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#: g10/keygen.c:879 g10/keygen.c:883
+#: g10/keygen.c:874 g10/keygen.c:878
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:934
+#: g10/keygen.c:929
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1519,7 +1538,7 @@ msgstr ""
 "     <n>m = kunci berakhir dalam n bulan\n"
 "     <n>y = kunci berakhir dalam n tahun\n"
 
-#: g10/keygen.c:943
+#: g10/keygen.c:938
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1535,30 +1554,30 @@ msgstr ""
 "     <n>m = signature berakhir dalam n bulan\n"
 "     <n>y = signature berakhir dalam n tahun\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:960
 msgid "Key is valid for? (0) "
 msgstr "Kunci valid untuk? (0) "
 
-#: g10/keygen.c:967
+#: g10/keygen.c:962
 msgid "Signature is valid for? (0) "
 msgstr "Signature valid untuk? (0) "
 
-#: g10/keygen.c:972
+#: g10/keygen.c:967
 msgid "invalid value\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keygen.c:977
+#: g10/keygen.c:972
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:984
+#: g10/keygen.c:979
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s berakhir pada %s\n"
 
-#: g10/keygen.c:990
+#: g10/keygen.c:985
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1566,11 +1585,11 @@ msgstr ""
 "Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
 "Namun, ia dapat menanganinya secara benar hingga 2106.\n"
 
-#: g10/keygen.c:995
+#: g10/keygen.c:990
 msgid "Is this correct (y/n)? "
 msgstr "Benar (y/t)? "
 
-#: g10/keygen.c:1038
+#: g10/keygen.c:1033
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1585,44 +1604,44 @@ msgstr ""
 "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
 "  \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1045
 msgid "Real name: "
 msgstr "Nama sebenarnya: "
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1053
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: g10/keygen.c:1060
+#: g10/keygen.c:1055
 msgid "Name may not start with a digit\n"
 msgstr "Nama tidak boleh dimulai dengan digit\n"
 
-#: g10/keygen.c:1062
+#: g10/keygen.c:1057
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nama harus berukuran minimum 5 karakter\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1065
 msgid "Email address: "
 msgstr "Alamat email: "
 
-#: g10/keygen.c:1081
+#: g10/keygen.c:1076
 msgid "Not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1084
 msgid "Comment: "
 msgstr "Komentar: "
 
-#: g10/keygen.c:1095
+#: g10/keygen.c:1090
 msgid "Invalid character in comment\n"
 msgstr "Karakter tidak valid dalam komentar\n"
 
-#: g10/keygen.c:1118
+#: g10/keygen.c:1113
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Anda menggunakan set karakter `%s'.\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1119
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1632,27 +1651,27 @@ msgstr ""
 "Anda memilih USER-ID ini:\n"
 "   \"%s\"\n"
 
-#: g10/keygen.c:1128
+#: g10/keygen.c:1123
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
 
-#: g10/keygen.c:1133
+#: g10/keygen.c:1128
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:1143
+#: g10/keygen.c:1138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (Q)uit? "
 
-#: g10/keygen.c:1144
+#: g10/keygen.c:1139
 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:1163
+#: g10/keygen.c:1158
 msgid "Please correct the error first\n"
 msgstr "Silakan perbaiki kesalahan ini dulu\n"
 
-#: g10/keygen.c:1202
+#: g10/keygen.c:1197
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1660,16 +1679,16 @@ msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keyedit.c:655 g10/keygen.c:1210
+#: g10/keyedit.c:664 g10/keygen.c:1205
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: g10/keygen.c:1211
+#: g10/keygen.c:1206
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1217
+#: g10/keygen.c:1212
 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"
@@ -1677,11 +1696,12 @@ msgid ""
 "\n"
 msgstr ""
 "Anda tidak ingin sebuah passphrase - ini mungkin ide yang *buruk*!\n"
-"Namun saya akan tetap lakukan. Anda dapat merubah passphrase anda setiap saat,\n"
+"Namun saya akan tetap lakukan. Anda dapat merubah passphrase anda setiap "
+"saat,\n"
 "menggunakan program ini dengan pilihan \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1233
 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"
@@ -1693,80 +1713,85 @@ msgstr ""
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1723
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Keypair DSA akan memiliki 1024 bit.\n"
 
-#: g10/keygen.c:1782
+#: g10/keygen.c:1777
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:1870 g10/keygen.c:1950
+#: g10/keygen.c:1865 g10/keygen.c:1945
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "menulis kunci publik ke `%s'\n"
 
-#: g10/keygen.c:1871 g10/keygen.c:1952
+#: g10/keygen.c:1866 g10/keygen.c:1947
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:1939
+#: g10/keygen.c:1934
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:1945
+#: g10/keygen.c:1940
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1954
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring publik `%s': %s\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1961
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1981
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1982
 msgid "key marked as ultimately trusted.\n"
 msgstr "kunci ditandai sebagai sangat dipercaya.\n"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1991
 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 ""
 "Perhatikan bahwa kunci ini tidak dapat digunakan untuk enkripsi. Anda \n"
-"mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua untuk tujuan ini.\n"
+"mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
+"untuk tujuan ini.\n"
 
-#: g10/keygen.c:2008 g10/keygen.c:2114
+#: g10/keygen.c:2003 g10/keygen.c:2109
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:2052 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2047 g10/sig-check.c:227 g10/sign.c:228
 #, 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"
+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:2054 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2049 g10/sig-check.c:229 g10/sign.c:230
 #, 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"
+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:2063
+#: g10/keygen.c:2058
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "CATATAN: membuat subkey bagi kunci-kunci v3 tidak OpenPGP compliant\n"
 
-#: g10/keygen.c:2090
+#: g10/keygen.c:2085
 msgid "Really create? "
 msgstr "Ingin diciptakan? "
 
@@ -1797,7 +1822,9 @@ msgstr "%s: PERINGATAN: file kosong\n"
 
 #: g10/encode.c:285
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
-msgstr "anda hanya dapat mengenkripsi ke kunci RSA 2048 bit atau kurang dalam mode --pgp2\n"
+msgstr ""
+"anda hanya dapat mengenkripsi ke kunci RSA 2048 bit atau kurang dalam mode --"
+"pgp2\n"
 
 #: g10/encode.c:313
 #, c-format
@@ -1805,40 +1832,42 @@ msgid "reading from `%s'\n"
 msgstr "Membaca dari `%s'\n"
 
 #: g10/encode.c:347
-msgid "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
-msgstr "tidak dapat menggunakan cipher IDEA untuk semua kunci yang anda enkripsi.\n"
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+msgstr ""
+"tidak dapat menggunakan cipher IDEA untuk semua kunci yang anda enkripsi.\n"
 
 #: g10/encode.c:563
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s dienkripsi untuk: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:142
+#: g10/delkey.c:69 g10/export.c:141
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:162
+#: g10/delkey.c:77 g10/export.c:161
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "gagal membaca keyblock: %s\n"
 
-#: g10/export.c:170
+#: g10/export.c:169
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "kunci %08lX: bukan kunci rfc2440 - dilewati\n"
 
-#: g10/export.c:181
+#: g10/export.c:180
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "kunci %08lX: tidak diproteksi - dilewati\n"
 
-#: g10/export.c:189
+#: g10/export.c:188
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "kunci %08lX: kunci gaya PGP 2.x - dilewati\n"
 
-#: g10/export.c:255
+#: g10/export.c:254
 msgid "WARNING: nothing exported\n"
 msgstr "PERINGATAN: tidak ada yang diekspor\n"
 
@@ -1853,8 +1882,8 @@ msgid "[User id not found]"
 msgstr "[User id tidak ditemukan]"
 
 #: g10/getkey.c:1362
-#, c-format
-msgid "Invalid key %08lX made valid by --always-trust\n"
+#, fuzzy, c-format
+msgid "invalid key %08lX made valid by --always-trust\n"
 msgstr "kunci tidak valid %08lX dibuat valid oleh --always-trust\n"
 
 #: g10/getkey.c:1957
@@ -2060,7 +2089,9 @@ msgstr "kunci %08lX: kunci rahasia tidak ditemukan: %s\n"
 #: g10/import.c:704
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
-msgstr "kunci %08lX: tdk ada kunci publik-tdk dpt mengaplikasikan sertifikat pembatalan\n"
+msgstr ""
+"kunci %08lX: tdk ada kunci publik-tdk dpt mengaplikasikan sertifikat "
+"pembatalan\n"
 
 #: g10/import.c:744
 #, c-format
@@ -2200,11 +2231,11 @@ msgstr "terdeteksi ID %d user tanpa self-signature yang valid\n"
 msgid "User ID \"%s\" is revoked.\n"
 msgstr "ID User \"%s\" dibatalkan.\n"
 
-#: g10/keyedit.c:330 g10/keyedit.c:1004
+#: g10/keyedit.c:330 g10/keyedit.c:1013
 msgid "Are you sure you still want to sign it?\n"
 msgstr "Apakah anda yakin masih ingin menandainya?\n"
 
-#: g10/keyedit.c:335 g10/keyedit.c:409 g10/keyedit.c:519 g10/keyedit.c:1007
+#: g10/keyedit.c:335 g10/keyedit.c:418 g10/keyedit.c:528 g10/keyedit.c:1016
 msgid "Really sign? "
 msgstr "Ditandai? "
 
@@ -2223,66 +2254,69 @@ msgstr ""
 "\n"
 "Apakah anda ingin menjadikannya signature yang full exportable?\n"
 
-#. Fixme: see whether there is a revocation in which
-#. * case we should allow to sign it again.
-#: g10/keyedit.c:374
+#: g10/keyedit.c:379
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %08lX\n"
+msgstr "\"%s\" Sudah ditandai %s dengan kunci %08lX\n"
+
+#: g10/keyedit.c:384
 #, c-format
 msgid "\"%s\" was already %ssigned by key %08lX\n"
 msgstr "\"%s\" Sudah ditandai %s dengan kunci %08lX\n"
 
-#: g10/keyedit.c:387
+#: g10/keyedit.c:396
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:402
+#: g10/keyedit.c:411
 msgid "This key has expired!"
 msgstr "Kunci ini telah berakhir!"
 
-#: g10/keyedit.c:406
+#: g10/keyedit.c:415
 msgid "  Are you sure you still want to sign it?\n"
 msgstr "  Apakah anda yakin masih ingin menandainya?\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:429
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:422
+#: g10/keyedit.c:431
 msgid "Do you want your signature to expire at the same time? (y/n) "
 msgstr "Anda ingin signature anda kadaluarsa pada waktu yang sama? (y/n) "
 
-#: g10/keyedit.c:450
+#: g10/keyedit.c:459
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
-"Sudah seberapa teliti anda memverifikasi kunci yang akan anda gunakan untuk menandai benar "
-"benar milik\n"
+"Sudah seberapa teliti anda memverifikasi kunci yang akan anda gunakan untuk "
+"menandai benar benar milik\n"
 "orang tersebut?  Jika anda tidak tahu jawabannya. masukkan \"0\".\n"
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:463
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Saya tidak akan menjawab.%s\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:465
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Saya belum memeriksanya.%s\n"
 
-#: g10/keyedit.c:458
+#: g10/keyedit.c:467
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Saya telah melakukan pemeriksaan biasa.%s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Saya telah melakukan pemeriksaan hati-hati.%s\n"
 
-#: g10/keyedit.c:485
+#: g10/keyedit.c:494
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2290,7 +2324,7 @@ msgstr ""
 "Apakah anda yakin untuk menandai kunci ini \n"
 "dengan kunci anda: "
 
-#: g10/keyedit.c:494
+#: g10/keyedit.c:503
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
@@ -2298,7 +2332,7 @@ msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat diekspor.\n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:507
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
@@ -2306,7 +2340,7 @@ msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:512
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
@@ -2314,7 +2348,7 @@ msgstr ""
 "\n"
 "Saya belum memeriksa kunci ini sama sekali.\n"
 
-#: g10/keyedit.c:507
+#: g10/keyedit.c:516
 msgid ""
 "\n"
 "I have checked this key casually.\n"
@@ -2322,7 +2356,7 @@ msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini.\n"
 
-#: g10/keyedit.c:511
+#: g10/keyedit.c:520
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
@@ -2330,29 +2364,29 @@ msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini dengan sangat hati-hati.\n"
 
-#: g10/keyedit.c:552 g10/keyedit.c:2459 g10/keyedit.c:2521 g10/sign.c:273
+#: g10/keyedit.c:561 g10/keyedit.c:2476 g10/keyedit.c:2538 g10/sign.c:273
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:621
 msgid "This key is not protected.\n"
 msgstr "Kunci ini tidak diproteksi.\n"
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:625
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:629
 msgid "Key is protected.\n"
 msgstr "Kunci diproteksi.\n"
 
-#: g10/keyedit.c:640
+#: g10/keyedit.c:649
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tidak dapat mengedit kunci ini: %s\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:655
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2360,7 +2394,7 @@ msgstr ""
 "Masukkan passphrase baru untuk kunci rahasia ini.\n"
 "\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:669
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2368,445 +2402,445 @@ msgstr ""
 "Anda tidak ingin passphrase - bukan ide yang baik!\n"
 "\n"
 
-#: g10/keyedit.c:663
+#: g10/keyedit.c:672
 msgid "Do you really want to do this? "
 msgstr "Apakah anda ingin melakukan hal ini? "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:736
 msgid "moving a key signature to the correct place\n"
 msgstr "memindahkan signature kunci ke tempat yang tepat\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:777
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
-#: g10/keyedit.c:769
+#: g10/keyedit.c:778
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:779
 msgid "save"
 msgstr "simpan"
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:779
 msgid "save and quit"
 msgstr "simpan dan berhenti"
 
-#: g10/keyedit.c:771
+#: g10/keyedit.c:780
 msgid "help"
 msgstr "bantuan"
 
-#: g10/keyedit.c:771
+#: g10/keyedit.c:780
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:782
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:782
 msgid "show fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:783
 msgid "list"
 msgstr "tampilkan"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:783
 msgid "list key and user IDs"
 msgstr "tampilkan kunci dan ID user"
 
-#: g10/keyedit.c:775
+#: g10/keyedit.c:784
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:785
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:785
 msgid "select user ID N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:786
 msgid "key"
 msgstr "kunci"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:786
 msgid "select secondary key N"
 msgstr "pilih kunci sekunder N"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:787
 msgid "check"
 msgstr "periksa"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:787
 msgid "list signatures"
 msgstr "tampilkan signature"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:788
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:789
 msgid "sign"
 msgstr "tandai"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:789
 msgid "sign the key"
 msgstr "tandai kunci"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:790
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:791
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:791
 msgid "sign the key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:792
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:792
 msgid "sign the key non-revocably"
 msgstr "tandai kunci sebagai tidak dapat dibatalkan"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:793
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:793
 msgid "sign the key locally and non-revocably"
 msgstr "tandai kunci secara lokal dan tidak dapat dibatalkan"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:794
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:795
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:795
 msgid "add a user ID"
 msgstr "tambah sebuah ID user"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:796
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:796
 msgid "add a photo ID"
 msgstr "tambah sebuah photo ID"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:797
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:797
 msgid "delete user ID"
 msgstr "hapus ID user"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:790
+#: g10/keyedit.c:799
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:800
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:800
 msgid "add a secondary key"
 msgstr "tambah kunci sekunder"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:801
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:801
 msgid "delete a secondary key"
 msgstr "hapus kunci sekunder"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:802
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:802
 msgid "delete signatures"
 msgstr "hapus signature"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:803
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:803
 msgid "change the expire date"
 msgstr "ubah tanggal kadaluarsa"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:804
 msgid "primary"
 msgstr "primer"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:804
 msgid "flag user ID as primary"
 msgstr "tandai ID user sebagai primer"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:805
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:805
 msgid "toggle between secret and public key listing"
 msgstr "ubah tampilan kunci rahasia dan publik"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:807
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:799
+#: g10/keyedit.c:808
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:799
+#: g10/keyedit.c:808
 msgid "list preferences (expert)"
 msgstr "tampilkan preferensi (ahli)"
 
-#: g10/keyedit.c:800
+#: g10/keyedit.c:809
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:800
+#: g10/keyedit.c:809
 msgid "list preferences (verbose)"
 msgstr "tampilkan preferensi (verbose)"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:810
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:810
 msgid "set preference list"
 msgstr "set daftar preferensi"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:811
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:811
 msgid "updated preferences"
 msgstr "perbarui preferensi"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:812
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:812
 msgid "change the passphrase"
 msgstr "ubah passphrase"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:813
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:813
 msgid "change the ownertrust"
 msgstr "ubah ownertrust"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:814
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:814
 msgid "revoke signatures"
 msgstr "batalkan signature"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:815
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:815
 msgid "revoke a secondary key"
 msgstr "batalkan kunci sekunder"
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:816
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:816
 msgid "disable a key"
 msgstr "tiadakan kunci"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:817
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:817
 msgid "enable a key"
 msgstr "aktifkan kunci"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:818
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:818
 msgid "show photo ID"
 msgstr "tampilkan photo ID"
 
-#: g10/delkey.c:112 g10/keyedit.c:829
+#: g10/delkey.c:112 g10/keyedit.c:838
 msgid "can't do that in batchmode\n"
 msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
 
-#: g10/keyedit.c:866
+#: g10/keyedit.c:875
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "kesalahan membaca keyblock rahasia `%s': %s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:893
 msgid "Secret key is available.\n"
 msgstr "Kunci rahasia tersedia.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:924
 msgid "Command> "
 msgstr "Perintah> "
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:956
 msgid "Need the secret key to do this.\n"
 msgstr "Perlu kunci rahasia untuk melakukan hal ini.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:960
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Silakan gunakan dulu perintah \"toogle\".\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1009
 msgid "Key is revoked.\n"
 msgstr "Kunci dibatalkan.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1025
 msgid "Really sign all user IDs? "
 msgstr "Tandai ID seluruh user? "
 
-#: g10/keyedit.c:1017
+#: g10/keyedit.c:1026
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1051
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
 
-#: g10/keyedit.c:1062 g10/keyedit.c:1083
+#: g10/keyedit.c:1071 g10/keyedit.c:1092
 msgid "You must select at least one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:1064
+#: g10/keyedit.c:1073
 msgid "You can't delete the last user ID!\n"
 msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1076
 msgid "Really remove all selected user IDs? "
 msgstr "Hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1068
+#: g10/keyedit.c:1077
 msgid "Really remove this user ID? "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1106 g10/keyedit.c:1128
+#: g10/keyedit.c:1115 g10/keyedit.c:1137
 msgid "You must select at least one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1110
+#: g10/keyedit.c:1119
 msgid "Do you really want to delete the selected keys? "
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: g10/keyedit.c:1111
+#: g10/keyedit.c:1120
 msgid "Do you really want to delete this key? "
 msgstr "Anda ingin menghapus kunci ini? "
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1141
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Anda ingin membatalkan kunci terpilih ini? "
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1142
 msgid "Do you really want to revoke this key? "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1206
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1208
 msgid "Really update the preferences? "
 msgstr "Update preferensi?"
 
-#: g10/keyedit.c:1237
+#: g10/keyedit.c:1246
 msgid "Save changes? "
 msgstr "Simpan perubahan? "
 
-#: g10/keyedit.c:1240
+#: g10/keyedit.c:1249
 msgid "Quit without saving? "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:1251
+#: g10/keyedit.c:1260
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/keyedit.c:1258
+#: g10/keyedit.c:1267
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1274
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1285
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1433
 #, c-format
 msgid "This key may be revoked by %s key %s%s\n"
 msgstr "Kunci ini mungkin dibatalkan oleh %s kunci %s%s\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1436
 msgid " (sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:1432 g10/keyedit.c:1458
+#: g10/keyedit.c:1441 g10/keyedit.c:1467
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  diciptakan: %s berakhir: %s"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1450
 #, c-format
 msgid " trust: %c/%c"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1454
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1483
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! subkey telah dibatalkan: %s\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1486
 msgid "rev- faked revocation found\n"
 msgstr "rev - ditemukan pembatalan palsu\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1488
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? masalah memeriksa pembatalan: %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1598
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
@@ -2814,101 +2848,101 @@ msgstr ""
 "PERINGATAN: Kunci ini telah memiliki sebuah photo ID.\n"
 "         Menambahkan photo ID lain dapat membingungkan beberapa versi PGP.\n"
 
-#: g10/keyedit.c:1593 g10/keyedit.c:1620
+#: g10/keyedit.c:1602 g10/keyedit.c:1629
 msgid "Are you sure you still want to add it? (y/n) "
 msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:1601
+#: g10/keyedit.c:1610
 msgid "You may only have one photo ID on a key.\n"
 msgstr "Anda hanya boleh memiliki satu photo ID untuk satu kunci. \n"
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1624
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
-"PERINGATAN: Ini adalah kunci bergaya PGP2.  Menambahkan sebuah photo ID dapat menyebabkan "
-"beberapa versi\n"
+"PERINGATAN: Ini adalah kunci bergaya PGP2.  Menambahkan sebuah photo ID "
+"dapat menyebabkan beberapa versi\n"
 "          PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:1626
+#: g10/keyedit.c:1635
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Anda tidak boleh menambahkan sebuah photo ID ke kunci bergaya PGP2 \n"
 
-#: g10/keyedit.c:1757
+#: g10/keyedit.c:1766
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:1770
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1774
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1780
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:1785
+#: g10/keyedit.c:1794
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:1786
+#: g10/keyedit.c:1795
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1798
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1867
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:1864
+#: g10/keyedit.c:1873
 msgid "Please select at most one secondary key.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1877
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:1879
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:1912
+#: g10/keyedit.c:1921
 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:1928
+#: g10/keyedit.c:1937
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2018
 msgid "Please select exactly one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:2184
+#: g10/keyedit.c:2193
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2239
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Tidak ada kunci sekunder dengan index %d\n"
 
-#: g10/keyedit.c:2328
+#: g10/keyedit.c:2337
 msgid "user ID: \""
 msgstr "ID user: "
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2342
 #, c-format
 msgid ""
 "\"\n"
@@ -2917,39 +2951,52 @@ msgstr ""
 "\"\n"
 "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyedit.c:2335
+#: g10/keyedit.c:2345
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"locally signed with your key %08lX at %s\n"
+msgstr ""
+"\"\n"
+"ditandai dengan kunci anda %08lX pada %s\n"
+
+#: g10/keyedit.c:2349
 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:2359
+#: g10/keyedit.c:2373
 msgid "You have signed these user IDs:\n"
 msgstr "Anda telah menandai ID user ini:\n"
 
-#: g10/keyedit.c:2373
-#, c-format
-msgid "   signed by %08lX at %s%s\n"
+#: g10/keyedit.c:2387
+#, fuzzy, c-format
+msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   ditandai oleh %08lX pada %s%s\n"
 
-#: g10/keyedit.c:2380
+#: g10/keyedit.c:2395
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2415
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2425
 #, c-format
-msgid "   signed by %08lX at %s\n"
-msgstr "   ditandai oleh %08lX pada %s\n"
+msgid "   signed by %08lX at %s%s\n"
+msgstr "   ditandai oleh %08lX pada %s%s\n"
 
-#: g10/keyedit.c:2418
+#: g10/keyedit.c:2427
+msgid " (non-exportable)"
+msgstr ""
+
+#: g10/keyedit.c:2434
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2464
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
@@ -3141,16 +3188,17 @@ msgstr "Algoritma eksperimental sebaiknya tidak dipakai!\n"
 
 #: g10/misc.c:241
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
-msgstr "algoritma cipher ini didepresiasi; silakan gunakan yang lebih standar!\n"
+msgstr ""
+"algoritma cipher ini didepresiasi; silakan gunakan yang lebih standar!\n"
 
 #: g10/misc.c:378
-#, c-format
-msgid "Warning: unsafe ownership on %s \"%s\"\n"
+#, fuzzy, c-format
+msgid "warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
 #: g10/misc.c:410
-#, c-format
-msgid "Warning: unsafe permissions on %s \"%s\"\n"
+#, fuzzy, c-format
+msgid "warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
 #: g10/misc.c:435
@@ -3158,8 +3206,11 @@ msgid "the IDEA cipher plugin is not present\n"
 msgstr "plugin cipher IDEA tidak tersedia\n"
 
 #: g10/misc.c:436
-msgid "please see http://www.gnupg.org/why-not-idea.html for more information\n"
-msgstr "silakan lihat http://www.gnupg.org/why-not-idea.html untuk informasi lebih lanjut\n"
+msgid ""
+"please see http://www.gnupg.org/why-not-idea.html for more information\n"
+msgstr ""
+"silakan lihat http://www.gnupg.org/why-not-idea.html untuk informasi lebih "
+"lanjut\n"
 
 #: g10/parse-packet.c:119
 #, c-format
@@ -3394,8 +3445,10 @@ msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "PERINGATAN: terdeteksi kunci lemah - silakan ubah passphrase lagi.\n"
 
 #: g10/sig-check.c:209
-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"
+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:217
 #, c-format
@@ -3418,8 +3471,11 @@ msgstr "mengasumsikan signature buruk karena ada bit kritik tidak dikenal\n"
 
 #: g10/sign.c:115
 #, c-format
-msgid "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
-msgstr "PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar).  Menggunakan yang tidak expand.\n"
+msgid ""
+"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
+msgstr ""
+"PERINGATAN: tidak dapat melakukan %%-expand policy url (terlalu besar).  "
+"Menggunakan yang tidak expand.\n"
 
 #: g10/sign.c:268
 #, c-format
@@ -3438,7 +3494,8 @@ msgstr "PERINGATAN: `%s' adalah file kosong\n"
 
 #: g10/sign.c:612
 msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
-msgstr "anda hanya dapat menandai kunci bergaya PGP 2.x saat dalam mode --pgp2\n"
+msgstr ""
+"anda hanya dapat menandai kunci bergaya PGP 2.x saat dalam mode --pgp2\n"
 
 #: g10/sign.c:637 g10/sign.c:806
 #, c-format
@@ -3451,7 +3508,9 @@ msgstr "menandai:"
 
 #: g10/sign.c:790
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
-msgstr "anda hanya dapat clearsign dengan kunci bergaya PGP 2.x saat dalam mode --pgp2\n"
+msgstr ""
+"anda hanya dapat clearsign dengan kunci bergaya PGP 2.x saat dalam mode --"
+"pgp2\n"
 
 #: g10/sign.c:949
 #, c-format
@@ -3754,11 +3813,14 @@ msgstr "%s: direktori tercipta\n"
 
 #: g10/openfile.c:355
 msgid "you have to start GnuPG again, so it can read the new options file\n"
-msgstr "anda harus memulai GnuPG lagi, sehingga ia dapat membaca file option baru\n"
+msgstr ""
+"anda harus memulai GnuPG lagi, sehingga ia dapat membaca file option baru\n"
 
 #: g10/encr-data.c:91
-msgid "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
-msgstr "PERINGATAN: pesan dienkripsi dengan kunci lemah dalam cipher simetrik.\n"
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgstr ""
+"PERINGATAN: pesan dienkripsi dengan kunci lemah dalam cipher simetrik.\n"
 
 #: g10/encr-data.c:98
 msgid "problem handling encrypted packet\n"
@@ -3771,7 +3833,8 @@ msgstr "kunci lemah tercipta - mengulang\n"
 #: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
-msgstr "tidak dapat menghindari kunci lemah untuk cipher simetrik; mencoba %d kali!\n"
+msgstr ""
+"tidak dapat menghindari kunci lemah untuk cipher simetrik; mencoba %d kali!\n"
 
 #: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
@@ -3805,8 +3868,10 @@ msgid ""
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
 "to do with the (implicitly created) web-of-certificates."
 msgstr ""
-"Terserah anda untuk memberi nilai baru di sini; nilai ini tidak akan diekspor\n"
-"ke pihak ketiga. Kami perlu untuk mengimplementasikan web-of-trust; tidak ada\n"
+"Terserah anda untuk memberi nilai baru di sini; nilai ini tidak akan "
+"diekspor\n"
+"ke pihak ketiga. Kami perlu untuk mengimplementasikan web-of-trust; tidak "
+"ada\n"
 "kaitan dengan (membuat secara implisit) web-of-certificates."
 
 #: g10/helptext.c:53
@@ -3830,7 +3895,8 @@ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 msgstr "Jika anda ingin menggunakan kunci tidak terpercaya ini, jawab \"ya\"."
 
 #: g10/helptext.c:68
-msgid "Enter the user ID of the addressee to whom you want to send the message."
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Masukkan ID user penerima pesan."
 
 #: g10/helptext.c:72
@@ -3971,38 +4037,40 @@ msgid ""
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
-"Ketika anda menandai user ID pada kunci, anda perlu memverifikasi bahwa kunci\n"
-"milik orang yang disebut dalam user ID.  Ini penting bagi orang lain untuk tahu\n"
+"Ketika anda menandai user ID pada kunci, anda perlu memverifikasi bahwa "
+"kunci\n"
+"milik orang yang disebut dalam user ID.  Ini penting bagi orang lain untuk "
+"tahu\n"
 "seberapa cermat anda memverifikasi ini.\n"
 "\n"
-"\"0\" berarti anda tidak melakukan klaim tentang betapa cermat anda memverifikasi"
-"    kunci.\n"
+"\"0\" berarti anda tidak melakukan klaim tentang betapa cermat anda "
+"memverifikasi    kunci.\n"
 "\n"
-"\"1\" berarti anda percaya bahwa kunci dimiliki oleh orang yang mengklaim memilikinya\n"
-"    namun anda tidak dapat, atau tidak memverifikasi kunci sama sekali.  Hal ini berguna"
-"bagi\n"
+"\"1\" berarti anda percaya bahwa kunci dimiliki oleh orang yang mengklaim "
+"memilikinya\n"
+"    namun anda tidak dapat, atau tidak memverifikasi kunci sama sekali.  Hal "
+"ini bergunabagi\n"
 "    verifikasi \"persona\", yaitu anda menandai kunci user pseudonymous\n"
 "\n"
-"\"2\" berarti anda melakukan verifikasi kasual atas kunci.  Sebagai contoh, hal"
-"ini dapat\n"
-"    berarti bahwa anda memverifikasi fingerprint kunci dan memeriksa user ID pada "
-"kunci\n"
+"\"2\" berarti anda melakukan verifikasi kasual atas kunci.  Sebagai contoh, "
+"halini dapat\n"
+"    berarti bahwa anda memverifikasi fingerprint kunci dan memeriksa user ID "
+"pada kunci\n"
 "    dengan photo ID.\n"
 "\n"
-"\"3\" berarti anda melakukan verifikasi ekstensif atas kunci.  Sebagai contoh, hal "
-"ini\n"
+"\"3\" berarti anda melakukan verifikasi ekstensif atas kunci.  Sebagai "
+"contoh, hal ini\n"
 "    dapat berarti anda memverifikasi fingerprint kunci dengan pemilik kunci\n"
-"    secara personal, dan anda memeriksa, dengan menggunakan dokumen yang sulit dipalsukan "
-"yang memiliki\n"
-"    photo ID (seperti paspor) bahwa nama pemilik kunci cocok "
-"dengan\n"
+"    secara personal, dan anda memeriksa, dengan menggunakan dokumen yang "
+"sulit dipalsukan yang memiliki\n"
+"    photo ID (seperti paspor) bahwa nama pemilik kunci cocok dengan\n"
 "    nama user ID kunci, dan bahwa anda telah memverifikasi (dengan "
 "pertukaran\n"
 "    email) bahwa alamat email pada kunci milik pemilik kunci.\n"
 "\n"
 "Contoh-contoh pada level 2 dan 3 hanyalah contoh.\n"
-"Pada akhirnya, terserah anda untuk memutuskan apa arti  \"kasual\" dan \"ekstensif"
-"\"\n"
+"Pada akhirnya, terserah anda untuk memutuskan apa arti  \"kasual\" dan "
+"\"ekstensif\"\n"
 "bagi anda ketika menandai kunci lain.\n"
 "\n"
 "Jika anda tidak tahu jawaban yang tepat, jawab \"0\"."
@@ -4068,10 +4136,11 @@ msgstr ""
 "tersedia yang kedua."
 
 #: g10/helptext.c:231
+#, fuzzy
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures fill be advanced by one second.\n"
+"self-signatures will be advanced by one second.\n"
 msgstr ""
 "Rubah preferensi seluruh user ID (atau hanya yang terpilih)\n"
 "ke daftar preferensi saat ini.  Timestamp seluruh self-signature\n"
@@ -4083,7 +4152,8 @@ msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
 #: g10/helptext.c:244
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr "Silakan ulangi passphrase terakhir, sehingga anda yakin yang anda ketikkan."
+msgstr ""
+"Silakan ulangi passphrase terakhir, sehingga anda yakin yang anda ketikkan."
 
 #: g10/helptext.c:248
 msgid "Give the name of the file to which the signature applies"
@@ -4119,7 +4189,8 @@ msgstr ""
 "Anda harus menspesifikasikan alasan pembatalan. Semua ini tergantung\n"
 "konteks, anda dapat memilih dari daftar berikut:\n"
 " \"Key has been compromised\"\n"
-"      Gunakan ini jika anda punya alasan untuk percaya bahwa orang yang tidak berhak\n"
+"      Gunakan ini jika anda punya alasan untuk percaya bahwa orang yang "
+"tidak berhak\n"
 "      memiliki akses ke kunci pribadi anda.\n"
 "  \"Key is superseded\"\n"
 "      Gunakan ini bila anda mengganti kunci anda dengan yang baru.\n"
@@ -4127,7 +4198,8 @@ msgstr ""
 "      Gunakan ini bila anda telah mempensiunkan kunci ini.\n"
 "  \"User ID is no longer valid\"\n"
 "      Gunakan ini untuk menyatakan user ID tidak boleh digunakan lagi;\n"
-"      normalnya digunakan untuk menandai bahwa alamat email tidak valid lagi.\n"
+"      normalnya digunakan untuk menandai bahwa alamat email tidak valid "
+"lagi.\n"
 
 #: g10/helptext.c:280
 msgid ""
@@ -4206,3 +4278,8 @@ msgstr "%lu kunci telah diperiksa (%lu signature)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: keyring tercipta\n"
 
+#~ msgid "Do you really need such a large keysize? "
+#~ msgstr "Apakah anda perlu keysize sebesar itu? "
+
+#~ msgid "   signed by %08lX at %s\n"
+#~ msgstr "   ditandai oleh %08lX pada %s\n"
diff --git a/po/it.po b/po/it.po
index dcec3bfd2..91970ff2c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.5\n"
-"POT-Creation-Date: 2002-03-03 15:18+0100\n"
+"POT-Creation-Date: 2002-04-06 17:29+0200\n"
 "PO-Revision-Date: 2001-04-23 21:15+02:00\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -45,7 +45,7 @@ msgstr "no"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:768 util/miscutil.c:326
+#: g10/keyedit.c:777 util/miscutil.c:326
 msgid "quit"
 msgstr "quit"
 
@@ -274,7 +274,7 @@ msgstr "... questo � un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Hai trovato un bug... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1552
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1547
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
@@ -353,7 +353,7 @@ msgstr ""
 "altra cosa per dare all'OS la possibilit� di raccogliere altra entropia!\n"
 "(Servono altri %d byte)\n"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid ""
 "@Commands:\n"
 " "
@@ -361,170 +361,170 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "store only"
 msgstr "immagazzina soltanto"
 
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/g10.c:297
+#: g10/g10.c:298
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "rimuove una chiave dal portachiavi pubblico"
 
-#: g10/g10.c:299
+#: g10/g10.c:300
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "rimuove una chiave dal portachiavi privato"
 
-#: g10/g10.c:300
+#: g10/g10.c:301
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/g10.c:301
+#: g10/g10.c:302
 msgid "sign a key locally"
 msgstr "firma localmente una chiave"
 
-#: g10/g10.c:302
+#: g10/g10.c:303
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "firma localmente una chiave"
 
-#: g10/g10.c:303
+#: g10/g10.c:304
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "firma localmente una chiave"
 
-#: g10/g10.c:304
+#: g10/g10.c:305
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/g10.c:310
+#: g10/g10.c:311
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importa le chiavi da un key server"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "list only the sequence of packets"
 msgstr "elenca solo la sequenza dei pacchetti"
 
-#: g10/g10.c:320
+#: g10/g10.c:321
 msgid "export the ownertrust values"
 msgstr "esporta i valori di fiducia"
 
-#: g10/g10.c:322
+#: g10/g10.c:323
 msgid "import ownertrust values"
 msgstr "importa i valori di fiducia"
 
-#: g10/g10.c:324
+#: g10/g10.c:325
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/g10.c:326
+#: g10/g10.c:327
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/g10.c:327
+#: g10/g10.c:328
 msgid "fix a corrupted trust database"
 msgstr "ripara un database della fiducia rovinato"
 
-#: g10/g10.c:328
+#: g10/g10.c:329
 msgid "De-Armor a file or stdin"
 msgstr "rimuovi l'armatura a un file o a stdin"
 
-#: g10/g10.c:330
+#: g10/g10.c:331
 msgid "En-Armor a file or stdin"
 msgstr "crea l'armatura a un file o a stdin"
 
-#: g10/g10.c:332
+#: g10/g10.c:333
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/g10.c:336
+#: g10/g10.c:337
 msgid ""
 "@\n"
 "Options:\n"
@@ -534,207 +534,207 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/g10.c:338
+#: g10/g10.c:339
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/g10.c:340
+#: g10/g10.c:341
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/g10.c:343
+#: g10/g10.c:344
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: g10/g10.c:345
+#: g10/g10.c:346
 msgid "use the default key as default recipient"
 msgstr "usa la chiave predefinita come destinatario predefinito"
 
-#: g10/g10.c:350
+#: g10/g10.c:352
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/g10.c:351
+#: g10/g10.c:353
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/g10.c:353
+#: g10/g10.c:355
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "verbose"
 msgstr "prolisso"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "don't use the terminal at all"
 msgstr "non usa per niente il terminale"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "force v3 signatures"
 msgstr "forza l'uso di firme v3"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "forza l'uso di firme v3"
 
-#: g10/g10.c:366
+#: g10/g10.c:368
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "forza l'uso di firme v3"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "forza l'uso di firme v3"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 msgid "always use a MDC for encryption"
 msgstr "usa sempre un MDC per cifrare"
 
-#: g10/g10.c:370
+#: g10/g10.c:372
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "usa sempre un MDC per cifrare"
 
-#: g10/g10.c:372
+#: g10/g10.c:374
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:374
+#: g10/g10.c:376
 msgid "use the gpg-agent"
 msgstr "usa gpg-agent"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "batch mode: never ask"
 msgstr "modo batch: non fa domande"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "assume yes on most questions"
 msgstr "assumi \"s�\" per quasi tutte le domande"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "assume no on most questions"
 msgstr "assumi \"no\" per quasi tutte le domande"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "add this keyring to the list of keyrings"
 msgstr "aggiungi questo portachiavi alla lista"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "add this secret keyring to the list"
 msgstr "aggiungi questo portachiavi segreto alla lista"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usa NOME come chiave segreta predefinita"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|cerca le chiavi in questo keyserver"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOME|imposta il set di caratteri del terminale NOME"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "read options from file"
 msgstr "leggi le opzioni dal file"
 
-#: g10/g10.c:391
+#: g10/g10.c:393
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato su questo FD"
 
-#: g10/g10.c:393
+#: g10/g10.c:395
 #, fuzzy
 msgid "|[file]|write status info to file"
 msgstr "|FD|scrivi le informazioni di stato su questo FD"
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 #, fuzzy
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|assegna fiducia definitiva a questa chiave"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "emulate the mode described in RFC1991"
 msgstr "emula il modo descritto in RFC 1991"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 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:403
+#: g10/g10.c:405
 #, fuzzy
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "imposta tutte le opzioni di pacchetto,\n"
 "cifrario e digest per OpenPGP"
 
-#: g10/g10.c:407
+#: g10/g10.c:409
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa il modo N per la passphrase"
 
-#: g10/g10.c:409
+#: g10/g10.c:411
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOME|usa l'algoritmo di message digest NOME per le passphrase"
 
-#: g10/g10.c:411
+#: g10/g10.c:413
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di cifratura NOME"
 
-#: g10/g10.c:413
+#: g10/g10.c:415
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di message digest NOME"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritmo di compressione N"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina il campo keyid dei pacchetti cifrati"
 
-#: g10/g10.c:416
+#: g10/g10.c:418
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:418
+#: g10/g10.c:420
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:419
+#: g10/g10.c:421
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALORE|usa questi dati per una nota"
 
-#: g10/g10.c:422
+#: g10/g10.c:424
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -742,7 +742,7 @@ msgstr ""
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid ""
 "@\n"
 "Examples:\n"
@@ -762,15 +762,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/g10.c:559
+#: g10/g10.c:561
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:565
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/g10.c:566
+#: g10/g10.c:568
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -780,7 +780,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/g10.c:577
+#: g10/g10.c:579
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -788,242 +788,247 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/g10.c:651
+#: g10/g10.c:653
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/g10.c:708
+#: g10/g10.c:710
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/g10.c:881
+#: g10/g10.c:883
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:887
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/g10.c:892
+#: g10/g10.c:894
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/g10.c:1174
+#: g10/g10.c:1176
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/g10.c:1190
+#: g10/g10.c:1192
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1294
+#: g10/g10.c:1208
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr ""
+
+#: g10/g10.c:1309
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/g10.c:1298
+#: g10/g10.c:1313
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:1305 g10/g10.c:1316
+#: g10/g10.c:1320 g10/g10.c:1331
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/g10.c:1307 g10/g10.c:1327
+#: g10/g10.c:1322 g10/g10.c:1342
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/g10.c:1310
+#: g10/g10.c:1325
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/g10.c:1336
+#: g10/g10.c:1351
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1342
+#: g10/g10.c:1357
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1348
+#: g10/g10.c:1363
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1361
+#: g10/g10.c:1376
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1375 g10/sign.c:614
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1390 g10/sign.c:614
 #: g10/sign.c:792
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr ""
 
-#: g10/g10.c:1414 g10/g10.c:1426
+#: g10/g10.c:1429 g10/g10.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/g10.c:1420 g10/g10.c:1432
+#: g10/g10.c:1435 g10/g10.c:1447
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:1436
+#: g10/g10.c:1451
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "L'URL della policy indicato non � valido\n"
 
-#: g10/g10.c:1440
+#: g10/g10.c:1455
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "L'URL della policy indicato non � valido\n"
 
-#: g10/g10.c:1443
+#: g10/g10.c:1458
 #, 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:1445
+#: g10/g10.c:1460
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/g10.c:1447
+#: g10/g10.c:1462
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/g10.c:1449
+#: g10/g10.c:1464
 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:1452
+#: g10/g10.c:1467
 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:1456
+#: g10/g10.c:1471
 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:1460
+#: g10/g10.c:1475
 #, fuzzy
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
 
-#: g10/g10.c:1463
+#: g10/g10.c:1478
 #, fuzzy
 msgid "invalid preferences\n"
 msgstr "elenca le impostazioni"
 
-#: g10/g10.c:1557
+#: g10/g10.c:1572
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/g10.c:1577
+#: g10/g10.c:1592
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/g10.c:1584
+#: g10/g10.c:1599
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:1592
+#: g10/g10.c:1607
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1624
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/g10.c:1622
+#: g10/g10.c:1637
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:1636
+#: g10/g10.c:1651
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:1645
+#: g10/g10.c:1660
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/g10.c:1663
+#: g10/g10.c:1678
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/g10.c:1674
+#: g10/g10.c:1689
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:1682
+#: g10/g10.c:1697
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:1690
+#: g10/g10.c:1705
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:1698
+#: g10/g10.c:1713
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1721
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/encode.c:307 g10/g10.c:1762 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1777 g10/sign.c:703
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/g10.c:1777
+#: g10/g10.c:1792
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/g10.c:1860
+#: g10/g10.c:1875
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1883
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1955
+#: g10/g10.c:1970
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/g10.c:2041
+#: g10/g10.c:2056
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2060
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2048 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2063 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/g10.c:2257
+#: g10/g10.c:2272
 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:2263
+#: g10/g10.c:2278
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -1031,11 +1036,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:2269
+#: g10/g10.c:2284
 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:2277
+#: g10/g10.c:2292
 msgid "a notation value must not use any control characters\n"
 msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 
@@ -1467,7 +1472,7 @@ msgstr "   (%d) DSA (firma solo)\n"
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keyedit.c:466 g10/keygen.c:776
+#: g10/keyedit.c:475 g10/keygen.c:776
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
@@ -1475,7 +1480,7 @@ msgstr "Cosa scegli? "
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "L'uso di questo algoritmo � deprecato - la creo comunque? "
 
-#: g10/keyedit.c:479 g10/keygen.c:810
+#: g10/keyedit.c:488 g10/keygen.c:810
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
@@ -1541,21 +1546,17 @@ 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:870
-msgid "Do you really need such a large keysize? "
-msgstr "Ti serve davvero una chiave cos� lunga? "
-
-#: g10/keygen.c:876
+#: g10/keygen.c:871
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La dimensione richiesta della chiave � %u bit\n"
 
-#: g10/keygen.c:879 g10/keygen.c:883
+#: g10/keygen.c:874 g10/keygen.c:878
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:934
+#: g10/keygen.c:929
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1571,7 +1572,7 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:943
+#: g10/keygen.c:938
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -1588,31 +1589,31 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:960
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:967
+#: g10/keygen.c:962
 #, fuzzy
 msgid "Signature is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:972
+#: g10/keygen.c:967
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:977
+#: g10/keygen.c:972
 #, fuzzy, c-format
 msgid "%s does not expire at all\n"
 msgstr "La chiave non scade\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:984
+#: g10/keygen.c:979
 #, fuzzy, c-format
 msgid "%s expires at %s\n"
 msgstr "La chiave scadr� il %s\n"
 
-#: g10/keygen.c:990
+#: g10/keygen.c:985
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1620,11 +1621,11 @@ msgstr ""
 "Il tuo sistema non pu� mostrare date oltre il 2038.\n"
 "Comunque, sar� gestita correttamente fino al 2106.\n"
 
-#: g10/keygen.c:995
+#: g10/keygen.c:990
 msgid "Is this correct (y/n)? "
 msgstr "� giusto (s/n)? "
 
-#: g10/keygen.c:1038
+#: g10/keygen.c:1033
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1640,44 +1641,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1045
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1053
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:1060
+#: g10/keygen.c:1055
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non pu� iniziare con una cifra\n"
 
-#: g10/keygen.c:1062
+#: g10/keygen.c:1057
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1065
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:1081
+#: g10/keygen.c:1076
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non � valido\n"
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1084
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:1095
+#: g10/keygen.c:1090
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:1118
+#: g10/keygen.c:1113
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Stai usando il set di caratteri `%s'.\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1119
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1688,27 +1689,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1128
+#: g10/keygen.c:1123
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
 
-#: g10/keygen.c:1133
+#: g10/keygen.c:1128
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1143
+#: g10/keygen.c:1138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? "
 
-#: g10/keygen.c:1144
+#: g10/keygen.c:1139
 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:1163
+#: g10/keygen.c:1158
 msgid "Please correct the error first\n"
 msgstr "Per favore correggi prima l'errore\n"
 
-#: g10/keygen.c:1202
+#: g10/keygen.c:1197
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1716,17 +1717,17 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:655 g10/keygen.c:1210
+#: g10/keyedit.c:664 g10/keygen.c:1205
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; riprova.\n"
 
-#: g10/keygen.c:1211
+#: g10/keygen.c:1206
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1217
+#: g10/keygen.c:1212
 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"
@@ -1738,7 +1739,7 @@ msgstr ""
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1233
 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"
@@ -1750,54 +1751,54 @@ 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:1728
+#: g10/keygen.c:1723
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La coppia DSA avr� 1024 bit.\n"
 
-#: g10/keygen.c:1782
+#: g10/keygen.c:1777
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:1870 g10/keygen.c:1950
+#: g10/keygen.c:1865 g10/keygen.c:1945
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scrittura della chiave pubblica in `%s'\n"
 
-#: g10/keygen.c:1871 g10/keygen.c:1952
+#: g10/keygen.c:1866 g10/keygen.c:1947
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:1939
+#: g10/keygen.c:1934
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 
-#: g10/keygen.c:1945
+#: g10/keygen.c:1940
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1954
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1961
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1981
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1982
 #, fuzzy
 msgid "key marked as ultimately trusted.\n"
 msgstr "Certificati che portano a chiavi definitivamente affidabili:\n"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1991
 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"
@@ -1806,12 +1807,12 @@ msgstr ""
 "il comando \"--edit-key\" per generare una chiave secondaria per questo "
 "scopo.\n"
 
-#: g10/keygen.c:2008 g10/keygen.c:2114
+#: g10/keygen.c:2003 g10/keygen.c:2109
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:2052 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2047 g10/sig-check.c:227 g10/sign.c:228
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1819,7 +1820,7 @@ msgstr ""
 "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:2054 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2049 g10/sig-check.c:229 g10/sign.c:230
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1827,11 +1828,11 @@ msgstr ""
 "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2058
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:2090
+#: g10/keygen.c:2085
 msgid "Really create? "
 msgstr "Crea davvero? "
 
@@ -1879,32 +1880,32 @@ msgstr ""
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s cifrato per: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:142
+#: g10/delkey.c:69 g10/export.c:141
 #, fuzzy, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "utente `%s' non trovato: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:162
+#: g10/delkey.c:77 g10/export.c:161
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/export.c:170
+#: g10/export.c:169
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "chiave %08lX: chiave non rfc2440 - saltata\n"
 
-#: g10/export.c:181
+#: g10/export.c:180
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "chiave %08lX: non protetta - saltata\n"
 
-#: g10/export.c:189
+#: g10/export.c:188
 #, fuzzy, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "chiave %08lX: nuova chiave - saltata\n"
 
-#: g10/export.c:255
+#: g10/export.c:254
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENZIONE: non � stato esportato nulla\n"
 
@@ -1920,7 +1921,7 @@ msgstr "[User ID non trovato]"
 
 #: g10/getkey.c:1362
 #, c-format
-msgid "Invalid key %08lX made valid by --always-trust\n"
+msgid "invalid key %08lX made valid by --always-trust\n"
 msgstr ""
 
 #: g10/getkey.c:1957
@@ -2268,12 +2269,12 @@ msgstr "Trovati %d user ID senza autofirme valide\n"
 msgid "User ID \"%s\" is revoked.\n"
 msgstr ""
 
-#: g10/keyedit.c:330 g10/keyedit.c:1004
+#: g10/keyedit.c:330 g10/keyedit.c:1013
 #, fuzzy
 msgid "Are you sure you still want to sign it?\n"
 msgstr "Sei sicuro di volere una chiave di queste dimensioni? "
 
-#: g10/keyedit.c:335 g10/keyedit.c:409 g10/keyedit.c:519 g10/keyedit.c:1007
+#: g10/keyedit.c:335 g10/keyedit.c:418 g10/keyedit.c:528 g10/keyedit.c:1016
 msgid "Really sign? "
 msgstr "Firmo davvero? "
 
@@ -2288,65 +2289,68 @@ msgid ""
 "Do you want to promote it to a full exportable signature?\n"
 msgstr ""
 
-#. Fixme: see whether there is a revocation in which
-#. * case we should allow to sign it again.
-#: g10/keyedit.c:374
+#: g10/keyedit.c:379
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %08lX\n"
+msgstr "Gi� firmato dalla chiave %08lX\n"
+
+#: g10/keyedit.c:384
 #, fuzzy, c-format
 msgid "\"%s\" was already %ssigned by key %08lX\n"
 msgstr "Gi� firmato dalla chiave %08lX\n"
 
-#: g10/keyedit.c:387
+#: g10/keyedit.c:396
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Niente da firmare con la chiave %08lX\n"
 
-#: g10/keyedit.c:402
+#: g10/keyedit.c:411
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Nota: questa chiave � scaduta!\n"
 
-#: g10/keyedit.c:406
+#: g10/keyedit.c:415
 #, fuzzy
 msgid "  Are you sure you still want to sign it?\n"
 msgstr "Sei sicuro di volere una chiave di queste dimensioni? "
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:429
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Questa chiave non � protetta.\n"
 
-#: g10/keyedit.c:422
+#: g10/keyedit.c:431
 msgid "Do you want your signature to expire at the same time? (y/n) "
 msgstr ""
 
-#: g10/keyedit.c:450
+#: g10/keyedit.c:459
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:463
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:465
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:458
+#: g10/keyedit.c:467
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:485
+#: g10/keyedit.c:494
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2354,7 +2358,7 @@ msgstr ""
 "Sei davvero sicuro di volere firmare questa chiave\n"
 "con la tua chiave: \""
 
-#: g10/keyedit.c:494
+#: g10/keyedit.c:503
 #, fuzzy
 msgid ""
 "\n"
@@ -2363,7 +2367,7 @@ msgstr ""
 "La firma sar� segnata come non esportabile.\n"
 "\n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:507
 #, fuzzy
 msgid ""
 "\n"
@@ -2372,47 +2376,47 @@ msgstr ""
 "La firma sar� segnata come non esportabile.\n"
 "\n"
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:512
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:507
+#: g10/keyedit.c:516
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:511
+#: g10/keyedit.c:520
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:552 g10/keyedit.c:2459 g10/keyedit.c:2521 g10/sign.c:273
+#: g10/keyedit.c:561 g10/keyedit.c:2476 g10/keyedit.c:2538 g10/sign.c:273
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:621
 msgid "This key is not protected.\n"
 msgstr "Questa chiave non � protetta.\n"
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:625
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:629
 msgid "Key is protected.\n"
 msgstr "La chiave � protetta.\n"
 
-#: g10/keyedit.c:640
+#: g10/keyedit.c:649
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossibile modificare questa chiave: %s\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:655
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2420,7 +2424,7 @@ msgstr ""
 "Inserisci la nuova passphrase per questa chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:669
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2428,559 +2432,559 @@ msgstr ""
 "Non vuoi una passphrase - questa � probabilmente una *cattiva* idea!\n"
 "\n"
 
-#: g10/keyedit.c:663
+#: g10/keyedit.c:672
 msgid "Do you really want to do this? "
 msgstr "Vuoi veramente farlo?"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:736
 msgid "moving a key signature to the correct place\n"
 msgstr "spostamento della firma di una chiave nel posto corretto\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:777
 msgid "quit this menu"
 msgstr "abbandona questo men�"
 
-#: g10/keyedit.c:769
+#: g10/keyedit.c:778
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:779
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:779
 msgid "save and quit"
 msgstr "salva ed esci"
 
-#: g10/keyedit.c:771
+#: g10/keyedit.c:780
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:771
+#: g10/keyedit.c:780
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:782
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:782
 msgid "show fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:783
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:783
 msgid "list key and user IDs"
 msgstr "elenca le chiavi e gli user ID"
 
-#: g10/keyedit.c:775
+#: g10/keyedit.c:784
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:785
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:785
 msgid "select user ID N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:786
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:786
 msgid "select secondary key N"
 msgstr "scegli la chiave secondaria N"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:787
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:787
 msgid "list signatures"
 msgstr "elenca le firme"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:788
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:789
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:789
 msgid "sign the key"
 msgstr "firma la chiave"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:790
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:791
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:791
 msgid "sign the key locally"
 msgstr "firma la chiave localmente"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:792
 #, fuzzy
 msgid "nrsign"
 msgstr "sign"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:792
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "firma la chiave localmente"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:793
 #, fuzzy
 msgid "nrlsign"
 msgstr "sign"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:793
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "firma la chiave localmente"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:794
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:795
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:795
 msgid "add a user ID"
 msgstr "aggiungi un user ID"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:796
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:796
 #, fuzzy
 msgid "add a photo ID"
 msgstr "aggiungi un user ID"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:797
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:797
 msgid "delete user ID"
 msgstr "cancella un user ID"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:790
+#: g10/keyedit.c:799
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:800
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:800
 msgid "add a secondary key"
 msgstr "aggiungi una chiave secondaria"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:801
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:801
 msgid "delete a secondary key"
 msgstr "cancella una chiave secondaria"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:802
 msgid "delsig"
 msgstr "delsign"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:802
 msgid "delete signatures"
 msgstr "cancella le firme"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:803
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:803
 msgid "change the expire date"
 msgstr "cambia la data di scadenza"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:804
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:804
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:805
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:805
 msgid "toggle between secret and public key listing"
 msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:807
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:799
+#: g10/keyedit.c:808
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:799
+#: g10/keyedit.c:808
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "elenca le impostazioni"
 
-#: g10/keyedit.c:800
+#: g10/keyedit.c:809
 #, fuzzy
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:800
+#: g10/keyedit.c:809
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "elenca le impostazioni"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:810
 #, fuzzy
 msgid "setpref"
 msgstr "pref"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:810
 #, fuzzy
 msgid "set preference list"
 msgstr "elenca le impostazioni"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:811
 #, fuzzy
 msgid "updpref"
 msgstr "pref"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:811
 #, fuzzy
 msgid "updated preferences"
 msgstr "elenca le impostazioni"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:812
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:812
 msgid "change the passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:813
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:813
 msgid "change the ownertrust"
 msgstr "cambia il valore di fiducia"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:814
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:814
 msgid "revoke signatures"
 msgstr "revoca firme"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:815
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:815
 msgid "revoke a secondary key"
 msgstr "revoca una chiave secondaria"
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:816
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:816
 msgid "disable a key"
 msgstr "disabilita una chiave"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:817
 msgid "enable"
 msgstr "abilita"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:817
 msgid "enable a key"
 msgstr "abilita una chiave"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:818
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:818
 msgid "show photo ID"
 msgstr ""
 
-#: g10/delkey.c:112 g10/keyedit.c:829
+#: g10/delkey.c:112 g10/keyedit.c:838
 msgid "can't do that in batchmode\n"
 msgstr "impossibile fare questo in modo batch\n"
 
-#: g10/keyedit.c:866
+#: g10/keyedit.c:875
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:893
 msgid "Secret key is available.\n"
 msgstr "� disponibile una chiave segreta.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:924
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:956
 msgid "Need the secret key to do this.\n"
 msgstr "Per fare questo serve la chiave segreta.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:960
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Per favore usa prima il comando \"toggle\".\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1009
 #, fuzzy
 msgid "Key is revoked.\n"
 msgstr "La chiave � protetta.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1025
 msgid "Really sign all user IDs? "
 msgstr "Firmo davvero tutti gli user ID? "
 
-#: g10/keyedit.c:1017
+#: g10/keyedit.c:1026
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1051
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1062 g10/keyedit.c:1083
+#: g10/keyedit.c:1071 g10/keyedit.c:1092
 msgid "You must select at least one user ID.\n"
 msgstr "Devi selezionare almeno un user ID.\n"
 
-#: g10/keyedit.c:1064
+#: g10/keyedit.c:1073
 msgid "You can't delete the last user ID!\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1076
 msgid "Really remove all selected user IDs? "
 msgstr "Tolgo davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1068
+#: g10/keyedit.c:1077
 msgid "Really remove this user ID? "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:1106 g10/keyedit.c:1128
+#: g10/keyedit.c:1115 g10/keyedit.c:1137
 msgid "You must select at least one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1110
+#: g10/keyedit.c:1119
 msgid "Do you really want to delete the selected keys? "
 msgstr "Vuoi davvero cancellare le chiavi selezionate? "
 
-#: g10/keyedit.c:1111
+#: g10/keyedit.c:1120
 msgid "Do you really want to delete this key? "
 msgstr "Vuoi davvero cancellare questa chiave? "
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1141
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Vuoi davvero revocare le chiavi selezionate? "
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1142
 msgid "Do you really want to revoke this key? "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1206
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Tolgo davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1208
 #, fuzzy
 msgid "Really update the preferences? "
 msgstr "Creare davvero i certificati di revoca? (s/N)"
 
-#: g10/keyedit.c:1237
+#: g10/keyedit.c:1246
 msgid "Save changes? "
 msgstr "Salvo i cambiamenti? "
 
-#: g10/keyedit.c:1240
+#: g10/keyedit.c:1249
 msgid "Quit without saving? "
 msgstr "Esco senza salvare? "
 
-#: g10/keyedit.c:1251
+#: g10/keyedit.c:1260
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/keyedit.c:1258
+#: g10/keyedit.c:1267
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1274
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1285
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1433
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s%s\n"
 msgstr "ATTENZIONE: questa chiave � stata revocata dal suo proprietario!\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1436
 msgid " (sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:1432 g10/keyedit.c:1458
+#: g10/keyedit.c:1441 g10/keyedit.c:1467
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  creata: %s scade: %s"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1450
 #, c-format
 msgid " trust: %c/%c"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1454
 msgid "This key has been disabled"
 msgstr "Questa chiave � stata disabilitata"
 
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1483
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! la subchiave � stata revocata: %s\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1486
 msgid "rev- faked revocation found\n"
 msgstr "rev- trovata una revoca falsificata\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1488
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problema controllando la revoca: %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1598
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
 msgstr ""
 
-#: g10/keyedit.c:1593 g10/keyedit.c:1620
+#: g10/keyedit.c:1602 g10/keyedit.c:1629
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/n) "
 msgstr "Sei sicuro di volere una chiave di queste dimensioni? "
 
-#: g10/keyedit.c:1601
+#: g10/keyedit.c:1610
 msgid "You may only have one photo ID on a key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1624
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1626
+#: g10/keyedit.c:1635
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1757
+#: g10/keyedit.c:1766
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:1770
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1774
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1780
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:1785
+#: g10/keyedit.c:1794
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:1786
+#: g10/keyedit.c:1795
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1798
 msgid "Nothing deleted.\n"
 msgstr "Non � stato cancellato nulla.\n"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1867
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:1864
+#: g10/keyedit.c:1873
 msgid "Please select at most one secondary key.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1877
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:1879
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:1912
+#: g10/keyedit.c:1921
 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:1928
+#: g10/keyedit.c:1937
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2018
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Devi selezionare almeno un user ID.\n"
 
-#: g10/keyedit.c:2184
+#: g10/keyedit.c:2193
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2239
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nessuna chiave secondaria con l'indice %d\n"
 
-#: g10/keyedit.c:2328
+#: g10/keyedit.c:2337
 msgid "user ID: \""
 msgstr "user ID: \""
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2342
 #, c-format
 msgid ""
 "\"\n"
@@ -2990,39 +2994,53 @@ msgstr ""
 "firmata con la tua chiave %08lX a %s\n"
 "\n"
 
-#: g10/keyedit.c:2335
+#: g10/keyedit.c:2345
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"locally signed with your key %08lX at %s\n"
+msgstr ""
+"\"\n"
+"firmata con la tua chiave %08lX a %s\n"
+"\n"
+
+#: g10/keyedit.c:2349
 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:2359
+#: g10/keyedit.c:2373
 msgid "You have signed these user IDs:\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:2373
+#: g10/keyedit.c:2387
 #, fuzzy, c-format
-msgid "   signed by %08lX at %s%s\n"
+msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   firmata da %08lX il %s\n"
 
-#: g10/keyedit.c:2380
+#: g10/keyedit.c:2395
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2415
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:2410
-#, c-format
-msgid "   signed by %08lX at %s\n"
+#: g10/keyedit.c:2425
+#, fuzzy, c-format
+msgid "   signed by %08lX at %s%s\n"
 msgstr "   firmata da %08lX il %s\n"
 
-#: g10/keyedit.c:2418
+#: g10/keyedit.c:2427
+msgid " (non-exportable)"
+msgstr ""
+
+#: g10/keyedit.c:2434
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Creare davvero i certificati di revoca? (s/N)"
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2464
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
@@ -3223,12 +3241,12 @@ msgstr "questo algoritmo di cifratura � deprecato; usane uno pi� standard!\n"
 
 #: g10/misc.c:378
 #, c-format
-msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgid "warning: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
 #: g10/misc.c:410
 #, c-format
-msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgid "warning: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
 #: g10/misc.c:435
@@ -4139,7 +4157,7 @@ msgstr ""
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures fill be advanced by one second.\n"
+"self-signatures will be advanced by one second.\n"
 msgstr ""
 
 #: g10/helptext.c:238
@@ -4275,6 +4293,12 @@ msgstr "elenca le chiavi e le firme"
 msgid "%s: keyring created\n"
 msgstr "%s: portachiavi creato\n"
 
+#~ msgid "Do you really need such a large keysize? "
+#~ msgstr "Ti serve davvero una chiave cos� lunga? "
+
+#~ msgid "   signed by %08lX at %s\n"
+#~ msgstr "   firmata da %08lX il %s\n"
+
 #~ msgid "--delete-secret-key user-id"
 #~ msgstr "--delete-secret-key user-id"
 
diff --git a/po/ja.po b/po/ja.po
index 142d11051..e2e34f961 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.4\n"
-"POT-Creation-Date: 2002-03-03 15:18+0100\n"
+"POT-Creation-Date: 2002-04-06 17:29+0200\n"
 "PO-Revision-Date: 2000-10-19 23:08+09:00\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -47,7 +47,7 @@ msgstr "no"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:768 util/miscutil.c:326
+#: g10/keyedit.c:777 util/miscutil.c:326
 msgid "quit"
 msgstr "quit"
 
@@ -277,7 +277,7 @@ msgstr "... �Х��Ǥ� (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "�Х��򸫤Ĥ����褦�Ǥ� ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1552
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1547
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s'�������ޤ���: %s\n"
@@ -353,7 +353,7 @@ msgstr ""
 "��ʬ��Ĺ��������������ޤ���OS����ä��𻨤������\n"
 "�Ǥ���褦���������Ƥ�������! (����%d�Х��Ȥ���ޤ�)\n"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid ""
 "@Commands:\n"
 " "
@@ -361,172 +361,172 @@ msgstr ""
 "@���ޥ��:\n"
 " "
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "|[file]|make a signature"
 msgstr "|[�ե�����]|��̾�����"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "|[file]|make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "make a detached signature"
 msgstr "ʬΥ��̾�����"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "encrypt data"
 msgstr "�ǡ�����Ź沽"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "encryption only with symmetric cipher"
 msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "store only"
 msgstr "��¸�Τ�"
 
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "decrypt data (default)"
 msgstr "�ǡ��������� (����)"
 
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "verify a signature"
 msgstr "��̾�򸡾�"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "list keys"
 msgstr "�����"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "list keys and signatures"
 msgstr "���Ƚ�̾�ΰ���"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "check key signatures"
 msgstr "���ν�̾�򸡾�"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "list keys and fingerprints"
 msgstr "���Ȼ���ΰ���"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "list secret keys"
 msgstr "��̩���ΰ���"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "generate a new key pair"
 msgstr "��������������"
 
-#: g10/g10.c:297
+#: g10/g10.c:298
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "�������ؤ��鸰����"
 
-#: g10/g10.c:299
+#: g10/g10.c:300
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "��̩���ؤ��鸰����"
 
-#: g10/g10.c:300
+#: g10/g10.c:301
 msgid "sign a key"
 msgstr "���˽�̾"
 
-#: g10/g10.c:301
+#: g10/g10.c:302
 msgid "sign a key locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/g10.c:302
+#: g10/g10.c:303
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "��������Ū�˽�̾"
 
-#: g10/g10.c:303
+#: g10/g10.c:304
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "��������Ū�˽�̾"
 
-#: g10/g10.c:304
+#: g10/g10.c:305
 msgid "sign or edit a key"
 msgstr "���ؤν�̾���Խ�"
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "generate a revocation certificate"
 msgstr "�˴������������"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "export keys"
 msgstr "����񤭽Ф�"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "export keys to a key server"
 msgstr "�������С��˸���񤭽Ф�"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "import keys from a key server"
 msgstr "�������С����鸰���ɤ߹���"
 
-#: g10/g10.c:310
+#: g10/g10.c:311
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "�������С��˸���񤭽Ф�"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "�������С����鸰���ɤ߹���"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "import/merge keys"
 msgstr "�����ɹ���/ʻ��"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "list only the sequence of packets"
 msgstr "�ѥ��å���Τߤΰ���"
 
-#: g10/g10.c:320
+#: g10/g10.c:321
 msgid "export the ownertrust values"
 msgstr "��ͭ�Ԥ��Ѥ����ͤ�񤭽Ф�"
 
-#: g10/g10.c:322
+#: g10/g10.c:323
 msgid "import ownertrust values"
 msgstr "��ͭ�Ԥ��Ѥ����ͤ��ɤ߹���"
 
-#: g10/g10.c:324
+#: g10/g10.c:325
 msgid "update the trust database"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: g10/g10.c:326
+#: g10/g10.c:327
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: g10/g10.c:327
+#: g10/g10.c:328
 msgid "fix a corrupted trust database"
 msgstr "���줿���ѥǡ����١�������"
 
-#: g10/g10.c:328
+#: g10/g10.c:329
 msgid "De-Armor a file or stdin"
 msgstr ""
 "�ե�����ޤ���ɸ�����Ϥ�\n"
 "��������"
 
-#: g10/g10.c:330
+#: g10/g10.c:331
 msgid "En-Armor a file or stdin"
 msgstr "�ե�����ޤ���ɸ�����Ϥ�������"
 
-#: g10/g10.c:332
+#: g10/g10.c:333
 msgid "|algo [files]|print message digests"
 msgstr "|���르�ꥺ�� [�ե�����]|��å�������������"
 
-#: g10/g10.c:336
+#: g10/g10.c:337
 msgid ""
 "@\n"
 "Options:\n"
@@ -536,243 +536,243 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/g10.c:338
+#: g10/g10.c:339
 msgid "create ascii armored output"
 msgstr "ASCII���������������"
 
-#: g10/g10.c:340
+#: g10/g10.c:341
 msgid "|NAME|encrypt for NAME"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: g10/g10.c:343
+#: g10/g10.c:344
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 "|̾��|����μ����ԤȤ���\n"
 "��̾���פ����"
 
-#: g10/g10.c:345
+#: g10/g10.c:346
 msgid "use the default key as default recipient"
 msgstr "����μ����Ԥ˴���θ������"
 
-#: g10/g10.c:350
+#: g10/g10.c:352
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "��̾������ˤ��Υ桼����id\n"
 "�����"
 
-#: g10/g10.c:351
+#: g10/g10.c:353
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|���̥�٥��N������\n"
 "(0���󰵽�)"
 
-#: g10/g10.c:353
+#: g10/g10.c:355
 msgid "use canonical text mode"
 msgstr "����ƥ����ȡ��⡼�ɤ����"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "use as output file"
 msgstr "���ϥե�����Ȥ��ƻ���"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "verbose"
 msgstr "��Ĺ"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "be somewhat more quiet"
 msgstr "����Ť�"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "don't use the terminal at all"
 msgstr "ü�����Ի���"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "force v3 signatures"
 msgstr "����Ū��v3��̾"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "����Ū��v3��̾"
 
-#: g10/g10.c:366
+#: g10/g10.c:368
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "����Ū��v3��̾"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "����Ū��v3��̾"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 msgid "always use a MDC for encryption"
 msgstr "�Ź沽�ˤϾ��MDC�����"
 
-#: g10/g10.c:370
+#: g10/g10.c:372
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "�Ź沽�ˤϾ��MDC�����"
 
-#: g10/g10.c:372
+#: g10/g10.c:374
 msgid "do not make any changes"
 msgstr "̵�ѹ�"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:374
+#: g10/g10.c:376
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "batch mode: never ask"
 msgstr "�Хå����⡼��: ��ǧ��ά"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "assume yes on most questions"
 msgstr ""
 "�����Ƥ��μ����������yes\n"
 "�Ȥߤʤ�"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "assume no on most questions"
 msgstr ""
 "�����Ƥ��μ����������no\n"
 "�Ȥߤʤ�"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "add this keyring to the list of keyrings"
 msgstr "���ؤΰ����ˤ��θ��ؤ��ɲ�"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "add this secret keyring to the list"
 msgstr "�����ˤ�����̩���ؤ��ɲ�"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 "|̾��|�������̩���Ȥ���\n"
 "��̾���פ����"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|�ۥ���|���θ����ˤ��θ������С������"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|CHARSET̾|ü����charset���CHARSET̾��\n"
 "������"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "read options from file"
 msgstr ""
 "�ե����뤫�饪�ץ�����\n"
 "�ɤ߹���"
 
-#: g10/g10.c:391
+#: g10/g10.c:393
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
 "�񤭽Ф�"
 
-#: g10/g10.c:393
+#: g10/g10.c:395
 #, fuzzy
 msgid "|[file]|write status info to file"
 msgstr ""
 "|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
 "�񤭽Ф�"
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 #, fuzzy
 msgid "|KEYID|ultimately trust this key"
 msgstr "|��ID|���Ρָ��פ���Ū�˿��Ѥ���"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "|FILE|load extension module FILE"
 msgstr ""
 "|�ե�����|��ĥ�⥸�塼��Υե������\n"
 "�ɤ߹���"
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "emulate the mode described in RFC1991"
 msgstr ""
 "RFC1991�˵��Ҥ��줿�⡼�ɤ�\n"
 "����"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "�ѥ��åȤȰŹ�Ƚ�̾�Υ��ץ���\n"
 "�������OpenPGP��������"
 
-#: g10/g10.c:403
+#: g10/g10.c:405
 #, fuzzy
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "�ѥ��åȤȰŹ�Ƚ�̾�Υ��ץ���\n"
 "�������OpenPGP��������"
 
-#: g10/g10.c:407
+#: g10/g10.c:409
 msgid "|N|use passphrase mode N"
 msgstr "|N|�ѥ��ե졼�����⡼��N�����"
 
-#: g10/g10.c:409
+#: g10/g10.c:411
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|̾��|�ѥ��ե졼���ˡ�̾���פΥ��\n"
 "���������󥢥르�ꥺ������"
 
-#: g10/g10.c:411
+#: g10/g10.c:413
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|̾��|�ѥ��ե졼���ˡ�̾���פΰŹ�\n"
 "���르�ꥺ������"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use cipher algorithm NAME"
 msgstr ""
 "|̾��|��̾���פΰŹ楢�르�ꥺ���\n"
 "����"
 
-#: g10/g10.c:413
+#: g10/g10.c:415
 msgid "|NAME|use message digest algorithm NAME"
 msgstr ""
 "|̾��|��̾���פΥ�å���������\n"
 "���르�ꥺ������"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|N|use compress algorithm N"
 msgstr ""
 "|̾��|��̾���פΰ��̥��르�ꥺ���\n"
 "����"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "�Ź�ѥ��åȤθ�ID�ե������\n"
 "������"
 
-#: g10/g10.c:416
+#: g10/g10.c:418
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:418
+#: g10/g10.c:420
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:419
+#: g10/g10.c:421
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|̾��=��|��������ǡ��������"
 
-#: g10/g10.c:422
+#: g10/g10.c:424
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -781,7 +781,7 @@ msgstr ""
 "(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
 "�ޥ˥奢�롦�ڡ���������������)\n"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid ""
 "@\n"
 "Examples:\n"
@@ -801,15 +801,15 @@ msgstr ""
 " --list-keys [̾��]         ����ɽ��\n"
 " --fingerprint [̾��]       �����ɽ��\n"
 
-#: g10/g10.c:559
+#: g10/g10.c:561
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:565
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/g10.c:566
+#: g10/g10.c:568
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -819,7 +819,7 @@ msgstr ""
 "��̾�����ڡ��Ź沽������\n"
 "�����ư��ϡ����ϥǡ����˰�¸\n"
 
-#: g10/g10.c:577
+#: g10/g10.c:579
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -827,240 +827,245 @@ msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: g10/g10.c:651
+#: g10/g10.c:653
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/g10.c:708
+#: g10/g10.c:710
 msgid "conflicting commands\n"
 msgstr "���ޥ�ɤξ���\n"
 
-#: g10/g10.c:881
+#: g10/g10.c:883
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե�����`%s'������ޤ���\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:887
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե�����`%s': %s\n"
 
-#: g10/g10.c:892
+#: g10/g10.c:894
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "`%s'���饪�ץ������ɤ߹��ߤޤ�\n"
 
-#: g10/g10.c:1174
+#: g10/g10.c:1176
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s��������ʸ������ǤϤ���ޤ���\n"
 
-#: g10/g10.c:1190
+#: g10/g10.c:1192
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1294
+#: g10/g10.c:1208
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr ""
+
+#: g10/g10.c:1309
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/g10.c:1298
+#: g10/g10.c:1313
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:1305 g10/g10.c:1316
+#: g10/g10.c:1320 g10/g10.c:1331
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s���Ѥ��ޤ���!\n"
 
-#: g10/g10.c:1307 g10/g10.c:1327
+#: g10/g10.c:1322 g10/g10.c:1342
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ���Ѥ��뤳�ȤϤǤ��ޤ���!\n"
 
-#: g10/g10.c:1310
+#: g10/g10.c:1325
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ���Ѥ��Ƥ�̵��̣�Ǥ�!\n"
 
-#: g10/g10.c:1336
+#: g10/g10.c:1351
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1342
+#: g10/g10.c:1357
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1348
+#: g10/g10.c:1363
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1361
+#: g10/g10.c:1376
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1375 g10/sign.c:614
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1390 g10/sign.c:614
 #: g10/sign.c:792
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr ""
 
-#: g10/g10.c:1414 g10/g10.c:1426
+#: g10/g10.c:1429 g10/g10.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ���̵���Ǥ�\n"
 
-#: g10/g10.c:1420 g10/g10.c:1432
+#: g10/g10.c:1435 g10/g10.c:1447
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ���̵���Ǥ�\n"
 
-#: g10/g10.c:1436
+#: g10/g10.c:1451
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "��������줿�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/g10.c:1440
+#: g10/g10.c:1455
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "��������줿�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/g10.c:1443
+#: g10/g10.c:1458
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "���̥��르�ꥺ���%d..%d���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1445
+#: g10/g10.c:1460
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:1447
+#: g10/g10.c:1462
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:1449
+#: g10/g10.c:1464
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1452
+#: g10/g10.c:1467
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/g10.c:1456
+#: g10/g10.c:1471
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1460
+#: g10/g10.c:1475
 #, fuzzy
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1463
+#: g10/g10.c:1478
 #, fuzzy
 msgid "invalid preferences\n"
 msgstr "ͥ���̤ΰ���"
 
-#: g10/g10.c:1557
+#: g10/g10.c:1572
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:1577
+#: g10/g10.c:1592
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/g10.c:1584
+#: g10/g10.c:1599
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/g10.c:1592
+#: g10/g10.c:1607
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1624
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/g10.c:1622
+#: g10/g10.c:1637
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/g10.c:1636
+#: g10/g10.c:1651
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/g10.c:1645
+#: g10/g10.c:1660
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/g10.c:1663
+#: g10/g10.c:1678
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/g10.c:1674
+#: g10/g10.c:1689
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/g10.c:1682
+#: g10/g10.c:1697
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/g10.c:1690
+#: g10/g10.c:1705
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/g10.c:1698
+#: g10/g10.c:1713
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1721
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/encode.c:307 g10/g10.c:1762 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1777 g10/sign.c:703
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s�������ޤ���: %s\n"
 
-#: g10/g10.c:1777
+#: g10/g10.c:1792
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [�桼����id] [����]"
 
-#: g10/g10.c:1860
+#: g10/g10.c:1875
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1883
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:1955
+#: g10/g10.c:1970
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ��`%s'�Ǥ�\n"
 
-#: g10/g10.c:2041
+#: g10/g10.c:2056
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2060
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å������򥿥��פ��Ƥ������� ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2048 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2063 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s'�������ޤ���\n"
 
-#: g10/g10.c:2257
+#: g10/g10.c:2272
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "����̾����Ƭ��ʸ�����������������(_)�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2263
+#: g10/g10.c:2278
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -1068,11 +1073,11 @@ msgstr ""
 "����̾�ˤ�ʸ�����������ɥåȡ���������������Τߤ��Ѥ���\n"
 "'='�ǽ����ʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2269
+#: g10/g10.c:2284
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "����̾�ΥɥåȤ�¾��ʸ���ǰϤޤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2277
+#: g10/g10.c:2292
 msgid "a notation value must not use any control characters\n"
 msgstr "����̾���ͤ�����ʸ�����Ѥ��ƤϤ����ޤ���\n"
 
@@ -1500,7 +1505,7 @@ msgstr "   (%d) DSA (��̾�Τ�)\n"
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (�Ź沽�Τ�)\n"
 
-#: g10/keyedit.c:466 g10/keygen.c:776
+#: g10/keyedit.c:475 g10/keygen.c:776
 msgid "Your selection? "
 msgstr "�ɤ�ˤ��ޤ���? "
 
@@ -1508,7 +1513,7 @@ msgstr "�ɤ�ˤ��ޤ���? "
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 
-#: g10/keyedit.c:479 g10/keygen.c:810
+#: g10/keyedit.c:488 g10/keygen.c:810
 msgid "Invalid selection.\n"
 msgstr "̵��������Ǥ���\n"
 
@@ -1574,21 +1579,17 @@ msgstr ""
 "�狼��ޤ����������������ʤ��Υ�˥����䥭���ܡ������Ϥϡ�\n"
 "����ˤ��������ȼ�Ǥ��뤳�Ȥ򿴤�α��Ƥ����Ƥ�������!\n"
 
-#: g10/keygen.c:870
-msgid "Do you really need such a large keysize? "
-msgstr "����ʤ�Ĺ�����������ˤ���ޤ���? "
-
-#: g10/keygen.c:876
+#: g10/keygen.c:871
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�׵ᤵ�줿��Ĺ��%u�ӥå�\n"
 
-#: g10/keygen.c:879 g10/keygen.c:883
+#: g10/keygen.c:874 g10/keygen.c:878
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u�ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:934
+#: g10/keygen.c:929
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1604,7 +1605,7 @@ msgstr ""
 "      <n>m = ͭ������ n �����\n"
 "      <n>y = ͭ������ n ǯ��\n"
 
-#: g10/keygen.c:943
+#: g10/keygen.c:938
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -1621,31 +1622,31 @@ msgstr ""
 "      <n>m = ͭ������ n �����\n"
 "      <n>y = ͭ������ n ǯ��\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:960
 msgid "Key is valid for? (0) "
 msgstr "����ͭ�����֤�? (0)"
 
-#: g10/keygen.c:967
+#: g10/keygen.c:962
 #, fuzzy
 msgid "Signature is valid for? (0) "
 msgstr "����ͭ�����֤�? (0)"
 
-#: g10/keygen.c:972
+#: g10/keygen.c:967
 msgid "invalid value\n"
 msgstr "̵������\n"
 
-#: g10/keygen.c:977
+#: g10/keygen.c:972
 #, fuzzy, c-format
 msgid "%s does not expire at all\n"
 msgstr "����̵���¤Ǥ�\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:984
+#: g10/keygen.c:979
 #, fuzzy, c-format
 msgid "%s expires at %s\n"
 msgstr "����%s�ˤƴ����ڤ�ˤʤ�ޤ�\n"
 
-#: g10/keygen.c:990
+#: g10/keygen.c:985
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1653,11 +1654,11 @@ msgstr ""
 "���Υ����ƥ�Ǥϡ�2038ǯ�ʹߤ����դ�ɽ���Ǥ��ޤ��󤬡�\n"
 "2106ǯ�ޤǤʤ������������Ǥ��ޤ���\n"
 
-#: g10/keygen.c:995
+#: g10/keygen.c:990
 msgid "Is this correct (y/n)? "
 msgstr "����Ǥ����Ǥ��� (y/n)? "
 
-#: g10/keygen.c:1038
+#: g10/keygen.c:1033
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1673,44 +1674,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1045
 msgid "Real name: "
 msgstr "��̾: "
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1053
 msgid "Invalid character in name\n"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:1060
+#: g10/keygen.c:1055
 msgid "Name may not start with a digit\n"
 msgstr "̾��������ǻϤ�ƤϤ����ޤ���\n"
 
-#: g10/keygen.c:1062
+#: g10/keygen.c:1057
 msgid "Name must be at least 5 characters long\n"
 msgstr "̾����5ʸ���ʾ�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1065
 msgid "Email address: "
 msgstr "�Żҥ᡼�롦���ɥ쥹: "
 
-#: g10/keygen.c:1081
+#: g10/keygen.c:1076
 msgid "Not a valid email address\n"
 msgstr "ͭ�����Żҥ᡼�롦���ɥ쥹�ǤϤ���ޤ���\n"
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1084
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:1095
+#: g10/keygen.c:1090
 msgid "Invalid character in comment\n"
 msgstr "�����Ȥ�̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:1118
+#: g10/keygen.c:1113
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "���ʤ���ʸ������`%s'��ȤäƤ��ޤ���\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1119
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1721,27 +1722,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1128
+#: g10/keygen.c:1123
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
 
-#: g10/keygen.c:1133
+#: g10/keygen.c:1128
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1143
+#: g10/keygen.c:1138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ��Ͻ�λ(Q)? "
 
-#: g10/keygen.c:1144
+#: g10/keygen.c:1139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ���OK(O)����λ(Q)? "
 
-#: g10/keygen.c:1163
+#: g10/keygen.c:1158
 msgid "Please correct the error first\n"
 msgstr "�ޤ����顼�������Ƥ�������\n"
 
-#: g10/keygen.c:1202
+#: g10/keygen.c:1197
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1749,17 +1750,17 @@ msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
 "\n"
 
-#: g10/keyedit.c:655 g10/keygen.c:1210
+#: g10/keyedit.c:664 g10/keygen.c:1205
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "�ѥ��ե졼�����ۤʤ�ޤ����⤦�������ꤷ�Ƥ���������\n"
 
-#: g10/keygen.c:1211
+#: g10/keygen.c:1206
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1217
+#: g10/keygen.c:1212
 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"
@@ -1771,7 +1772,7 @@ msgstr ""
 "�Ρ�--edit-key�ץ��ץ����Ǥ��ĤǤ��ѹ��Ǥ��ޤ���\n"
 "\n"
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1233
 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"
@@ -1782,54 +1783,54 @@ msgstr ""
 "�Ȥ����ǥ������˥�����������Ȥ���¾�Τ��Ȥ򤹤�ȡ���������Ҥ�\n"
 "�𻨤����礭�ʤ���������������䤹���ʤ�Τǡ������ᤷ�ޤ���\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1723
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA���Ф�1024�ӥåȤˤʤ�ޤ���\n"
 
-#: g10/keygen.c:1782
+#: g10/keygen.c:1777
 msgid "Key generation canceled.\n"
 msgstr "������������ߤ���ޤ�����\n"
 
-#: g10/keygen.c:1870 g10/keygen.c:1950
+#: g10/keygen.c:1865 g10/keygen.c:1945
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "`%s'�ظ�������񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:1871 g10/keygen.c:1952
+#: g10/keygen.c:1866 g10/keygen.c:1947
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "`%s'����̩����񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:1939
+#: g10/keygen.c:1934
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "��%08lX: �����������Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:1945
+#: g10/keygen.c:1940
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "��%08lX: ��̩�������Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1954
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "����`%s'�ν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1961
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "����`%s'�ν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1981
 msgid "public and secret key created and signed.\n"
 msgstr "����������̩�����ꡢ��̾���ޤ�����\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1982
 #, fuzzy
 msgid "key marked as ultimately trusted.\n"
 msgstr "����Ū�˿��Ѥ������ؤξ�����:\n"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1991
 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"
@@ -1837,28 +1838,28 @@ msgstr ""
 "���θ��ϰŹ沽�ˤϻ��ѤǤ��ʤ����Ȥ����դ��Ƥ����������Ź沽��Ԥ��ˤϡ�\n"
 "��--edit-key�ץ��ޥ�ɤ��Ѥ����������������Ƥ���������\n"
 
-#: g10/keygen.c:2008 g10/keygen.c:2114
+#: g10/keygen.c:2003 g10/keygen.c:2109
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "���������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:2052 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2047 g10/sig-check.c:227 g10/sign.c:228
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
 
-#: g10/keygen.c:2054 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2049 g10/sig-check.c:229 g10/sign.c:230
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2058
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:2090
+#: g10/keygen.c:2085
 msgid "Really create? "
 msgstr "�����˺��ޤ���? "
 
@@ -1906,32 +1907,32 @@ msgstr ""
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s�Ź沽 ������: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:142
+#: g10/delkey.c:69 g10/export.c:141
 #, fuzzy, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "�桼����'%s'�����Ĥ���ޤ���: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:162
+#: g10/delkey.c:77 g10/export.c:161
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "`%s'���ɹ��ߥ��顼: %s\n"
 
-#: g10/export.c:170
+#: g10/export.c:169
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "�� %08lX: rfc2440�θ��ǤϤ���ޤ��� - �����å�\n"
 
-#: g10/export.c:181
+#: g10/export.c:180
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "�� %08lX: �ݸ��Ƥ��ޤ��� - �����å�\n"
 
-#: g10/export.c:189
+#: g10/export.c:188
 #, fuzzy, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "�� %08lX: ���������Ǥ� - �����å�\n"
 
-#: g10/export.c:255
+#: g10/export.c:254
 msgid "WARNING: nothing exported\n"
 msgstr "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
 
@@ -1947,7 +1948,7 @@ msgstr "[�桼����id�����Ĥ���ޤ���]"
 
 #: g10/getkey.c:1362
 #, c-format
-msgid "Invalid key %08lX made valid by --always-trust\n"
+msgid "invalid key %08lX made valid by --always-trust\n"
 msgstr ""
 
 #: g10/getkey.c:1957
@@ -2293,12 +2294,12 @@ msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��%d�ĸ���\n"
 msgid "User ID \"%s\" is revoked.\n"
 msgstr ""
 
-#: g10/keyedit.c:330 g10/keyedit.c:1004
+#: g10/keyedit.c:330 g10/keyedit.c:1013
 #, fuzzy
 msgid "Are you sure you still want to sign it?\n"
 msgstr "���θ�Ĺ�������ˤ����Ǥ���? "
 
-#: g10/keyedit.c:335 g10/keyedit.c:409 g10/keyedit.c:519 g10/keyedit.c:1007
+#: g10/keyedit.c:335 g10/keyedit.c:418 g10/keyedit.c:528 g10/keyedit.c:1016
 msgid "Really sign? "
 msgstr "�����˽�̾���ޤ���? "
 
@@ -2313,71 +2314,74 @@ msgid ""
 "Do you want to promote it to a full exportable signature?\n"
 msgstr ""
 
-#. Fixme: see whether there is a revocation in which
-#. * case we should allow to sign it again.
-#: g10/keyedit.c:374
+#: g10/keyedit.c:379
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %08lX\n"
+msgstr "��%08lX�Ǥ⤦��̾���Ƥ���ޤ�\n"
+
+#: g10/keyedit.c:384
 #, fuzzy, c-format
 msgid "\"%s\" was already %ssigned by key %08lX\n"
 msgstr "��%08lX�Ǥ⤦��̾���Ƥ���ޤ�\n"
 
-#: g10/keyedit.c:387
+#: g10/keyedit.c:396
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "��%08lX�ǽ�̾�����ΤϤ���ޤ���\n"
 
-#: g10/keyedit.c:402
+#: g10/keyedit.c:411
 #, fuzzy
 msgid "This key has expired!"
 msgstr "����: ���θ��ϴ����ڤ�Ǥ�!\n"
 
-#: g10/keyedit.c:406
+#: g10/keyedit.c:415
 #, fuzzy
 msgid "  Are you sure you still want to sign it?\n"
 msgstr "���θ�Ĺ�������ˤ����Ǥ���? "
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:429
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "���θ����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:422
+#: g10/keyedit.c:431
 msgid "Do you want your signature to expire at the same time? (y/n) "
 msgstr ""
 
-#: g10/keyedit.c:450
+#: g10/keyedit.c:459
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:463
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:465
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:458
+#: g10/keyedit.c:467
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:485
+#: g10/keyedit.c:494
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr "�����ˤ��θ��ˤ��ʤ��θ��ǽ�̾���Ƥ褤�Ǥ���: \""
 
-#: g10/keyedit.c:494
+#: g10/keyedit.c:503
 #, fuzzy
 msgid ""
 "\n"
@@ -2386,7 +2390,7 @@ msgstr ""
 "��̾�Ͻ�Ф��ԲĤ����ꤵ��ޤ���\n"
 "\n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:507
 #, fuzzy
 msgid ""
 "\n"
@@ -2395,47 +2399,47 @@ msgstr ""
 "��̾�Ͻ�Ф��ԲĤ����ꤵ��ޤ���\n"
 "\n"
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:512
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:507
+#: g10/keyedit.c:516
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:511
+#: g10/keyedit.c:520
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:552 g10/keyedit.c:2459 g10/keyedit.c:2521 g10/sign.c:273
+#: g10/keyedit.c:561 g10/keyedit.c:2476 g10/keyedit.c:2538 g10/sign.c:273
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:621
 msgid "This key is not protected.\n"
 msgstr "���θ����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:625
 msgid "Secret parts of primary key are not available.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:629
 msgid "Key is protected.\n"
 msgstr "�����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:640
+#: g10/keyedit.c:649
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "���θ����Խ��Ǥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:655
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2443,7 +2447,7 @@ msgstr ""
 "������̩���ο������ѥ��ե졼�������Ϥ��Ƥ���������\n"
 "\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:669
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2452,559 +2456,559 @@ msgstr ""
 "�����餯����Ϥ����ʹͤ��ǤϤ���ޤ���!\n"
 "\n"
 
-#: g10/keyedit.c:663
+#: g10/keyedit.c:672
 msgid "Do you really want to do this? "
 msgstr "�����˼¹Ԥ��ޤ���? "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:736
 msgid "moving a key signature to the correct place\n"
 msgstr "���ν�̾�����������˰�ư���ޤ�\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:777
 msgid "quit this menu"
 msgstr "���Υ�˥塼��λ"
 
-#: g10/keyedit.c:769
+#: g10/keyedit.c:778
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:779
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:779
 msgid "save and quit"
 msgstr "��¸���ƽ�λ"
 
-#: g10/keyedit.c:771
+#: g10/keyedit.c:780
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:771
+#: g10/keyedit.c:780
 msgid "show this help"
 msgstr "���Υإ�פ򸫤�"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:782
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:782
 msgid "show fingerprint"
 msgstr "����򸫤�"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:783
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:783
 msgid "list key and user IDs"
 msgstr "���ȥ桼����ID�ΰ���"
 
-#: g10/keyedit.c:775
+#: g10/keyedit.c:784
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:785
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:785
 msgid "select user ID N"
 msgstr "�桼����ID N������"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:786
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:786
 msgid "select secondary key N"
 msgstr "����N������"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:787
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:787
 msgid "list signatures"
 msgstr "��̾�ΰ���"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:788
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:789
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:789
 msgid "sign the key"
 msgstr "���ؽ�̾"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:790
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:791
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:791
 msgid "sign the key locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:792
 #, fuzzy
 msgid "nrsign"
 msgstr "sign"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:792
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "��������Ū�˽�̾"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:793
 #, fuzzy
 msgid "nrlsign"
 msgstr "sign"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:793
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "��������Ū�˽�̾"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:794
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:795
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:795
 msgid "add a user ID"
 msgstr "�桼����ID���ɲ�"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:796
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:796
 #, fuzzy
 msgid "add a photo ID"
 msgstr "�桼����ID���ɲ�"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:797
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:797
 msgid "delete user ID"
 msgstr "�桼����ID�κ��"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:790
+#: g10/keyedit.c:799
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:800
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:800
 msgid "add a secondary key"
 msgstr "�������ɲ�"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:801
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:801
 msgid "delete a secondary key"
 msgstr "������"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:802
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:802
 msgid "delete signatures"
 msgstr "��̾�κ��"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:803
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:803
 msgid "change the expire date"
 msgstr "ͭ�����¤��ѹ�"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:804
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:804
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:805
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:805
 msgid "toggle between secret and public key listing"
 msgstr "��̩���ȸ������ΰ��������ؤ�"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:807
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:799
+#: g10/keyedit.c:808
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:799
+#: g10/keyedit.c:808
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "ͥ���̤ΰ���"
 
-#: g10/keyedit.c:800
+#: g10/keyedit.c:809
 #, fuzzy
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:800
+#: g10/keyedit.c:809
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "ͥ���̤ΰ���"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:810
 #, fuzzy
 msgid "setpref"
 msgstr "pref"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:810
 #, fuzzy
 msgid "set preference list"
 msgstr "ͥ���̤ΰ���"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:811
 #, fuzzy
 msgid "updpref"
 msgstr "pref"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:811
 #, fuzzy
 msgid "updated preferences"
 msgstr "ͥ���̤ΰ���"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:812
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:812
 msgid "change the passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:813
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:813
 msgid "change the ownertrust"
 msgstr "��ͭ�Կ��Ѥ��ѹ�"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:814
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:814
 msgid "revoke signatures"
 msgstr "��̾���˴�"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:815
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:815
 msgid "revoke a secondary key"
 msgstr "�������˴�"
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:816
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:816
 msgid "disable a key"
 msgstr "���λ��Ѥ�ػߤ���"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:817
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:817
 msgid "enable a key"
 msgstr "���λ��Ѥ���Ĥ���"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:818
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:818
 msgid "show photo ID"
 msgstr ""
 
-#: g10/delkey.c:112 g10/keyedit.c:829
+#: g10/delkey.c:112 g10/keyedit.c:838
 msgid "can't do that in batchmode\n"
 msgstr "����ϥХå��⡼�ɤǤϤǤ��ޤ���\n"
 
-#: g10/keyedit.c:866
+#: g10/keyedit.c:875
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "`%s'���ɹ��ߥ��顼: %s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:893
 msgid "Secret key is available.\n"
 msgstr "��̩�������ѤǤ��ޤ���\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:924
 msgid "Command> "
 msgstr "���ޥ��> "
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:956
 msgid "Need the secret key to do this.\n"
 msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:960
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�ޤ���toggle�ץ��ޥ�ɤ�ȤäƤ�������\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1009
 #, fuzzy
 msgid "Key is revoked.\n"
 msgstr "�����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1025
 msgid "Really sign all user IDs? "
 msgstr "���������桼����ID�˽�̾���ޤ���? "
 
-#: g10/keyedit.c:1017
+#: g10/keyedit.c:1026
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1051
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1062 g10/keyedit.c:1083
+#: g10/keyedit.c:1071 g10/keyedit.c:1092
 msgid "You must select at least one user ID.\n"
 msgstr "�桼����ID�򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1064
+#: g10/keyedit.c:1073
 msgid "You can't delete the last user ID!\n"
 msgstr "�Ǹ�Υ桼����ID�Ϻ���Ǥ��ޤ���!\n"
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1076
 msgid "Really remove all selected user IDs? "
 msgstr "���򤷤����桼����ID�������˺�����ޤ���? "
 
-#: g10/keyedit.c:1068
+#: g10/keyedit.c:1077
 msgid "Really remove this user ID? "
 msgstr "���Υ桼����ID�������˺�����ޤ���? "
 
-#: g10/keyedit.c:1106 g10/keyedit.c:1128
+#: g10/keyedit.c:1115 g10/keyedit.c:1137
 msgid "You must select at least one key.\n"
 msgstr "���򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1110
+#: g10/keyedit.c:1119
 msgid "Do you really want to delete the selected keys? "
 msgstr "���򤷤����������˺�����ޤ���? "
 
-#: g10/keyedit.c:1111
+#: g10/keyedit.c:1120
 msgid "Do you really want to delete this key? "
 msgstr "���θ��������˺�����ޤ���? "
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1141
 msgid "Do you really want to revoke the selected keys? "
 msgstr "���򤷤������������˴����ޤ���? "
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1142
 msgid "Do you really want to revoke this key? "
 msgstr "���θ����������˴����ޤ���? "
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1206
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "���򤷤����桼����ID�������˺�����ޤ���? "
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1208
 #, fuzzy
 msgid "Really update the preferences? "
 msgstr "�˴�������������˺��ޤ���? (y/N)"
 
-#: g10/keyedit.c:1237
+#: g10/keyedit.c:1246
 msgid "Save changes? "
 msgstr "�ѹ�����¸���ޤ���? "
 
-#: g10/keyedit.c:1240
+#: g10/keyedit.c:1249
 msgid "Quit without saving? "
 msgstr "��¸�����˽�λ���ޤ���? "
 
-#: g10/keyedit.c:1251
+#: g10/keyedit.c:1260
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1258
+#: g10/keyedit.c:1267
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "��̩���ι����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1274
 msgid "Key not changed so no update needed.\n"
 msgstr "����̵�ѹ��ʤΤǹ����Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1285
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵���ʥ��ޥ�� (��help�פ򻲾�)\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1433
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s%s\n"
 msgstr "�ٹ�: ���θ����ܿͤˤ�ä��˴�����Ƥ��ޤ�!\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1436
 msgid " (sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:1432 g10/keyedit.c:1458
+#: g10/keyedit.c:1441 g10/keyedit.c:1467
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  ����: %s ����: %s"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1450
 #, c-format
 msgid " trust: %c/%c"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1454
 msgid "This key has been disabled"
 msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�"
 
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1483
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! �������˴��ѤߤǤ�: %s\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1486
 msgid "rev- faked revocation found\n"
 msgstr "rev- �Ǥä��������˴���ȯ��\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1488
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? �˴���ǧ�㳲: %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1598
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
 msgstr ""
 
-#: g10/keyedit.c:1593 g10/keyedit.c:1620
+#: g10/keyedit.c:1602 g10/keyedit.c:1629
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/n) "
 msgstr "���θ�Ĺ�������ˤ����Ǥ���? "
 
-#: g10/keyedit.c:1601
+#: g10/keyedit.c:1610
 msgid "You may only have one photo ID on a key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1624
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1626
+#: g10/keyedit.c:1635
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1757
+#: g10/keyedit.c:1766
 msgid "Delete this good signature? (y/N/q)"
 msgstr "������������̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:1770
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1774
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "����̤�Τν�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1780
 msgid "Really delete this self-signature? (y/N)"
 msgstr "���μ��ʽ�̾�������˺�����ޤ���? (y/N)"
 
-#: g10/keyedit.c:1785
+#: g10/keyedit.c:1794
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:1786
+#: g10/keyedit.c:1795
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1798
 msgid "Nothing deleted.\n"
 msgstr "���������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1867
 msgid "Please remove selections from the secret keys.\n"
 msgstr "��̩���������Ȥ��Ƥ���������\n"
 
-#: g10/keyedit.c:1864
+#: g10/keyedit.c:1873
 msgid "Please select at most one secondary key.\n"
 msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1877
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "������ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:1879
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:1912
+#: g10/keyedit.c:1921
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1937
 msgid "No corresponding signature in secret ring\n"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2018
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "�桼����ID�򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:2184
+#: g10/keyedit.c:2193
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2239
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "%d�֤������Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:2328
+#: g10/keyedit.c:2337
 msgid "user ID: \""
 msgstr "�桼����ID: \""
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2342
 #, c-format
 msgid ""
 "\"\n"
@@ -3013,39 +3017,52 @@ msgstr ""
 "\"\n"
 "���ʤ��θ�%08lX��%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:2335
+#: g10/keyedit.c:2345
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"locally signed with your key %08lX at %s\n"
+msgstr ""
+"\"\n"
+"���ʤ��θ�%08lX��%s�˽�̾����Ƥ��ޤ�\n"
+
+#: g10/keyedit.c:2349
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "���ν�̾�ˤ��������˴����������ޤ���? (y/N)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2373
 msgid "You have signed these user IDs:\n"
 msgstr "�����Υ桼����ID�˽�̾���ޤ���:\n"
 
-#: g10/keyedit.c:2373
+#: g10/keyedit.c:2387
 #, fuzzy, c-format
-msgid "   signed by %08lX at %s%s\n"
+msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   %08lX��%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:2380
+#: g10/keyedit.c:2395
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   %08lX��%s���˴�����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2415
 msgid "You are about to revoke these signatures:\n"
 msgstr "�����ν�̾���˴����褦�Ȥ��Ƥ��ޤ�:\n"
 
-#: g10/keyedit.c:2410
-#, c-format
-msgid "   signed by %08lX at %s\n"
+#: g10/keyedit.c:2425
+#, fuzzy, c-format
+msgid "   signed by %08lX at %s%s\n"
 msgstr "   %08lX��%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:2418
+#: g10/keyedit.c:2427
+msgid " (non-exportable)"
+msgstr ""
+
+#: g10/keyedit.c:2434
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "�˴�������������˺��ޤ���? (y/N)"
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2464
 msgid "no secret key\n"
 msgstr "��̩��������ޤ���\n"
 
@@ -3250,12 +3267,12 @@ msgstr ""
 
 #: g10/misc.c:378
 #, c-format
-msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgid "warning: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
 #: g10/misc.c:410
 #, c-format
-msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgid "warning: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
 #: g10/misc.c:435
@@ -4157,7 +4174,7 @@ msgstr ""
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures fill be advanced by one second.\n"
+"self-signatures will be advanced by one second.\n"
 msgstr ""
 
 #: g10/helptext.c:238
@@ -4293,6 +4310,12 @@ msgstr "���Ƚ�̾�ΰ���"
 msgid "%s: keyring created\n"
 msgstr "%s: ���ؤ��Ǥ��ޤ���\n"
 
+#~ msgid "Do you really need such a large keysize? "
+#~ msgstr "����ʤ�Ĺ�����������ˤ���ޤ���? "
+
+#~ msgid "   signed by %08lX at %s\n"
+#~ msgstr "   %08lX��%s�˽�̾����Ƥ��ޤ�\n"
+
 #~ msgid "--delete-secret-key user-id"
 #~ msgstr "--delete-secret-key �桼����id"
 
diff --git a/po/nl.po b/po/nl.po
index 328957029..e7a73f5fe 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: 2002-03-03 15:18+0100\n"
+"POT-Creation-Date: 2002-04-06 17:29+0200\n"
 "PO-Revision-Date: 2000-02-20 21:30+01:00\n"
 "Last-Translator: Ivo Timmermans <[email protected]>\n"
 "Language-Team: Dutch <[email protected]>\n"
@@ -45,7 +45,7 @@ msgstr "nee"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:768 util/miscutil.c:326
+#: g10/keyedit.c:777 util/miscutil.c:326
 msgid "quit"
 msgstr "einde"
 
@@ -275,7 +275,7 @@ msgstr "... dit is een programmeerfout (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "u heeft een fout in het programma gevonden ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1552
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1547
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
@@ -352,7 +352,7 @@ msgstr ""
 "om het besturingssysteem de kans te geven om meer entropie te\n"
 "verzamelen! (Nog %d bytes nodig)\n"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid ""
 "@Commands:\n"
 " "
@@ -360,170 +360,170 @@ msgstr ""
 "@Opdrachten:\n"
 " "
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "|[file]|make a signature"
 msgstr "|[bestand]|maak een ondertekening"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "|[file]|make a clear text signature"
 msgstr "|[bestand]|maak een niet versleutelde ondertekening"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "make a detached signature"
 msgstr "maak een losstaande ondertekening"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "encrypt data"
 msgstr "versleutel gegevens"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "encryption only with symmetric cipher"
 msgstr "versleutel slechts met een symmetrische versleutelmethode"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "store only"
 msgstr "alleen bewaren"
 
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "decrypt data (default)"
 msgstr "gegevens decoderen (standaard)"
 
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "verify a signature"
 msgstr "ondertekening controleren"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "list keys"
 msgstr "lijst van sleutels genereren"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "list keys and signatures"
 msgstr "sleutels en ondertekeningen opnoemen"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "check key signatures"
 msgstr "sleutelverificaties controleren"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "list keys and fingerprints"
 msgstr "sleutels en vingerafdrukken opnoemen"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "list secret keys"
 msgstr "geheime sleutels opnoemen"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "generate a new key pair"
 msgstr "nieuw sleutelpaar genereren"
 
-#: g10/g10.c:297
+#: g10/g10.c:298
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "sleutel weghalen uit de publieke sleutelbos"
 
-#: g10/g10.c:299
+#: g10/g10.c:300
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "sleutel weghalen uit de geheime sleutelbos"
 
-#: g10/g10.c:300
+#: g10/g10.c:301
 msgid "sign a key"
 msgstr "onderteken een sleutel"
 
-#: g10/g10.c:301
+#: g10/g10.c:302
 msgid "sign a key locally"
 msgstr "onderteken een sleutel lokaal"
 
-#: g10/g10.c:302
+#: g10/g10.c:303
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "onderteken een sleutel lokaal"
 
-#: g10/g10.c:303
+#: g10/g10.c:304
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "onderteken een sleutel lokaal"
 
-#: g10/g10.c:304
+#: g10/g10.c:305
 msgid "sign or edit a key"
 msgstr "onderteken of bewerk een sleutel"
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "generate a revocation certificate"
 msgstr "genereer een terugtrekkings-certificaat"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "export keys"
 msgstr "exporteer sleutels"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "export keys to a key server"
 msgstr "exporteer sleutels naar een sleutelserver"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "import keys from a key server"
 msgstr "importeer sleutels van een sleutelserver"
 
-#: g10/g10.c:310
+#: g10/g10.c:311
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exporteer sleutels naar een sleutelserver"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importeer sleutels van een sleutelserver"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "import/merge keys"
 msgstr "sleutels importeren/samenvoegen"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "list only the sequence of packets"
 msgstr "noem alleen de volgorde van pakketten"
 
-#: g10/g10.c:320
+#: g10/g10.c:321
 msgid "export the ownertrust values"
 msgstr "exporteer het vertrouwen in de eigenaars"
 
-#: g10/g10.c:322
+#: g10/g10.c:323
 msgid "import ownertrust values"
 msgstr "importeer het vertrouwen in de eigenaars"
 
-#: g10/g10.c:324
+#: g10/g10.c:325
 msgid "update the trust database"
 msgstr "werk de vertrouwensdatabase bij"
 
-#: g10/g10.c:326
+#: g10/g10.c:327
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "werk de vertrouwensdatabase bij"
 
-#: g10/g10.c:327
+#: g10/g10.c:328
 msgid "fix a corrupted trust database"
 msgstr "repareer een beschadigde vertrouwensdatabase"
 
-#: g10/g10.c:328
+#: g10/g10.c:329
 msgid "De-Armor a file or stdin"
 msgstr "Verwijder de beveiliging op bestand of standaard invoer"
 
-#: g10/g10.c:330
+#: g10/g10.c:331
 msgid "En-Armor a file or stdin"
 msgstr "Voeg beveiliging toe aan bestad of standaard invoer"
 
-#: g10/g10.c:332
+#: g10/g10.c:333
 msgid "|algo [files]|print message digests"
 msgstr "|algo [bestanden]|geef controlegetal van berichten weer"
 
-#: g10/g10.c:336
+#: g10/g10.c:337
 msgid ""
 "@\n"
 "Options:\n"
@@ -533,209 +533,209 @@ msgstr ""
 "Opties:\n"
 " "
 
-#: g10/g10.c:338
+#: g10/g10.c:339
 msgid "create ascii armored output"
 msgstr "genereer beveiliging in ASCII"
 
-#: g10/g10.c:340
+#: g10/g10.c:341
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAAM|versleutel voor NAAM"
 
-#: g10/g10.c:343
+#: g10/g10.c:344
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAAM|gebruik NAAM als standaard ontvanger"
 
-#: g10/g10.c:345
+#: g10/g10.c:346
 msgid "use the default key as default recipient"
 msgstr "gebruik de standaard sleutel als standaard ontvanger"
 
-#: g10/g10.c:350
+#: g10/g10.c:352
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "gebruik deze gebruikersidentificatie om te ondertekenen of te decoderen"
 
-#: g10/g10.c:351
+#: g10/g10.c:353
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|stel compressieniveau in op N (uitzetten met 0)"
 
-#: g10/g10.c:353
+#: g10/g10.c:355
 msgid "use canonical text mode"
 msgstr "gebruik de verkorte tekstmodus"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "use as output file"
 msgstr "gebruik als uitvoerbestand"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "verbose"
 msgstr "geef meer informatie"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "be somewhat more quiet"
 msgstr "wees iets stiller"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "don't use the terminal at all"
 msgstr "gebruik de terminal helemaal niet"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "force v3 signatures"
 msgstr "forcees v3 ondertekening"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "forcees v3 ondertekening"
 
-#: g10/g10.c:366
+#: g10/g10.c:368
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "forcees v3 ondertekening"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "forcees v3 ondertekening"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 msgid "always use a MDC for encryption"
 msgstr "gebruik altijd een MDC voor versleuteling"
 
-#: g10/g10.c:370
+#: g10/g10.c:372
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "gebruik altijd een MDC voor versleuteling"
 
-#: g10/g10.c:372
+#: g10/g10.c:374
 msgid "do not make any changes"
 msgstr "maak geen enkele verandering"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:374
+#: g10/g10.c:376
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "batch mode: never ask"
 msgstr "doorlopende modus: vraag nooit"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "assume yes on most questions"
 msgstr "veronderstel ja als antwoord op de meeste vragen"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "assume no on most questions"
 msgstr "veronderstel nee als antwoord op de meeste vragen"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "add this keyring to the list of keyrings"
 msgstr "voeg deze sleutelbos toe aan de lijst van sleutelbossen"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "add this secret keyring to the list"
 msgstr "voeg deze geheime sleutelbos toe aan de lijst"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAAM|gebruik NAAM als standaard geheime sleutel"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVER|gebruik deze sleutelserver om sleutels op te zoeken"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAAM|zet tekenverzameling van terminal op NAAM"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "read options from file"
 msgstr "lees opties uit bestand"
 
-#: g10/g10.c:391
+#: g10/g10.c:393
 msgid "|FD|write status info to this FD"
 msgstr "|BB|schrijf status naar deze bestandsbeschrijver"
 
-#: g10/g10.c:393
+#: g10/g10.c:395
 #, fuzzy
 msgid "|[file]|write status info to file"
 msgstr "|BB|schrijf status naar deze bestandsbeschrijver"
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "|KEYID|ultimately trust this key"
 msgstr ""
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "|FILE|load extension module FILE"
 msgstr "|BESTAND|laad extensiemodule BESTAND"
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "emulate the mode described in RFC1991"
 msgstr "doe als RFC1991 voorschrijft"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 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:403
+#: g10/g10.c:405
 #, fuzzy
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "zet alle pakket-, versleutel- en controle-opties naar OpenPGP gedrag"
 
-#: g10/g10.c:407
+#: g10/g10.c:409
 msgid "|N|use passphrase mode N"
 msgstr "|N|gebruik sleuteltekst modus N"
 
-#: g10/g10.c:409
+#: g10/g10.c:411
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM voor sleutelteksten"
 
-#: g10/g10.c:411
+#: g10/g10.c:413
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAAM|gebruik versleutelalgoritme NAAM voor sleutelteksten"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAAM|gebruik versleutelalgoritme NAAM"
 
-#: g10/g10.c:413
+#: g10/g10.c:415
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|N|use compress algorithm N"
 msgstr "|N|gebruik compressiealgoritme N"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "throw keyid field of encrypted packets"
 msgstr "plaats geen sleutelidentificatieveld in versleutelde pakketten"
 
-#: g10/g10.c:416
+#: g10/g10.c:418
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:418
+#: g10/g10.c:420
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:419
+#: g10/g10.c:421
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAAM=WAARDE|gebruik deze notitiegegevens"
 
-#: g10/g10.c:422
+#: g10/g10.c:424
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid ""
 "@\n"
 "Examples:\n"
@@ -755,17 +755,17 @@ msgstr ""
 " --list-keys [namen]         toon sleutels\n"
 " --fingerprints [namen]      toon vingerafdrukken\n"
 
-#: g10/g10.c:559
+#: g10/g10.c:561
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Meld fouten in het programma a.u.b. aan <[email protected]>;\n"
 "fouten in de vertaling aan <[email protected]>.\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:565
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Gebruik: gpg [opties] [bestanden] (-h voor hulp)"
 
-#: g10/g10.c:566
+#: g10/g10.c:568
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -775,7 +775,7 @@ msgstr ""
 "onderteken, controleer, versleutel of decodeer de ingevoerde gegevens\n"
 "standaardactie hangt af van de gegevens\n"
 
-#: g10/g10.c:577
+#: g10/g10.c:579
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -783,242 +783,247 @@ msgstr ""
 "\n"
 "Ondersteunde algoritmes:\n"
 
-#: g10/g10.c:651
+#: g10/g10.c:653
 msgid "usage: gpg [options] "
 msgstr "gebruik: gpg [opties] "
 
-#: g10/g10.c:708
+#: g10/g10.c:710
 msgid "conflicting commands\n"
 msgstr "tegenstrijdige commando's\n"
 
-#: g10/g10.c:881
+#: g10/g10.c:883
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "LET OP: geen bestand `%s' met standaardopties\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:887
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "optiebestand `%s': %s\n"
 
-#: g10/g10.c:892
+#: g10/g10.c:894
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "opties inlezen van `%s'\n"
 
-#: g10/g10.c:1174
+#: g10/g10.c:1176
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s is een onbekende tekenverzameling\n"
 
-#: g10/g10.c:1190
+#: g10/g10.c:1192
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1294
+#: g10/g10.c:1208
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr ""
+
+#: g10/g10.c:1309
 msgid "WARNING: program may create a core file!\n"
 msgstr "LET OP: programma zou een geheugendump kunnen maken!\n"
 
-#: g10/g10.c:1298
+#: g10/g10.c:1313
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:1305 g10/g10.c:1316
+#: g10/g10.c:1320 g10/g10.c:1331
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "LET OP: %s is niet voor gewoon gebruik!\n"
 
-#: g10/g10.c:1307 g10/g10.c:1327
+#: g10/g10.c:1322 g10/g10.c:1342
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s is niet toegestaan met deze %s!\n"
 
-#: g10/g10.c:1310
+#: g10/g10.c:1325
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s heeft geen betekenis met %s!\n"
 
-#: g10/g10.c:1336
+#: g10/g10.c:1351
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1342
+#: g10/g10.c:1357
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1348
+#: g10/g10.c:1363
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1361
+#: g10/g10.c:1376
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1375 g10/sign.c:614
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1390 g10/sign.c:614
 #: g10/sign.c:792
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr ""
 
-#: g10/g10.c:1414 g10/g10.c:1426
+#: g10/g10.c:1429 g10/g10.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "geselecteerd versleutelalgoritme is ongeldig\n"
 
-#: g10/g10.c:1420 g10/g10.c:1432
+#: g10/g10.c:1435 g10/g10.c:1447
 msgid "selected digest algorithm is invalid\n"
 msgstr "geselecteerd controle-algoritme is ongeldig\n"
 
-#: g10/g10.c:1436
+#: g10/g10.c:1451
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "de gegeven beleids-URL is ongeldig\n"
 
-#: g10/g10.c:1440
+#: g10/g10.c:1455
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "de gegeven beleids-URL is ongeldig\n"
 
-#: g10/g10.c:1443
+#: g10/g10.c:1458
 #, 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:1445
+#: g10/g10.c:1460
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed(?) moet groter zijn dan 0\n"
 
-#: g10/g10.c:1447
+#: g10/g10.c:1462
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed(?) moet groter zijn dan 1\n"
 
-#: g10/g10.c:1449
+#: g10/g10.c:1464
 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:1452
+#: g10/g10.c:1467
 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:1456
+#: g10/g10.c:1471
 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:1460
+#: g10/g10.c:1475
 #, fuzzy
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "ongeldige S2K modus; moet 0, 1 of 3 zijn\n"
 
-#: g10/g10.c:1463
+#: g10/g10.c:1478
 #, fuzzy
 msgid "invalid preferences\n"
 msgstr "toon voorkeuren"
 
-#: g10/g10.c:1557
+#: g10/g10.c:1572
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "fout bij het initialiseren van de vertrouwensdatabase: %s\n"
 
-#: g10/g10.c:1577
+#: g10/g10.c:1592
 msgid "--store [filename]"
 msgstr "--store [bestandsnaam]"
 
-#: g10/g10.c:1584
+#: g10/g10.c:1599
 msgid "--symmetric [filename]"
 msgstr "--symmetric [bestandsnaam]"
 
-#: g10/g10.c:1592
+#: g10/g10.c:1607
 msgid "--encrypt [filename]"
 msgstr "--encrypt [bestandsnaam]"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1624
 msgid "--sign [filename]"
 msgstr "--sign [bestandsnaam]"
 
-#: g10/g10.c:1622
+#: g10/g10.c:1637
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [bestandsnaam]"
 
-#: g10/g10.c:1636
+#: g10/g10.c:1651
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [bestandsnaam]"
 
-#: g10/g10.c:1645
+#: g10/g10.c:1660
 msgid "--clearsign [filename]"
 msgstr "--clearsign [bestandsnaam]"
 
-#: g10/g10.c:1663
+#: g10/g10.c:1678
 msgid "--decrypt [filename]"
 msgstr "--decrypt [bestandsnaam]"
 
-#: g10/g10.c:1674
+#: g10/g10.c:1689
 msgid "--sign-key user-id"
 msgstr "--sign-key gebruikersidentificatie"
 
-#: g10/g10.c:1682
+#: g10/g10.c:1697
 msgid "--lsign-key user-id"
 msgstr "--lsign-key gebruikers-identificatie"
 
-#: g10/g10.c:1690
+#: g10/g10.c:1705
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key gebruikersidentificatie"
 
-#: g10/g10.c:1698
+#: g10/g10.c:1713
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key gebruikersidentificatie"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1721
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key gebruikersidentificatie [opdrachten]"
 
-#: g10/encode.c:307 g10/g10.c:1762 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1777 g10/sign.c:703
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan %s niet openen: %s\n"
 
-#: g10/g10.c:1777
+#: g10/g10.c:1792
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [gebruikersidentificatie] [sleutelbos]"
 
-#: g10/g10.c:1860
+#: g10/g10.c:1875
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "opheffen van beveiliging mislukt: %s\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1883
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "beveiligen mislukt: %s\n"
 
-#: g10/g10.c:1955
+#: g10/g10.c:1970
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ongeldig frommelalgoritme `%s'\n"
 
-#: g10/g10.c:2041
+#: g10/g10.c:2056
 msgid "[filename]"
 msgstr "[bestandsnaam]"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2060
 msgid "Go ahead and type your message ...\n"
 msgstr "Gaat uw gang, type het bericht ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2048 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2063 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan `%s' niet openen\n"
 
-#: g10/g10.c:2257
+#: g10/g10.c:2272
 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:2263
+#: g10/g10.c:2278
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -1026,11 +1031,11 @@ msgstr ""
 "een notitienaam mag alleen letters, cijfers, punten of underscores bevatten "
 "en eindig met een =\n"
 
-#: g10/g10.c:2269
+#: g10/g10.c:2284
 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:2277
+#: g10/g10.c:2292
 msgid "a notation value must not use any control characters\n"
 msgstr "een notitienaam mag geen controletekens bevatten\n"
 
@@ -1474,7 +1479,7 @@ msgstr "   (%d) DSA (alleen ondertekenen)\n"
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (alleen versleutelen)\n"
 
-#: g10/keyedit.c:466 g10/keygen.c:776
+#: g10/keyedit.c:475 g10/keygen.c:776
 msgid "Your selection? "
 msgstr "Uw keuze? "
 
@@ -1482,7 +1487,7 @@ msgstr "Uw keuze? "
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 
-#: g10/keyedit.c:479 g10/keygen.c:810
+#: g10/keyedit.c:488 g10/keygen.c:810
 msgid "Invalid selection.\n"
 msgstr "Ongeldige keuze.\n"
 
@@ -1549,21 +1554,17 @@ msgstr ""
 "Okee, maar houd er rekening mee dat straling van monitor en toetsenbord ook "
 "erg vatbaar zijn voor aanvallen!\n"
 
-#: g10/keygen.c:870
-msgid "Do you really need such a large keysize? "
-msgstr "Heb je echt een sleutel nodig die zo lang is? "
-
-#: g10/keygen.c:876
+#: g10/keygen.c:871
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Gevraagde sleutellengte is %u bits\n"
 
-#: g10/keygen.c:879 g10/keygen.c:883
+#: g10/keygen.c:874 g10/keygen.c:878
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "afgerond naar %u bits\n"
 
-#: g10/keygen.c:934
+#: g10/keygen.c:929
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1579,7 +1580,7 @@ msgstr ""
 "    <n>m = sleutel verloopt over n maanden\n"
 "    <n>y = sleutel verloopt over n jaar\n"
 
-#: g10/keygen.c:943
+#: g10/keygen.c:938
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -1596,32 +1597,32 @@ msgstr ""
 "    <n>m = sleutel verloopt over n maanden\n"
 "    <n>y = sleutel verloopt over n jaar\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:960
 msgid "Key is valid for? (0) "
 msgstr "Sleutel is geldig gedurende? (0) "
 
-#: g10/keygen.c:967
+#: g10/keygen.c:962
 #, fuzzy
 msgid "Signature is valid for? (0) "
 msgstr "Sleutel is geldig gedurende? (0) "
 
-#: g10/keygen.c:972
+#: g10/keygen.c:967
 msgid "invalid value\n"
 msgstr "ongeldige waarde\n"
 
-#: g10/keygen.c:977
+#: g10/keygen.c:972
 #, fuzzy, c-format
 msgid "%s does not expire at all\n"
 msgstr "Sleutel verloopt nooit\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:984
+#: g10/keygen.c:979
 #, fuzzy, c-format
 msgid "%s expires at %s\n"
 msgstr "Sleutel verloopt op %s\n"
 
 # fixme
-#: g10/keygen.c:990
+#: g10/keygen.c:985
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1629,11 +1630,11 @@ msgstr ""
 "Uw systeem kan geen data weergeven van na 2038.\n"
 "Desondanks wordt het goed behandeld tot 2106.\n"
 
-#: g10/keygen.c:995
+#: g10/keygen.c:990
 msgid "Is this correct (y/n)? "
 msgstr "Klopt dit (j/n)? "
 
-#: g10/keygen.c:1038
+#: g10/keygen.c:1033
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1649,44 +1650,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1045
 msgid "Real name: "
 msgstr "Echte naam: "
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1053
 msgid "Invalid character in name\n"
 msgstr "Ongeldig teken in naam\n"
 
-#: g10/keygen.c:1060
+#: g10/keygen.c:1055
 msgid "Name may not start with a digit\n"
 msgstr "Naam mag niet beginnen met een cijfer\n"
 
-#: g10/keygen.c:1062
+#: g10/keygen.c:1057
 msgid "Name must be at least 5 characters long\n"
 msgstr "Naam moet ten minste 5 tekens lang zijn\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1065
 msgid "Email address: "
 msgstr "Email Adres: "
 
-#: g10/keygen.c:1081
+#: g10/keygen.c:1076
 msgid "Not a valid email address\n"
 msgstr "Ongeldig email adres\n"
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1084
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:1095
+#: g10/keygen.c:1090
 msgid "Invalid character in comment\n"
 msgstr "Ongeldig teken in kommentaar\n"
 
-#: g10/keygen.c:1118
+#: g10/keygen.c:1113
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Je gebruik tekenverzameling `%s'.\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1119
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1697,28 +1698,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1128
+#: g10/keygen.c:1123
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:1133
+#: g10/keygen.c:1128
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoEe"
 
-#: g10/keygen.c:1143
+#: g10/keygen.c:1138
 #, 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:1144
+#: g10/keygen.c:1139
 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:1163
+#: g10/keygen.c:1158
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1202
+#: g10/keygen.c:1197
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1726,17 +1727,17 @@ msgstr ""
 "Je hebt een sleuteltekst nodig om je geheime sleutel te bewaken.\n"
 "\n"
 
-#: g10/keyedit.c:655 g10/keygen.c:1210
+#: g10/keyedit.c:664 g10/keygen.c:1205
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "sleuteltekst is niet goed herhaald; probeer het opnieuw.\n"
 
-#: g10/keygen.c:1211
+#: g10/keygen.c:1206
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1217
+#: g10/keygen.c:1212
 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"
@@ -1748,7 +1749,7 @@ msgstr ""
 "nog aanpassen, gebruik dit programma met de optie \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1233
 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"
@@ -1761,54 +1762,54 @@ msgstr ""
 "dit geeft de generator een grotere kans om genoeg entropie te\n"
 "verzamelen.\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1723
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA sleutelpaar zal 1024 bits lang zijn.\n"
 
-#: g10/keygen.c:1782
+#: g10/keygen.c:1777
 msgid "Key generation canceled.\n"
 msgstr "Sleutelgeneratie afgebroken.\n"
 
-#: g10/keygen.c:1870 g10/keygen.c:1950
+#: g10/keygen.c:1865 g10/keygen.c:1945
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "Openbaar certificaat wordt geschreven naar `%s'\n"
 
-#: g10/keygen.c:1871 g10/keygen.c:1952
+#: g10/keygen.c:1866 g10/keygen.c:1947
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "Geheim certificaat wordt weggeschreven naar `%s'\n"
 
-#: g10/keygen.c:1939
+#: g10/keygen.c:1934
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "sleutel %08lX: openbare sleutel niet gevonden: %s\n"
 
-#: g10/keygen.c:1945
+#: g10/keygen.c:1940
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "sleutel %08lX: geheime sleutel niet gevonden: %s\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1954
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1961
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1981
 msgid "public and secret key created and signed.\n"
 msgstr "openbare en geheime sleutels zijn gemaakt en getekend.\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1982
 #, fuzzy
 msgid "key marked as ultimately trusted.\n"
 msgstr "Certificaten die leiden tot een volledig betrouwbare sleutel:\n"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1991
 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"
@@ -1817,12 +1818,12 @@ msgstr ""
 "U wilt misschien het commando \"--edit-key\" gebruiken om een tweede\n"
 "sleutel te maken hiervoor.\n"
 
-#: g10/keygen.c:2008 g10/keygen.c:2114
+#: g10/keygen.c:2003 g10/keygen.c:2109
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Sleutelgeneratie is mislukt: %s\n"
 
-#: g10/keygen.c:2052 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2047 g10/sig-check.c:227 g10/sign.c:228
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1830,7 +1831,7 @@ msgstr ""
 "Sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
 "klokprobleem)\n"
 
-#: g10/keygen.c:2054 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2049 g10/sig-check.c:229 g10/sign.c:230
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1838,11 +1839,11 @@ msgstr ""
 "sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
 "klokprobleem)\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2058
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:2090
+#: g10/keygen.c:2085
 msgid "Really create? "
 msgstr "Echt maken? "
 
@@ -1890,32 +1891,32 @@ msgstr ""
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s versleuteld voor: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:142
+#: g10/delkey.c:69 g10/export.c:141
 #, fuzzy, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "gebruiker `%s' niet gevonden: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:162
+#: g10/delkey.c:77 g10/export.c:161
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fout bij lezen `%s': %s\n"
 
-#: g10/export.c:170
+#: g10/export.c:169
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
 
-#: g10/export.c:181
+#: g10/export.c:180
 #, fuzzy, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
 
-#: g10/export.c:189
+#: g10/export.c:188
 #, fuzzy, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
 
-#: g10/export.c:255
+#: g10/export.c:254
 msgid "WARNING: nothing exported\n"
 msgstr "LET OP: er is niets ge�xporteerd\n"
 
@@ -1932,7 +1933,7 @@ msgstr "[gebruiker niet gevonden]"
 
 #: g10/getkey.c:1362
 #, c-format
-msgid "Invalid key %08lX made valid by --always-trust\n"
+msgid "invalid key %08lX made valid by --always-trust\n"
 msgstr ""
 
 #: g10/getkey.c:1957
@@ -2289,12 +2290,12 @@ msgstr ""
 msgid "User ID \"%s\" is revoked.\n"
 msgstr ""
 
-#: g10/keyedit.c:330 g10/keyedit.c:1004
+#: g10/keyedit.c:330 g10/keyedit.c:1013
 #, fuzzy
 msgid "Are you sure you still want to sign it?\n"
 msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
 
-#: g10/keyedit.c:335 g10/keyedit.c:409 g10/keyedit.c:519 g10/keyedit.c:1007
+#: g10/keyedit.c:335 g10/keyedit.c:418 g10/keyedit.c:528 g10/keyedit.c:1016
 msgid "Really sign? "
 msgstr "Echt tekenen? "
 
@@ -2309,65 +2310,68 @@ msgid ""
 "Do you want to promote it to a full exportable signature?\n"
 msgstr ""
 
-#. Fixme: see whether there is a revocation in which
-#. * case we should allow to sign it again.
-#: g10/keyedit.c:374
+#: g10/keyedit.c:379
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %08lX\n"
+msgstr "Reeds ondertekend met sleutel %08lx\n"
+
+#: g10/keyedit.c:384
 #, fuzzy, c-format
 msgid "\"%s\" was already %ssigned by key %08lX\n"
 msgstr "Reeds ondertekend met sleutel %08lx\n"
 
-#: g10/keyedit.c:387
+#: g10/keyedit.c:396
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Niets te tekenen met sleutel %08lX\n"
 
-#: g10/keyedit.c:402
+#: g10/keyedit.c:411
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Let op: Deze sleutel is verlopen!\n"
 
-#: g10/keyedit.c:406
+#: g10/keyedit.c:415
 #, fuzzy
 msgid "  Are you sure you still want to sign it?\n"
 msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:429
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Deze sleutel is niet beveiligd.\n"
 
-#: g10/keyedit.c:422
+#: g10/keyedit.c:431
 msgid "Do you want your signature to expire at the same time? (y/n) "
 msgstr ""
 
-#: g10/keyedit.c:450
+#: g10/keyedit.c:459
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:463
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:465
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:458
+#: g10/keyedit.c:467
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:485
+#: g10/keyedit.c:494
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2375,7 +2379,7 @@ msgstr ""
 "Bent u er echt zeker van dat u deze sleutel wilt tekenen\n"
 "met uw sleutel: \""
 
-#: g10/keyedit.c:494
+#: g10/keyedit.c:503
 #, fuzzy
 msgid ""
 "\n"
@@ -2384,7 +2388,7 @@ msgstr ""
 "Deze ondertekening zal gemarkeerd worden als niet exporteerbaar.\n"
 "\n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:507
 #, fuzzy
 msgid ""
 "\n"
@@ -2393,48 +2397,48 @@ msgstr ""
 "Deze ondertekening zal gemarkeerd worden als niet exporteerbaar.\n"
 "\n"
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:512
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:507
+#: g10/keyedit.c:516
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:511
+#: g10/keyedit.c:520
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:552 g10/keyedit.c:2459 g10/keyedit.c:2521 g10/sign.c:273
+#: g10/keyedit.c:561 g10/keyedit.c:2476 g10/keyedit.c:2538 g10/sign.c:273
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "ondertekening mislukt: %s\n"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:621
 msgid "This key is not protected.\n"
 msgstr "Deze sleutel is niet beveiligd.\n"
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:625
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "geheime sleutel niet beschikbaar"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:629
 msgid "Key is protected.\n"
 msgstr "Sleutel is beveiligd.\n"
 
-#: g10/keyedit.c:640
+#: g10/keyedit.c:649
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan deze sleutel niet bewerken: %s\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:655
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2442,7 +2446,7 @@ msgstr ""
 "Geef de sleuteltekst voor deze geheime sleutel.\n"
 "\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:669
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2450,560 +2454,560 @@ msgstr ""
 "U wilt geen sleuteltekst - dit is waaschijnlijk een *slecht* idee!\n"
 "\n"
 
-#: g10/keyedit.c:663
+#: g10/keyedit.c:672
 msgid "Do you really want to do this? "
 msgstr "Wilt u dit echt? "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:736
 msgid "moving a key signature to the correct place\n"
 msgstr "sleutelondertekening naar de juiste plaats schuiven\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:777
 msgid "quit this menu"
 msgstr "be�indig dit menu"
 
-#: g10/keyedit.c:769
+#: g10/keyedit.c:778
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:779
 msgid "save"
 msgstr "bewaar"
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:779
 msgid "save and quit"
 msgstr "opslaan en be�indigen"
 
-#: g10/keyedit.c:771
+#: g10/keyedit.c:780
 msgid "help"
 msgstr "hulp"
 
-#: g10/keyedit.c:771
+#: g10/keyedit.c:780
 msgid "show this help"
 msgstr "geef deze hulp"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:782
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:782
 msgid "show fingerprint"
 msgstr "toon vingerafdruk"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:783
 msgid "list"
 msgstr "lijst"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:783
 msgid "list key and user IDs"
 msgstr "lijst van sleutel- en gebruikersidentificaties"
 
-#: g10/keyedit.c:775
+#: g10/keyedit.c:784
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:785
 msgid "uid"
 msgstr "gebruikersidentificatie"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:785
 msgid "select user ID N"
 msgstr "selecteer gebruikersidentificatie N"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:786
 msgid "key"
 msgstr "sleutel"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:786
 msgid "select secondary key N"
 msgstr "selecteer subsleutel N"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:787
 msgid "check"
 msgstr "controleer"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:787
 msgid "list signatures"
 msgstr "toon ondertekeningen"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:788
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:789
 msgid "sign"
 msgstr "onderteken"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:789
 msgid "sign the key"
 msgstr "onderteken de sleutel"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:790
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:791
 msgid "lsign"
 msgstr "lteken"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:791
 msgid "sign the key locally"
 msgstr "teken de sleutel lokaal"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:792
 #, fuzzy
 msgid "nrsign"
 msgstr "onderteken"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:792
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "teken de sleutel lokaal"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:793
 #, fuzzy
 msgid "nrlsign"
 msgstr "onderteken"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:793
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "teken de sleutel lokaal"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:794
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:795
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:795
 msgid "add a user ID"
 msgstr "voeg een gebruikersidentificatie toe"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:796
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:796
 #, fuzzy
 msgid "add a photo ID"
 msgstr "voeg een gebruikersidentificatie toe"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:797
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:797
 msgid "delete user ID"
 msgstr "verwijder gebruikersidentificatie"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:790
+#: g10/keyedit.c:799
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:800
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:800
 msgid "add a secondary key"
 msgstr "voeg een secundaire sleutel toe"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:801
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:801
 msgid "delete a secondary key"
 msgstr "verwijder een secundaire sleutel"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:802
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:802
 msgid "delete signatures"
 msgstr "verwijder ondertekeningen"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:803
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:803
 msgid "change the expire date"
 msgstr "verander de vervaldatum"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:804
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:804
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:805
 msgid "toggle"
 msgstr "wissel"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:805
 msgid "toggle between secret and public key listing"
 msgstr "wissel tussen geheime en openbare sleutels"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:807
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:799
+#: g10/keyedit.c:808
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:799
+#: g10/keyedit.c:808
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "toon voorkeuren"
 
-#: g10/keyedit.c:800
+#: g10/keyedit.c:809
 #, fuzzy
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:800
+#: g10/keyedit.c:809
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "toon voorkeuren"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:810
 #, fuzzy
 msgid "setpref"
 msgstr "pref"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:810
 #, fuzzy
 msgid "set preference list"
 msgstr "toon voorkeuren"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:811
 #, fuzzy
 msgid "updpref"
 msgstr "pref"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:811
 #, fuzzy
 msgid "updated preferences"
 msgstr "toon voorkeuren"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:812
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:812
 msgid "change the passphrase"
 msgstr "verander de sleuteltekst"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:813
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:813
 msgid "change the ownertrust"
 msgstr "verander het vertrouwen in de eigenaar"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:814
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:814
 msgid "revoke signatures"
 msgstr "roep ondertekeningen terug"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:815
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:815
 msgid "revoke a secondary key"
 msgstr "trek secundaire sleutel in"
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:816
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:816
 msgid "disable a key"
 msgstr "sta het gebruik van een sleutel niet toe"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:817
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:817
 msgid "enable a key"
 msgstr "sta gebruik van een sleutel toe"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:818
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:818
 msgid "show photo ID"
 msgstr ""
 
-#: g10/delkey.c:112 g10/keyedit.c:829
+#: g10/delkey.c:112 g10/keyedit.c:838
 msgid "can't do that in batchmode\n"
 msgstr "kan dat niet doen in lopende band-modus\n"
 
-#: g10/keyedit.c:866
+#: g10/keyedit.c:875
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "fout bij lezen `%s': %s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:893
 msgid "Secret key is available.\n"
 msgstr "Geheime sleutel is beschikbaar.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:924
 msgid "Command> "
 msgstr "Commando> "
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:956
 msgid "Need the secret key to do this.\n"
 msgstr "Ik heb de geheime sleutel nodig om dat te doen.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:960
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1009
 #, fuzzy
 msgid "Key is revoked.\n"
 msgstr "Sleutel is beveiligd.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1025
 msgid "Really sign all user IDs? "
 msgstr "Echt alle gebruikers tekenen? "
 
-#: g10/keyedit.c:1017
+#: g10/keyedit.c:1026
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Hint: Selecteer de gebruikersidentificaties om te tekenen\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1051
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1062 g10/keyedit.c:1083
+#: g10/keyedit.c:1071 g10/keyedit.c:1092
 msgid "You must select at least one user ID.\n"
 msgstr "U moet op zijn minst een gebruikersidentificatie opgeven.\n"
 
-#: g10/keyedit.c:1064
+#: g10/keyedit.c:1073
 msgid "You can't delete the last user ID!\n"
 msgstr "U kunt de laatste gebruiker niet verwijderen!\n"
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1076
 msgid "Really remove all selected user IDs? "
 msgstr "Al deze gebruikers echt verwijderen? "
 
-#: g10/keyedit.c:1068
+#: g10/keyedit.c:1077
 msgid "Really remove this user ID? "
 msgstr "Deze gebruiker echt verwijderen? "
 
-#: g10/keyedit.c:1106 g10/keyedit.c:1128
+#: g10/keyedit.c:1115 g10/keyedit.c:1137
 msgid "You must select at least one key.\n"
 msgstr "U moet op zijn minst een sleutel selecteren.\n"
 
-#: g10/keyedit.c:1110
+#: g10/keyedit.c:1119
 msgid "Do you really want to delete the selected keys? "
 msgstr "Wilt u echt alle geselecteerde sleutels verwijderen? "
 
-#: g10/keyedit.c:1111
+#: g10/keyedit.c:1120
 msgid "Do you really want to delete this key? "
 msgstr "Wilt u deze sleutel echt verwijderen? "
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1141
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Wilt u echt alle geselecteerde sleutels intrekken? "
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1142
 msgid "Do you really want to revoke this key? "
 msgstr "Wilt u deze sleutel echt intrekken? "
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1206
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Al deze gebruikers echt verwijderen? "
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1208
 #, fuzzy
 msgid "Really update the preferences? "
 msgstr "Echt deze terugtrekkingscertificaten aanmaken? (j/N)"
 
-#: g10/keyedit.c:1237
+#: g10/keyedit.c:1246
 msgid "Save changes? "
 msgstr "Veranderingen bewaren? "
 
-#: g10/keyedit.c:1240
+#: g10/keyedit.c:1249
 msgid "Quit without saving? "
 msgstr "Be�indigen zonder te bewaren? "
 
-#: g10/keyedit.c:1251
+#: g10/keyedit.c:1260
 #, c-format
 msgid "update failed: %s\n"
 msgstr "bijwerken ging niet: %s\n"
 
-#: g10/keyedit.c:1258
+#: g10/keyedit.c:1267
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "bijwerken van de geheime sleutel mislukte: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1274
 msgid "Key not changed so no update needed.\n"
 msgstr "sleutel is niet veranderd en hoeft dus niet bijgewerkt te worden.\n"
 
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1285
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Foutief commando (probeer \"help\")\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1433
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s%s\n"
 msgstr "LET OP: Deze sleutel is ingetrokken door de eigenaar!\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1436
 msgid " (sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:1432 g10/keyedit.c:1458
+#: g10/keyedit.c:1441 g10/keyedit.c:1467
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1450
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1454
 msgid "This key has been disabled"
 msgstr "Deze sleutel is niet beschikbaar"
 
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1483
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! subsleutel is teruggeroepen: %s\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1486
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "rev- vervalste sleutelterugtrekking gevonden\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1488
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1598
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
 msgstr ""
 
-#: g10/keyedit.c:1593 g10/keyedit.c:1620
+#: g10/keyedit.c:1602 g10/keyedit.c:1629
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/n) "
 msgstr "Weet je zeker dat je deze sleutellengte wilt gebruiken? "
 
-#: g10/keyedit.c:1601
+#: g10/keyedit.c:1610
 msgid "You may only have one photo ID on a key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1624
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1626
+#: g10/keyedit.c:1635
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1757
+#: g10/keyedit.c:1766
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Verwijder deze goede ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:1770
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Verwijder deze ongeldige ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1774
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Verwijder deze onbekende ondertekening? (j/N/q)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1780
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Deze zelfondertekening echt verwijderen? (j/N)"
 
-#: g10/keyedit.c:1785
+#: g10/keyedit.c:1794
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d ondertekening verwijderd.\n"
 
-#: g10/keyedit.c:1786
+#: g10/keyedit.c:1795
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d ondertekeningen verwijderd.\n"
 
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1798
 msgid "Nothing deleted.\n"
 msgstr "Niets verwijderd.\n"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1867
 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:1864
+#: g10/keyedit.c:1873
 msgid "Please select at most one secondary key.\n"
 msgstr "Selecteer a.u.b. maximaal ��n secundaire sleutel.\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1877
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Vervaldatum voor secundaire sleutel instellen.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:1879
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Vervaldatum voor primaire sleutel instellen.\n"
 
-#: g10/keyedit.c:1912
+#: g10/keyedit.c:1921
 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:1928
+#: g10/keyedit.c:1937
 msgid "No corresponding signature in secret ring\n"
 msgstr "Geen overeenkomende ondertekening in de geheime sleutelbos\n"
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2018
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "U moet op zijn minst een gebruikersidentificatie opgeven.\n"
 
-#: g10/keyedit.c:2184
+#: g10/keyedit.c:2193
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Geen gebruikersidentificatie met index %d\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2239
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Geen secundaire sleutel met index %d\n"
 
-#: g10/keyedit.c:2328
+#: g10/keyedit.c:2337
 msgid "user ID: \""
 msgstr "gebruikersidentificatie: \""
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2342
 #, c-format
 msgid ""
 "\"\n"
@@ -3012,39 +3016,52 @@ msgstr ""
 "\"\n"
 "tekende met uw sleutel %08lX op %s\n"
 
-#: g10/keyedit.c:2335
+#: g10/keyedit.c:2345
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"locally signed with your key %08lX at %s\n"
+msgstr ""
+"\"\n"
+"tekende met uw sleutel %08lX op %s\n"
+
+#: g10/keyedit.c:2349
 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:2359
+#: g10/keyedit.c:2373
 msgid "You have signed these user IDs:\n"
 msgstr "U heeft deze gebruikers ondertekend:\n"
 
-#: g10/keyedit.c:2373
+#: g10/keyedit.c:2387
 #, fuzzy, c-format
-msgid "   signed by %08lX at %s%s\n"
+msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   getekend door %08lX op %s\n"
 
-#: g10/keyedit.c:2380
+#: g10/keyedit.c:2395
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   ingetrokken door %08lX op %s\n"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2415
 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:2410
-#, c-format
-msgid "   signed by %08lX at %s\n"
+#: g10/keyedit.c:2425
+#, fuzzy, c-format
+msgid "   signed by %08lX at %s%s\n"
 msgstr "   getekend door %08lX op %s\n"
 
-#: g10/keyedit.c:2418
+#: g10/keyedit.c:2427
+msgid " (non-exportable)"
+msgstr ""
+
+#: g10/keyedit.c:2434
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Echt deze terugtrekkingscertificaten aanmaken? (j/N)"
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2464
 msgid "no secret key\n"
 msgstr "geen geheime sleutel\n"
 
@@ -3248,12 +3265,12 @@ msgstr "dit versleutelalgoritme is verouderd; gebruik een meer algemene!\n"
 
 #: g10/misc.c:378
 #, c-format
-msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgid "warning: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
 #: g10/misc.c:410
 #, c-format
-msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgid "warning: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
 #: g10/misc.c:435
@@ -4173,7 +4190,7 @@ msgstr ""
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures fill be advanced by one second.\n"
+"self-signatures will be advanced by one second.\n"
 msgstr ""
 
 #: g10/helptext.c:238
@@ -4295,6 +4312,12 @@ msgstr "sleutels en ondertekeningen opnoemen"
 msgid "%s: keyring created\n"
 msgstr "%s: sleutelbos aangemaakt\n"
 
+#~ msgid "Do you really need such a large keysize? "
+#~ msgstr "Heb je echt een sleutel nodig die zo lang is? "
+
+#~ msgid "   signed by %08lX at %s\n"
+#~ msgstr "   getekend door %08lX op %s\n"
+
 #~ msgid "--delete-secret-key user-id"
 #~ msgstr "--delete-secret-key gebruikersidentificatie"
 
diff --git a/po/pl.po b/po/pl.po
index 855078911..998f91132 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.4\n"
-"POT-Creation-Date: 2002-03-03 15:18+0100\n"
+"POT-Creation-Date: 2002-04-06 17:29+0200\n"
 "PO-Revision-Date: 2001-04-21 01:03+02:00\n"
 "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -55,7 +55,7 @@ msgstr "nie"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:768 util/miscutil.c:326
+#: g10/keyedit.c:777 util/miscutil.c:326
 msgid "quit"
 msgstr "wyj�cie"
 
@@ -283,7 +283,7 @@ msgstr "... to jest b��d w programie (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "znalaz�e�(a�) b��d w programie ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1552
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1547
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� %s: %s\n"
@@ -363,7 +363,7 @@ msgstr ""
 "Prosz� kontynuowa� inne dzia�ania aby system m�g� zebra� odpowiedni�\n"
 "ilo�� entropii do ich wygenerowania (brakuje %d bajt�w).\n"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid ""
 "@Commands:\n"
 " "
@@ -371,170 +371,170 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu na czytelnym dokumencie"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "make a detached signature"
 msgstr "z�o�enie podpisu oddzielonego od dokumentu"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "store only"
 msgstr "tylko zapis"
 
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lnie)"
 
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpis�w"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "check key signatures"
 msgstr "sprawdzenie podpis�w kluczy"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "list secret keys"
 msgstr "lista kluczy tajnych"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "generate a new key pair"
 msgstr "generacja nowej pary klucza"
 
-#: g10/g10.c:297
+#: g10/g10.c:298
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: g10/g10.c:299
+#: g10/g10.c:300
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy tajnych"
 
-#: g10/g10.c:300
+#: g10/g10.c:301
 msgid "sign a key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/g10.c:301
+#: g10/g10.c:302
 msgid "sign a key locally"
 msgstr "z�o�enie lokalnego podpisu na kluczu"
 
-#: g10/g10.c:302
+#: g10/g10.c:303
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "z�o�enie lokalnego podpisu na kluczu"
 
-#: g10/g10.c:303
+#: g10/g10.c:304
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "z�o�enie lokalnego podpisu na kluczu"
 
-#: g10/g10.c:304
+#: g10/g10.c:305
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "generate a revocation certificate"
 msgstr "generacja certyfikatu uniewa�nienia klucza"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/g10.c:310
+#: g10/g10.c:311
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "import/merge keys"
 msgstr "import/do��czenie kluczy"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "list only the sequence of packets"
 msgstr "wypisane sekwencji pakiet�w"
 
-#: g10/g10.c:320
+#: g10/g10.c:321
 msgid "export the ownertrust values"
 msgstr "eksport warto�ci zaufania"
 
-#: g10/g10.c:322
+#: g10/g10.c:323
 msgid "import ownertrust values"
 msgstr "wczytanie warto��i zaufania"
 
-#: g10/g10.c:324
+#: g10/g10.c:325
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/g10.c:326
+#: g10/g10.c:327
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/g10.c:327
+#: g10/g10.c:328
 msgid "fix a corrupted trust database"
 msgstr "naprawa uszkodzonej bazy zaufania"
 
-#: g10/g10.c:328
+#: g10/g10.c:329
 msgid "De-Armor a file or stdin"
 msgstr "zdj�cie opakowania ASCII pliku lub potoku"
 
-#: g10/g10.c:330
+#: g10/g10.c:331
 msgid "En-Armor a file or stdin"
 msgstr "opakowanie ASCII pliku lub potoku"
 
-#: g10/g10.c:332
+#: g10/g10.c:333
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/g10.c:336
+#: g10/g10.c:337
 msgid ""
 "@\n"
 "Options:\n"
@@ -544,203 +544,203 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/g10.c:338
+#: g10/g10.c:339
 msgid "create ascii armored output"
 msgstr "plik wynikowy w opakowaniu ASCII"
 
-#: g10/g10.c:340
+#: g10/g10.c:341
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/g10.c:343
+#: g10/g10.c:344
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego adresata"
 
-#: g10/g10.c:345
+#: g10/g10.c:346
 msgid "use the default key as default recipient"
 msgstr "domy�lny klucz jest domy�lnym adresatem"
 
-#: g10/g10.c:350
+#: g10/g10.c:352
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/g10.c:351
+#: g10/g10.c:353
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - brak)"
 
-#: g10/g10.c:353
+#: g10/g10.c:355
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "use as output file"
 msgstr "plik wyj�ciowy"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "verbose"
 msgstr "z informacjami dodatkowymi"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "be somewhat more quiet"
 msgstr "mniej komunikat�ww"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "don't use the terminal at all"
 msgstr "bez odwo�a� do terminala"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "force v3 signatures"
 msgstr "wymuszenie trzeciej wersji formatu podpis�w"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "wymuszenie trzeciej wersji formatu podpis�w"
 
-#: g10/g10.c:366
+#: g10/g10.c:368
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "wymuszenie trzeciej wersji formatu podpis�w"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "wymuszenie trzeciej wersji formatu podpis�w"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 msgid "always use a MDC for encryption"
 msgstr "do szyfrowania b�dzie u�ywany MDC"
 
-#: g10/g10.c:370
+#: g10/g10.c:372
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "do szyfrowania b�dzie u�ywany MDC"
 
-#: g10/g10.c:372
+#: g10/g10.c:374
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:374
+#: g10/g10.c:376
 msgid "use the gpg-agent"
 msgstr "u�yj gpg-agenta"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: �adnych pyta�"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "assume yes on most questions"
 msgstr "automatyczna odpowied� tak na wi�kszo�� pyta�"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "assume no on most questions"
 msgstr "automatyczna odpowied� nie na wi�kszo�� pyta�"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "add this keyring to the list of keyrings"
 msgstr "doda� zbi�r kluczy do listy u�ywanych"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "add this secret keyring to the list"
 msgstr "doda� zbi�r kluczy tajnych do listy"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego klucza tajnego"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|serwer kluczy w kt�rym b�d� poszukiwane"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAZWA|zestaw znak�w terminala NAZWA"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "read options from file"
 msgstr "wczytanie opcji z pliku"
 
-#: g10/g10.c:391
+#: g10/g10.c:393
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapisa� opis stanu do FD"
 
-#: g10/g10.c:393
+#: g10/g10.c:395
 #, fuzzy
 msgid "|[file]|write status info to file"
 msgstr "|FD|zapisa� opis stanu do FD"
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 #, fuzzy
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KLUCZ|ca�kowite zaufanie dla tego klucza"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "|FILE|load extension module FILE"
 msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "emulate the mode described in RFC1991"
 msgstr "emulacja trybu opisanego w RFC1991"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 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:403
+#: g10/g10.c:405
 #, fuzzy
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "zgodno�� ustawie� pakiet�w, szyfr�w i skr�t�w z OpenPGP"
 
-#: g10/g10.c:407
+#: g10/g10.c:409
 msgid "|N|use passphrase mode N"
 msgstr "|N|N-ty tryb wprowadzania wyra�enia przej�ciowego"
 
-#: g10/g10.c:409
+#: g10/g10.c:411
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|ALG|algorytm obliczania skr�t�w wiadomo�ci ALG"
 
-#: g10/g10.c:411
+#: g10/g10.c:413
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|ALG|algorytmu szyfruj�cy ALG dla has�a"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|algorytm szyfruj�cy NAZWA"
 
-#: g10/g10.c:413
+#: g10/g10.c:415
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|algorytm obliczania skr�t�w wiadomo�ci NAZWA"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|N|use compress algorithm N"
 msgstr "|N|algorytm kompresji N"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "throw keyid field of encrypted packets"
 msgstr "usuni�cie identyfikator�w kluczy z pakiet�w"
 
-#: g10/g10.c:416
+#: g10/g10.c:418
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:418
+#: g10/g10.c:420
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:419
+#: g10/g10.c:421
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAZWA=TRE��|adnotacje"
 
-#: g10/g10.c:422
+#: g10/g10.c:424
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -748,7 +748,7 @@ msgstr ""
 "@\n"
 "(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid ""
 "@\n"
 "Examples:\n"
@@ -769,15 +769,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/g10.c:559
+#: g10/g10.c:561
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:565
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/g10.c:566
+#: g10/g10.c:568
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -787,7 +787,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/g10.c:577
+#: g10/g10.c:579
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -795,240 +795,245 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/g10.c:651
+#: g10/g10.c:653
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/g10.c:708
+#: g10/g10.c:710
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/g10.c:881
+#: g10/g10.c:883
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji '%s'\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:887
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji '%s': %s\n"
 
-#: g10/g10.c:892
+#: g10/g10.c:894
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z '%s'\n"
 
-#: g10/g10.c:1174
+#: g10/g10.c:1176
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/g10.c:1190
+#: g10/g10.c:1192
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1294
+#: g10/g10.c:1208
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr ""
+
+#: g10/g10.c:1309
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/g10.c:1298
+#: g10/g10.c:1313
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:1305 g10/g10.c:1316
+#: g10/g10.c:1320 g10/g10.c:1331
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/g10.c:1307 g10/g10.c:1327
+#: g10/g10.c:1322 g10/g10.c:1342
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/g10.c:1310
+#: g10/g10.c:1325
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu z %s!\n"
 
-#: g10/g10.c:1336
+#: g10/g10.c:1351
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1342
+#: g10/g10.c:1357
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1348
+#: g10/g10.c:1363
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1361
+#: g10/g10.c:1376
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1375 g10/sign.c:614
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1390 g10/sign.c:614
 #: g10/sign.c:792
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr ""
 
-#: g10/g10.c:1414 g10/g10.c:1426
+#: g10/g10.c:1429 g10/g10.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/g10.c:1420 g10/g10.c:1432
+#: g10/g10.c:1435 g10/g10.c:1447
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm geenracji skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/g10.c:1436
+#: g10/g10.c:1451
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu jest niepoprawny\n"
 
-#: g10/g10.c:1440
+#: g10/g10.c:1455
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu jest niepoprawny\n"
 
-#: g10/g10.c:1443
+#: g10/g10.c:1458
 #, 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:1445
+#: g10/g10.c:1460
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/g10.c:1447
+#: g10/g10.c:1462
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/g10.c:1449
+#: g10/g10.c:1464
 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:1452
+#: g10/g10.c:1467
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/g10.c:1456
+#: g10/g10.c:1471
 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:1460
+#: g10/g10.c:1475
 #, fuzzy
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "niepoprawny tryb S2K; musi mie� warto�� 0, 1 lub 3\n"
 
-#: g10/g10.c:1463
+#: g10/g10.c:1478
 #, fuzzy
 msgid "invalid preferences\n"
 msgstr "lista opcji"
 
-#: g10/g10.c:1557
+#: g10/g10.c:1572
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1577
+#: g10/g10.c:1592
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/g10.c:1584
+#: g10/g10.c:1599
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:1592
+#: g10/g10.c:1607
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1624
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/g10.c:1622
+#: g10/g10.c:1637
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:1636
+#: g10/g10.c:1651
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:1645
+#: g10/g10.c:1660
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/g10.c:1663
+#: g10/g10.c:1678
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/g10.c:1674
+#: g10/g10.c:1689
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/g10.c:1682
+#: g10/g10.c:1697
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/g10.c:1690
+#: g10/g10.c:1705
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/g10.c:1698
+#: g10/g10.c:1713
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1721
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/encode.c:307 g10/g10.c:1762 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1777 g10/sign.c:703
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "nie mo�na otworzy� %s: %s\n"
 
-#: g10/g10.c:1777
+#: g10/g10.c:1792
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
 
-#: g10/g10.c:1860
+#: g10/g10.c:1875
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1883
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1955
+#: g10/g10.c:1970
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu '%s'\n"
 
-#: g10/g10.c:2041
+#: g10/g10.c:2056
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2060
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2048 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2063 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mo�na otworzy� '%s'\n"
 
-#: g10/g10.c:2257
+#: g10/g10.c:2272
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "adnotacja musi zaczyna� si� od podkre�lenia lub litery\n"
 
-#: g10/g10.c:2263
+#: g10/g10.c:2278
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -1036,11 +1041,11 @@ msgstr ""
 "nazwa adnotacji mo�e zawiera� tylko litery, cyfry, kropki,\n"
 "podkre�lenia, i musi ko�czy� si� '='\n"
 
-#: g10/g10.c:2269
+#: g10/g10.c:2284
 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:2277
+#: g10/g10.c:2292
 msgid "a notation value must not use any control characters\n"
 msgstr "warto�� adnotacji nie mo�e zawiera� znak�w steruj�cych\n"
 
@@ -1475,7 +1480,7 @@ msgstr "   (%d) DSA (tylko do podpisywania)\n"
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowanie)\n"
 
-#: g10/keyedit.c:466 g10/keygen.c:776
+#: g10/keyedit.c:475 g10/keygen.c:776
 msgid "Your selection? "
 msgstr "Tw�j wyb�r? "
 
@@ -1483,7 +1488,7 @@ msgstr "Tw�j wyb�r? "
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "U�ywanie tego algorytmu jest odradzane - tworzy� mimo to? "
 
-#: g10/keyedit.c:479 g10/keygen.c:810
+#: g10/keyedit.c:488 g10/keygen.c:810
 msgid "Invalid selection.\n"
 msgstr "Niew�a�ciwy wyb�r.\n"
 
@@ -1550,21 +1555,17 @@ 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:870
-msgid "Do you really need such a large keysize? "
-msgstr "Czy naprawd� potrzebujesz takiego d�ugiego klucza? "
-
-#: g10/keygen.c:876
+#: g10/keygen.c:871
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "��dana d�ugo�� klucza to %u bity.\n"
 
-#: g10/keygen.c:879 g10/keygen.c:883
+#: g10/keygen.c:874 g10/keygen.c:878
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�glono do %u bit�w\n"
 
-#: g10/keygen.c:934
+#: g10/keygen.c:929
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1580,7 +1581,7 @@ 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:943
+#: g10/keygen.c:938
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -1597,31 +1598,31 @@ 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:965
+#: g10/keygen.c:960
 msgid "Key is valid for? (0) "
 msgstr "Okres wa�no�ci klucza ? (0) "
 
-#: g10/keygen.c:967
+#: g10/keygen.c:962
 #, fuzzy
 msgid "Signature is valid for? (0) "
 msgstr "Okres wa�no�ci klucza ? (0) "
 
-#: g10/keygen.c:972
+#: g10/keygen.c:967
 msgid "invalid value\n"
 msgstr "niepoprawna warto��\n"
 
-#: g10/keygen.c:977
+#: g10/keygen.c:972
 #, fuzzy, c-format
 msgid "%s 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:984
+#: g10/keygen.c:979
 #, fuzzy, c-format
 msgid "%s expires at %s\n"
 msgstr "Data wa�no�ci klucza: %s\n"
 
-#: g10/keygen.c:990
+#: g10/keygen.c:985
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1629,11 +1630,11 @@ msgstr ""
 "Tw�j system nie potrafi pokaza� daty po roku 2038.\n"
 "Niemniej daty do roku 2106 b�d� poprawnie obs�ugiwane.\n"
 
-#: g10/keygen.c:995
+#: g10/keygen.c:990
 msgid "Is this correct (y/n)? "
 msgstr "Dane poprawne (t/n)? "
 
-#: g10/keygen.c:1038
+#: g10/keygen.c:1033
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1649,44 +1650,44 @@ msgstr ""
 "    \"Tadeusz �ele�ski (Boy) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1045
 msgid "Real name: "
 msgstr "Imi� i nazwisko: "
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1053
 msgid "Invalid character in name\n"
 msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:1060
+#: g10/keygen.c:1055
 msgid "Name may not start with a digit\n"
 msgstr "Imi� lub nazwisko nie mo�e zaczyna� si� od cyfry\n"
 
-#: g10/keygen.c:1062
+#: g10/keygen.c:1057
 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:1070
+#: g10/keygen.c:1065
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:1081
+#: g10/keygen.c:1076
 msgid "Not a valid email address\n"
 msgstr "To nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1084
 msgid "Comment: "
 msgstr "Komentarz: "
 
-#: g10/keygen.c:1095
+#: g10/keygen.c:1090
 msgid "Invalid character in comment\n"
 msgstr "Niew�a�ciwy znak w komentarzu\n"
 
-#: g10/keygen.c:1118
+#: g10/keygen.c:1113
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "U�ywasz zestawu znak�w %s.\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1119
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1697,40 +1698,40 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1128
+#: g10/keygen.c:1123
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Nie nalezy umieszcza� adresu poczty elektronicznej w polu nazwiska czy\n"
 "komentarza.\n"
 
-#: g10/keygen.c:1133
+#: g10/keygen.c:1128
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:1143
+#: g10/keygen.c:1138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr ""
 "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, \n"
 "czy (W)yj��? "
 
-#: g10/keygen.c:1144
+#: g10/keygen.c:1139
 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:1163
+#: g10/keygen.c:1158
 msgid "Please correct the error first\n"
 msgstr "Najpierw trzeba poprawi� ten b��d\n"
 
-#: g10/keygen.c:1202
+#: g10/keygen.c:1197
 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:655 g10/keygen.c:1210
+#: g10/keyedit.c:664 g10/keygen.c:1205
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
@@ -1738,12 +1739,12 @@ msgstr ""
 "pr�bie;\n"
 "spr�buj jeszcze raz.\n"
 
-#: g10/keygen.c:1211
+#: g10/keygen.c:1206
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1217
+#: g10/keygen.c:1212
 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"
@@ -1755,7 +1756,7 @@ msgstr ""
 "i opcji \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1233
 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"
@@ -1769,54 +1770,54 @@ msgstr ""
 "generator liczb losowych ma mo�liwo�� zebrania odpowiedniej ilo�ci "
 "entropii.\n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1723
 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:1782
+#: g10/keygen.c:1777
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza zosta�a anulowana.\n"
 
-#: g10/keygen.c:1870 g10/keygen.c:1950
+#: g10/keygen.c:1865 g10/keygen.c:1945
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuj� klucz publiczny w '%s'\n"
 
-#: g10/keygen.c:1871 g10/keygen.c:1952
+#: g10/keygen.c:1866 g10/keygen.c:1947
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/keygen.c:1939
+#: g10/keygen.c:1934
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "klucz %08lX: brak klucza publicznego: %s\n"
 
-#: g10/keygen.c:1945
+#: g10/keygen.c:1940
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nie mog� zablokowa� zbioru kluczy tajnych: %s\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1954
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1961
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1981
 msgid "public and secret key created and signed.\n"
 msgstr "tajny i publiczny klucz zosta�y utworzone i podpisane.\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1982
 #, fuzzy
 msgid "key marked as ultimately trusted.\n"
 msgstr "Certyfikaty prowadz�ce do ostatecznie zaufanego klucza:\n"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1991
 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"
@@ -1824,12 +1825,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:2008 g10/keygen.c:2114
+#: g10/keygen.c:2003 g10/keygen.c:2109
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/keygen.c:2052 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2047 g10/sig-check.c:227 g10/sign.c:228
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1837,7 +1838,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:2054 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2049 g10/sig-check.c:229 g10/sign.c:230
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1845,11 +1846,11 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2058
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:2090
+#: g10/keygen.c:2085
 msgid "Really create? "
 msgstr "Na pewno utworzy�? "
 
@@ -1897,32 +1898,32 @@ msgstr ""
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s zaszyfrowany dla: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:142
+#: g10/delkey.c:69 g10/export.c:141
 #, fuzzy, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "u�ytkownik '%s' nie odnaleziony: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:162
+#: g10/delkey.c:77 g10/export.c:161
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "b��d odczytu '%s': %s\n"
 
-#: g10/export.c:170
+#: g10/export.c:169
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "klucz %08lX: nie jest w formacie RFC 2440 - pomini�ty\n"
 
-#: g10/export.c:181
+#: g10/export.c:180
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "klucz %08lX: nie jest chroniony - pomini�ty\n"
 
-#: g10/export.c:189
+#: g10/export.c:188
 #, fuzzy, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "klucz %08lX: nowy klucz - pomini�ty\n"
 
-#: g10/export.c:255
+#: g10/export.c:254
 msgid "WARNING: nothing exported\n"
 msgstr "OSTRZE�ENIE: nic nie zosta�o wyeksportowane!\n"
 
@@ -1938,7 +1939,7 @@ msgstr "[brak identyfikatora u�ytkownika]"
 
 #: g10/getkey.c:1362
 #, c-format
-msgid "Invalid key %08lX made valid by --always-trust\n"
+msgid "invalid key %08lX made valid by --always-trust\n"
 msgstr ""
 
 #: g10/getkey.c:1957
@@ -2290,12 +2291,12 @@ msgstr ""
 msgid "User ID \"%s\" is revoked.\n"
 msgstr ""
 
-#: g10/keyedit.c:330 g10/keyedit.c:1004
+#: g10/keyedit.c:330 g10/keyedit.c:1013
 #, fuzzy
 msgid "Are you sure you still want to sign it?\n"
 msgstr "Na pewno wygenerowa� klucz takiej d�ugo�ci? "
 
-#: g10/keyedit.c:335 g10/keyedit.c:409 g10/keyedit.c:519 g10/keyedit.c:1007
+#: g10/keyedit.c:335 g10/keyedit.c:418 g10/keyedit.c:528 g10/keyedit.c:1016
 msgid "Really sign? "
 msgstr "Na pewno podpisa�? "
 
@@ -2310,65 +2311,68 @@ msgid ""
 "Do you want to promote it to a full exportable signature?\n"
 msgstr ""
 
-#. Fixme: see whether there is a revocation in which
-#. * case we should allow to sign it again.
-#: g10/keyedit.c:374
+#: g10/keyedit.c:379
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %08lX\n"
+msgstr "Ju� podpisano kluczem %08lX.\n"
+
+#: g10/keyedit.c:384
 #, fuzzy, c-format
 msgid "\"%s\" was already %ssigned by key %08lX\n"
 msgstr "Ju� podpisano kluczem %08lX.\n"
 
-#: g10/keyedit.c:387
+#: g10/keyedit.c:396
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nie ma nic do podpisania kluczem %08lX.\n"
 
-#: g10/keyedit.c:402
+#: g10/keyedit.c:411
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Uwaga: Data wa�no�ci tego klucza up�yn�a!\n"
 
-#: g10/keyedit.c:406
+#: g10/keyedit.c:415
 #, fuzzy
 msgid "  Are you sure you still want to sign it?\n"
 msgstr "Na pewno wygenerowa� klucz takiej d�ugo�ci? "
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:429
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Ten klucz nie jest chroniony.\n"
 
-#: g10/keyedit.c:422
+#: g10/keyedit.c:431
 msgid "Do you want your signature to expire at the same time? (y/n) "
 msgstr ""
 
-#: g10/keyedit.c:450
+#: g10/keyedit.c:459
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:463
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:465
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:458
+#: g10/keyedit.c:467
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:485
+#: g10/keyedit.c:494
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2376,7 +2380,7 @@ msgstr ""
 "Czy jeste� naprawd� pewien �e chcesz podpisa� ten klucz \n"
 "swoim kluczem: \""
 
-#: g10/keyedit.c:494
+#: g10/keyedit.c:503
 #, fuzzy
 msgid ""
 "\n"
@@ -2385,7 +2389,7 @@ msgstr ""
 "Podpis zostanie oznaczony jako nieeksportowalny.\n"
 "\n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:507
 #, fuzzy
 msgid ""
 "\n"
@@ -2394,47 +2398,47 @@ msgstr ""
 "Podpis zostanie oznaczony jako nieeksportowalny.\n"
 "\n"
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:512
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:507
+#: g10/keyedit.c:516
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:511
+#: g10/keyedit.c:520
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:552 g10/keyedit.c:2459 g10/keyedit.c:2521 g10/sign.c:273
+#: g10/keyedit.c:561 g10/keyedit.c:2476 g10/keyedit.c:2538 g10/sign.c:273
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:621
 msgid "This key is not protected.\n"
 msgstr "Ten klucz nie jest chroniony.\n"
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:625
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:629
 msgid "Key is protected.\n"
 msgstr "Klucz jest chroniony.\n"
 
-#: g10/keyedit.c:640
+#: g10/keyedit.c:649
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tego klucza nie mo�na edytowa�: %s.\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:655
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2442,7 +2446,7 @@ msgstr ""
 "Wprowad� nowe wyra�enie przej�ciowe (has�o) dla tego klucza tajnego.\n"
 "\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:669
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2450,559 +2454,559 @@ msgstr ""
 "Nie chcesz poda� wyra�enia przej�ciowego (has�a) - to *z�y* pomys�!\n"
 "\n"
 
-#: g10/keyedit.c:663
+#: g10/keyedit.c:672
 msgid "Do you really want to do this? "
 msgstr "Czy na pewno chcesz to zrobi�? "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:736
 msgid "moving a key signature to the correct place\n"
 msgstr "przenosz� podpis klucza na w�a�ciwe miejsce\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:777
 msgid "quit this menu"
 msgstr "wyj�cie z tego menu"
 
-#: g10/keyedit.c:769
+#: g10/keyedit.c:778
 msgid "q"
 msgstr "w"
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:779
 msgid "save"
 msgstr "zapis"
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:779
 msgid "save and quit"
 msgstr "zapis zmian i wyj�cie"
 
-#: g10/keyedit.c:771
+#: g10/keyedit.c:780
 msgid "help"
 msgstr "pomoc"
 
-#: g10/keyedit.c:771
+#: g10/keyedit.c:780
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:782
 msgid "fpr"
 msgstr "odc"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:782
 msgid "show fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:783
 msgid "list"
 msgstr "lista"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:783
 msgid "list key and user IDs"
 msgstr "lista kluczy i identyfikator�w u�ytkownik�w"
 
-#: g10/keyedit.c:775
+#: g10/keyedit.c:784
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:785
 msgid "uid"
 msgstr "id"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:785
 msgid "select user ID N"
 msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:786
 msgid "key"
 msgstr "klucz"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:786
 msgid "select secondary key N"
 msgstr "wyb�r podklucza N"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:787
 msgid "check"
 msgstr "lista"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:787
 msgid "list signatures"
 msgstr "lista podpis�w"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:788
 msgid "c"
 msgstr "l"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:789
 msgid "sign"
 msgstr "podpis"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:789
 msgid "sign the key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:790
 msgid "s"
 msgstr "p"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:791
 msgid "lsign"
 msgstr "lpodpis"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:791
 msgid "sign the key locally"
 msgstr "z�o�enie lokalnego podpisu na kluczu"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:792
 #, fuzzy
 msgid "nrsign"
 msgstr "podpis"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:792
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "z�o�enie lokalnego podpisu na kluczu"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:793
 #, fuzzy
 msgid "nrlsign"
 msgstr "podpis"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:793
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "z�o�enie lokalnego podpisu na kluczu"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:794
 msgid "debug"
 msgstr "�ledzenia"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:795
 msgid "adduid"
 msgstr "dodid"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:795
 msgid "add a user ID"
 msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:796
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:796
 #, fuzzy
 msgid "add a photo ID"
 msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:797
 msgid "deluid"
 msgstr "usid"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:797
 msgid "delete user ID"
 msgstr "usuni�cie identyfikatora u�ytkownika z klucza"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:790
+#: g10/keyedit.c:799
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:800
 msgid "addkey"
 msgstr "dodkl"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:800
 msgid "add a secondary key"
 msgstr "dodanie podklucza"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:801
 msgid "delkey"
 msgstr "uskl"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:801
 msgid "delete a secondary key"
 msgstr "usuni�cie podklucza"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:802
 msgid "delsig"
 msgstr "uspod"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:802
 msgid "delete signatures"
 msgstr "usuni�cie podpis�w"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:803
 msgid "expire"
 msgstr "data"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:803
 msgid "change the expire date"
 msgstr "zmiana daty wa�no�ci klucza"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:804
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:804
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:805
 msgid "toggle"
 msgstr "prze�"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:805
 msgid "toggle between secret and public key listing"
 msgstr "prze��czenie pomi�dzy list� kluczy publicznych i tajnych"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:807
 msgid "t"
 msgstr "p"
 
-#: g10/keyedit.c:799
+#: g10/keyedit.c:808
 msgid "pref"
 msgstr "opcje"
 
-#: g10/keyedit.c:799
+#: g10/keyedit.c:808
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "lista opcji"
 
-#: g10/keyedit.c:800
+#: g10/keyedit.c:809
 msgid "showpref"
 msgstr ""
 
-#: g10/keyedit.c:800
+#: g10/keyedit.c:809
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "lista opcji"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:810
 #, fuzzy
 msgid "setpref"
 msgstr "opcje"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:810
 #, fuzzy
 msgid "set preference list"
 msgstr "lista opcji"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:811
 #, fuzzy
 msgid "updpref"
 msgstr "opcje"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:811
 #, fuzzy
 msgid "updated preferences"
 msgstr "lista opcji"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:812
 msgid "passwd"
 msgstr "has�o"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:812
 msgid "change the passphrase"
 msgstr "zmiana wyra�enia przej�ciowego (has�a)"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:813
 msgid "trust"
 msgstr "zaufanie"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:813
 msgid "change the ownertrust"
 msgstr "zmiana zaufania w�a�ciciela"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:814
 msgid "revsig"
 msgstr "unpod"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:814
 msgid "revoke signatures"
 msgstr "uniewa�nienie podpisu"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:815
 msgid "revkey"
 msgstr "unpkl"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:815
 msgid "revoke a secondary key"
 msgstr "uniewa�nienie podklucza"
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:816
 msgid "disable"
 msgstr "wy�kl"
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:816
 msgid "disable a key"
 msgstr "wy��czy� klucz z u�ycia"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:817
 msgid "enable"
 msgstr "w�kl"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:817
 msgid "enable a key"
 msgstr "w��czy� klucz do u�ycia"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:818
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:818
 msgid "show photo ID"
 msgstr ""
 
-#: g10/delkey.c:112 g10/keyedit.c:829
+#: g10/delkey.c:112 g10/keyedit.c:838
 msgid "can't do that in batchmode\n"
 msgstr "nie dzia�a w trybie wsadowym\n"
 
-#: g10/keyedit.c:866
+#: g10/keyedit.c:875
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "b��d odczytu '%s': %s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:893
 msgid "Secret key is available.\n"
 msgstr "Dost�pny jest klucz tajny.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:924
 msgid "Command> "
 msgstr "Polecenie> "
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:956
 msgid "Need the secret key to do this.\n"
 msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:960
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Najpierw trzeba u�y� polecenia \"prze�\".\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1009
 #, fuzzy
 msgid "Key is revoked.\n"
 msgstr "Klucz jest chroniony.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1025
 msgid "Really sign all user IDs? "
 msgstr "Podpisa� wszystkie identyfikatory u�ytkownika na tym kluczu? "
 
-#: g10/keyedit.c:1017
+#: g10/keyedit.c:1026
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Podpowied�: wybierz identyfikatory u�ytkownika do podpisania.\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1051
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1062 g10/keyedit.c:1083
+#: g10/keyedit.c:1071 g10/keyedit.c:1092
 msgid "You must select at least one user ID.\n"
 msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:1064
+#: g10/keyedit.c:1073
 msgid "You can't delete the last user ID!\n"
 msgstr "Nie mo�esz usun�� ostatniego identyfikatora u�ytkownika!\n"
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1076
 msgid "Really remove all selected user IDs? "
 msgstr "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:1068
+#: g10/keyedit.c:1077
 msgid "Really remove this user ID? "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:1106 g10/keyedit.c:1128
+#: g10/keyedit.c:1115 g10/keyedit.c:1137
 msgid "You must select at least one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:1110
+#: g10/keyedit.c:1119
 msgid "Do you really want to delete the selected keys? "
 msgstr "Czy na pewno chcesz usun�� wybrane klucze? "
 
-#: g10/keyedit.c:1111
+#: g10/keyedit.c:1120
 msgid "Do you really want to delete this key? "
 msgstr "Czy na pewno chcesz usun�� ten klucz? "
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1141
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Czy na pewno chcesz uniewa�ni� wybrane klucze? "
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1142
 msgid "Do you really want to revoke this key? "
 msgstr "Czy na pewno chcesz uniewa�ni� ten klucz? "
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1206
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1208
 #, fuzzy
 msgid "Really update the preferences? "
 msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N)"
 
-#: g10/keyedit.c:1237
+#: g10/keyedit.c:1246
 msgid "Save changes? "
 msgstr "Zapisa� zmiany? "
 
-#: g10/keyedit.c:1240
+#: g10/keyedit.c:1249
 msgid "Quit without saving? "
 msgstr "Wyj�� bez zapisania zmian? "
 
-#: g10/keyedit.c:1251
+#: g10/keyedit.c:1260
 #, c-format
 msgid "update failed: %s\n"
 msgstr "naniesienie poprawek nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:1258
+#: g10/keyedit.c:1267
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "naniesienie poprawek na kluczu tajnym nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1274
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 "Klucz nie zosta� zmieniony wi�c naniesienie poprawek nie jest konieczne.\n"
 
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1285
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawna komenda  (spr�buj \"help\")\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1433
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s%s\n"
 msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony przez w�a�ciciela!\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1436
 msgid " (sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:1432 g10/keyedit.c:1458
+#: g10/keyedit.c:1441 g10/keyedit.c:1467
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  utworzony: %s wygasa %s"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1450
 #, c-format
 msgid " trust: %c/%c"
 msgstr "zaufanie: %c/%c"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1454
 msgid "This key has been disabled"
 msgstr "Ten klucz zosta� wy��czony z u�ytku"
 
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1483
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "podklucz zosta� uniewa�niony: %s\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1486
 msgid "rev- faked revocation found\n"
 msgstr "fa�szywy certyfikat uniewa�nienia\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1488
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "problem przy sprawdzaniu uniewa�nienia: %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1598
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
 msgstr ""
 
-#: g10/keyedit.c:1593 g10/keyedit.c:1620
+#: g10/keyedit.c:1602 g10/keyedit.c:1629
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/n) "
 msgstr "Na pewno wygenerowa� klucz takiej d�ugo�ci? "
 
-#: g10/keyedit.c:1601
+#: g10/keyedit.c:1610
 msgid "You may only have one photo ID on a key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1624
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1626
+#: g10/keyedit.c:1635
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1757
+#: g10/keyedit.c:1766
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usun�� ten poprawny podpis? (t/N/w)"
 
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:1770
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usun�� ten niepoprawny podpis? (t/N/w)"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1774
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usun�� ten nieznany podpis? (t/N/w)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1780
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usun�� ten podpis klucza nim samym? (t/N)"
 
-#: g10/keyedit.c:1785
+#: g10/keyedit.c:1794
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d podpis usuni�ty.\n"
 
-#: g10/keyedit.c:1786
+#: g10/keyedit.c:1795
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d podpis�w usuni�tych.\n"
 
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1798
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta�o usuni�te.\n"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1867
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Prosz� usun�� znacznik wyboru z kluczy tajnych.\n"
 
-#: g10/keyedit.c:1864
+#: g10/keyedit.c:1873
 msgid "Please select at most one secondary key.\n"
 msgstr "Prosz� wybra� najwy�ej jeden podklucz.\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1877
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Zmiana daty wa�no�ci podklucza.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:1879
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
 
-#: g10/keyedit.c:1912
+#: g10/keyedit.c:1921
 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:1928
+#: g10/keyedit.c:1937
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy tajnych\n"
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2018
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:2184
+#: g10/keyedit.c:2193
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2239
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Brak podklucza o indeksie %d\n"
 
-#: g10/keyedit.c:2328
+#: g10/keyedit.c:2337
 msgid "user ID: \""
 msgstr "Identyfikator u�ytkownika: "
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2342
 #, c-format
 msgid ""
 "\"\n"
@@ -3011,39 +3015,52 @@ msgstr ""
 "\"\n"
 "podpisano Twoim kluczem %08lX w %s\n"
 
-#: g10/keyedit.c:2335
+#: g10/keyedit.c:2345
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"locally signed with your key %08lX at %s\n"
+msgstr ""
+"\"\n"
+"podpisano Twoim kluczem %08lX w %s\n"
+
+#: g10/keyedit.c:2349
 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:2359
+#: g10/keyedit.c:2373
 msgid "You have signed these user IDs:\n"
 msgstr "Te identyfikatory u�ytkownik�w s� podpisane przez Ciebie:\n"
 
-#: g10/keyedit.c:2373
+#: g10/keyedit.c:2387
 #, fuzzy, c-format
-msgid "   signed by %08lX at %s%s\n"
+msgid "   signed by %08lX at %s%s%s\n"
 msgstr "podpisany przez %08lX w %s\n"
 
-#: g10/keyedit.c:2380
+#: g10/keyedit.c:2395
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "uniewa�niony przez %08lX w %s\n"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2415
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
 
-#: g10/keyedit.c:2410
-#, c-format
-msgid "   signed by %08lX at %s\n"
+#: g10/keyedit.c:2425
+#, fuzzy, c-format
+msgid "   signed by %08lX at %s%s\n"
 msgstr "podpisany przez %08lX w %s\n"
 
-#: g10/keyedit.c:2418
+#: g10/keyedit.c:2427
+msgid " (non-exportable)"
+msgstr ""
+
+#: g10/keyedit.c:2434
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N)"
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2464
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
@@ -3248,12 +3265,12 @@ msgstr ""
 
 #: g10/misc.c:378
 #, c-format
-msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgid "warning: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
 #: g10/misc.c:410
 #, c-format
-msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgid "warning: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
 #: g10/misc.c:435
@@ -4165,7 +4182,7 @@ msgstr ""
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures fill be advanced by one second.\n"
+"self-signatures will be advanced by one second.\n"
 msgstr ""
 
 #: g10/helptext.c:238
@@ -4299,6 +4316,12 @@ msgstr "lista kluczy i podpis�w"
 msgid "%s: keyring created\n"
 msgstr "%s: zbi�r kluczy utworzony\n"
 
+#~ msgid "Do you really need such a large keysize? "
+#~ msgstr "Czy naprawd� potrzebujesz takiego d�ugiego klucza? "
+
+#~ msgid "   signed by %08lX at %s\n"
+#~ msgstr "podpisany przez %08lX w %s\n"
+
 #~ msgid "--delete-secret-key user-id"
 #~ msgstr "--delete-secret-key nazwa u�ytkownika"
 
diff --git a/po/pt.po b/po/pt.po
index 04a1be5c1..95d446a02 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
-"POT-Creation-Date: 2002-03-03 15:18+0100\n"
+"POT-Creation-Date: 2002-04-06 17:29+0200\n"
 "PO-Revision-Date: 2002-03-05 16:05+0000\n"
 "Last-Translator: Pedro Morais <[email protected]>\n"
 "Language-Team: pt <[email protected]>\n"
@@ -48,7 +48,7 @@ msgstr "n�o"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:768 util/miscutil.c:326
+#: g10/keyedit.c:777 util/miscutil.c:326
 msgid "quit"
 msgstr "sair"
 
@@ -275,7 +275,7 @@ msgstr "... isto � um bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "voc� encontrou um bug ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1552
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1547
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -352,7 +352,7 @@ msgstr ""
 "N�o h� bytes aleat�rios suficientes. Por favor, fa�a outro trabalho para\n"
 "que o sistema possa recolher mais entropia! (S�o necess�rios mais %d bytes)\n"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid ""
 "@Commands:\n"
 " "
@@ -360,163 +360,163 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "encrypt data"
 msgstr "cifrar dados"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "|[files]|encrypt files"
 msgstr "|[ficheiros]|cifrar ficheiros"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar apenas com cifra sim�trica"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "decrypt data (default)"
 msgstr "decifrar dados (ac��o por omiss�o)"
 
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "|[files]|decrypt files"
 msgstr "|[ficheiros]|decifrar ficheiros"
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:297
+#: g10/g10.c:298
 msgid "remove keys from the public keyring"
 msgstr "remover chaves do porta-chaves p�blico"
 
-#: g10/g10.c:299
+#: g10/g10.c:300
 msgid "remove keys from the secret keyring"
 msgstr "remover chaves do porta-chaves secreto"
 
-#: g10/g10.c:300
+#: g10/g10.c:301
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:301
+#: g10/g10.c:302
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:302
+#: g10/g10.c:303
 msgid "sign a key non-revocably"
 msgstr "assinar uma chave de forma n�o revoc�vel"
 
-#: g10/g10.c:303
+#: g10/g10.c:304
 msgid "sign a key locally and non-revocably"
 msgstr "assinar uma chave localmente e de forma n�o revoc�vel"
 
-#: g10/g10.c:304
+#: g10/g10.c:305
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor de chaves"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor de chaves"
 
-#: g10/g10.c:310
+#: g10/g10.c:311
 msgid "search for keys on a key server"
 msgstr "procurar chaves num servidor de chaves"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 msgid "update all keys from a keyserver"
 msgstr "actualizar todas as chaves a partir de um servidor de chaves"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "list only the sequence of packets"
 msgstr "listar apenas as sequ�ncias de pacotes"
 
-#: g10/g10.c:320
+#: g10/g10.c:321
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confian�a"
 
-#: g10/g10.c:322
+#: g10/g10.c:323
 msgid "import ownertrust values"
 msgstr "importar os valores de confian�a"
 
-#: g10/g10.c:324
+#: g10/g10.c:325
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confian�a"
 
-#: g10/g10.c:326
+#: g10/g10.c:327
 msgid "unattended trust database update"
 msgstr "actualizar automaticamente a base de dados de confian�a"
 
-#: g10/g10.c:327
+#: g10/g10.c:328
 msgid "fix a corrupted trust database"
 msgstr "consertar uma base de dados de confian�a"
 
-#: g10/g10.c:328
+#: g10/g10.c:329
 msgid "De-Armor a file or stdin"
 msgstr "retirar armadura de um ficheiro ou do \"stdin\""
 
-#: g10/g10.c:330
+#: g10/g10.c:331
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um ficheiro ou \"stdin\""
 
-#: g10/g10.c:332
+#: g10/g10.c:333
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:336
+#: g10/g10.c:337
 msgid ""
 "@\n"
 "Options:\n"
@@ -526,214 +526,214 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/g10.c:338
+#: g10/g10.c:339
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/g10.c:340
+#: g10/g10.c:341
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/g10.c:343
+#: g10/g10.c:344
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinat�rio por omiss�o"
 
-#: g10/g10.c:345
+#: g10/g10.c:346
 msgid "use the default key as default recipient"
 msgstr "usar a chave por omiss�o como destinat�rio por omiss�o"
 
-#: g10/g10.c:350
+#: g10/g10.c:352
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou decifrar"
 
-#: g10/g10.c:351
+#: g10/g10.c:353
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desactiva)"
 
-#: g10/g10.c:353
+#: g10/g10.c:355
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "use as output file"
 msgstr "usar como ficheiro de sa�da"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "do not force v3 signatures"
 msgstr "n�o for�ar assinaturas v3"
 
-#: g10/g10.c:366
+#: g10/g10.c:368
 msgid "force v4 key signatures"
 msgstr "for�ar assinaturas v4"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "do not force v4 key signatures"
 msgstr "n�o for�ar assinaturas v4"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para cifrar"
 
-#: g10/g10.c:370
+#: g10/g10.c:372
 msgid "never use a MDC for encryption"
 msgstr "nunca usar um MDC para cifrar"
 
-#: g10/g10.c:372
+#: g10/g10.c:374
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:374
+#: g10/g10.c:376
 msgid "use the gpg-agent"
 msgstr "utilizar o gpg-agent"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "batch mode: never ask"
 msgstr "modo n�o-interactivo: nunca perguntar"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "add this keyring to the list of keyrings"
 msgstr ""
 "adicionar este porta-chaves\n"
 "� lista de porta-chaves"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "add this secret keyring to the list"
 msgstr "adicionar este porta-chaves secreto � lista"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "show which keyring a listed key is on"
 msgstr "mostrar em que porta-chave a chave est�"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta por omiss�o"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "read options from file"
 msgstr "ler op��es do ficheiro"
 
-#: g10/g10.c:391
+#: g10/g10.c:393
 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:393
+#: g10/g10.c:395
 msgid "|[file]|write status info to file"
 msgstr "|[ficheiro]|escrever ifnroam��es de estado para o ficheiro"
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "|KEYID|ultimately trust this key"
 msgstr "|KEYID|confiar totalmente nesta chave"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "configurar todas as op��es de pacote, cifragem e \"digest\"\n"
 "para comportamento OpenPGP"
 
-#: g10/g10.c:403
+#: g10/g10.c:405
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
 "configurar todas as op��es de pacote, cifragem e \"digest\"\n"
 "para comportamento PGP 2.x"
 
-#: g10/g10.c:407
+#: g10/g10.c:409
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar mode de frase secreta N"
 
-#: g10/g10.c:409
+#: g10/g10.c:411
 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:411
+#: g10/g10.c:413
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:413
+#: g10/g10.c:415
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "throw keyid field of encrypted packets"
 msgstr "eliminar campo keyid dos pacotes cifrados"
 
-#: g10/g10.c:416
+#: g10/g10.c:418
 msgid "Show Photo IDs"
 msgstr "Mostrar IDs Fotogr�ficos"
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "Don't show Photo IDs"
 msgstr "N�o mostrar IDs Fotogr�ficos"
 
-#: g10/g10.c:418
+#: g10/g10.c:420
 msgid "Set command line to view Photo IDs"
 msgstr "Configurar linha de comandos para ver fotografias"
 
-#: g10/g10.c:419
+#: g10/g10.c:421
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALOR|usar estes dados de nota��o"
 
-#: g10/g10.c:422
+#: g10/g10.c:424
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -741,7 +741,7 @@ msgstr ""
 "@\n"
 "(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid ""
 "@\n"
 "Examples:\n"
@@ -761,15 +761,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:559
+#: g10/g10.c:561
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:565
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/g10.c:566
+#: g10/g10.c:568
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -779,7 +779,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/g10.c:577
+#: g10/g10.c:579
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -787,235 +787,241 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:651
+#: g10/g10.c:653
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:708
+#: g10/g10.c:710
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/g10.c:881
+#: g10/g10.c:883
 #, 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:885
+#: g10/g10.c:887
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: g10/g10.c:892
+#: g10/g10.c:894
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/g10.c:1174
+#: g10/g10.c:1176
 #, 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:1190
+#: g10/g10.c:1192
 msgid "could not parse keyserver URI\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1208
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr ""
+
+#: g10/g10.c:1309
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/g10.c:1298
+#: g10/g10.c:1313
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrep�e %s\n"
 
-#: g10/g10.c:1305 g10/g10.c:1316
+#: g10/g10.c:1320 g10/g10.c:1331
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/g10.c:1307 g10/g10.c:1327
+#: g10/g10.c:1322 g10/g10.c:1342
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:1310
+#: g10/g10.c:1325
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:1336
+#: g10/g10.c:1351
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s� pode fazer assinaturas separadas ou em texto puro no modo --pgp2\n"
 
-#: g10/g10.c:1342
+#: g10/g10.c:1357
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "n�o pode assinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/g10.c:1348
+#: g10/g10.c:1363
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
-msgstr "deve utilizar ficheiros (e n�o um 'pipe') quando trabalho no modo --pgp2.\n"
+msgstr ""
+"deve utilizar ficheiros (e n�o um 'pipe') quando trabalho no modo --pgp2.\n"
 
-#: g10/g10.c:1361
+#: g10/g10.c:1376
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar uma mensagem no modo --pgp2 necessita da cifra IDEA\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1375 g10/sign.c:614
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1390 g10/sign.c:614
 #: g10/sign.c:792
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "esta mensagem poder� n�o ser utiliz�vel pelo PGP 2.x\n"
 
-#: g10/g10.c:1414 g10/g10.c:1426
+#: g10/g10.c:1429 g10/g10.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1420 g10/g10.c:1432
+#: g10/g10.c:1435 g10/g10.c:1447
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1436
+#: g10/g10.c:1451
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/g10.c:1440
+#: g10/g10.c:1455
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica de certifica��o dada � inv�lida\n"
 
-#: g10/g10.c:1443
+#: g10/g10.c:1458
 #, 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:1445
+#: g10/g10.c:1460
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:1447
+#: g10/g10.c:1462
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:1449
+#: g10/g10.c:1464
 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:1452
+#: g10/g10.c:1467
 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:1456
+#: g10/g10.c:1471
 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:1460
+#: g10/g10.c:1475
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:1463
+#: g10/g10.c:1478
 msgid "invalid preferences\n"
 msgstr "prefer�ncias inv�lidas\n"
 
-#: g10/g10.c:1557
+#: g10/g10.c:1572
 #, 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:1577
+#: g10/g10.c:1592
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/g10.c:1584
+#: g10/g10.c:1599
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:1592
+#: g10/g10.c:1607
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1624
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/g10.c:1622
+#: g10/g10.c:1637
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1636
+#: g10/g10.c:1651
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:1645
+#: g10/g10.c:1660
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/g10.c:1663
+#: g10/g10.c:1678
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1674
+#: g10/g10.c:1689
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/g10.c:1682
+#: g10/g10.c:1697
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/g10.c:1690
+#: g10/g10.c:1705
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id-utilizador"
 
-#: g10/g10.c:1698
+#: g10/g10.c:1713
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id-utilizador"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1721
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/encode.c:307 g10/g10.c:1762 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1777 g10/sign.c:703
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/g10.c:1777
+#: g10/g10.c:1792
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/g10.c:1860
+#: g10/g10.c:1875
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1883
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/g10.c:1955
+#: g10/g10.c:1970
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: g10/g10.c:2041
+#: g10/g10.c:2056
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2060
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2048 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2063 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/g10.c:2257
+#: g10/g10.c:2272
 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:2263
+#: g10/g10.c:2278
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -1023,12 +1029,12 @@ msgstr ""
 "um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:2269
+#: g10/g10.c:2284
 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:2277
+#: g10/g10.c:2292
 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"
 
@@ -1237,7 +1243,8 @@ msgstr "%08lX: a chave expirou\n"
 #, c-format
 msgid ""
 "%08lX: There is no indication that this key really belongs to the owner\n"
-msgstr "%08lx: N�o h� indica��o de que a assinatura pertence realmente ao dono.\n"
+msgstr ""
+"%08lx: N�o h� indica��o de que a assinatura pertence realmente ao dono.\n"
 
 #: g10/pkclist.c:440
 #, c-format
@@ -1343,7 +1350,9 @@ msgstr "N�o especificou um identificador de utilizador. (pode usar \"-r\")\n"
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
-msgstr "\nInsira o identificador do utilizador. Termine com uma linha vazia: "
+msgstr ""
+"\n"
+"Insira o identificador do utilizador. Termine com uma linha vazia: "
 
 #: g10/pkclist.c:768
 msgid "No such user ID.\n"
@@ -1446,7 +1455,7 @@ msgstr "   (%d) RSA (apenas assinatura)\n"
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keyedit.c:466 g10/keygen.c:776
+#: g10/keyedit.c:475 g10/keygen.c:776
 msgid "Your selection? "
 msgstr "Op��o? "
 
@@ -1454,7 +1463,7 @@ msgstr "Op��o? "
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "A utiliza��o destes algoritmos est� desactualizada - criar na mesma?"
 
-#: g10/keyedit.c:479 g10/keygen.c:810
+#: g10/keyedit.c:488 g10/keygen.c:810
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
@@ -1520,21 +1529,17 @@ 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:870
-msgid "Do you really need such a large keysize? "
-msgstr "Voc� precisa realmente de uma chave t�o grande? "
-
-#: g10/keygen.c:876
+#: g10/keygen.c:871
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:879 g10/keygen.c:883
+#: g10/keygen.c:874 g10/keygen.c:878
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:934
+#: g10/keygen.c:929
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1550,7 +1555,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:943
+#: g10/keygen.c:938
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1566,30 +1571,30 @@ msgstr ""
 "      <n>m = assinatura expira em n meses\n"
 "      <n>y = assinatura expira em n anos\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:960
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:967
+#: g10/keygen.c:962
 msgid "Signature is valid for? (0) "
 msgstr "A assinatura � valida por? (0) "
 
-#: g10/keygen.c:972
+#: g10/keygen.c:967
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:977
+#: g10/keygen.c:972
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "A %s n�o expira nunca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:984
+#: g10/keygen.c:979
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s expira em %s\n"
 
-#: g10/keygen.c:990
+#: g10/keygen.c:985
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1597,11 +1602,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:995
+#: g10/keygen.c:990
 msgid "Is this correct (y/n)? "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1038
+#: g10/keygen.c:1033
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1618,44 +1623,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1045
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1053
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido no nome\n"
 
-#: g10/keygen.c:1060
+#: g10/keygen.c:1055
 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:1062
+#: g10/keygen.c:1057
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1065
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:1081
+#: g10/keygen.c:1076
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1084
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:1095
+#: g10/keygen.c:1090
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido no coment�rio\n"
 
-#: g10/keygen.c:1118
+#: g10/keygen.c:1113
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1119
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1666,29 +1671,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1128
+#: g10/keygen.c:1123
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor n�o coloque o endere�o de email no nome verdadeiro ou no "
 "coment�rio\n"
 
-#: g10/keygen.c:1133
+#: g10/keygen.c:1128
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1143
+#: g10/keygen.c:1138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Mudar (N)ome, (C)oment�rio, (E)mail ou (S)air? "
 
-#: g10/keygen.c:1144
+#: g10/keygen.c:1139
 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:1163
+#: g10/keygen.c:1158
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primeiro o erro\n"
 
-#: g10/keygen.c:1202
+#: g10/keygen.c:1197
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1696,16 +1701,16 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keyedit.c:655 g10/keygen.c:1210
+#: g10/keyedit.c:664 g10/keygen.c:1205
 msgid "passphrase not correctly repeated; try again"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
-#: g10/keygen.c:1211
+#: g10/keygen.c:1206
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1217
+#: g10/keygen.c:1212
 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"
@@ -1717,7 +1722,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1233
 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"
@@ -1729,53 +1734,53 @@ 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:1728
+#: g10/keygen.c:1723
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:1782
+#: g10/keygen.c:1777
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:1870 g10/keygen.c:1950
+#: g10/keygen.c:1865 g10/keygen.c:1945
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/keygen.c:1871 g10/keygen.c:1952
+#: g10/keygen.c:1866 g10/keygen.c:1947
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:1939
+#: g10/keygen.c:1934
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenhum porta-chaves p�blico com permiss�es de escrita encontrado: %s\n"
 
-#: g10/keygen.c:1945
+#: g10/keygen.c:1940
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nenhum porta-chaves secreto com permiss�es de escrita encontrado: %s\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1954
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro ao escrever no porta-chaves p�blico `%s': %s\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1961
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1981
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1982
 msgid "key marked as ultimately trusted.\n"
 msgstr "chave marcada como de confian�a absoluta\n"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1991
 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"
@@ -1783,12 +1788,12 @@ msgstr ""
 "Note que esta chave n�o pode ser usada para cifragem. Voc� pode usar\n"
 "o comando \"--edit-key\" para gerar uma chave secund�ria para esse fim.\n"
 
-#: g10/keygen.c:2008 g10/keygen.c:2114
+#: g10/keygen.c:2003 g10/keygen.c:2109
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:2052 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2047 g10/sig-check.c:227 g10/sign.c:228
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1796,7 +1801,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:2054 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2049 g10/sig-check.c:229 g10/sign.c:230
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1804,11 +1809,11 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2058
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "NOTA: a cria��o de sub-chave para chaves v3 n�o respeito o OpenPGP\n"
 
-#: g10/keygen.c:2090
+#: g10/keygen.c:2085
 msgid "Really create? "
 msgstr "Realmente criar? "
 
@@ -1849,39 +1854,41 @@ msgstr "lendo de `%s'\n"
 #: g10/encode.c:347
 msgid ""
 "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
-msgstr "imposs�vel utilizar a cifra IDEA para todas as chaves para que est� a cifrar.\n"
+msgstr ""
+"imposs�vel utilizar a cifra IDEA para todas as chaves para que est� a "
+"cifrar.\n"
 
 #: g10/encode.c:563
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s cifrado para: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:142
+#: g10/delkey.c:69 g10/export.c:141
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:162
+#: g10/delkey.c:77 g10/export.c:161
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
 
-#: g10/export.c:170
+#: g10/export.c:169
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:181
+#: g10/export.c:180
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "chave %08lX: n�o est� protegida - ignorada\n"
 
-#: g10/export.c:189
+#: g10/export.c:188
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: tipo PGP 2.x - ignorada\n"
 
-#: g10/export.c:255
+#: g10/export.c:254
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
@@ -1896,8 +1903,8 @@ msgid "[User id not found]"
 msgstr "[Utilizador n�o encontrado]"
 
 #: g10/getkey.c:1362
-#, c-format
-msgid "Invalid key %08lX made valid by --always-trust\n"
+#, fuzzy, c-format
+msgid "invalid key %08lX made valid by --always-trust\n"
 msgstr "Chave inv�lida %08lX tornada v�lida por --always-trust\n"
 
 #: g10/getkey.c:1957
@@ -2245,11 +2252,11 @@ msgstr "%d IDs de utilizadores sem auto-assinaturas v�lidas detectados\n"
 msgid "User ID \"%s\" is revoked.\n"
 msgstr "Identificador do utilizador \"%s\" est� revocado.\n"
 
-#: g10/keyedit.c:330 g10/keyedit.c:1004
+#: g10/keyedit.c:330 g10/keyedit.c:1013
 msgid "Are you sure you still want to sign it?\n"
 msgstr "Voc� tem certeza de que quer assin�-la?\n"
 
-#: g10/keyedit.c:335 g10/keyedit.c:409 g10/keyedit.c:519 g10/keyedit.c:1007
+#: g10/keyedit.c:335 g10/keyedit.c:418 g10/keyedit.c:528 g10/keyedit.c:1016
 msgid "Really sign? "
 msgstr "Realmente assinar? "
 
@@ -2268,65 +2275,69 @@ msgstr ""
 "\n"
 "Quer promov�-la a uma assinatura export�vel?\n"
 
-#. Fixme: see whether there is a revocation in which
-#. * case we should allow to sign it again.
-#: g10/keyedit.c:374
+#: g10/keyedit.c:379
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %08lX\n"
+msgstr "\"%s\" j� foi %sassinado pela chave %08lX\n"
+
+#: g10/keyedit.c:384
 #, c-format
 msgid "\"%s\" was already %ssigned by key %08lX\n"
 msgstr "\"%s\" j� foi %sassinado pela chave %08lX\n"
 
-#: g10/keyedit.c:387
+#: g10/keyedit.c:396
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:402
+#: g10/keyedit.c:411
 msgid "This key has expired!"
 msgstr "Esta chave expirou!"
 
-#: g10/keyedit.c:406
+#: g10/keyedit.c:415
 msgid "  Are you sure you still want to sign it?\n"
 msgstr "  Voc� tem a certeza que quer mesmo assim assin�-la?\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:429
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave vai expirar em %s.\n"
 
-#: g10/keyedit.c:422
+#: g10/keyedit.c:431
 msgid "Do you want your signature to expire at the same time? (y/n) "
 msgstr "Quer que a sua assinatura expire na mesma altura? (s/n) "
 
-#: g10/keyedit.c:450
+#: g10/keyedit.c:459
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
-"Com que cuidado � que verificou que chave que est� prestes a assinar pertence\n"
+"Com que cuidado � que verificou que chave que est� prestes a assinar "
+"pertence\n"
 "� pessoa correcta? Se n�o sabe o que responder, escolha \"0\".\n"
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:463
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) N�o vou responder.%s\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:465
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) N�o verifiquei.%s\n"
 
-#: g10/keyedit.c:458
+#: g10/keyedit.c:467
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Verifiquei por alto.%s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Verifiquei com bastante cuidado.%s\n"
 
-#: g10/keyedit.c:485
+#: g10/keyedit.c:494
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2334,59 +2345,69 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "a sua chave: \""
 
-#: g10/keyedit.c:494
+#: g10/keyedit.c:503
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
-msgstr "\nA assinatura ser� marcada como n�o-export�vel.\n"
+msgstr ""
+"\n"
+"A assinatura ser� marcada como n�o-export�vel.\n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:507
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
-msgstr "\nA assinatura ser� marcada como n�o-revoc�vel.\n"
+msgstr ""
+"\n"
+"A assinatura ser� marcada como n�o-revoc�vel.\n"
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:512
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
-msgstr "\nN�o verifiquei esta chave.\n"
+msgstr ""
+"\n"
+"N�o verifiquei esta chave.\n"
 
-#: g10/keyedit.c:507
+#: g10/keyedit.c:516
 msgid ""
 "\n"
 "I have checked this key casually.\n"
-msgstr "\nVerifiquei por alto esta chave.\n"
+msgstr ""
+"\n"
+"Verifiquei por alto esta chave.\n"
 
-#: g10/keyedit.c:511
+#: g10/keyedit.c:520
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
-msgstr "\nVerifiquei esta chave com muito cuidado.\n"
+msgstr ""
+"\n"
+"Verifiquei esta chave com muito cuidado.\n"
 
-#: g10/keyedit.c:552 g10/keyedit.c:2459 g10/keyedit.c:2521 g10/sign.c:273
+#: g10/keyedit.c:561 g10/keyedit.c:2476 g10/keyedit.c:2538 g10/sign.c:273
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:621
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:625
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:629
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:640
+#: g10/keyedit.c:649
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:655
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2394,7 +2415,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:669
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2402,445 +2423,446 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:663
+#: g10/keyedit.c:672
 msgid "Do you really want to do this? "
 msgstr "Voc� quer realmente fazer isso? "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:736
 msgid "moving a key signature to the correct place\n"
 msgstr "a mover a assinatura da chave para o local correcto\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:777
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/keyedit.c:769
+#: g10/keyedit.c:778
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:779
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:779
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:771
+#: g10/keyedit.c:780
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:771
+#: g10/keyedit.c:780
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:782
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:782
 msgid "show fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:783
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:783
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de utilizadores"
 
-#: g10/keyedit.c:775
+#: g10/keyedit.c:784
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:785
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:785
 msgid "select user ID N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:786
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:786
 msgid "select secondary key N"
 msgstr "seleciona chave secund�ria N"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:787
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:787
 msgid "list signatures"
 msgstr "lista assinaturas"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:788
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:789
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:789
 msgid "sign the key"
 msgstr "assina a chave"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:790
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:791
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:791
 msgid "sign the key locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:792
 msgid "nrsign"
 msgstr "nrsign"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:792
 msgid "sign the key non-revocably"
 msgstr "assina a chave de forma n�o-revog�vel"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:793
 msgid "nrlsign"
 msgstr "nrlsign"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:793
 msgid "sign the key locally and non-revocably"
 msgstr "assinar a chave localmente e de forma n�o revog�vel"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:794
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:795
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:795
 msgid "add a user ID"
 msgstr "adiciona um novo ID de utilizador"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:796
 msgid "addphoto"
 msgstr "addphoto"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:796
 msgid "add a photo ID"
 msgstr "adiciona um identificador fotogr�fico"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:797
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:797
 msgid "delete user ID"
 msgstr "remove ID de utilizador"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:790
+#: g10/keyedit.c:799
 msgid "delphoto"
 msgstr "delphoto"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:800
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:800
 msgid "add a secondary key"
 msgstr "adiciona nova chave secund�ria"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:801
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:801
 msgid "delete a secondary key"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:802
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:802
 msgid "delete signatures"
 msgstr "remove assinaturas"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:803
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:803
 msgid "change the expire date"
 msgstr "muda a data de validade"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:804
 msgid "primary"
 msgstr "primary"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:804
 msgid "flag user ID as primary"
 msgstr "seleccionar o identificador do utilizador como prim�rio"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:805
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:805
 msgid "toggle between secret and public key listing"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:807
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:799
+#: g10/keyedit.c:808
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:799
+#: g10/keyedit.c:808
 msgid "list preferences (expert)"
 msgstr "lista prefer�ncias (perito)"
 
-#: g10/keyedit.c:800
+#: g10/keyedit.c:809
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:800
+#: g10/keyedit.c:809
 msgid "list preferences (verbose)"
 msgstr "lista prefer�ncias (detalhadamente)"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:810
 msgid "setpref"
 msgstr "setpref"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:810
 msgid "set preference list"
 msgstr "configurar lista de prefer�ncias"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:811
 msgid "updpref"
 msgstr "updpref"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:811
 msgid "updated preferences"
 msgstr "prefer�ncias actualizadas"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:812
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:812
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:813
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:813
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:814
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:814
 msgid "revoke signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:815
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:815
 msgid "revoke a secondary key"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:816
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:816
 msgid "disable a key"
 msgstr "desactiva uma chave"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:817
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:817
 msgid "enable a key"
 msgstr "activa uma chave"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:818
 msgid "showphoto"
 msgstr "showphoto"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:818
 msgid "show photo ID"
 msgstr "mostrar identificador fotogr�fico"
 
-#: g10/delkey.c:112 g10/keyedit.c:829
+#: g10/delkey.c:112 g10/keyedit.c:838
 msgid "can't do that in batchmode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
-#: g10/keyedit.c:866
+#: g10/keyedit.c:875
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "erro na leitura do bloco de chave secreto `%s': %s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:893
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:924
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:956
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:960
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor utilize o comando \"toggle\" primeiro.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1009
 msgid "Key is revoked.\n"
 msgstr "A chave est� revogada.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1025
 msgid "Really sign all user IDs? "
 msgstr "Realmente assinar todos os IDs de utilizador? "
 
-#: g10/keyedit.c:1017
+#: g10/keyedit.c:1026
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1051
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Este comando n�o � permitido no modo %s.\n"
 
-#: g10/keyedit.c:1062 g10/keyedit.c:1083
+#: g10/keyedit.c:1071 g10/keyedit.c:1092
 msgid "You must select at least one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de utilizador.\n"
 
-#: g10/keyedit.c:1064
+#: g10/keyedit.c:1073
 msgid "You can't delete the last user ID!\n"
 msgstr "Voc� n�o pode remover o �ltimo ID de utilizador!\n"
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1076
 msgid "Really remove all selected user IDs? "
 msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1068
+#: g10/keyedit.c:1077
 msgid "Really remove this user ID? "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1106 g10/keyedit.c:1128
+#: g10/keyedit.c:1115 g10/keyedit.c:1137
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1110
+#: g10/keyedit.c:1119
 msgid "Do you really want to delete the selected keys? "
 msgstr "Voc� quer realmente remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1111
+#: g10/keyedit.c:1120
 msgid "Do you really want to delete this key? "
 msgstr "Voc� quer realmente remover esta chave? "
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1141
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Voc� quer realmente revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1142
 msgid "Do you really want to revoke this key? "
 msgstr "Voc� quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1206
 msgid "Really update the preferences for the selected user IDs? "
-msgstr "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
+msgstr ""
+"Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1208
 msgid "Really update the preferences? "
 msgstr "Realmente actualizar as prefer�ncias?"
 
-#: g10/keyedit.c:1237
+#: g10/keyedit.c:1246
 msgid "Save changes? "
 msgstr "Gravar altera��es? "
 
-#: g10/keyedit.c:1240
+#: g10/keyedit.c:1249
 msgid "Quit without saving? "
 msgstr "Sair sem gravar? "
 
-#: g10/keyedit.c:1251
+#: g10/keyedit.c:1260
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:1258
+#: g10/keyedit.c:1267
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1274
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma actualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1285
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1433
 #, c-format
 msgid "This key may be revoked by %s key %s%s\n"
 msgstr "Esta chave pode ser revogada pela chave %s %s%s\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1436
 msgid " (sensitive)"
 msgstr " (sens�vel)"
 
-#: g10/keyedit.c:1432 g10/keyedit.c:1458
+#: g10/keyedit.c:1441 g10/keyedit.c:1467
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  criada: %s expira: %s"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1450
 #, c-format
 msgid " trust: %c/%c"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1454
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1483
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! subchave foi revogada: %s\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1486
 msgid "rev- faked revocation found\n"
 msgstr "rev- revoga��o falsa encontrada\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1488
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "rev? problema ao verificar revoga��o: %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1598
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
@@ -2848,15 +2870,15 @@ msgstr ""
 "AVISO: Esta chave j� tem um identificador fotogr�fico.\n"
 "       Se adicionar outro pode confundir algumas vers�o do PGP.\n"
 
-#: g10/keyedit.c:1593 g10/keyedit.c:1620
+#: g10/keyedit.c:1602 g10/keyedit.c:1629
 msgid "Are you sure you still want to add it? (y/n) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (y/n) "
 
-#: g10/keyedit.c:1601
+#: g10/keyedit.c:1610
 msgid "You may only have one photo ID on a key.\n"
 msgstr "S� pode ter um identificador fotogr�fico por chave.\n"
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1624
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -2865,83 +2887,84 @@ msgstr ""
 "AVISO: Esta chave � do tipo PGP2. Se adicionar um identificador fotogr�fico\n"
 "       algumas vers�o do PGP podem rejeit�-la.\n"
 
-#: g10/keyedit.c:1626
+#: g10/keyedit.c:1635
 msgid "You may not add a photo ID to a PGP2-style key.\n"
-msgstr "N�o pode adicionar um identificador fotogr�fico a uma chave tipo PGP2.\n"
+msgstr ""
+"N�o pode adicionar um identificador fotogr�fico a uma chave tipo PGP2.\n"
 
-#: g10/keyedit.c:1757
+#: g10/keyedit.c:1766
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:1770
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1774
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1780
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:1785
+#: g10/keyedit.c:1794
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:1786
+#: g10/keyedit.c:1795
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1798
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1867
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as selec��es das chaves secretas.\n"
 
-#: g10/keyedit.c:1864
+#: g10/keyedit.c:1873
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor seleccione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1877
 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:1870
+#: g10/keyedit.c:1879
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:1912
+#: g10/keyedit.c:1921
 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:1928
+#: g10/keyedit.c:1937
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2018
 msgid "Please select exactly one user ID.\n"
 msgstr "Seleccione exactamente um identificador de utilizador.\n"
 
-#: g10/keyedit.c:2184
+#: g10/keyedit.c:2193
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2239
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secund�ria com �ndice %d\n"
 
-#: g10/keyedit.c:2328
+#: g10/keyedit.c:2337
 msgid "user ID: \""
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2342
 #, c-format
 msgid ""
 "\"\n"
@@ -2950,39 +2973,52 @@ msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:2335
+#: g10/keyedit.c:2345
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"locally signed with your key %08lX at %s\n"
+msgstr ""
+"\"\n"
+"assinado com sua chave %08lX em %s\n"
+
+#: g10/keyedit.c:2349
 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:2359
+#: g10/keyedit.c:2373
 msgid "You have signed these user IDs:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:2373
-#, c-format
-msgid "   signed by %08lX at %s%s\n"
+#: g10/keyedit.c:2387
+#, fuzzy, c-format
+msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   assinado por %08lX em %s%s\n"
 
-#: g10/keyedit.c:2380
+#: g10/keyedit.c:2395
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2415
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2425
 #, c-format
-msgid "   signed by %08lX at %s\n"
-msgstr "   assinado por %08lX em %s\n"
+msgid "   signed by %08lX at %s%s\n"
+msgstr "   assinado por %08lX em %s%s\n"
 
-#: g10/keyedit.c:2418
+#: g10/keyedit.c:2427
+msgid " (non-exportable)"
+msgstr ""
+
+#: g10/keyedit.c:2434
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2464
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
@@ -3179,13 +3215,13 @@ msgstr ""
 "algoritmo mais standard!x\n"
 
 #: g10/misc.c:378
-#, c-format
-msgid "Warning: unsafe ownership on %s \"%s\"\n"
+#, fuzzy, c-format
+msgid "warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Aviso: dono pouco seguro em %s \"%s\"\n"
 
 #: g10/misc.c:410
-#, c-format
-msgid "Warning: unsafe permissions on %s \"%s\"\n"
+#, fuzzy, c-format
+msgid "warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Aviso: permiss�es pouco seguras em %s \"%s\"\n"
 
 #: g10/misc.c:435
@@ -3706,12 +3742,14 @@ msgstr "chave p�blica %08lX n�o encontrada: %s\n"
 #: g10/trustdb.c:1363
 #, c-format
 msgid "public key of ultimately trusted key %08lX not found\n"
-msgstr "chave p�blica da chave absolutamente de confian�a %08lX n�o encontrada\n"
+msgstr ""
+"chave p�blica da chave absolutamente de confian�a %08lX n�o encontrada\n"
 
 #: g10/trustdb.c:1441
 #, c-format
 msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
-msgstr "a verificar � profundidade %d assinado=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
+msgstr ""
+"a verificar � profundidade %d assinado=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
 
 #: g10/verify.c:108
 msgid ""
@@ -3869,7 +3907,8 @@ msgid ""
 msgstr ""
 "Para construir a Teia-de-Confian�a ('Web-of-Trust'), o GnuPG precisa de\n"
 "saber quais s�o as chaves em que deposita confian�a absoluta - normalmente\n"
-"estas s�o as chaves a que tem acesso � chave privada.  Responda \"sim\" para\n"
+"estas s�o as chaves a que tem acesso � chave privada.  Responda \"sim\" "
+"para\n"
 "que esta chave seja de confian�a absoluta.\n"
 
 #: g10/helptext.c:60
@@ -3878,7 +3917,9 @@ msgstr "Se voc� quiser usar esta chave revogada assim mesmo, responda \"sim\"."
 
 #: g10/helptext.c:64
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr "Se voc� quiser usar esta chave, n�o de confian�a, assim mesmo, responda \"sim\"."
+msgstr ""
+"Se voc� quiser usar esta chave, n�o de confian�a, assim mesmo, responda \"sim"
+"\"."
 
 #: g10/helptext.c:68
 msgid ""
@@ -4039,10 +4080,12 @@ msgstr ""
 "\n"
 "\"2\" significa que efectuou uma verifica��o normal da chave. Por exemplo,\n"
 "    isto pode significar que verificou a impress�o digital da chave e\n"
-"    verificou o identificador de utilizador da chave contra uma identifica��o\n"
+"    verificou o identificador de utilizador da chave contra uma "
+"identifica��o\n"
 "    fotogr�fica.\n"
 "\n"
-"\"3\" significa que efectuou uma verifica��o exaustiva da chave. Por exemplo,\n"
+"\"3\" significa que efectuou uma verifica��o exaustiva da chave. Por "
+"exemplo,\n"
 "    isto pode significar que efectuou a verifica��o pessoalmente, e que \n"
 "    utilizou um documento, com fotografia, dif�cil de falsificar \n"
 "    (como por exemplo um passaporte) que o nome do dono da chave � o\n"
@@ -4051,7 +4094,8 @@ msgstr ""
 "    ao done da chave.\n"
 "\n"
 "Aten��o: os exemplos dados para os n�veis 2 e 3 s�o *apenas* exemplos.\n"
-"Compete-lhe a si decidir o que considera, ao assinar chaves, uma verifica��o\n"
+"Compete-lhe a si decidir o que considera, ao assinar chaves, uma "
+"verifica��o\n"
 "\"normal\" e uma verifica��o \"exaustiva\".\n"
 "\n"
 "Se n�o sabe qual � a resposta correcta, responda \"0\"."
@@ -4114,10 +4158,11 @@ msgstr ""
 "raz�o esta auto-assinatura n�o for v�lida e h� uma segunda dispon�vel."
 
 #: g10/helptext.c:231
+#, fuzzy
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures fill be advanced by one second.\n"
+"self-signatures will be advanced by one second.\n"
 msgstr ""
 "Muda as prefer�ncias de todos os identificadores de utilizadores\n"
 "(ou apenas dos seleccionados) para a lista actual de prefer�ncias.\n"
@@ -4254,3 +4299,9 @@ msgstr "%lu chave verificadas (%lu assinaturas)\n"
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: porta-chaves criado\n"
+
+#~ msgid "Do you really need such a large keysize? "
+#~ msgstr "Voc� precisa realmente de uma chave t�o grande? "
+
+#~ msgid "   signed by %08lX at %s\n"
+#~ msgstr "   assinado por %08lX em %s\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8803e8ed2..ae1af8058 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2002-03-03 15:18+0100\n"
+"POT-Creation-Date: 2002-04-06 17:29+0200\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-20 23:46:36-0200\n"
 "From: Thiago Jung Bauermann <[email protected]>\n"
@@ -50,7 +50,7 @@ msgid "nN"
 msgstr "nN"
 
 # INICIO MENU
-#: g10/keyedit.c:768 util/miscutil.c:326
+#: g10/keyedit.c:777 util/miscutil.c:326
 msgid "quit"
 msgstr "sair"
 
@@ -281,7 +281,7 @@ msgstr "... isto � um bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "voc� encontrou um bug ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1552
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1547
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -358,7 +358,7 @@ msgstr ""
 "para que o sistema possa coletar mais entropia!\n"
 "(S�o necess�rios mais %d bytes)\n"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid ""
 "@Commands:\n"
 " "
@@ -366,175 +366,175 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "sim�trica"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padr�o)"
 
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:297
+#: g10/g10.c:298
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "remover a chave do chaveiro p�blico"
 
-#: g10/g10.c:299
+#: g10/g10.c:300
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "remover a chave do chaveiro secreto"
 
-#: g10/g10.c:300
+#: g10/g10.c:301
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:301
+#: g10/g10.c:302
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:302
+#: g10/g10.c:303
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:303
+#: g10/g10.c:304
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:304
+#: g10/g10.c:305
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:310
+#: g10/g10.c:311
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "list only the sequence of packets"
 msgstr "listar apenas as seq��ncias de pacotes"
 
 # ownertrust ???
-#: g10/g10.c:320
+#: g10/g10.c:321
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confian�a"
 
-#: g10/g10.c:322
+#: g10/g10.c:323
 msgid "import ownertrust values"
 msgstr "importar os valores de confian�a"
 
-#: g10/g10.c:324
+#: g10/g10.c:325
 msgid "update the trust database"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/g10.c:326
+#: g10/g10.c:327
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/g10.c:327
+#: g10/g10.c:328
 msgid "fix a corrupted trust database"
 msgstr ""
 "consertar um banco de dados de confiabilidade\n"
 "danificado"
 
-#: g10/g10.c:328
+#: g10/g10.c:329
 msgid "De-Armor a file or stdin"
 msgstr "retirar a armadura de um arquivo ou de \"stdin\""
 
-#: g10/g10.c:330
+#: g10/g10.c:331
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um arquivo ou \"stdin\""
 
-#: g10/g10.c:332
+#: g10/g10.c:333
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:336
+#: g10/g10.c:337
 msgid ""
 "@\n"
 "Options:\n"
@@ -544,166 +544,166 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/g10.c:338
+#: g10/g10.c:339
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/g10.c:340
+#: g10/g10.c:341
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/g10.c:343
+#: g10/g10.c:344
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: g10/g10.c:345
+#: g10/g10.c:346
 msgid "use the default key as default recipient"
 msgstr "usar a chave padr�o como destinat�rio padr�o"
 
-#: g10/g10.c:350
+#: g10/g10.c:352
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usu�rio para\n"
 "assinar ou descriptografar"
 
-#: g10/g10.c:351
+#: g10/g10.c:353
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desabilita)"
 
-#: g10/g10.c:353
+#: g10/g10.c:355
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "use as output file"
 msgstr "usar como arquivo de sa�da"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: g10/g10.c:366
+#: g10/g10.c:368
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "for�ar assinaturas v3"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "for�ar assinaturas v3"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para criptografar"
 
-#: g10/g10.c:370
+#: g10/g10.c:372
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "sempre usar um MDC para criptografar"
 
-#: g10/g10.c:372
+#: g10/g10.c:374
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:374
+#: g10/g10.c:376
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "batch mode: never ask"
 msgstr "modo n�o-interativo: nunca perguntar"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "add this keyring to the list of keyrings"
 msgstr "adicionar este chaveiro � lista de chaveiros"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "add this secret keyring to the list"
 msgstr "adicionar este chaveiro secreto � lista"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta padr�o"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "read options from file"
 msgstr "ler op��es do arquivo"
 
-#: g10/g10.c:391
+#: g10/g10.c:393
 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:393
+#: g10/g10.c:395
 #, fuzzy
 msgid "|[file]|write status info to file"
 msgstr ""
 "|DA|escrever informa��es de estado para o\n"
 "descritor de arquivo DA"
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "|KEYID|ultimately trust this key"
 msgstr ""
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "|FILE|load extension module FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 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:403
+#: g10/g10.c:405
 #, fuzzy
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr ""
@@ -711,63 +711,63 @@ msgstr ""
 "criptografia e \"digest\" para comportamento\n"
 "OpenPGP"
 
-#: g10/g10.c:407
+#: g10/g10.c:409
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar frase secreta modo N"
 
-#: g10/g10.c:409
+#: g10/g10.c:411
 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:411
+#: g10/g10.c:413
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:413
+#: g10/g10.c:415
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "eliminar o campo keyid dos pacotes\n"
 "criptografados"
 
-#: g10/g10.c:416
+#: g10/g10.c:418
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:418
+#: g10/g10.c:420
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:419
+#: g10/g10.c:421
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALOR|usar estes dados de nota��o"
 
-#: g10/g10.c:422
+#: g10/g10.c:424
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid ""
 "@\n"
 "Examples:\n"
@@ -787,15 +787,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:559
+#: g10/g10.c:561
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:565
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/g10.c:566
+#: g10/g10.c:568
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -805,7 +805,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/g10.c:577
+#: g10/g10.c:579
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -813,243 +813,248 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:651
+#: g10/g10.c:653
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:708
+#: g10/g10.c:710
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/g10.c:881
+#: g10/g10.c:883
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:887
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: g10/g10.c:892
+#: g10/g10.c:894
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/g10.c:1174
+#: g10/g10.c:1176
 #, 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:1190
+#: g10/g10.c:1192
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1294
+#: g10/g10.c:1208
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr ""
+
+#: g10/g10.c:1309
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/g10.c:1298
+#: g10/g10.c:1313
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:1305 g10/g10.c:1316
+#: g10/g10.c:1320 g10/g10.c:1331
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/g10.c:1307 g10/g10.c:1327
+#: g10/g10.c:1322 g10/g10.c:1342
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:1310
+#: g10/g10.c:1325
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:1336
+#: g10/g10.c:1351
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1342
+#: g10/g10.c:1357
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1348
+#: g10/g10.c:1363
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1361
+#: g10/g10.c:1376
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1375 g10/sign.c:614
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1390 g10/sign.c:614
 #: g10/sign.c:792
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr ""
 
-#: g10/g10.c:1414 g10/g10.c:1426
+#: g10/g10.c:1429 g10/g10.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1420 g10/g10.c:1432
+#: g10/g10.c:1435 g10/g10.c:1447
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1436
+#: g10/g10.c:1451
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:1440
+#: g10/g10.c:1455
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:1443
+#: g10/g10.c:1458
 #, 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:1445
+#: g10/g10.c:1460
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:1447
+#: g10/g10.c:1462
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:1449
+#: g10/g10.c:1464
 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:1452
+#: g10/g10.c:1467
 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:1456
+#: g10/g10.c:1471
 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:1460
+#: g10/g10.c:1475
 #, fuzzy
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:1463
+#: g10/g10.c:1478
 #, fuzzy
 msgid "invalid preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:1557
+#: g10/g10.c:1572
 #, 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:1577
+#: g10/g10.c:1592
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/g10.c:1584
+#: g10/g10.c:1599
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:1592
+#: g10/g10.c:1607
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1624
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/g10.c:1622
+#: g10/g10.c:1637
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1636
+#: g10/g10.c:1651
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:1645
+#: g10/g10.c:1660
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/g10.c:1663
+#: g10/g10.c:1678
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1674
+#: g10/g10.c:1689
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:1682
+#: g10/g10.c:1697
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/g10.c:1690
+#: g10/g10.c:1705
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:1698
+#: g10/g10.c:1713
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1721
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/encode.c:307 g10/g10.c:1762 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1777 g10/sign.c:703
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/g10.c:1777
+#: g10/g10.c:1792
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usu�rio] [chaveiro]"
 
-#: g10/g10.c:1860
+#: g10/g10.c:1875
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1883
 #, 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:1955
+#: g10/g10.c:1970
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/g10.c:2041
+#: g10/g10.c:2056
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2060
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2048 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2063 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/g10.c:2257
+#: g10/g10.c:2272
 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:2263
+#: g10/g10.c:2278
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -1057,12 +1062,12 @@ msgstr ""
 "um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:2269
+#: g10/g10.c:2284
 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:2277
+#: g10/g10.c:2292
 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"
 
@@ -1498,7 +1503,7 @@ msgstr "   (%d) DSA (apenas assinatura)\n"
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keyedit.c:466 g10/keygen.c:776
+#: g10/keyedit.c:475 g10/keygen.c:776
 msgid "Your selection? "
 msgstr "Sua op��o? "
 
@@ -1506,7 +1511,7 @@ msgstr "Sua op��o? "
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 
-#: g10/keyedit.c:479 g10/keygen.c:810
+#: g10/keyedit.c:488 g10/keygen.c:810
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
@@ -1573,21 +1578,17 @@ 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:870
-msgid "Do you really need such a large keysize? "
-msgstr "Voc� realmente precisa de uma chave t�o grande? "
-
-#: g10/keygen.c:876
+#: g10/keygen.c:871
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:879 g10/keygen.c:883
+#: g10/keygen.c:874 g10/keygen.c:878
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:934
+#: g10/keygen.c:929
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1603,7 +1604,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:943
+#: g10/keygen.c:938
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -1620,31 +1621,31 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:960
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:967
+#: g10/keygen.c:962
 #, fuzzy
 msgid "Signature is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:972
+#: g10/keygen.c:967
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:977
+#: g10/keygen.c:972
 #, fuzzy, c-format
 msgid "%s does not expire at all\n"
 msgstr "A chave n�o expira nunca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:984
+#: g10/keygen.c:979
 #, fuzzy, c-format
 msgid "%s expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:990
+#: g10/keygen.c:985
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1652,11 +1653,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:995
+#: g10/keygen.c:990
 msgid "Is this correct (y/n)? "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1038
+#: g10/keygen.c:1033
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1672,44 +1673,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1045
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1053
 msgid "Invalid character in name\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:1060
+#: g10/keygen.c:1055
 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:1062
+#: g10/keygen.c:1057
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1065
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:1081
+#: g10/keygen.c:1076
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1084
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:1095
+#: g10/keygen.c:1090
 msgid "Invalid character in comment\n"
 msgstr "Caractere inv�lido no coment�rio\n"
 
-#: g10/keygen.c:1118
+#: g10/keygen.c:1113
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1119
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1720,28 +1721,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1128
+#: g10/keygen.c:1123
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:1133
+#: g10/keygen.c:1128
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1143
+#: g10/keygen.c:1138
 #, 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:1144
+#: g10/keygen.c:1139
 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:1163
+#: g10/keygen.c:1158
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1202
+#: g10/keygen.c:1197
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1749,17 +1750,17 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keyedit.c:655 g10/keygen.c:1210
+#: g10/keyedit.c:664 g10/keygen.c:1205
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keygen.c:1211
+#: g10/keygen.c:1206
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1217
+#: g10/keygen.c:1212
 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"
@@ -1771,7 +1772,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1233
 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"
@@ -1783,54 +1784,54 @@ 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:1728
+#: g10/keygen.c:1723
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:1782
+#: g10/keygen.c:1777
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:1870 g10/keygen.c:1950
+#: g10/keygen.c:1865 g10/keygen.c:1945
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/keygen.c:1871 g10/keygen.c:1952
+#: g10/keygen.c:1866 g10/keygen.c:1947
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:1939
+#: g10/keygen.c:1934
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/keygen.c:1945
+#: g10/keygen.c:1940
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1954
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1961
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1981
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1982
 #, fuzzy
 msgid "key marked as ultimately trusted.\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1991
 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"
@@ -1838,12 +1839,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:2008 g10/keygen.c:2114
+#: g10/keygen.c:2003 g10/keygen.c:2109
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:2052 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2047 g10/sig-check.c:227 g10/sign.c:228
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1851,7 +1852,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:2054 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2049 g10/sig-check.c:229 g10/sign.c:230
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1859,11 +1860,11 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2058
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:2090
+#: g10/keygen.c:2085
 msgid "Really create? "
 msgstr "Realmente criar? "
 
@@ -1911,32 +1912,32 @@ msgstr ""
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s criptografado para: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:142
+#: g10/delkey.c:69 g10/export.c:141
 #, fuzzy, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:162
+#: g10/delkey.c:77 g10/export.c:161
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/export.c:170
+#: g10/export.c:169
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:181
+#: g10/export.c:180
 #, fuzzy, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:189
+#: g10/export.c:188
 #, fuzzy, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:255
+#: g10/export.c:254
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
@@ -1953,7 +1954,7 @@ msgstr "[usu�rio n�o encontrado]"
 
 #: g10/getkey.c:1362
 #, c-format
-msgid "Invalid key %08lX made valid by --always-trust\n"
+msgid "invalid key %08lX made valid by --always-trust\n"
 msgstr ""
 
 #: g10/getkey.c:1957
@@ -2301,12 +2302,12 @@ msgstr "%d IDs de usu�rios sem auto-assinaturas v�lidas detectados\n"
 msgid "User ID \"%s\" is revoked.\n"
 msgstr ""
 
-#: g10/keyedit.c:330 g10/keyedit.c:1004
+#: g10/keyedit.c:330 g10/keyedit.c:1013
 #, fuzzy
 msgid "Are you sure you still want to sign it?\n"
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:335 g10/keyedit.c:409 g10/keyedit.c:519 g10/keyedit.c:1007
+#: g10/keyedit.c:335 g10/keyedit.c:418 g10/keyedit.c:528 g10/keyedit.c:1016
 msgid "Really sign? "
 msgstr "Realmente assinar? "
 
@@ -2321,65 +2322,68 @@ msgid ""
 "Do you want to promote it to a full exportable signature?\n"
 msgstr ""
 
-#. Fixme: see whether there is a revocation in which
-#. * case we should allow to sign it again.
-#: g10/keyedit.c:374
+#: g10/keyedit.c:379
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %08lX\n"
+msgstr "J� assinado pela chave %08lX\n"
+
+#: g10/keyedit.c:384
 #, fuzzy, c-format
 msgid "\"%s\" was already %ssigned by key %08lX\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:387
+#: g10/keyedit.c:396
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:402
+#: g10/keyedit.c:411
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/keyedit.c:406
+#: g10/keyedit.c:415
 #, fuzzy
 msgid "  Are you sure you still want to sign it?\n"
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:429
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:422
+#: g10/keyedit.c:431
 msgid "Do you want your signature to expire at the same time? (y/n) "
 msgstr ""
 
-#: g10/keyedit.c:450
+#: g10/keyedit.c:459
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:463
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:465
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:458
+#: g10/keyedit.c:467
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:485
+#: g10/keyedit.c:494
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2387,7 +2391,7 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "sua chave: \""
 
-#: g10/keyedit.c:494
+#: g10/keyedit.c:503
 #, fuzzy
 msgid ""
 "\n"
@@ -2396,7 +2400,7 @@ msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:507
 #, fuzzy
 msgid ""
 "\n"
@@ -2405,48 +2409,48 @@ msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:512
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:507
+#: g10/keyedit.c:516
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:511
+#: g10/keyedit.c:520
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:552 g10/keyedit.c:2459 g10/keyedit.c:2521 g10/sign.c:273
+#: g10/keyedit.c:561 g10/keyedit.c:2476 g10/keyedit.c:2538 g10/sign.c:273
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:621
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:625
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:629
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:640
+#: g10/keyedit.c:649
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:655
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2454,7 +2458,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:669
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2462,561 +2466,561 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:663
+#: g10/keyedit.c:672
 msgid "Do you really want to do this? "
 msgstr "Voc� realmente quer fazer isso? "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:736
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a assinatura da chave para o local correto\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:777
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/keyedit.c:769
+#: g10/keyedit.c:778
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:779
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:779
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:771
+#: g10/keyedit.c:780
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:771
+#: g10/keyedit.c:780
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:782
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:782
 msgid "show fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:783
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:783
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de usu�rios"
 
-#: g10/keyedit.c:775
+#: g10/keyedit.c:784
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:785
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:785
 msgid "select user ID N"
 msgstr "seleciona ID de usu�rio N"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:786
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:786
 msgid "select secondary key N"
 msgstr "seleciona chave secund�ria N"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:787
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:787
 msgid "list signatures"
 msgstr "lista assinaturas"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:788
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:789
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:789
 msgid "sign the key"
 msgstr "assina a chave"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:790
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:791
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:791
 msgid "sign the key locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:792
 #, fuzzy
 msgid "nrsign"
 msgstr "sign"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:792
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:793
 #, fuzzy
 msgid "nrlsign"
 msgstr "sign"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:793
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:794
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:795
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:795
 msgid "add a user ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:796
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:796
 #, fuzzy
 msgid "add a photo ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:797
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:797
 msgid "delete user ID"
 msgstr "remove ID de usu�rio"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:790
+#: g10/keyedit.c:799
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:800
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:800
 msgid "add a secondary key"
 msgstr "adiciona nova chave secund�ria"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:801
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:801
 msgid "delete a secondary key"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:802
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:802
 msgid "delete signatures"
 msgstr "remove assinaturas"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:803
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:803
 msgid "change the expire date"
 msgstr "muda a data de validade"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:804
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:804
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:805
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:805
 msgid "toggle between secret and public key listing"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:807
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:799
+#: g10/keyedit.c:808
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:799
+#: g10/keyedit.c:808
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:800
+#: g10/keyedit.c:809
 #, fuzzy
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:800
+#: g10/keyedit.c:809
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:810
 #, fuzzy
 msgid "setpref"
 msgstr "pref"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:810
 #, fuzzy
 msgid "set preference list"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:811
 #, fuzzy
 msgid "updpref"
 msgstr "pref"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:811
 #, fuzzy
 msgid "updated preferences"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:812
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:812
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:813
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:813
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:814
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:814
 msgid "revoke signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:815
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:815
 msgid "revoke a secondary key"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:816
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:816
 msgid "disable a key"
 msgstr "desativa uma chave"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:817
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:817
 msgid "enable a key"
 msgstr "ativa uma chave"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:818
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:818
 msgid "show photo ID"
 msgstr ""
 
-#: g10/delkey.c:112 g10/keyedit.c:829
+#: g10/delkey.c:112 g10/keyedit.c:838
 msgid "can't do that in batchmode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
-#: g10/keyedit.c:866
+#: g10/keyedit.c:875
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:893
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:924
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:956
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:960
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1009
 #, fuzzy
 msgid "Key is revoked.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1025
 msgid "Really sign all user IDs? "
 msgstr "Realmente assinar todos os IDs de usu�rio? "
 
-#: g10/keyedit.c:1017
+#: g10/keyedit.c:1026
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de usu�rio para assinar\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1051
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1062 g10/keyedit.c:1083
+#: g10/keyedit.c:1071 g10/keyedit.c:1092
 msgid "You must select at least one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
 
-#: g10/keyedit.c:1064
+#: g10/keyedit.c:1073
 msgid "You can't delete the last user ID!\n"
 msgstr "Voc� n�o pode remover o �ltimo ID de usu�rio!\n"
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1076
 msgid "Really remove all selected user IDs? "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1068
+#: g10/keyedit.c:1077
 msgid "Really remove this user ID? "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:1106 g10/keyedit.c:1128
+#: g10/keyedit.c:1115 g10/keyedit.c:1137
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1110
+#: g10/keyedit.c:1119
 msgid "Do you really want to delete the selected keys? "
 msgstr "Voc� realmente quer remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1111
+#: g10/keyedit.c:1120
 msgid "Do you really want to delete this key? "
 msgstr "Voc� realmente quer remover esta chave? "
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1141
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Voc� realmente quer revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1142
 msgid "Do you really want to revoke this key? "
 msgstr "Voc� realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1206
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1208
 #, fuzzy
 msgid "Really update the preferences? "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:1237
+#: g10/keyedit.c:1246
 msgid "Save changes? "
 msgstr "Salvar altera��es? "
 
-#: g10/keyedit.c:1240
+#: g10/keyedit.c:1249
 msgid "Quit without saving? "
 msgstr "Sair sem salvar? "
 
-#: g10/keyedit.c:1251
+#: g10/keyedit.c:1260
 #, c-format
 msgid "update failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:1258
+#: g10/keyedit.c:1267
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1274
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma atualiza��o � necess�ria.\n"
 
 # help ou ajuda ???
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1285
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1433
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s%s\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1436
 msgid " (sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:1432 g10/keyedit.c:1458
+#: g10/keyedit.c:1441 g10/keyedit.c:1467
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1450
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1454
 msgid "This key has been disabled"
 msgstr "Esta chave foi desativada"
 
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1483
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! a subchave foi revogada: %s\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1486
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1488
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1598
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
 msgstr ""
 
-#: g10/keyedit.c:1593 g10/keyedit.c:1620
+#: g10/keyedit.c:1602 g10/keyedit.c:1629
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/n) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:1601
+#: g10/keyedit.c:1610
 msgid "You may only have one photo ID on a key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1624
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1626
+#: g10/keyedit.c:1635
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1757
+#: g10/keyedit.c:1766
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deletar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:1770
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deletar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1774
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1780
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:1785
+#: g10/keyedit.c:1794
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:1786
+#: g10/keyedit.c:1795
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1798
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1867
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as sele��es das chaves secretas.\n"
 
-#: g10/keyedit.c:1864
+#: g10/keyedit.c:1873
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1877
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Modificando a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:1879
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:1912
+#: g10/keyedit.c:1921
 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:1928
+#: g10/keyedit.c:1937
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2018
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
 
-#: g10/keyedit.c:2184
+#: g10/keyedit.c:2193
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2239
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secund�ria com �ndice %d\n"
 
-#: g10/keyedit.c:2328
+#: g10/keyedit.c:2337
 msgid "user ID: \""
 msgstr "ID de usu�rio: \""
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2342
 #, c-format
 msgid ""
 "\"\n"
@@ -3025,39 +3029,52 @@ msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyedit.c:2335
+#: g10/keyedit.c:2345
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"locally signed with your key %08lX at %s\n"
+msgstr ""
+"\"\n"
+"assinado com sua chave %08lX em %s\n"
+
+#: g10/keyedit.c:2349
 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:2359
+#: g10/keyedit.c:2373
 msgid "You have signed these user IDs:\n"
 msgstr "Voc� assinou estes IDs de usu�rio:\n"
 
-#: g10/keyedit.c:2373
+#: g10/keyedit.c:2387
 #, fuzzy, c-format
-msgid "   signed by %08lX at %s%s\n"
+msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:2380
+#: g10/keyedit.c:2395
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2415
 msgid "You are about to revoke these signatures:\n"
 msgstr "Voc� est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:2410
-#, c-format
-msgid "   signed by %08lX at %s\n"
+#: g10/keyedit.c:2425
+#, fuzzy, c-format
+msgid "   signed by %08lX at %s%s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:2418
+#: g10/keyedit.c:2427
+msgid " (non-exportable)"
+msgstr ""
+
+#: g10/keyedit.c:2434
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2464
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
@@ -3262,12 +3279,12 @@ msgstr ""
 
 #: g10/misc.c:378
 #, c-format
-msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgid "warning: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
 #: g10/misc.c:410
 #, c-format
-msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgid "warning: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
 #: g10/misc.c:435
@@ -4179,7 +4196,7 @@ msgstr ""
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures fill be advanced by one second.\n"
+"self-signatures will be advanced by one second.\n"
 msgstr ""
 
 #: g10/helptext.c:238
@@ -4299,6 +4316,12 @@ msgstr "listar as chaves e as assinaturas"
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro criado\n"
 
+#~ msgid "Do you really need such a large keysize? "
+#~ msgstr "Voc� realmente precisa de uma chave t�o grande? "
+
+#~ msgid "   signed by %08lX at %s\n"
+#~ msgstr "   assinado por %08lX em %s\n"
+
 #~ msgid "--delete-secret-key user-id"
 #~ msgstr "--delete-secret-key id-usu�rio"
 
diff --git a/po/sv.po b/po/sv.po
index 3aed0db32..6d911b8e7 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: 2002-03-03 15:18+0100\n"
+"POT-Creation-Date: 2002-04-06 17:29+0200\n"
 "PO-Revision-Date: 2000-04-23 16:43+02:00\n"
 "Last-Translator: Daniel Resare <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -53,7 +53,7 @@ msgstr "nej"
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:768 util/miscutil.c:326
+#: g10/keyedit.c:777 util/miscutil.c:326
 msgid "quit"
 msgstr "avsluta"
 
@@ -288,7 +288,7 @@ msgstr "... detta �r en bugg (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "du har hittat en bugg ... (%s:%d)\\n\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1552
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1547
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte �ppna \"%s\": %s\n"
@@ -366,7 +366,7 @@ msgstr ""
 "en stund f�r att ge operativsystemet en chans att samla mer entropi!\n"
 "(Beh�ver %d fler byte)\n"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid ""
 "@Commands:\n"
 " "
@@ -374,170 +374,170 @@ msgstr ""
 "@Kommandon:\n"
 " "
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "|[file]|make a signature"
 msgstr "|[fil]|skapa en signatur"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|skapa en klartext-signatur"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "make a detached signature"
 msgstr "skapa en signatur i en separat fil"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "|[files]|encrypt files"
 msgstr ""
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "encryption only with symmetric cipher"
 msgstr "endast kryptering med symmetriskt chiffer"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "store only"
 msgstr "endast lagring"
 
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "decrypt data (default)"
 msgstr "dekryptera data (normall�ge)"
 
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "|[files]|decrypt files"
 msgstr ""
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "verify a signature"
 msgstr "verifiera en signatur"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "list keys"
 msgstr "r�kna upp nycklar"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "list keys and signatures"
 msgstr "r�kna upp nycklar och signaturer"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "check key signatures"
 msgstr "verifiera nyckelsignaturer"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "list keys and fingerprints"
 msgstr "r�kna upp nycklar och fingeravtryck"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "list secret keys"
 msgstr "r�kna upp hemliga nycklar"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/g10.c:297
+#: g10/g10.c:298
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "ta bort en nyckel fr�n den publika nyckelringen"
 
-#: g10/g10.c:299
+#: g10/g10.c:300
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "ta bort en nyckel fr�n den hemliga nyckelringen"
 
-#: g10/g10.c:300
+#: g10/g10.c:301
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: g10/g10.c:301
+#: g10/g10.c:302
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/g10.c:302
+#: g10/g10.c:303
 #, fuzzy
 msgid "sign a key non-revocably"
 msgstr "signera en nyckel lokalt"
 
-#: g10/g10.c:303
+#: g10/g10.c:304
 #, fuzzy
 msgid "sign a key locally and non-revocably"
 msgstr "signera en nyckel lokalt"
 
-#: g10/g10.c:304
+#: g10/g10.c:305
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "generate a revocation certificate"
 msgstr "generera ett �terkallelesecertifikat"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "import keys from a key server"
 msgstr "importera nycklar fr�n en nyckelserver"
 
-#: g10/g10.c:310
+#: g10/g10.c:311
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importera nycklar fr�n en nyckelserver"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "import/merge keys"
 msgstr "importera/sl� ihop nycklar"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "list only the sequence of packets"
 msgstr "skriv endast ut paketsekvensen"
 
-#: g10/g10.c:320
+#: g10/g10.c:321
 msgid "export the ownertrust values"
 msgstr "exportera de v�rden som representerar �gartillit"
 
-#: g10/g10.c:322
+#: g10/g10.c:323
 msgid "import ownertrust values"
 msgstr "importera v�rden som representerar �gartillit"
 
-#: g10/g10.c:324
+#: g10/g10.c:325
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/g10.c:326
+#: g10/g10.c:327
 #, fuzzy
 msgid "unattended trust database update"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/g10.c:327
+#: g10/g10.c:328
 msgid "fix a corrupted trust database"
 msgstr "reparera en korrupt tillitsdatabas"
 
-#: g10/g10.c:328
+#: g10/g10.c:329
 msgid "De-Armor a file or stdin"
 msgstr "Skala av en fil eller standard in"
 
-#: g10/g10.c:330
+#: g10/g10.c:331
 msgid "En-Armor a file or stdin"
 msgstr "Skapa ett skal f�r en fil eller standard in"
 
-#: g10/g10.c:332
+#: g10/g10.c:333
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skriv ut kontrollsummor"
 
-#: g10/g10.c:336
+#: g10/g10.c:337
 msgid ""
 "@\n"
 "Options:\n"
@@ -547,202 +547,202 @@ msgstr ""
 "Flaggor:\n"
 " "
 
-#: g10/g10.c:338
+#: g10/g10.c:339
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/g10.c:340
+#: g10/g10.c:341
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMN|kryptera f�r NAMN"
 
-#: g10/g10.c:343
+#: g10/g10.c:344
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMN|anv�nd NAMN som standardv�rdet f�r mottagare"
 
-#: g10/g10.c:345
+#: g10/g10.c:346
 msgid "use the default key as default recipient"
 msgstr "anv�nd standardnyckeln som standardmottagare"
 
-#: g10/g10.c:350
+#: g10/g10.c:352
 msgid "use this user-id to sign or decrypt"
 msgstr "anv�nd denna anv�ndaridentitet f�r att signera eller dekryptera"
 
-#: g10/g10.c:351
+#: g10/g10.c:353
 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:353
+#: g10/g10.c:355
 msgid "use canonical text mode"
 msgstr "anv�nd \"ursprunglig text\"-l�get"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "use as output file"
 msgstr "anv�nd som fil f�r utdata"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "verbose"
 msgstr "utf�rlig"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "be somewhat more quiet"
 msgstr "var n�got tystare"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "don't use the terminal at all"
 msgstr "anv�nd inte terminalen alls"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "force v3 signatures"
 msgstr "anv�nd v3-signaturer"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 #, fuzzy
 msgid "do not force v3 signatures"
 msgstr "anv�nd v3-signaturer"
 
-#: g10/g10.c:366
+#: g10/g10.c:368
 #, fuzzy
 msgid "force v4 key signatures"
 msgstr "anv�nd v3-signaturer"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 #, fuzzy
 msgid "do not force v4 key signatures"
 msgstr "anv�nd v3-signaturer"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 msgid "always use a MDC for encryption"
 msgstr "anv�nd alltid en MDC f�r kryptering"
 
-#: g10/g10.c:370
+#: g10/g10.c:372
 #, fuzzy
 msgid "never use a MDC for encryption"
 msgstr "anv�nd alltid en MDC f�r kryptering"
 
-#: g10/g10.c:372
+#: g10/g10.c:374
 msgid "do not make any changes"
 msgstr "g�r inga �ndringar"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:374
+#: g10/g10.c:376
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "batch mode: never ask"
 msgstr "batch-l�ge: fr�ga aldrig"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "assume yes on most questions"
 msgstr "anta att svaret �r ja p� de flesta fr�gor"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "assume no on most questions"
 msgstr "anta att svaret �r nej p� de flesta fr�gor"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "add this keyring to the list of keyrings"
 msgstr "l�gg till denna nyckelring till listan av nyckelringar"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "add this secret keyring to the list"
 msgstr "l�gg till denna hemliga nyckelring till listan"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "show which keyring a listed key is on"
 msgstr ""
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMN|anv�nd NAMN som f�rvald hemlig nyckel"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|V�RD|anv�nd denna nyckelserver f�r att sl� upp nycklar"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMN|s�tt teckentabellen f�r terminalen till NAMN"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "read options from file"
 msgstr "l�s flaggor fr�n fil"
 
-#: g10/g10.c:391
+#: g10/g10.c:393
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
-#: g10/g10.c:393
+#: g10/g10.c:395
 #, fuzzy
 msgid "|[file]|write status info to file"
 msgstr "|FD|skriv statusinformation till denna FD"
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "|KEYID|ultimately trust this key"
 msgstr ""
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "|FILE|load extension module FILE"
 msgstr "|FIL|ladda till�ggsmodul FIL"
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "emulate the mode described in RFC1991"
 msgstr "imitera l�get som beskrivs i RFC1991"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 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:403
+#: g10/g10.c:405
 #, fuzzy
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "st�ll om alla flaggor s� att gpg f�ljer OpenPGP-standarden"
 
-#: g10/g10.c:407
+#: g10/g10.c:409
 msgid "|N|use passphrase mode N"
 msgstr "|N|anv�nd l�senordsl�get N"
 
-#: g10/g10.c:409
+#: g10/g10.c:411
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAMN|anv�nd kontrollsummealgoritmen NAMN f�r l�senordsfraser"
 
-#: g10/g10.c:411
+#: g10/g10.c:413
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAMN|anv�nd chifferalgoritmen NAMN f�r l�senordsfraser"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMN|anv�nd chifferalgoritmen NAMN"
 
-#: g10/g10.c:413
+#: g10/g10.c:415
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMN|anv�nd kontrollsummealgoritmen NAMN"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|N|use compress algorithm N"
 msgstr "|N|anv�nd komprimeringsalgoritmen N"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "throw keyid field of encrypted packets"
 msgstr "sl�ng bort nyckelidentitetsf�ltet fr�n krypterade paket"
 
-#: g10/g10.c:416
+#: g10/g10.c:418
 msgid "Show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "Don't show Photo IDs"
 msgstr ""
 
-#: g10/g10.c:418
+#: g10/g10.c:420
 msgid "Set command line to view Photo IDs"
 msgstr ""
 
-#: g10/g10.c:419
+#: g10/g10.c:421
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAMN=V�RDE|anv�nd detta s�tt f�r att beskriva data"
 
-#: g10/g10.c:422
+#: g10/g10.c:424
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -750,7 +750,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan f�r en komplett lista p� alla kommandon och flaggor)\n"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid ""
 "@\n"
 "Examples:\n"
@@ -770,17 +770,17 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/g10.c:559
+#: g10/g10.c:561
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Rapportera g�rna fel till <[email protected]>.\n"
 "Rapportera g�rna fel eller synpunkter p� �vers�ttningen till <[email protected]>.\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:565
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Anv�ndning: gpg [flaggor] [filer] (-h f�r hj�lp)"
 
-#: g10/g10.c:566
+#: g10/g10.c:568
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -790,7 +790,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "vilken operation som utf�rs beror p� programmets indata\n"
 
-#: g10/g10.c:577
+#: g10/g10.c:579
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -798,102 +798,107 @@ msgstr ""
 "\n"
 "St�dda algoritmer:\n"
 
-#: g10/g10.c:651
+#: g10/g10.c:653
 msgid "usage: gpg [options] "
 msgstr "anv�ndning: gpg [flaggor] "
 
-#: g10/g10.c:708
+#: g10/g10.c:710
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
-#: g10/g10.c:881
+#: g10/g10.c:883
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTERA: inst�llningsfilen \"%s\" saknas\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:887
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inst�llningsfil \"%s\": %s\n"
 
-#: g10/g10.c:892
+#: g10/g10.c:894
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser flaggor fr�n \"%s\"\n"
 
-#: g10/g10.c:1174
+#: g10/g10.c:1176
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s �r ingen giltig teckentabell\n"
 
-#: g10/g10.c:1190
+#: g10/g10.c:1192
 msgid "could not parse keyserver URI\n"
 msgstr ""
 
-#: g10/g10.c:1294
+#: g10/g10.c:1208
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr ""
+
+#: g10/g10.c:1309
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
 
-#: g10/g10.c:1298
+#: g10/g10.c:1313
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:1305 g10/g10.c:1316
+#: g10/g10.c:1320 g10/g10.c:1331
 #, 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:1307 g10/g10.c:1327
+#: g10/g10.c:1322 g10/g10.c:1342
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �r inte till�ten tillsammans med %s!\n"
 
-#: g10/g10.c:1310
+#: g10/g10.c:1325
 #, 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:1336
+#: g10/g10.c:1351
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1342
+#: g10/g10.c:1357
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:1348
+#: g10/g10.c:1363
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:1361
+#: g10/g10.c:1376
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1375 g10/sign.c:614
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1390 g10/sign.c:614
 #: g10/sign.c:792
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr ""
 
-#: g10/g10.c:1414 g10/g10.c:1426
+#: g10/g10.c:1429 g10/g10.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen �r ogiltig\n"
 
-#: g10/g10.c:1420 g10/g10.c:1432
+#: g10/g10.c:1435 g10/g10.c:1447
 msgid "selected digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen �r ogiltig\n"
 
-#: g10/g10.c:1436
+#: g10/g10.c:1451
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "angiven URL �r ogiltig\n"
 
-#: g10/g10.c:1440
+#: g10/g10.c:1455
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "angiven URL �r ogiltig\n"
 
-#: g10/g10.c:1443
+#: g10/g10.c:1458
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "kompressionsalgoritmen m�ste vara i intervallet %d..%d\n"
@@ -904,145 +909,145 @@ msgstr "kompressionsalgoritmen m�ste vara i intervallet %d..%d\n"
 # �r �nd� litet. Eventuellt borde meddelandena inte alls
 # �vers�ttas f�r att g�ra eventuell fels�kning l�ttare
 # f�r internationella fels�kare
-#: g10/g10.c:1445
+#: g10/g10.c:1460
 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:1447
+#: g10/g10.c:1462
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" m�ste vara st�rre �n 1\n"
 
-#: g10/g10.c:1449
+#: g10/g10.c:1464
 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:1452
+#: g10/g10.c:1467
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTERA: enkelt S2K-l�ge (0) rekommenderas inte\n"
 
-#: g10/g10.c:1456
+#: g10/g10.c:1471
 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:1460
+#: g10/g10.c:1475
 #, fuzzy
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "ogiltigt S2K-l�ge; m�ste vara 0, 1 eller 3\n"
 
-#: g10/g10.c:1463
+#: g10/g10.c:1478
 #, fuzzy
 msgid "invalid preferences\n"
 msgstr "skriv ut inst�llningar"
 
-#: g10/g10.c:1557
+#: g10/g10.c:1572
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/g10.c:1577
+#: g10/g10.c:1592
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/g10.c:1584
+#: g10/g10.c:1599
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/g10.c:1592
+#: g10/g10.c:1607
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1624
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/g10.c:1622
+#: g10/g10.c:1637
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:1636
+#: g10/g10.c:1651
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/g10.c:1645
+#: g10/g10.c:1660
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/g10.c:1663
+#: g10/g10.c:1678
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/g10.c:1674
+#: g10/g10.c:1689
 msgid "--sign-key user-id"
 msgstr "--sign-key anv�ndaridentitet"
 
-#: g10/g10.c:1682
+#: g10/g10.c:1697
 msgid "--lsign-key user-id"
 msgstr "--lsign-key anv�ndaridentitet"
 
-#: g10/g10.c:1690
+#: g10/g10.c:1705
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key anv�ndaridentitet"
 
-#: g10/g10.c:1698
+#: g10/g10.c:1713
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key anv�ndaridentitet"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1721
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key anv�ndaridentitet [kommandon]"
 
 # Filnamn b�de med och utan fnuttar finns. lite ologiskt. Vill n�gon
 # fixa en patch?
-#: g10/encode.c:307 g10/g10.c:1762 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1777 g10/sign.c:703
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan inte �ppna %s: %s\n"
 
-#: g10/g10.c:1777
+#: g10/g10.c:1792
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [anv�ndaridentitet] [nyckelring]"
 
-#: g10/g10.c:1860
+#: g10/g10.c:1875
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort skalet: %s\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1883
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa skal: %s\n"
 
-#: g10/g10.c:1955
+#: g10/g10.c:1970
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "felaktig hash-algoritm \"%s\"\n"
 
-#: g10/g10.c:2041
+#: g10/g10.c:2056
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2060
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande h�r ...\n"
 
 # se f�rra kommentaren
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2048 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2063 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan inte �ppna \"%s\"\n"
 
-#: g10/g10.c:2257
+#: g10/g10.c:2272
 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:2263
+#: g10/g10.c:2278
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -1050,11 +1055,11 @@ msgstr ""
 "ett notationsnamn kan bara inneh�lla bokst�ver, siffror, punkter eller\n"
 "understrykningstecken och sluta med ett likhetstecken\n"
 
-#: g10/g10.c:2269
+#: g10/g10.c:2284
 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:2277
+#: g10/g10.c:2292
 msgid "a notation value must not use any control characters\n"
 msgstr "ett notationsv�rde f�r inte ineh�lla n�gra kontrolltecken\n"
 
@@ -1491,7 +1496,7 @@ msgstr "   (%d) DSA (endast signering)\n"
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (endast kryptering)\n"
 
-#: g10/keyedit.c:466 g10/keygen.c:776
+#: g10/keyedit.c:475 g10/keygen.c:776
 msgid "Your selection? "
 msgstr "Vad v�ljer du? "
 
@@ -1499,7 +1504,7 @@ msgstr "Vad v�ljer du? "
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr ""
 
-#: g10/keyedit.c:479 g10/keygen.c:810
+#: g10/keyedit.c:488 g10/keygen.c:810
 msgid "Invalid selection.\n"
 msgstr "Felaktigt val.\n"
 
@@ -1566,22 +1571,18 @@ 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:870
-msgid "Do you really need such a large keysize? "
-msgstr "Beh�ver du verkligen en s� stor nyckelstorlek? "
-
-#: g10/keygen.c:876
+#: g10/keygen.c:871
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Den efterfr�gade nyckelstorleken �r %u bitar\n"
 
-#: g10/keygen.c:879 g10/keygen.c:883
+#: g10/keygen.c:874 g10/keygen.c:878
 #, 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:934
+#: g10/keygen.c:929
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1598,7 +1599,7 @@ msgstr ""
 "      <n>y = nyckeln blir ogiltig efter n �r\n"
 
 # borde kolla upp m�jligheterna i k�llkoden att anv�nda v m � ist�llet f�r wmy
-#: g10/keygen.c:943
+#: g10/keygen.c:938
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -1615,31 +1616,31 @@ msgstr ""
 "      <n>m = nyckeln blir ogiltig efter n m�nader\n"
 "      <n>y = nyckeln blir ogiltig efter n �r\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:960
 msgid "Key is valid for? (0) "
 msgstr "F�r hur l�ng tid �r nyckeln giltig? (0) "
 
-#: g10/keygen.c:967
+#: g10/keygen.c:962
 #, fuzzy
 msgid "Signature is valid for? (0) "
 msgstr "F�r hur l�ng tid �r nyckeln giltig? (0) "
 
-#: g10/keygen.c:972
+#: g10/keygen.c:967
 msgid "invalid value\n"
 msgstr "ogiltigt v�rde\n"
 
-#: g10/keygen.c:977
+#: g10/keygen.c:972
 #, fuzzy, c-format
 msgid "%s does not expire at all\n"
 msgstr "Nyckeln g�r aldrig ut\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:984
+#: g10/keygen.c:979
 #, fuzzy, c-format
 msgid "%s expires at %s\n"
 msgstr "Nyckeln g�r ut vid f�ljande tidpunkt: %s\n"
 
-#: g10/keygen.c:990
+#: g10/keygen.c:985
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1647,11 +1648,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:995
+#: g10/keygen.c:990
 msgid "Is this correct (y/n)? "
 msgstr "St�mmer detta (j/n)? "
 
-#: g10/keygen.c:1038
+#: g10/keygen.c:1033
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1667,44 +1668,44 @@ msgstr ""
 "     \"Gustav Vasa (Brutal kung) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1045
 msgid "Real name: "
 msgstr "Namn: "
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1053
 msgid "Invalid character in name\n"
 msgstr "Ogiltigt tecken i namnet\n"
 
-#: g10/keygen.c:1060
+#: g10/keygen.c:1055
 msgid "Name may not start with a digit\n"
 msgstr "Namnet f�r inte b�rja med en siffra\n"
 
-#: g10/keygen.c:1062
+#: g10/keygen.c:1057
 msgid "Name must be at least 5 characters long\n"
 msgstr "Namnet m�ste vara �tminstone 5 tecken l�ngt\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1065
 msgid "Email address: "
 msgstr "Epostadress: "
 
-#: g10/keygen.c:1081
+#: g10/keygen.c:1076
 msgid "Not a valid email address\n"
 msgstr "Epostadressen �r ogiltig\n"
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1084
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1095
+#: g10/keygen.c:1090
 msgid "Invalid character in comment\n"
 msgstr "Ogiltigt tecken i kommentaren\n"
 
-#: g10/keygen.c:1118
+#: g10/keygen.c:1113
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du anv�nder teckenupps�ttningen \"%s\"\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1119
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1715,28 +1716,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1128
+#: g10/keygen.c:1123
 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:1133
+#: g10/keygen.c:1128
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoAa"
 
-#: g10/keygen.c:1143
+#: g10/keygen.c:1138
 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:1144
+#: g10/keygen.c:1139
 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:1163
+#: g10/keygen.c:1158
 msgid "Please correct the error first\n"
 msgstr "R�tta f�rst felet\n"
 
 # fel kapitalisering i originalet?
-#: g10/keygen.c:1202
+#: g10/keygen.c:1197
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1744,17 +1745,17 @@ msgstr ""
 "Du beh�ver en l�senordsfras f�r att skydda din hemliga nyckel\n"
 "\n"
 
-#: g10/keyedit.c:655 g10/keygen.c:1210
+#: g10/keyedit.c:664 g10/keygen.c:1205
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "l�senordsfrasen upprepades ej korrekt; f�rs�k igen.\n"
 
-#: g10/keygen.c:1211
+#: g10/keygen.c:1206
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1217
+#: g10/keygen.c:1212
 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"
@@ -1765,7 +1766,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:1238
+#: g10/keygen.c:1233
 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"
@@ -1777,54 +1778,54 @@ 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:1728
+#: g10/keygen.c:1723
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA-nyckelparet kommer att ha 1024 bitar.\n"
 
-#: g10/keygen.c:1782
+#: g10/keygen.c:1777
 msgid "Key generation canceled.\n"
 msgstr "Skapandet av nycklar avbr�ts.\n"
 
-#: g10/keygen.c:1870 g10/keygen.c:1950
+#: g10/keygen.c:1865 g10/keygen.c:1945
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver publik nyckel till \"%s\"\n"
 
-#: g10/keygen.c:1871 g10/keygen.c:1952
+#: g10/keygen.c:1866 g10/keygen.c:1947
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/keygen.c:1939
+#: g10/keygen.c:1934
 #, fuzzy, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nyckel %08lX: hittade ingen publik nyckel: %s\n"
 
-#: g10/keygen.c:1945
+#: g10/keygen.c:1940
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nyckel %08lX: hittade inte den hemliga nyckeln: %s\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1954
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1961
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1981
 msgid "public and secret key created and signed.\n"
 msgstr "publik och hemlig nyckel skapad och signerad.\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1982
 #, fuzzy
 msgid "key marked as ultimately trusted.\n"
 msgstr "Certifikat som leder till en p�litlig nyckel:\n"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1991
 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"
@@ -1833,13 +1834,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:2008 g10/keygen.c:2114
+#: g10/keygen.c:2003 g10/keygen.c:2109
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
 # c-format beh�vs inte i singularis
-#: g10/keygen.c:2052 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2047 g10/sig-check.c:227 g10/sign.c:228
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1847,7 +1848,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:2054 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2049 g10/sig-check.c:229 g10/sign.c:230
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1855,11 +1856,11 @@ msgstr ""
 "nyckeln �r skapad %lu sekunder in i framtiden (problemet �r\n"
 "relaterat till tidsresande eller en felst�lld klocka)\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2058
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:2090
+#: g10/keygen.c:2085
 msgid "Really create? "
 msgstr "Vill du verkligen skapa? "
 
@@ -1907,32 +1908,32 @@ msgstr ""
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s krypterad f�r: %s\n"
 
-#: g10/delkey.c:69 g10/export.c:142
+#: g10/delkey.c:69 g10/export.c:141
 #, fuzzy, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "anv�ndaren \"%s\" hittades inte: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:162
+#: g10/delkey.c:77 g10/export.c:161
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fel vid l�sning av \"%s\": %s\n"
 
-#: g10/export.c:170
+#: g10/export.c:169
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "nyckeln %08lX f�ljer inte standarden RFC2440 - �verhoppad\n"
 
-#: g10/export.c:181
+#: g10/export.c:180
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "nyckeln %08lX �r inte skyddad - �verhoppad\n"
 
-#: g10/export.c:189
+#: g10/export.c:188
 #, fuzzy, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "nyckeln %08lX f�ljer inte standarden RFC2440 - �verhoppad\n"
 
-#: g10/export.c:255
+#: g10/export.c:254
 msgid "WARNING: nothing exported\n"
 msgstr "VARNING: exporterade ingenting\n"
 
@@ -1949,7 +1950,7 @@ msgstr "[hittade inte anv�ndaren]"
 
 #: g10/getkey.c:1362
 #, c-format
-msgid "Invalid key %08lX made valid by --always-trust\n"
+msgid "invalid key %08lX made valid by --always-trust\n"
 msgstr ""
 
 #: g10/getkey.c:1957
@@ -2298,12 +2299,12 @@ msgstr "%d anv�ndaridentiteter utan giltig sj�lvsignatur hittades\n"
 msgid "User ID \"%s\" is revoked.\n"
 msgstr ""
 
-#: g10/keyedit.c:330 g10/keyedit.c:1004
+#: g10/keyedit.c:330 g10/keyedit.c:1013
 #, fuzzy
 msgid "Are you sure you still want to sign it?\n"
 msgstr "�r du s�ker p� att du vill ha denna nyckelstorlek? "
 
-#: g10/keyedit.c:335 g10/keyedit.c:409 g10/keyedit.c:519 g10/keyedit.c:1007
+#: g10/keyedit.c:335 g10/keyedit.c:418 g10/keyedit.c:528 g10/keyedit.c:1016
 msgid "Really sign? "
 msgstr "Vill du verkligen signera? "
 
@@ -2318,65 +2319,68 @@ msgid ""
 "Do you want to promote it to a full exportable signature?\n"
 msgstr ""
 
-#. Fixme: see whether there is a revocation in which
-#. * case we should allow to sign it again.
-#: g10/keyedit.c:374
+#: g10/keyedit.c:379
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %08lX\n"
+msgstr "Redan signerad av nyckeln %08lX\n"
+
+#: g10/keyedit.c:384
 #, fuzzy, c-format
 msgid "\"%s\" was already %ssigned by key %08lX\n"
 msgstr "Redan signerad av nyckeln %08lX\n"
 
-#: g10/keyedit.c:387
+#: g10/keyedit.c:396
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Det finns inget att signera med nyckeln %08lX\n"
 
-#: g10/keyedit.c:402
+#: g10/keyedit.c:411
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Notera: Denna nyckel har g�tt ut!\n"
 
-#: g10/keyedit.c:406
+#: g10/keyedit.c:415
 #, fuzzy
 msgid "  Are you sure you still want to sign it?\n"
 msgstr "�r du s�ker p� att du vill ha denna nyckelstorlek? "
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:429
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denna nyckel �r inte skyddad.\n"
 
-#: g10/keyedit.c:422
+#: g10/keyedit.c:431
 msgid "Do you want your signature to expire at the same time? (y/n) "
 msgstr ""
 
-#: g10/keyedit.c:450
+#: g10/keyedit.c:459
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:463
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:465
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:458
+#: g10/keyedit.c:467
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:485
+#: g10/keyedit.c:494
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2384,7 +2388,7 @@ msgstr ""
 "�r du verkligen s�ker p� att du vill signera denna nyckel\n"
 "med din nyckel: \""
 
-#: g10/keyedit.c:494
+#: g10/keyedit.c:503
 #, fuzzy
 msgid ""
 "\n"
@@ -2393,7 +2397,7 @@ msgstr ""
 "Signaturen kommer att markeras som icke exporterbar.\n"
 "\n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:507
 #, fuzzy
 msgid ""
 "\n"
@@ -2402,47 +2406,47 @@ msgstr ""
 "Signaturen kommer att markeras som icke exporterbar.\n"
 "\n"
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:512
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:507
+#: g10/keyedit.c:516
 msgid ""
 "\n"
 "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:511
+#: g10/keyedit.c:520
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:552 g10/keyedit.c:2459 g10/keyedit.c:2521 g10/sign.c:273
+#: g10/keyedit.c:561 g10/keyedit.c:2476 g10/keyedit.c:2538 g10/sign.c:273
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:621
 msgid "This key is not protected.\n"
 msgstr "Denna nyckel �r inte skyddad.\n"
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:625
 msgid "Secret parts of primary key are not available.\n"
 msgstr "De hemliga delarna av den prim�ra nyckeln �r inte tillg�ngliga.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:629
 msgid "Key is protected.\n"
 msgstr "Nyckeln �r skyddad.\n"
 
-#: g10/keyedit.c:640
+#: g10/keyedit.c:649
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan inte redigera denna nyckel: %s\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:655
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2450,7 +2454,7 @@ msgstr ""
 "Skriv in den nya l�senordsfrasen f�r denna hemliga nyckel.\n"
 "\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:669
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2458,563 +2462,563 @@ msgstr ""
 "Du vill inte ha n�gon l�senordsfras - detta �r sannolikt en d�lig id�!\n"
 "\n"
 
-#: g10/keyedit.c:663
+#: g10/keyedit.c:672
 msgid "Do you really want to do this? "
 msgstr "Vill du verkligen g�ra detta? "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:736
 msgid "moving a key signature to the correct place\n"
 msgstr "flyttar en nyckelsignatur till den r�tta platsen\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:777
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
-#: g10/keyedit.c:769
+#: g10/keyedit.c:778
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:779
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:779
 msgid "save and quit"
 msgstr "spara och avsluta"
 
-#: g10/keyedit.c:771
+#: g10/keyedit.c:780
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:771
+#: g10/keyedit.c:780
 msgid "show this help"
 msgstr "visa denna hj�lp"
 
 # skall dessa �vers�ttas?
-#: g10/keyedit.c:773
+#: g10/keyedit.c:782
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:782
 msgid "show fingerprint"
 msgstr "visa fingeravtryck"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:783
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:783
 msgid "list key and user IDs"
 msgstr "r�kna upp nycklar och anv�ndaridentiteter"
 
-#: g10/keyedit.c:775
+#: g10/keyedit.c:784
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:785
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:785
 msgid "select user ID N"
 msgstr "v�lj anv�ndaridentitet N"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:786
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:786
 msgid "select secondary key N"
 msgstr "v�lj sekund�r nyckel N"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:787
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:787
 msgid "list signatures"
 msgstr "r�kna upp signaturer"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:788
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:789
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:789
 msgid "sign the key"
 msgstr "signera nyckeln"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:790
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:791
 msgid "lsign"
 msgstr "lsign"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:791
 msgid "sign the key locally"
 msgstr "signera nyckeln lokalt"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:792
 #, fuzzy
 msgid "nrsign"
 msgstr "sign"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:792
 #, fuzzy
 msgid "sign the key non-revocably"
 msgstr "signera nyckeln lokalt"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:793
 #, fuzzy
 msgid "nrlsign"
 msgstr "sign"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:793
 #, fuzzy
 msgid "sign the key locally and non-revocably"
 msgstr "signera nyckeln lokalt"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:794
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:795
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:795
 msgid "add a user ID"
 msgstr "l�gg till en anv�ndaridentitet"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:796
 msgid "addphoto"
 msgstr ""
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:796
 #, fuzzy
 msgid "add a photo ID"
 msgstr "l�gg till en anv�ndaridentitet"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:797
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:797
 msgid "delete user ID"
 msgstr "ta bort en anv�ndaridentitet"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:790
+#: g10/keyedit.c:799
 msgid "delphoto"
 msgstr ""
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:800
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:800
 msgid "add a secondary key"
 msgstr "l�gg till en sekund�r nyckel"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:801
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:801
 msgid "delete a secondary key"
 msgstr "ta bort en sekund�r nyckel"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:802
 msgid "delsig"
 msgstr "delsig"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:802
 msgid "delete signatures"
 msgstr "ta bort signaturer"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:803
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:803
 msgid "change the expire date"
 msgstr "�ndra utg�ngsdatum"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:804
 msgid "primary"
 msgstr ""
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:804
 msgid "flag user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:805
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:805
 msgid "toggle between secret and public key listing"
 msgstr "hoppa mellan utskrift av hemliga och publika nycklar"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:807
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:799
+#: g10/keyedit.c:808
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:799
+#: g10/keyedit.c:808
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "skriv ut inst�llningar"
 
-#: g10/keyedit.c:800
+#: g10/keyedit.c:809
 #, fuzzy
 msgid "showpref"
 msgstr "showpref"
 
-#: g10/keyedit.c:800
+#: g10/keyedit.c:809
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "skriv ut inst�llningar"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:810
 #, fuzzy
 msgid "setpref"
 msgstr "pref"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:810
 #, fuzzy
 msgid "set preference list"
 msgstr "skriv ut inst�llningar"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:811
 #, fuzzy
 msgid "updpref"
 msgstr "pref"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:811
 #, fuzzy
 msgid "updated preferences"
 msgstr "skriv ut inst�llningar"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:812
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:812
 msgid "change the passphrase"
 msgstr "�ndra l�senordsfrasen"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:813
 msgid "trust"
 msgstr "trust"
 
 # originalet borde ha ett value
-#: g10/keyedit.c:804
+#: g10/keyedit.c:813
 msgid "change the ownertrust"
 msgstr "�ndra �gartillitsv�rdet"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:814
 msgid "revsig"
 msgstr "revsig"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:814
 msgid "revoke signatures"
 msgstr "�terkalla signaturer"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:815
 msgid "revkey"
 msgstr "revkey"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:815
 msgid "revoke a secondary key"
 msgstr "�terkalla en sekund�r nyckel"
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:816
 msgid "disable"
 msgstr "disable"
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:816
 msgid "disable a key"
 msgstr "deaktivera en nyckel"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:817
 msgid "enable"
 msgstr "enable"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:817
 msgid "enable a key"
 msgstr "aktivera en nyckel"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:818
 msgid "showphoto"
 msgstr ""
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:818
 msgid "show photo ID"
 msgstr ""
 
-#: g10/delkey.c:112 g10/keyedit.c:829
+#: g10/delkey.c:112 g10/keyedit.c:838
 msgid "can't do that in batchmode\n"
 msgstr "kan ej g�ra detta i batch-l�ge\n"
 
-#: g10/keyedit.c:866
+#: g10/keyedit.c:875
 #, fuzzy, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "fel vid l�sning av \"%s\": %s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:893
 msgid "Secret key is available.\n"
 msgstr "Den hemliga nyckeln finns tillg�nglig.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:924
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:956
 msgid "Need the secret key to do this.\n"
 msgstr "Den hemliga nyckeln beh�vs f�r att g�ra detta.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:960
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Anv�nd kommandot \"toggle\" f�rst.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1009
 #, fuzzy
 msgid "Key is revoked.\n"
 msgstr "Nyckeln �r skyddad.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1025
 msgid "Really sign all user IDs? "
 msgstr "Vill du verkligen signera alla anv�ndaridentiteter? "
 
-#: g10/keyedit.c:1017
+#: g10/keyedit.c:1026
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: V�lj det anv�ndarid du vill signera\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1051
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1062 g10/keyedit.c:1083
+#: g10/keyedit.c:1071 g10/keyedit.c:1092
 msgid "You must select at least one user ID.\n"
 msgstr "Du m�ste v�lja �tminstone en anv�ndaridentitet.\n"
 
-#: g10/keyedit.c:1064
+#: g10/keyedit.c:1073
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan inte ta bort den sista anv�ndaridentiteten!\n"
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1076
 msgid "Really remove all selected user IDs? "
 msgstr "Vill du verkligen ta bort alla valda anv�ndaridentiteter? "
 
-#: g10/keyedit.c:1068
+#: g10/keyedit.c:1077
 msgid "Really remove this user ID? "
 msgstr "Vill du verkligen ta bort denna anv�ndaridentitet? "
 
-#: g10/keyedit.c:1106 g10/keyedit.c:1128
+#: g10/keyedit.c:1115 g10/keyedit.c:1137
 msgid "You must select at least one key.\n"
 msgstr "Du m�ste v�lja �tminstone en nyckel.\n"
 
-#: g10/keyedit.c:1110
+#: g10/keyedit.c:1119
 msgid "Do you really want to delete the selected keys? "
 msgstr "Vill du verkligen ta bort valda nycklar? "
 
-#: g10/keyedit.c:1111
+#: g10/keyedit.c:1120
 msgid "Do you really want to delete this key? "
 msgstr "Vill du verkligen ta bort denna nyckel? "
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1141
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Vill du verkligen �terkalla de valda nycklarna? "
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1142
 msgid "Do you really want to revoke this key? "
 msgstr "Vill du verkligen �terkalla denna nyckel? "
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1206
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? "
 msgstr "Vill du verkligen ta bort alla valda anv�ndaridentiteter? "
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1208
 #, fuzzy
 msgid "Really update the preferences? "
 msgstr "Vill du verkligen skapa �terkallelsecertifikaten? (j/N)"
 
-#: g10/keyedit.c:1237
+#: g10/keyedit.c:1246
 msgid "Save changes? "
 msgstr "Spara �ndringarna? "
 
-#: g10/keyedit.c:1240
+#: g10/keyedit.c:1249
 msgid "Quit without saving? "
 msgstr "Avsluta utan att spara? "
 
-#: g10/keyedit.c:1251
+#: g10/keyedit.c:1260
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
 
-#: g10/keyedit.c:1258
+#: g10/keyedit.c:1267
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1274
 msgid "Key not changed so no update needed.\n"
 msgstr "Nyckeln �r of�r�ndrad s� det beh�vs ingen uppdatering.\n"
 
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1285
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ogiltigt kommando (f�rs�k med \"help\")\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1433
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s%s\n"
 msgstr "VARNING: Denna nyckel har �terkallats av sin �gare!\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1436
 msgid " (sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:1432 g10/keyedit.c:1458
+#: g10/keyedit.c:1441 g10/keyedit.c:1467
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1450
 #, c-format
 msgid " trust: %c/%c"
 msgstr ""
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1454
 msgid "This key has been disabled"
 msgstr "Denna nyckel har deaktiverats"
 
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1483
 #, fuzzy, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "rev! en undernyckel har �terkallats: %s\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1486
 #, fuzzy
 msgid "rev- faked revocation found\n"
 msgstr "rev- fel �terkallelser av nycklar\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1488
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1598
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
 msgstr ""
 
-#: g10/keyedit.c:1593 g10/keyedit.c:1620
+#: g10/keyedit.c:1602 g10/keyedit.c:1629
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/n) "
 msgstr "�r du s�ker p� att du vill ha denna nyckelstorlek? "
 
-#: g10/keyedit.c:1601
+#: g10/keyedit.c:1610
 msgid "You may only have one photo ID on a key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1624
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1626
+#: g10/keyedit.c:1635
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1757
+#: g10/keyedit.c:1766
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:1770
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1774
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna ok�nda signatur? (j/N/a)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1780
 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:1785
+#: g10/keyedit.c:1794
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:1786
+#: g10/keyedit.c:1795
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Raderade %d signaturer.\n"
 
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1798
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1867
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Tag bort markeringar fr�n de hemliga nycklarna.\n"
 
-#: g10/keyedit.c:1864
+#: g10/keyedit.c:1873
 msgid "Please select at most one secondary key.\n"
 msgstr "V�lj som mest en sekund�r nyckel.\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1877
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "�ndrar giltighetstid f�r en sekund�r nyckel.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:1879
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�ndrar giltighetstid f�r den prim�ra nyckeln.\n"
 
-#: g10/keyedit.c:1912
+#: g10/keyedit.c:1921
 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:1928
+#: g10/keyedit.c:1937
 msgid "No corresponding signature in secret ring\n"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2018
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Du m�ste v�lja �tminstone en anv�ndaridentitet.\n"
 
-#: g10/keyedit.c:2184
+#: g10/keyedit.c:2193
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen anv�ndaridentitet med index %d\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2239
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ingen sekund�r nyckel med index %d\n"
 
-#: g10/keyedit.c:2328
+#: g10/keyedit.c:2337
 msgid "user ID: \""
 msgstr "anv�ndaridentitet: \""
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2342
 #, c-format
 msgid ""
 "\"\n"
@@ -3023,39 +3027,52 @@ msgstr ""
 "\"\n"
 "signerad med din nyckel %08lX %s\n"
 
-#: g10/keyedit.c:2335
+#: g10/keyedit.c:2345
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"locally signed with your key %08lX at %s\n"
+msgstr ""
+"\"\n"
+"signerad med din nyckel %08lX %s\n"
+
+#: g10/keyedit.c:2349
 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:2359
+#: g10/keyedit.c:2373
 msgid "You have signed these user IDs:\n"
 msgstr "Du har signerat f�ljande anv�ndaridentiteter:\n"
 
-#: g10/keyedit.c:2373
+#: g10/keyedit.c:2387
 #, fuzzy, c-format
-msgid "   signed by %08lX at %s%s\n"
+msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   signerad av %08lX %s\n"
 
-#: g10/keyedit.c:2380
+#: g10/keyedit.c:2395
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   �terkallad av %08lX %s\n"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2415
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du st�r i begrepp att �terkalla dessa signaturer:\n"
 
-#: g10/keyedit.c:2410
-#, c-format
-msgid "   signed by %08lX at %s\n"
+#: g10/keyedit.c:2425
+#, fuzzy, c-format
+msgid "   signed by %08lX at %s%s\n"
 msgstr "   signerad av %08lX %s\n"
 
-#: g10/keyedit.c:2418
+#: g10/keyedit.c:2427
+msgid " (non-exportable)"
+msgstr ""
+
+#: g10/keyedit.c:2434
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Vill du verkligen skapa �terkallelsecertifikaten? (j/N)"
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2464
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
@@ -3270,12 +3287,12 @@ msgstr ""
 
 #: g10/misc.c:378
 #, c-format
-msgid "Warning: unsafe ownership on %s \"%s\"\n"
+msgid "warning: unsafe ownership on %s \"%s\"\n"
 msgstr ""
 
 #: g10/misc.c:410
 #, c-format
-msgid "Warning: unsafe permissions on %s \"%s\"\n"
+msgid "warning: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
 #: g10/misc.c:435
@@ -4191,7 +4208,7 @@ msgstr ""
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures fill be advanced by one second.\n"
+"self-signatures will be advanced by one second.\n"
 msgstr ""
 
 # ej klar, eller?
@@ -4332,6 +4349,12 @@ msgstr "r�kna upp nycklar och signaturer"
 msgid "%s: keyring created\n"
 msgstr "%s: nyckelring skapad\n"
 
+#~ msgid "Do you really need such a large keysize? "
+#~ msgstr "Beh�ver du verkligen en s� stor nyckelstorlek? "
+
+#~ msgid "   signed by %08lX at %s\n"
+#~ msgstr "   signerad av %08lX %s\n"
+
 #~ msgid "--delete-secret-key user-id"
 #~ msgstr "--delete-secret-key anv�ndaridentitet"
 
diff --git a/po/tr.po b/po/tr.po
index c91abd6b4..1d6a42400 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.7\n"
-"POT-Creation-Date: 2002-03-03 15:18+0100\n"
+"POT-Creation-Date: 2002-04-06 17:29+0200\n"
 "PO-Revision-Date: 2002-03-05 08:35+0200\n"
 "Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -20,7 +20,9 @@ msgstr "Uyarı: kullanılan bellek güvenli değil!\n"
 
 #: util/secmem.c:89
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
-msgstr "Daha geniş bilgi edinmek için http://www.gnupg.org/faq.html adresine bakınız\n"
+msgstr ""
+"Daha geniş bilgi edinmek için http://www.gnupg.org/faq.html adresine "
+"bakınız\n"
 
 #: util/secmem.c:326
 msgid "operation is not possible without initialized secure memory\n"
@@ -46,7 +48,7 @@ msgstr "hayır"
 msgid "nN"
 msgstr "hH"
 
-#: g10/keyedit.c:768 util/miscutil.c:326
+#: g10/keyedit.c:777 util/miscutil.c:326
 msgid "quit"
 msgstr "çıkış"
 
@@ -273,7 +275,7 @@ msgstr "... bu bir yazılım hatası (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "bir yazılım hatası buldunuz ... (%s:%d)\n"
 
-#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1552
+#: cipher/random.c:320 g10/import.c:145 g10/keygen.c:1547
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
@@ -350,7 +352,7 @@ msgstr ""
 "daha fazla rasgele bayt toplayabilmesi için işletim sistemine\n"
 "yardımcı olun! (%d bayt daha gerekiyor)\n"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid ""
 "@Commands:\n"
 " "
@@ -358,163 +360,163 @@ msgstr ""
 "@Komutlar:\n"
 " "
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "|[file]|make a signature"
 msgstr "|[dosya]|bir imza yapar"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosya]|açıkça okunabilen bir imza yapar"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "make a detached signature"
 msgstr "bağımsız bir imza yapar"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "encrypt data"
 msgstr "veriyi şifreler"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "|[files]|encrypt files"
 msgstr "|[dosyalar]|dosyalar şifrelenir"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "encryption only with symmetric cipher"
 msgstr "sadece simetrik şifre ile şifreler"
 
-#: g10/g10.c:285
+#: g10/g10.c:286
 msgid "store only"
 msgstr "sadece saklar"
 
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "decrypt data (default)"
 msgstr "veri şifresini açar (öntanımlı)"
 
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "|[files]|decrypt files"
 msgstr "|[dosyalar]|dosyaların şifresi açılır"
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "verify a signature"
 msgstr "bir imzayı doğrular"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "list keys"
 msgstr "anahtarları listeler"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "list keys and signatures"
 msgstr "anahtarları ve imzaları listeler"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "check key signatures"
 msgstr "anahtar imzalarını kontrol eder"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "list keys and fingerprints"
 msgstr "anahtarları ve parmak izlerini listeler"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "list secret keys"
 msgstr "gizli anahtarları listeler"
 
-#: g10/g10.c:296
+#: g10/g10.c:297
 msgid "generate a new key pair"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/g10.c:297
+#: g10/g10.c:298
 msgid "remove keys from the public keyring"
 msgstr "anahtarları genel anahtar zincirinden siler"
 
-#: g10/g10.c:299
+#: g10/g10.c:300
 msgid "remove keys from the secret keyring"
 msgstr "anahtarları gizli anahtar zincirinden siler"
 
-#: g10/g10.c:300
+#: g10/g10.c:301
 msgid "sign a key"
 msgstr "bir anahtarı imzalar"
 
-#: g10/g10.c:301
+#: g10/g10.c:302
 msgid "sign a key locally"
 msgstr "bir anahtarı yerel olarak imzalar"
 
-#: g10/g10.c:302
+#: g10/g10.c:303
 msgid "sign a key non-revocably"
 msgstr "bir anahtarı iptal edilemez olarak imzalar"
 
-#: g10/g10.c:303
+#: g10/g10.c:304
 msgid "sign a key locally and non-revocably"
 msgstr "bir anahtarı yerel ve iptal edilemez olarak imzalar"
 
-#: g10/g10.c:304
+#: g10/g10.c:305
 msgid "sign or edit a key"
 msgstr "bir anahtarı düzenler ve imzalar"
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "generate a revocation certificate"
 msgstr "bir yürürlükten kaldırma sertifikası üretir"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "export keys"
 msgstr "anahtarları gönderir"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "export keys to a key server"
 msgstr "anahtarları bir anahtar sunucusuna gönderir"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "import keys from a key server"
 msgstr "anahtarları bir anahtar sunucusundan indirir"
 
-#: g10/g10.c:310
+#: g10/g10.c:311
 msgid "search for keys on a key server"
 msgstr "bir anahtar sunucusunda anahtarları arar"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 msgid "update all keys from a keyserver"
 msgstr "anahtarları bir anahtar sunucusundan günceller"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "import/merge keys"
 msgstr "anahtarları indirir/katıştırır"
 
-#: g10/g10.c:318
+#: g10/g10.c:319
 msgid "list only the sequence of packets"
 msgstr "sadece paketlerin silsilesini listeler"
 
-#: g10/g10.c:320
+#: g10/g10.c:321
 msgid "export the ownertrust values"
 msgstr "sahibiningüvencesi değerlerini gönderir"
 
-#: g10/g10.c:322
+#: g10/g10.c:323
 msgid "import ownertrust values"
 msgstr "sahibiningüvencesi değerlerini indirir"
 
-#: g10/g10.c:324
+#: g10/g10.c:325
 msgid "update the trust database"
 msgstr "güvence veritabanını günceller"
 
-#: g10/g10.c:326
+#: g10/g10.c:327
 msgid "unattended trust database update"
 msgstr "bakımsız güvence veritabanının güncellemesi"
 
-#: g10/g10.c:327
+#: g10/g10.c:328
 msgid "fix a corrupted trust database"
 msgstr "bozulan güvence veritabanını onarır"
 
-#: g10/g10.c:328
+#: g10/g10.c:329
 msgid "De-Armor a file or stdin"
 msgstr "Bir dosya veya standart girdinin zırhını kaldırır"
 
-#: g10/g10.c:330
+#: g10/g10.c:331
 msgid "En-Armor a file or stdin"
 msgstr "Bir dosya veya standart girdiyi zırhlar"
 
-#: g10/g10.c:332
+#: g10/g10.c:333
 msgid "|algo [files]|print message digests"
 msgstr "|algo [dosyalar]|ileti özümlemelerini gösterir"
 
-#: g10/g10.c:336
+#: g10/g10.c:337
 msgid ""
 "@\n"
 "Options:\n"
@@ -524,196 +526,198 @@ msgstr ""
 "Seçenekler:\n"
 " "
 
-#: g10/g10.c:338
+#: g10/g10.c:339
 msgid "create ascii armored output"
 msgstr "ascii zırhlı çıktı oluşturur"
 
-#: g10/g10.c:340
+#: g10/g10.c:341
 msgid "|NAME|encrypt for NAME"
 msgstr "|İSİM|İSİM için şifreleme yapar"
 
-#: g10/g10.c:343
+#: g10/g10.c:344
 msgid "|NAME|use NAME as default recipient"
 msgstr "|İSİM|öntanımlı alıcı olarak İSİM kullanılır"
 
-#: g10/g10.c:345
+#: g10/g10.c:346
 msgid "use the default key as default recipient"
 msgstr "öntanımlı alıcı olarak öntanımlı anahtar kullanılır"
 
-#: g10/g10.c:350
+#: g10/g10.c:352
 msgid "use this user-id to sign or decrypt"
 msgstr "imzalamak ya da şifre çözmek için bu kullanıcı kimliği kullanılır"
 
-#: g10/g10.c:351
+#: g10/g10.c:353
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sıkıştırma seviyesi N olarak ayarlanır (0 ise sıkıştırma yapılmaz)"
 
-#: g10/g10.c:353
+#: g10/g10.c:355
 msgid "use canonical text mode"
 msgstr "kurallı metin kipini kullanır"
 
-#: g10/g10.c:360
+#: g10/g10.c:362
 msgid "use as output file"
 msgstr "çıktı dosyası olarak kullanılır"
 
-#: g10/g10.c:361
+#: g10/g10.c:363
 msgid "verbose"
 msgstr "çok detaylı"
 
-#: g10/g10.c:362
+#: g10/g10.c:364
 msgid "be somewhat more quiet"
 msgstr "daha az detaylı"
 
-#: g10/g10.c:363
+#: g10/g10.c:365
 msgid "don't use the terminal at all"
 msgstr "terminali hiç kullanma"
 
-#: g10/g10.c:364
+#: g10/g10.c:366
 msgid "force v3 signatures"
 msgstr "v3 imzalarına zorlar"
 
-#: g10/g10.c:365
+#: g10/g10.c:367
 msgid "do not force v3 signatures"
 msgstr "v3 imzalara zorlamaz"
 
-#: g10/g10.c:366
+#: g10/g10.c:368
 msgid "force v4 key signatures"
 msgstr "v4 imzalara zorlar"
 
-#: g10/g10.c:367
+#: g10/g10.c:369
 msgid "do not force v4 key signatures"
 msgstr "v4 imzalara zorlamaz"
 
-#: g10/g10.c:368
+#: g10/g10.c:370
 msgid "always use a MDC for encryption"
 msgstr "şifreleme için daima bir MDC kullanılır"
 
-#: g10/g10.c:370
+#: g10/g10.c:372
 msgid "never use a MDC for encryption"
 msgstr "şifreleme için asla bir MDC kullanılmaz"
 
-#: g10/g10.c:372
+#: g10/g10.c:374
 msgid "do not make any changes"
 msgstr "hiçbir değişiklik yapmaz"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:374
+#: g10/g10.c:376
 msgid "use the gpg-agent"
 msgstr "gpg-agent kullan"
 
-#: g10/g10.c:377
+#: g10/g10.c:379
 msgid "batch mode: never ask"
 msgstr "önceden belirlenmiş işlemler kipi: hiç sormaz"
 
-#: g10/g10.c:378
+#: g10/g10.c:380
 msgid "assume yes on most questions"
 msgstr "soruların çoğunda cevap evet farzedilir"
 
-#: g10/g10.c:379
+#: g10/g10.c:381
 msgid "assume no on most questions"
 msgstr "soruların çoğunda cevap hayır farzedilir"
 
-#: g10/g10.c:380
+#: g10/g10.c:382
 msgid "add this keyring to the list of keyrings"
 msgstr "bu anahtar zincirini anahtar zincirleri listesine ekler"
 
-#: g10/g10.c:381
+#: g10/g10.c:383
 msgid "add this secret keyring to the list"
 msgstr "bu gizli anahtar zincirini listeye ekler"
 
-#: g10/g10.c:382
+#: g10/g10.c:384
 msgid "show which keyring a listed key is on"
 msgstr "listedeki bir anahtarın hangi anahtar zincirinde olduğunu gösterir"
 
-#: g10/g10.c:383
+#: g10/g10.c:385
 msgid "|NAME|use NAME as default secret key"
 msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
 
-#: g10/g10.c:384
+#: g10/g10.c:386
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|MAKİNA|anahtarları aramak için bu anahtar sunucusu kullanılır"
 
-#: g10/g10.c:386
+#: g10/g10.c:388
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|İSİM|terminal karakter setini İSİM olarak ayarlar"
 
-#: g10/g10.c:387
+#: g10/g10.c:389
 msgid "read options from file"
 msgstr "seçenekleri dosyadan okur"
 
-#: g10/g10.c:391
+#: g10/g10.c:393
 msgid "|FD|write status info to this FD"
 msgstr "|FD|durum bilgisini bu FD'ye yazar"
 
-#: g10/g10.c:393
+#: g10/g10.c:395
 msgid "|[file]|write status info to file"
 msgstr "|[DOSYA]|durum bilgisini DOSYAya yazar"
 
-#: g10/g10.c:399
+#: g10/g10.c:401
 msgid "|KEYID|ultimately trust this key"
 msgstr "|ANHKİML|bu anahtar son derece güvenli"
 
-#: g10/g10.c:400
+#: g10/g10.c:402
 msgid "|FILE|load extension module FILE"
 msgstr "|DOSYA|genişletme modülü olarak DOSYA yüklenir"
 
-#: g10/g10.c:401
+#: g10/g10.c:403
 msgid "emulate the mode described in RFC1991"
 msgstr "RFC1991 de açıklanan kipi uygular"
 
-#: g10/g10.c:402
+#: g10/g10.c:404
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "tüm paket, şifre ve özümleme seçeneklerini OpenPGP tarzında ayarlar"
 
-#: g10/g10.c:403
+#: g10/g10.c:405
 msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 msgstr "tüm paket, şifre ve özümleme seçeneklerini PGP 2.x'e göre ayarlar"
 
-#: g10/g10.c:407
+#: g10/g10.c:409
 msgid "|N|use passphrase mode N"
 msgstr "|N|anahtar parolası kipi olarak N kullanılır"
 
-#: g10/g10.c:409
+#: g10/g10.c:411
 msgid "|NAME|use message digest algorithm NAME for passphrases"
-msgstr "|İSİM|anahtar parolaları için ileti özümleme algoritması olarak İSİM kullanılır"
+msgstr ""
+"|İSİM|anahtar parolaları için ileti özümleme algoritması olarak İSİM "
+"kullanılır"
 
-#: g10/g10.c:411
+#: g10/g10.c:413
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|İSİM|anahtar parolaları için şifre algoritması olarak İSİM kullanılır"
 
-#: g10/g10.c:412
+#: g10/g10.c:414
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|İSİM|şifre algoritması olarak İSİM kullanılır"
 
-#: g10/g10.c:413
+#: g10/g10.c:415
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|İSİM|özümleme algoritması olarak İSİM kullanılır"
 
-#: g10/g10.c:414
+#: g10/g10.c:416
 msgid "|N|use compress algorithm N"
 msgstr "|N|sıkıştırma algoritması olarak N kullanılır"
 
-#: g10/g10.c:415
+#: g10/g10.c:417
 msgid "throw keyid field of encrypted packets"
 msgstr "şifreli paketlerin anahtar-kimlik alanlarını atar"
 
-#: g10/g10.c:416
+#: g10/g10.c:418
 msgid "Show Photo IDs"
 msgstr "Foto kimliklerini gösterir"
 
-#: g10/g10.c:417
+#: g10/g10.c:419
 msgid "Don't show Photo IDs"
 msgstr "Foto kimliklerini göstermez"
 
-#: g10/g10.c:418
+#: g10/g10.c:420
 msgid "Set command line to view Photo IDs"
 msgstr "Komut satırını foto kimliklerini göstermeye ayarlar"
 
-#: g10/g10.c:419
+#: g10/g10.c:421
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|İSİM=DEĞER|veri bu nitelemeyle kullanılır"
 
-#: g10/g10.c:422
+#: g10/g10.c:424
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -721,7 +725,7 @@ msgstr ""
 "@\n"
 "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: g10/g10.c:425
+#: g10/g10.c:427
 msgid ""
 "@\n"
 "Examples:\n"
@@ -741,15 +745,15 @@ msgstr ""
 " --list-keys [isimler]      anahtarları listeler\n"
 " --fingerprint [isimler]    parmak izlerini gösterir\n"
 
-#: g10/g10.c:559
+#: g10/g10.c:561
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Yazılım hatalarını lütfen <[email protected]> adresine bildirin.\n"
 
-#: g10/g10.c:563
+#: g10/g10.c:565
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/g10.c:566
+#: g10/g10.c:568
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -759,238 +763,246 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/g10.c:577
+#: g10/g10.c:579
 msgid ""
 "\n"
 "Supported algorithms:\n"
-msgstr "\nDesteklenen algoritmalar:\n"
+msgstr ""
+"\n"
+"Desteklenen algoritmalar:\n"
 
-#: g10/g10.c:651
+#: g10/g10.c:653
 msgid "usage: gpg [options] "
 msgstr "kullanımı: gpg [seçenekler] "
 
-#: g10/g10.c:708
+#: g10/g10.c:710
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/g10.c:881
+#: g10/g10.c:883
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
 
-#: g10/g10.c:885
+#: g10/g10.c:887
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: g10/g10.c:892
+#: g10/g10.c:894
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: g10/g10.c:1174
+#: g10/g10.c:1176
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s geçerli bir karakter seti değil\n"
 
-#: g10/g10.c:1190
+#: g10/g10.c:1192
 msgid "could not parse keyserver URI\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/g10.c:1294
+#: g10/g10.c:1208
+#, c-format
+msgid "unable to set exec-path to %s\n"
+msgstr ""
+
+#: g10/g10.c:1309
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/g10.c:1298
+#: g10/g10.c:1313
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/g10.c:1305 g10/g10.c:1316
+#: g10/g10.c:1320 g10/g10.c:1331
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "BİLGİ: %s normal kullanım için değil!\n"
 
-#: g10/g10.c:1307 g10/g10.c:1327
+#: g10/g10.c:1322 g10/g10.c:1342
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/g10.c:1310
+#: g10/g10.c:1325
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/g10.c:1336
+#: g10/g10.c:1351
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2 kipinde sadece ayrık veya sade imzalar yapabilirsiniz\n"
 
-#: g10/g10.c:1342
+#: g10/g10.c:1357
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 kipinde aynı anda hem imzalama hem de şifreleme yapamazsınız\n"
 
-#: g10/g10.c:1348
+#: g10/g10.c:1363
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 ile çalışırken veri yolu yerine dosyaları kullanmalısınız.\n"
 
-#: g10/g10.c:1361
+#: g10/g10.c:1376
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1375 g10/sign.c:614
+#: g10/encode.c:287 g10/encode.c:349 g10/g10.c:1390 g10/sign.c:614
 #: g10/sign.c:792
 msgid "this message may not be usable by PGP 2.x\n"
 msgstr "bu ileti PGP 2.x tarafından kullanılamayabilir\n"
 
-#: g10/g10.c:1414 g10/g10.c:1426
+#: g10/g10.c:1429 g10/g10.c:1441
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/g10.c:1420 g10/g10.c:1432
+#: g10/g10.c:1435 g10/g10.c:1447
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özümleme algoritması geçersiz\n"
 
-#: g10/g10.c:1436
+#: g10/g10.c:1451
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
-#: g10/g10.c:1440
+#: g10/g10.c:1455
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/g10.c:1443
+#: g10/g10.c:1458
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "sıkıştırma algoritması %d..%d aralığında olmalı\n"
 
-#: g10/g10.c:1445
+#: g10/g10.c:1460
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/g10.c:1447
+#: g10/g10.c:1462
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/g10.c:1449
+#: g10/g10.c:1464
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "\"max-cert-depth\" 1 ile 255 arasında olmalı\n"
 
-#: g10/g10.c:1452
+#: g10/g10.c:1467
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/g10.c:1456
+#: g10/g10.c:1471
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n"
 
-#: g10/g10.c:1460
+#: g10/g10.c:1475
 msgid "invalid default-check-level; must be 0, 1, 2, or 3\n"
 msgstr "öntanımlı denetim seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n"
 
-#: g10/g10.c:1463
+#: g10/g10.c:1478
 msgid "invalid preferences\n"
 msgstr "tercihler geçersiz\n"
 
-#: g10/g10.c:1557
+#: g10/g10.c:1572
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
 
-#: g10/g10.c:1577
+#: g10/g10.c:1592
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/g10.c:1584
+#: g10/g10.c:1599
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/g10.c:1592
+#: g10/g10.c:1607
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/g10.c:1609
+#: g10/g10.c:1624
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/g10.c:1622
+#: g10/g10.c:1637
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/g10.c:1636
+#: g10/g10.c:1651
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/g10.c:1645
+#: g10/g10.c:1660
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/g10.c:1663
+#: g10/g10.c:1678
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/g10.c:1674
+#: g10/g10.c:1689
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/g10.c:1682
+#: g10/g10.c:1697
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/g10.c:1690
+#: g10/g10.c:1705
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key KULL-KML"
 
-#: g10/g10.c:1698
+#: g10/g10.c:1713
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key KULL-KML"
 
-#: g10/g10.c:1706
+#: g10/g10.c:1721
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/encode.c:307 g10/g10.c:1762 g10/sign.c:703
+#: g10/encode.c:307 g10/g10.c:1777 g10/sign.c:703
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s açılamadı: %s\n"
 
-#: g10/g10.c:1777
+#: g10/g10.c:1792
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kullanıcı-kimliği] [anahtar-zinciri]"
 
-#: g10/g10.c:1860
+#: g10/g10.c:1875
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/g10.c:1868
+#: g10/g10.c:1883
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/g10.c:1955
+#: g10/g10.c:1970
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' hash algoritması geçersiz\n"
 
-#: g10/g10.c:2041
+#: g10/g10.c:2056
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/g10.c:2045
+#: g10/g10.c:2060
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2048 g10/verify.c:94
+#: g10/decrypt.c:60 g10/decrypt.c:106 g10/g10.c:2063 g10/verify.c:94
 #: g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' açılamadı\n"
 
-#: g10/g10.c:2257
-msgid "the first character of a notation name must be a letter or an underscore\n"
+#: g10/g10.c:2272
+msgid ""
+"the first character of a notation name must be a letter or an underscore\n"
 msgstr "bir niteleme isminin ilk karakteri bir harf ya da altçizgi olmalı\n"
 
-#: g10/g10.c:2263
+#: g10/g10.c:2278
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -998,11 +1010,13 @@ msgstr ""
 "bir niteleme ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve "
 "sonuna bir '=' gelir.\n"
 
-#: g10/g10.c:2269
+#: g10/g10.c:2284
 msgid "dots in a notation name must be surrounded by other characters\n"
-msgstr "bir niteleme isminde noktalar diğer karakterler tarafından kuşatılmış olmalıdır\n"
+msgstr ""
+"bir niteleme isminde noktalar diğer karakterler tarafından kuşatılmış "
+"olmalıdır\n"
 
-#: g10/g10.c:2277
+#: g10/g10.c:2292
 msgid "a notation value must not use any control characters\n"
 msgstr "bir niteleme değerinde kontrol karakterleri kullanılamaz\n"
 
@@ -1075,8 +1089,11 @@ msgid "invalid armor: line longer than %d characters\n"
 msgstr "geçersiz zırh: satır %d karakterden uzun\n"
 
 #: g10/armor.c:1058
-msgid "quoted printable character in armor - probably a buggy MTA has been used\n"
-msgstr "zırh içinde uluslararası karakterler - büyük olasılıkla hatalı bir e-posta sunucusu kullanılmış\n"
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
+msgstr ""
+"zırh içinde uluslararası karakterler - büyük olasılıkla hatalı bir e-posta "
+"sunucusu kullanılmış\n"
 
 #: g10/pkclist.c:61
 msgid "No reason specified"
@@ -1179,7 +1196,8 @@ msgstr "Kararınız? "
 
 #: g10/pkclist.c:305
 msgid "Do you really want to set this key to ultimate trust? "
-msgstr "Bu anahtara gerçekten en yüksek güven derecesini vermek istiyor musunuz?"
+msgstr ""
+"Bu anahtara gerçekten en yüksek güven derecesini vermek istiyor musunuz?"
 
 #: g10/pkclist.c:317
 msgid "Certificates leading to an ultimately trusted key:\n"
@@ -1206,8 +1224,10 @@ msgstr "%08lX: anahtarın kullanım süresi dolmuş\n"
 
 #: g10/pkclist.c:434
 #, c-format
-msgid "%08lX: There is no indication that this key really belongs to the owner\n"
-msgstr "%08lX: Bu anahtarın gerçekten sahibine ait olduğuna dair bir belirti yok\n"
+msgid ""
+"%08lX: There is no indication that this key really belongs to the owner\n"
+msgstr ""
+"%08lX: Bu anahtarın gerçekten sahibine ait olduğuna dair bir belirti yok\n"
 
 #: g10/pkclist.c:440
 #, c-format
@@ -1256,7 +1276,8 @@ msgstr "         Bu imza sahte anlamına gelebilir.\n"
 
 #: g10/pkclist.c:561
 msgid "WARNING: This subkey has been revoked by its owner!\n"
-msgstr "UYARI: Bu yardımcı anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
+msgstr ""
+"UYARI: Bu yardımcı anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
 
 #: g10/pkclist.c:566
 msgid "Note: This key has been disabled.\n"
@@ -1271,7 +1292,8 @@ msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "UYARI: Bu anahtar güven dereceli bir imza ile sertifikalanmamış!\n"
 
 #: g10/pkclist.c:584
-msgid "         There is no indication that the signature belongs to the owner.\n"
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Bu imzanın sahibine ait olduğuna dair bir belirti yok.\n"
 
 #: g10/pkclist.c:592
@@ -1283,8 +1305,11 @@ msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Bu imza SAHTE olabilir.\n"
 
 #: g10/pkclist.c:601
-msgid "WARNING: This key is not certified with sufficiently trusted signatures!\n"
-msgstr "UYARI: Bu anahtar yeterli güven derecesine sahip imzalarla sertifikalanmamış!\n"
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgstr ""
+"UYARI: Bu anahtar yeterli güven derecesine sahip imzalarla "
+"sertifikalanmamış!\n"
 
 #: g10/pkclist.c:603
 msgid "         It is not certain that the signature belongs to the owner.\n"
@@ -1308,7 +1333,9 @@ msgstr "Bir kullanıcı kimliği belirtmediniz. (\"-r\" kullanabilirsiniz)\n"
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
-msgstr "\nKullanıcı kimliğini girin. Boş bir satır işlemi sonlandırır:"
+msgstr ""
+"\n"
+"Kullanıcı kimliğini girin. Boş bir satır işlemi sonlandırır:"
 
 #: g10/pkclist.c:768
 msgid "No such user ID.\n"
@@ -1411,7 +1438,7 @@ msgstr "   (%d) RSA (sadece imzalamak için)\n"
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (sadece şifrelemek için)\n"
 
-#: g10/keyedit.c:466 g10/keygen.c:776
+#: g10/keyedit.c:475 g10/keygen.c:776
 msgid "Your selection? "
 msgstr "Seçiminiz? "
 
@@ -1419,7 +1446,7 @@ msgstr "Seçiminiz? "
 msgid "The use of this algorithm is deprecated - create anyway? "
 msgstr "Bu algoritmanın kullanımı uygun değil - Yine de oluşturulsun mu?"
 
-#: g10/keyedit.c:479 g10/keygen.c:810
+#: g10/keyedit.c:488 g10/keygen.c:810
 msgid "Invalid selection.\n"
 msgstr "Seçim geçersiz.\n"
 
@@ -1446,7 +1473,8 @@ msgstr "DSA anahtarının uzunluğu 512 ile 1024 bit arasında olabilir\n"
 
 #: g10/keygen.c:839
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "anahtar uzunluğu çok küçük; RSA anahtarı için en küçük uzunluk: 1024 bit\n"
+msgstr ""
+"anahtar uzunluğu çok küçük; RSA anahtarı için en küçük uzunluk: 1024 bit\n"
 
 #: g10/keygen.c:842
 msgid "keysize too small; 768 is smallest value allowed.\n"
@@ -1485,21 +1513,17 @@ msgstr ""
 "Tamam, ama saldırılara çok duyarlı olan monitör ve klavye ışınımlarından "
 "kendinizi uzak tutun! (ne demekse...)\n"
 
-#: g10/keygen.c:870
-msgid "Do you really need such a large keysize? "
-msgstr "Bu kadar büyük anahtar uzunluğuna gerçekten ihtiyacınız var mı?"
-
-#: g10/keygen.c:876
+#: g10/keygen.c:871
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "İstenen anahtar uzunluğu: %u bit\n"
 
-#: g10/keygen.c:879 g10/keygen.c:883
+#: g10/keygen.c:874 g10/keygen.c:878
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u bite yuvarlandı\n"
 
-#: g10/keygen.c:934
+#: g10/keygen.c:929
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1515,7 +1539,7 @@ msgstr ""
 "      <n>m = anahtar n ay geçerli\n"
 "      <n>y = anahtar n yıl geçerli\n"
 
-#: g10/keygen.c:943
+#: g10/keygen.c:938
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -1531,30 +1555,30 @@ msgstr ""
 "      <n>m = imza n ay geçerli\n"
 "      <n>y = imza n yıl geçerli\n"
 
-#: g10/keygen.c:965
+#: g10/keygen.c:960
 msgid "Key is valid for? (0) "
 msgstr "Anahtar ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:967
+#: g10/keygen.c:962
 msgid "Signature is valid for? (0) "
 msgstr "İmza ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:972
+#: g10/keygen.c:967
 msgid "invalid value\n"
 msgstr "değer hatalı\n"
 
-#: g10/keygen.c:977
+#: g10/keygen.c:972
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s hep geçerli olacak\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:984
+#: g10/keygen.c:979
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s %s sonra geçersiz olacak\n"
 
-#: g10/keygen.c:990
+#: g10/keygen.c:985
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -1562,11 +1586,11 @@ msgstr ""
 "Sisteminiz 2038 yılından sonraki tarihleri gösteremiyor.\n"
 "Ama emin olun ki 2106 yılına kadar elde edilebilecek.\n"
 
-#: g10/keygen.c:995
+#: g10/keygen.c:990
 msgid "Is this correct (y/n)? "
 msgstr "Bu doğru mu? (e/h)? "
 
-#: g10/keygen.c:1038
+#: g10/keygen.c:1033
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1575,49 +1599,51 @@ msgid ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 msgstr ""
-"\nAnahtarınızın size ait olduğunu belirten bir Kullanıcı-Kimliği olmalı;\n"
+"\n"
+"Anahtarınızın size ait olduğunu belirten bir Kullanıcı-Kimliği olmalı;\n"
 "Kullanıcı-Kimliği, Gerçek İsminiz, Bir Önbilgi ve e-Posta Adresiniz\n"
 "alanlarının bir birleşiminden oluşur. Örneğin:\n"
-"\t\"Fatih Sultan Mehmed (Padisah) <[email protected]>\"\n\n"
+"\t\"Fatih Sultan Mehmed (Padisah) <[email protected]>\"\n"
+"\n"
 
-#: g10/keygen.c:1050
+#: g10/keygen.c:1045
 msgid "Real name: "
 msgstr "Adınız ve Soyadınız: "
 
-#: g10/keygen.c:1058
+#: g10/keygen.c:1053
 msgid "Invalid character in name\n"
 msgstr "Ad ve soyadınızda geçersiz karakter var\n"
 
-#: g10/keygen.c:1060
+#: g10/keygen.c:1055
 msgid "Name may not start with a digit\n"
 msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
 
-#: g10/keygen.c:1062
+#: g10/keygen.c:1057
 msgid "Name must be at least 5 characters long\n"
 msgstr "Ad ve soyadınız en az 5 harfli olmalı\n"
 
-#: g10/keygen.c:1070
+#: g10/keygen.c:1065
 msgid "Email address: "
 msgstr "E-posta adresiniz: "
 
-#: g10/keygen.c:1081
+#: g10/keygen.c:1076
 msgid "Not a valid email address\n"
 msgstr "geçerli bir E-posta adresi değil\n"
 
-#: g10/keygen.c:1089
+#: g10/keygen.c:1084
 msgid "Comment: "
 msgstr "Önbilgi: "
 
-#: g10/keygen.c:1095
+#: g10/keygen.c:1090
 msgid "Invalid character in comment\n"
 msgstr "Önbilgi alanında geçersiz karakter var\n"
 
-#: g10/keygen.c:1118
+#: g10/keygen.c:1113
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
 
-#: g10/keygen.c:1124
+#: g10/keygen.c:1119
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1628,42 +1654,48 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1128
+#: g10/keygen.c:1123
 msgid "Please don't put the email address into the real name or the comment\n"
-msgstr "Lütfen E-posta adresinizi Adı ve Soyadı veya Açıklama alanı içine koymayın\n"
+msgstr ""
+"Lütfen E-posta adresinizi Adı ve Soyadı veya Açıklama alanı içine koymayın\n"
 
-#: g10/keygen.c:1133
+#: g10/keygen.c:1128
 msgid "NnCcEeOoQq"
 msgstr "AaYyEeTtKk"
 
-#: g10/keygen.c:1143
+#: g10/keygen.c:1138
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da Çı(k)? "
 
-#: g10/keygen.c:1144
+#: g10/keygen.c:1139
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
-msgstr "(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da (T)amam/Çı(k)? "
+msgstr ""
+"(A)dı ve Soyadı, (Y)orum, (E)posta alanlarını değiştir ya da (T)amam/Çı(k)? "
 
-#: g10/keygen.c:1163
+#: g10/keygen.c:1158
 msgid "Please correct the error first\n"
 msgstr "Lütfen önce hatayı düzeltin\n"
 
-#: g10/keygen.c:1202
+#: g10/keygen.c:1197
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
-msgstr "Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n\n"
+msgstr ""
+"Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
+"\n"
 
-#: g10/keyedit.c:655 g10/keygen.c:1210
+#: g10/keyedit.c:664 g10/keygen.c:1205
 msgid "passphrase not correctly repeated; try again"
-msgstr "ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem tekrarlanacak"
+msgstr ""
+"ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem "
+"tekrarlanacak"
 
-#: g10/keygen.c:1211
+#: g10/keygen.c:1206
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1217
+#: g10/keygen.c:1212
 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"
@@ -1675,7 +1707,7 @@ msgstr ""
 "seçeneği ile kullanarak her zaman değiştirebilirsiniz.\n"
 "\n"
 
-#: g10/keygen.c:1238
+#: g10/keygen.c:1233
 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"
@@ -1683,57 +1715,58 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 "Bir miktar rasgele bayt üretilmesi gerekiyor. İlk üretim sırasında biraz\n"
-"hareket (klavyeyi kullanmak, fareyi hareket ettirmek, disklerden yararlanmak)\n"
+"hareket (klavyeyi kullanmak, fareyi hareket ettirmek, disklerden "
+"yararlanmak)\n"
 "iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
 "üretecine yardımcı olur. \n"
 
-#: g10/keygen.c:1728
+#: g10/keygen.c:1723
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "DSA anahtar çifti 1024 bit olacak.\n"
 
-#: g10/keygen.c:1782
+#: g10/keygen.c:1777
 msgid "Key generation canceled.\n"
 msgstr "Anahtar üretimi durduruldu.\n"
 
-#: g10/keygen.c:1870 g10/keygen.c:1950
+#: g10/keygen.c:1865 g10/keygen.c:1945
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "genel anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:1871 g10/keygen.c:1952
+#: g10/keygen.c:1866 g10/keygen.c:1947
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:1939
+#: g10/keygen.c:1934
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:1945
+#: g10/keygen.c:1940
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "yazılabilir bir gizli anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:1959
+#: g10/keygen.c:1954
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "`%s' genel anahtar zincirine yazılırken hata oluştu: %s\n"
 
-#: g10/keygen.c:1966
+#: g10/keygen.c:1961
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "`%s' gixli anahtar zincirine yazılırken hata oluştu: %s\n"
 
-#: g10/keygen.c:1986
+#: g10/keygen.c:1981
 msgid "public and secret key created and signed.\n"
 msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
 
-#: g10/keygen.c:1987
+#: g10/keygen.c:1982
 msgid "key marked as ultimately trusted.\n"
 msgstr "anahtar son derece güvenli olarak imlendi.\n"
 
-#: g10/keygen.c:1996
+#: g10/keygen.c:1991
 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"
@@ -1741,26 +1774,32 @@ msgstr ""
 "Bu anahtar şifreleme için kullanılamaz. Şifreleme için ikinci bir anahtarı\n"
 "\"--edit-key\" seçeneğini kullanarak üretebilirsiniz.\n"
 
-#: g10/keygen.c:2008 g10/keygen.c:2114
+#: g10/keygen.c:2003 g10/keygen.c:2109
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
 
-#: g10/keygen.c:2052 g10/sig-check.c:227 g10/sign.c:228
+#: g10/keygen.c:2047 g10/sig-check.c:227 g10/sign.c:228
 #, c-format
-msgid "key has been created %lu second in future (time warp or clock problem)\n"
-msgstr "anahtar %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
+msgstr ""
+"anahtar %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
 
-#: g10/keygen.c:2054 g10/sig-check.c:229 g10/sign.c:230
+#: g10/keygen.c:2049 g10/sig-check.c:229 g10/sign.c:230
 #, c-format
-msgid "key has been created %lu seconds in future (time warp or clock problem)\n"
-msgstr "anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat problemi)\n"
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
+msgstr ""
+"anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
+"problemi)\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2058
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
-msgstr "BİLGİ: v3 anahtarları için yardımcı anahtar üretimi OpenPGP uyumlu değildir\n"
+msgstr ""
+"BİLGİ: v3 anahtarları için yardımcı anahtar üretimi OpenPGP uyumlu değildir\n"
 
-#: g10/keygen.c:2090
+#: g10/keygen.c:2085
 msgid "Really create? "
 msgstr "Gerçekten oluşturulsun mu? "
 
@@ -1791,7 +1830,9 @@ msgstr "%s: UYARI: dosya boş\n"
 
 #: g10/encode.c:285
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
-msgstr "--pgp2 kipinde sadece 2048 bitlik RSA anahtarları ile şifreleme yapabilirsiniz\n"
+msgstr ""
+"--pgp2 kipinde sadece 2048 bitlik RSA anahtarları ile şifreleme "
+"yapabilirsiniz\n"
 
 #: g10/encode.c:313
 #, c-format
@@ -1799,7 +1840,8 @@ msgid "reading from `%s'\n"
 msgstr "`%s'den okunuyor\n"
 
 #: g10/encode.c:347
-msgid "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "tüm anahtarları şifrelemek için IDEA şifresi kullanılamaz.\n"
 
 #: g10/encode.c:563
@@ -1807,32 +1849,32 @@ msgstr "tüm anahtarları şifrelemek için IDEA şifresi kullanılamaz.\n"
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s %s için şifrelendi\n"
 
-#: g10/delkey.c:69 g10/export.c:142
+#: g10/delkey.c:69 g10/export.c:141
 #, c-format
 msgid "key `%s' not found: %s\n"
 msgstr "anahtar `%s' yok: %s\n"
 
-#: g10/delkey.c:77 g10/export.c:162
+#: g10/delkey.c:77 g10/export.c:161
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "anahtar bloğu okunurken hata: %s\n"
 
-#: g10/export.c:170
+#: g10/export.c:169
 #, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "%08lX anahtarı: bir RFC2440 anahtarı değil - atlandı\n"
 
-#: g10/export.c:181
+#: g10/export.c:180
 #, c-format
 msgid "key %08lX: not protected - skipped\n"
 msgstr "%08lX anahtarı: korunmamış - atlandı\n"
 
-#: g10/export.c:189
+#: g10/export.c:188
 #, c-format
 msgid "key %08lX: PGP 2.x style key - skipped\n"
 msgstr "%08lX anahtarı: PGP 2.x tarzı bir anahtar - atlandı\n"
 
-#: g10/export.c:255
+#: g10/export.c:254
 msgid "WARNING: nothing exported\n"
 msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
 
@@ -1847,9 +1889,10 @@ msgid "[User id not found]"
 msgstr "[Kullanıcı kimliği bulunamadı]"
 
 #: g10/getkey.c:1362
-#, c-format
-msgid "Invalid key %08lX made valid by --always-trust\n"
-msgstr "Geçersiz %08lX anahtarı --always-trust kullanılarak geçerli yapılıyor\n"
+#, fuzzy, c-format
+msgid "invalid key %08lX made valid by --always-trust\n"
+msgstr ""
+"Geçersiz %08lX anahtarı --always-trust kullanılarak geçerli yapılıyor\n"
 
 #: g10/getkey.c:1957
 #, c-format
@@ -2054,12 +2097,15 @@ msgstr "anahtar %08lX: gizli anahtar bulunamadı: %s\n"
 #: g10/import.c:704
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
-msgstr "anahtar %08lX: genel anahtar değil - yürürlükten kaldırma sertifikası uygulanamaz\n"
+msgstr ""
+"anahtar %08lX: genel anahtar değil - yürürlükten kaldırma sertifikası "
+"uygulanamaz\n"
 
 #: g10/import.c:744
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
-msgstr "anahtar %08lX: yürürlükten kaldırma sertifikası geçersiz: %s - reddedildi\n"
+msgstr ""
+"anahtar %08lX: yürürlükten kaldırma sertifikası geçersiz: %s - reddedildi\n"
 
 #: g10/import.c:775
 #, c-format
@@ -2118,12 +2164,14 @@ msgstr "anahtar %08lX: imza gönderilebilir değil (%02x sınıfı) - atlandı\n
 #: g10/import.c:952
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
-msgstr "anahtar %08lX: yürürlükten kaldırma sertifikası yanlış yerde - atlandı\n"
+msgstr ""
+"anahtar %08lX: yürürlükten kaldırma sertifikası yanlış yerde - atlandı\n"
 
 #: g10/import.c:969
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
-msgstr "anahtar %08lX: yürürlükten kaldırma sertifikası geçersiz: %s - atlandı\n"
+msgstr ""
+"anahtar %08lX: yürürlükten kaldırma sertifikası geçersiz: %s - atlandı\n"
 
 #: g10/import.c:1070
 #, c-format
@@ -2194,11 +2242,11 @@ msgstr "%d öz-imzası geçersiz kullanıcı kimliği saptandı\n"
 msgid "User ID \"%s\" is revoked.\n"
 msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı.\n"
 
-#: g10/keyedit.c:330 g10/keyedit.c:1004
+#: g10/keyedit.c:330 g10/keyedit.c:1013
 msgid "Are you sure you still want to sign it?\n"
 msgstr "Onu yine de imzalamak istiyor musunuz?\n"
 
-#: g10/keyedit.c:335 g10/keyedit.c:409 g10/keyedit.c:519 g10/keyedit.c:1007
+#: g10/keyedit.c:335 g10/keyedit.c:418 g10/keyedit.c:528 g10/keyedit.c:1016
 msgid "Really sign? "
 msgstr "Gerçekten imzalayacak mısınız? "
 
@@ -2213,39 +2261,43 @@ msgid ""
 "Do you want to promote it to a full exportable signature?\n"
 msgstr ""
 "\"%s\" üzerindeki imzanız\n"
-"dahili bir imza.\n\n"
+"dahili bir imza.\n"
+"\n"
 "Bu imzanın dışarda da geçerli hale getirilmesini istiyor musunuz?\n"
 
-#. Fixme: see whether there is a revocation in which
-#. * case we should allow to sign it again.
-#: g10/keyedit.c:374
+#: g10/keyedit.c:379
+#, fuzzy, c-format
+msgid "\"%s\" was already locally signed by key %08lX\n"
+msgstr "\"%1$s\" zaten %3$08lX anahtarıyla %2$s-imzalı\n"
+
+#: g10/keyedit.c:384
 #, c-format
 msgid "\"%s\" was already %ssigned by key %08lX\n"
 msgstr "\"%1$s\" zaten %3$08lX anahtarıyla %2$s-imzalı\n"
 
-#: g10/keyedit.c:387
+#: g10/keyedit.c:396
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "%08lX anahtarı ile imzalanacak hiçbir şey yok\n"
 
-#: g10/keyedit.c:402
+#: g10/keyedit.c:411
 msgid "This key has expired!"
 msgstr "Bu anahtarın kullanım süresi dolmuş!"
 
-#: g10/keyedit.c:406
+#: g10/keyedit.c:415
 msgid "  Are you sure you still want to sign it?\n"
 msgstr "  Onu yine de imzalamak istiyor musunuz?\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:429
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitiyor.\n"
 
-#: g10/keyedit.c:422
+#: g10/keyedit.c:431
 msgid "Do you want your signature to expire at the same time? (y/n) "
 msgstr "İmzanızın da bu kadar süre geçerli olmasını ister misiniz? (e/h) "
 
-#: g10/keyedit.c:450
+#: g10/keyedit.c:459
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2254,27 +2306,27 @@ msgstr ""
 "Bu anahtarın ismi yukarda yazılı kişiye ait olduğunu ne kadar dikkatli\n"
 "doğruladınız?  Bu sorunun cevabını bilmiyorsanız \"0\" yazın.\n"
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:463
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Cevabı bilmiyorum. %s\n"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:465
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Tamamen kontrol edildi.%s\n"
 
-#: g10/keyedit.c:458
+#: g10/keyedit.c:467
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) İlişkisel denetim yaptım.%s\n"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:469
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Çok dikkatli bir denetim yaptım.%s\n"
 
-#: g10/keyedit.c:485
+#: g10/keyedit.c:494
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -2282,525 +2334,542 @@ msgstr ""
 "Bu anahtarı kendi anahtarınızla imzalamak istediğinize gerçekten\n"
 "emin misiniz?: \""
 
-#: g10/keyedit.c:494
+#: g10/keyedit.c:503
 msgid ""
 "\n"
 "The signature will be marked as non-exportable.\n"
-msgstr "\nİmza dışarı gönderilemez olarak imlenecek.\n"
+msgstr ""
+"\n"
+"İmza dışarı gönderilemez olarak imlenecek.\n"
 
-#: g10/keyedit.c:498
+#: g10/keyedit.c:507
 msgid ""
 "\n"
 "The signature will be marked as non-revocable.\n"
-msgstr "\nİmza yürürlükten kaldırılamaz olarak imlenecek.\n"
+msgstr ""
+"\n"
+"İmza yürürlükten kaldırılamaz olarak imlenecek.\n"
 
-#: g10/keyedit.c:503
+#: g10/keyedit.c:512
 msgid ""
 "\n"
 "I have not checked this key at all.\n"
-msgstr "\nHer şeyiyle bu anahtarı kontol edemedim.\n"
+msgstr ""
+"\n"
+"Her şeyiyle bu anahtarı kontol edemedim.\n"
 
-#: g10/keyedit.c:507
+#: g10/keyedit.c:516
 msgid ""
 "\n"
 "I have checked this key casually.\n"
-msgstr "\nBu anahtarı karşılaştırmalı kontrol ettim.\n"
+msgstr ""
+"\n"
+"Bu anahtarı karşılaştırmalı kontrol ettim.\n"
 
-#: g10/keyedit.c:511
+#: g10/keyedit.c:520
 msgid ""
 "\n"
 "I have checked this key very carefully.\n"
-msgstr "\nBu anahtarı çok dikkatli kontrol ettim.\n"
+msgstr ""
+"\n"
+"Bu anahtarı çok dikkatli kontrol ettim.\n"
 
-#: g10/keyedit.c:552 g10/keyedit.c:2459 g10/keyedit.c:2521 g10/sign.c:273
+#: g10/keyedit.c:561 g10/keyedit.c:2476 g10/keyedit.c:2538 g10/sign.c:273
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "imzalama başarısız: %s\n"
 
-#: g10/keyedit.c:612
+#: g10/keyedit.c:621
 msgid "This key is not protected.\n"
 msgstr "Bu anahtar korunmamış.\n"
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:625
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
 
-#: g10/keyedit.c:620
+#: g10/keyedit.c:629
 msgid "Key is protected.\n"
 msgstr "Anahtar korunmuş.\n"
 
-#: g10/keyedit.c:640
+#: g10/keyedit.c:649
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Bu anahtar üzerinde düzenleme yapılamaz: %s\n"
 
-#: g10/keyedit.c:646
+#: g10/keyedit.c:655
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
-msgstr "Bu gizli anahtar için yeni anahtar parolasını giriniz.\n\n"
+msgstr ""
+"Bu gizli anahtar için yeni anahtar parolasını giriniz.\n"
+"\n"
 
-#: g10/keyedit.c:660
+#: g10/keyedit.c:669
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
-msgstr "Bir anahtar parolası vermediniz - bu çok *kötü* bir fikir!\n\n"
+msgstr ""
+"Bir anahtar parolası vermediniz - bu çok *kötü* bir fikir!\n"
+"\n"
 
-#: g10/keyedit.c:663
+#: g10/keyedit.c:672
 msgid "Do you really want to do this? "
 msgstr "Gerçekten bunu yapmak istiyor musunuz? "
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:736
 msgid "moving a key signature to the correct place\n"
 msgstr "bir anahtar imzası doğru yere taşınıyor\n"
 
-#: g10/keyedit.c:768
+#: g10/keyedit.c:777
 msgid "quit this menu"
 msgstr "bu menüden çık"
 
-#: g10/keyedit.c:769
+#: g10/keyedit.c:778
 msgid "q"
 msgstr "k"
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:779
 msgid "save"
 msgstr "kaydet"
 
-#: g10/keyedit.c:770
+#: g10/keyedit.c:779
 msgid "save and quit"
 msgstr "kaydet ve çık"
 
-#: g10/keyedit.c:771
+#: g10/keyedit.c:780
 msgid "help"
 msgstr "yardım"
 
-#: g10/keyedit.c:771
+#: g10/keyedit.c:780
 msgid "show this help"
 msgstr "bunu gösterir "
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:782
 msgid "fpr"
 msgstr "piz"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:782
 msgid "show fingerprint"
 msgstr "parmak izini göster"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:783
 msgid "list"
 msgstr "listele"
 
-#: g10/keyedit.c:774
+#: g10/keyedit.c:783
 msgid "list key and user IDs"
 msgstr "anahtarı ve kullanıcı kimliğini göster"
 
-#: g10/keyedit.c:775
+#: g10/keyedit.c:784
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:785
 msgid "uid"
 msgstr "kullkim"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:785
 msgid "select user ID N"
 msgstr "N kullanıcı kimliğini seçer"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:786
 msgid "key"
 msgstr "anahtar"
 
-#: g10/keyedit.c:777
+#: g10/keyedit.c:786
 msgid "select secondary key N"
 msgstr "N yardımcı anahtarını seçer"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:787
 msgid "check"
 msgstr "kontrol"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:787
 msgid "list signatures"
 msgstr "imzaları listele"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:788
 msgid "c"
 msgstr "k"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:789
 msgid "sign"
 msgstr "imzala"
 
-#: g10/keyedit.c:780
+#: g10/keyedit.c:789
 msgid "sign the key"
 msgstr "anahtarı imzalar"
 
-#: g10/keyedit.c:781
+#: g10/keyedit.c:790
 msgid "s"
 msgstr "i"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:791
 msgid "lsign"
 msgstr "yimza"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:791
 msgid "sign the key locally"
 msgstr "anahtarı yerel olarak imzala"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:792
 msgid "nrsign"
 msgstr "yksızimza"
 
-#: g10/keyedit.c:783
+#: g10/keyedit.c:792
 msgid "sign the key non-revocably"
 msgstr "yürürlükten kaldırılamayan imza"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:793
 msgid "nrlsign"
 msgstr "içyksızimza"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:793
 msgid "sign the key locally and non-revocably"
 msgstr "yürürlükten kaldırılamayan dahili imza"
 
-#: g10/keyedit.c:785
+#: g10/keyedit.c:794
 msgid "debug"
 msgstr "hata ayıklama"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:795
 msgid "adduid"
 msgstr "kullkimEkle"
 
-#: g10/keyedit.c:786
+#: g10/keyedit.c:795
 msgid "add a user ID"
 msgstr "bir kullanıcı kimliği ekler"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:796
 msgid "addphoto"
 msgstr "fotoekle"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:796
 msgid "add a photo ID"
 msgstr "bir foto kimliği ekler"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:797
 msgid "deluid"
 msgstr "kullkimSil"
 
-#: g10/keyedit.c:788
+#: g10/keyedit.c:797
 msgid "delete user ID"
 msgstr "kullanıcı kimliğini siler"
 
 #. delphoto is really deluid in disguise
-#: g10/keyedit.c:790
+#: g10/keyedit.c:799
 msgid "delphoto"
 msgstr "fotosil"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:800
 msgid "addkey"
 msgstr "anhEkle"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:800
 msgid "add a secondary key"
 msgstr "bir yardımcı anahtar ekler"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:801
 msgid "delkey"
 msgstr "anhSil"
 
-#: g10/keyedit.c:792
+#: g10/keyedit.c:801
 msgid "delete a secondary key"
 msgstr "bir yardımcı anahtar siler"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:802
 msgid "delsig"
 msgstr "imzaSil"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:802
 msgid "delete signatures"
 msgstr "imzaları siler"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:803
 msgid "expire"
 msgstr "sontarih"
 
-#: g10/keyedit.c:794
+#: g10/keyedit.c:803
 msgid "change the expire date"
 msgstr "son kullanım tarihini değiştirir"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:804
 msgid "primary"
 msgstr "asıl"
 
-#: g10/keyedit.c:795
+#: g10/keyedit.c:804
 msgid "flag user ID as primary"
 msgstr "kullanıcı kimliğini asıl olarak imler"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:805
 msgid "toggle"
 msgstr "seçmece"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:805
 msgid "toggle between secret and public key listing"
 msgstr "genel ve gizli anahtar listeleri arasında yer değiştirir"
 
-#: g10/keyedit.c:798
+#: g10/keyedit.c:807
 msgid "t"
 msgstr "b"
 
-#: g10/keyedit.c:799
+#: g10/keyedit.c:808
 msgid "pref"
 msgstr "önayar"
 
-#: g10/keyedit.c:799
+#: g10/keyedit.c:808
 msgid "list preferences (expert)"
 msgstr "tercihleri listeler (uzman)"
 
-#: g10/keyedit.c:800
+#: g10/keyedit.c:809
 msgid "showpref"
 msgstr "tercihgöst"
 
-#: g10/keyedit.c:800
+#: g10/keyedit.c:809
 msgid "list preferences (verbose)"
 msgstr "tercihleri listeler (ayrıntılı)"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:810
 msgid "setpref"
 msgstr "tercihyap"
 
-#: g10/keyedit.c:801
+#: g10/keyedit.c:810
 msgid "set preference list"
 msgstr "tercih listesi oluşturmak için"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:811
 msgid "updpref"
 msgstr "tercgüncel"
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:811
 msgid "updated preferences"
 msgstr "güncelenmiş tercihler"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:812
 msgid "passwd"
 msgstr "aparola"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:812
 msgid "change the passphrase"
 msgstr "anahtar parolasını değiştirir"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:813
 msgid "trust"
 msgstr "güvence"
 
-#: g10/keyedit.c:804
+#: g10/keyedit.c:813
 msgid "change the ownertrust"
 msgstr "sahibiningüvencesini değiştirir"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:814
 msgid "revsig"
 msgstr "imzayürkal"
 
-#: g10/keyedit.c:805
+#: g10/keyedit.c:814
 msgid "revoke signatures"
 msgstr "imzaları yürürlükten kaldırır"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:815
 msgid "revkey"
 msgstr "yürkalanh"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:815
 msgid "revoke a secondary key"
 msgstr "bir yardımcı anahtarı yürürlükten kaldırır"
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:816
 msgid "disable"
 msgstr "iptal"
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:816
 msgid "disable a key"
 msgstr "bir anahtarı iptal eder"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:817
 msgid "enable"
 msgstr "kullan"
 
-#: g10/keyedit.c:808
+#: g10/keyedit.c:817
 msgid "enable a key"
 msgstr "bir anahtarı kullanıma sokar"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:818
 msgid "showphoto"
 msgstr "fotogöst"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:818
 msgid "show photo ID"
 msgstr "foto kimliğini gösterir"
 
-#: g10/delkey.c:112 g10/keyedit.c:829
+#: g10/delkey.c:112 g10/keyedit.c:838
 msgid "can't do that in batchmode\n"
 msgstr "bu önceden belirlenmiş işlemler kipinde (in batchmode) yapılamaz\n"
 
-#: g10/keyedit.c:866
+#: g10/keyedit.c:875
 #, c-format
 msgid "error reading secret keyblock `%s': %s\n"
 msgstr "gizli anahtar bloğu `%s' okunurken hata oluştu: %s\n"
 
-#: g10/keyedit.c:884
+#: g10/keyedit.c:893
 msgid "Secret key is available.\n"
 msgstr "Gizli anahtar mevcut.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:924
 msgid "Command> "
 msgstr "Komut> "
 
-#: g10/keyedit.c:947
+#: g10/keyedit.c:956
 msgid "Need the secret key to do this.\n"
 msgstr "Bunu yapmak için gizli anahtar gerekli.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:960
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "lütfen önce \"seçmece\" komutunu kullanın.\n"
 
-#: g10/keyedit.c:1000
+#: g10/keyedit.c:1009
 msgid "Key is revoked.\n"
 msgstr "Anahtar yürürlükten kaldırıldı.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1025
 msgid "Really sign all user IDs? "
 msgstr "Tüm kullanıcı kimlikleri gerçekten imzalanacak mı? "
 
-#: g10/keyedit.c:1017
+#: g10/keyedit.c:1026
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "İpucu: İmzalamak için bir kullanıcı kimliği seçiniz\n"
 
-#: g10/keyedit.c:1042
+#: g10/keyedit.c:1051
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s kipindeyken bu komut kullanılamaz.\n"
 
-#: g10/keyedit.c:1062 g10/keyedit.c:1083
+#: g10/keyedit.c:1071 g10/keyedit.c:1092
 msgid "You must select at least one user ID.\n"
 msgstr "En az bir kullanıcı kimliği seçmelisiniz.\n"
 
-#: g10/keyedit.c:1064
+#: g10/keyedit.c:1073
 msgid "You can't delete the last user ID!\n"
 msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
 
-#: g10/keyedit.c:1067
+#: g10/keyedit.c:1076
 msgid "Really remove all selected user IDs? "
 msgstr "Seçilen tüm kullanıcı kimlikleri gerçekten silinecek mi? "
 
-#: g10/keyedit.c:1068
+#: g10/keyedit.c:1077
 msgid "Really remove this user ID? "
 msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? "
 
-#: g10/keyedit.c:1106 g10/keyedit.c:1128
+#: g10/keyedit.c:1115 g10/keyedit.c:1137
 msgid "You must select at least one key.\n"
 msgstr "En az bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1110
+#: g10/keyedit.c:1119
 msgid "Do you really want to delete the selected keys? "
 msgstr "Seçilen anahtarları gerçekten silmek istiyor musunuz? "
 
-#: g10/keyedit.c:1111
+#: g10/keyedit.c:1120
 msgid "Do you really want to delete this key? "
 msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? "
 
-#: g10/keyedit.c:1132
+#: g10/keyedit.c:1141
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Seçilen anahtarları gerçekten yürürlükten kaldırmak istiyor musunuz? "
 
-#: g10/keyedit.c:1133
+#: g10/keyedit.c:1142
 msgid "Do you really want to revoke this key? "
 msgstr "Bu anahtarı gerçekten yürürlükten kaldırmak istiyor musunuz? "
 
-#: g10/keyedit.c:1197
+#: g10/keyedit.c:1206
 msgid "Really update the preferences for the selected user IDs? "
-msgstr "Seçilen kullanıcı kimlik için tercihleri gerçekten güncellemek istiyor musunuz? "
+msgstr ""
+"Seçilen kullanıcı kimlik için tercihleri gerçekten güncellemek istiyor "
+"musunuz? "
 
-#: g10/keyedit.c:1199
+#: g10/keyedit.c:1208
 msgid "Really update the preferences? "
 msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? "
 
-#: g10/keyedit.c:1237
+#: g10/keyedit.c:1246
 msgid "Save changes? "
 msgstr "Değişiklikler kaydedilecek mi? "
 
-#: g10/keyedit.c:1240
+#: g10/keyedit.c:1249
 msgid "Quit without saving? "
 msgstr "Kaydetmeden çıkılsın mı? "
 
-#: g10/keyedit.c:1251
+#: g10/keyedit.c:1260
 #, c-format
 msgid "update failed: %s\n"
 msgstr "güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:1258
+#: g10/keyedit.c:1267
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gizliyi güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1274
 msgid "Key not changed so no update needed.\n"
 msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
 
-#: g10/keyedit.c:1276
+#: g10/keyedit.c:1285
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"yardım\" komutunu deneyin)\n"
 
-#: g10/keyedit.c:1424
+#: g10/keyedit.c:1433
 #, c-format
 msgid "This key may be revoked by %s key %s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1436
 msgid " (sensitive)"
 msgstr " (duyarlı)"
 
-#: g10/keyedit.c:1432 g10/keyedit.c:1458
+#: g10/keyedit.c:1441 g10/keyedit.c:1467
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
 msgstr "%s%c %4u%c/%08lX  üretildi: %s son kullanma tarihi: %s"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1450
 #, c-format
 msgid " trust: %c/%c"
 msgstr " güven derecesi: %c/%c"
 
-#: g10/keyedit.c:1445
+#: g10/keyedit.c:1454
 msgid "This key has been disabled"
 msgstr "Bu anahtar iptal edilmişti"
 
-#: g10/keyedit.c:1474
+#: g10/keyedit.c:1483
 #, c-format
 msgid "rev! subkey has been revoked: %s\n"
 msgstr "yürkal! yardımcı anahtar yürürlülükten kaldırıldı: %s\n"
 
-#: g10/keyedit.c:1477
+#: g10/keyedit.c:1486
 msgid "rev- faked revocation found\n"
 msgstr "yürkal- sahte yürürlükten kaldırma sertifikası bulundu\n"
 
-#: g10/keyedit.c:1479
+#: g10/keyedit.c:1488
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
 msgstr "yürkal? Yürürlükten kaldırma denetlenirken problem: %s\n"
 
-#: g10/keyedit.c:1589
+#: g10/keyedit.c:1598
 msgid ""
 "WARNING: This key already has a photo ID.\n"
 "         Adding another photo ID may confuse some versions of PGP.\n"
 msgstr ""
 "UYARI: Bu anahtarın zaten bir foto kimliği var.\n"
-"    Başka bir foto kimliği eklemek PGP'in bazı sürümleriyle uyumsuz olabilir.\n"
+"    Başka bir foto kimliği eklemek PGP'in bazı sürümleriyle uyumsuz "
+"olabilir.\n"
 
-#: g10/keyedit.c:1593 g10/keyedit.c:1620
+#: g10/keyedit.c:1602 g10/keyedit.c:1629
 msgid "Are you sure you still want to add it? (y/n) "
 msgstr "Onu yine de eklemek istiyor musunuz? (e/h)"
 
-#: g10/keyedit.c:1601
+#: g10/keyedit.c:1610
 msgid "You may only have one photo ID on a key.\n"
 msgstr "Bir anahtarın sadece bir foto kimliği olabilir.\n"
 
-#: g10/keyedit.c:1615
+#: g10/keyedit.c:1624
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -2809,83 +2878,83 @@ msgstr ""
 "UYARI: Bu PGP-2 tarzı bir anahtar. Bir foto kimliği eklenmesi bu anahtarın\n"
 "       bazı PGP sürümleri tarafından reddedilmesi ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:1626
+#: g10/keyedit.c:1635
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2 tarzı bir anahtara bir foto kimliği ekleyemeyebilirsiniz.\n"
 
-#: g10/keyedit.c:1757
+#: g10/keyedit.c:1766
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Bu doğru imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:1761
+#: g10/keyedit.c:1770
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Bu geçersiz imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:1765
+#: g10/keyedit.c:1774
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1780
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Bu öz-imza gerçekten silinecek mi? (e/H)"
 
-#: g10/keyedit.c:1785
+#: g10/keyedit.c:1794
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:1786
+#: g10/keyedit.c:1795
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1798
 msgid "Nothing deleted.\n"
 msgstr "Hiçbir şey silinmedi.\n"
 
-#: g10/keyedit.c:1858
+#: g10/keyedit.c:1867
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n"
 
-#: g10/keyedit.c:1864
+#: g10/keyedit.c:1873
 msgid "Please select at most one secondary key.\n"
 msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
 
-#: g10/keyedit.c:1868
+#: g10/keyedit.c:1877
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Bir yardımcı anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:1870
+#: g10/keyedit.c:1879
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Asıl anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:1912
+#: g10/keyedit.c:1921
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Bir v3 anahtarının son kullanma tarihini değiştiremezsiniz\n"
 
-#: g10/keyedit.c:1928
+#: g10/keyedit.c:1937
 msgid "No corresponding signature in secret ring\n"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/keyedit.c:2009
+#: g10/keyedit.c:2018
 msgid "Please select exactly one user ID.\n"
 msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
 
-#: g10/keyedit.c:2184
+#: g10/keyedit.c:2193
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:2230
+#: g10/keyedit.c:2239
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "%d endeksine sahip yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:2328
+#: g10/keyedit.c:2337
 msgid "user ID: \""
 msgstr "Kullanıcı kimliği: \""
 
-#: g10/keyedit.c:2331
+#: g10/keyedit.c:2342
 #, c-format
 msgid ""
 "\"\n"
@@ -2894,39 +2963,54 @@ msgstr ""
 "\"\n"
 " %08lX anahtarınızla %s de imzalandı\n"
 
-#: g10/keyedit.c:2335
+#: g10/keyedit.c:2345
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"locally signed with your key %08lX at %s\n"
+msgstr ""
+"\"\n"
+" %08lX anahtarınızla %s de imzalandı\n"
+
+#: g10/keyedit.c:2349
 msgid "Create a revocation certificate for this signature? (y/N)"
-msgstr "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H)"
+msgstr ""
+"Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H)"
 
 #. FIXME: detect duplicates here
-#: g10/keyedit.c:2359
+#: g10/keyedit.c:2373
 msgid "You have signed these user IDs:\n"
 msgstr "Bu kullanıcı kimliklerini imzalamışsınız:\n"
 
-#: g10/keyedit.c:2373
-#, c-format
-msgid "   signed by %08lX at %s%s\n"
+#: g10/keyedit.c:2387
+#, fuzzy, c-format
+msgid "   signed by %08lX at %s%s%s\n"
 msgstr "   %08lX ile %s%s de imzalanmış\n"
 
-#: g10/keyedit.c:2380
+#: g10/keyedit.c:2395
 #, c-format
 msgid "   revoked by %08lX at %s\n"
 msgstr "   %08lX tarafından %s de yürürlükten kaldırılmış\n"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2415
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:2410
+#: g10/keyedit.c:2425
 #, c-format
-msgid "   signed by %08lX at %s\n"
-msgstr "   %08lX tarafından %s de imzalanmış\n"
+msgid "   signed by %08lX at %s%s\n"
+msgstr "   %08lX ile %s%s de imzalanmış\n"
 
-#: g10/keyedit.c:2418
+#: g10/keyedit.c:2427
+msgid " (non-exportable)"
+msgstr ""
+
+#: g10/keyedit.c:2434
 msgid "Really create the revocation certificates? (y/N)"
-msgstr "Bu yürürlükten kaldırma sertifikalarını gerçekten oluşturacak mısınız? (e/H)"
+msgstr ""
+"Bu yürürlükten kaldırma sertifikalarını gerçekten oluşturacak mısınız? (e/H)"
 
-#: g10/keyedit.c:2447
+#: g10/keyedit.c:2464
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
@@ -3017,7 +3101,8 @@ msgstr "%s şifreli veri varsayılıyor\n"
 #: g10/mainproc.c:436
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
-msgstr "IDEA şifre kullanışsız, iyimserlikle yerine %s kullanılmaya çalışılıyor\n"
+msgstr ""
+"IDEA şifre kullanışsız, iyimserlikle yerine %s kullanılmaya çalışılıyor\n"
 
 #: g10/mainproc.c:466
 msgid "decryption okay\n"
@@ -3043,7 +3128,8 @@ msgstr "özgün dosya adı = '%.*s'\n"
 
 #: g10/mainproc.c:668
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
-msgstr "tek başına yürürlükten kaldırma - uygulamak için \"gpg --import\" kullanın\n"
+msgstr ""
+"tek başına yürürlükten kaldırma - uygulamak için \"gpg --import\" kullanın\n"
 
 #: g10/mainproc.c:729
 msgid "Notation: "
@@ -3120,16 +3206,17 @@ msgstr "Deneysel algoritmalar kullanılmamalı!\n"
 
 #: g10/misc.c:241
 msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
-msgstr "bu şifre algoritması standart dışı; lütfen daha standart birini kullanın!\n"
+msgstr ""
+"bu şifre algoritması standart dışı; lütfen daha standart birini kullanın!\n"
 
 #: g10/misc.c:378
-#, c-format
-msgid "Warning: unsafe ownership on %s \"%s\"\n"
+#, fuzzy, c-format
+msgid "warning: unsafe ownership on %s \"%s\"\n"
 msgstr "Uyarı: %s de güvensiz sahiplik \"%s\"\n"
 
 #: g10/misc.c:410
-#, c-format
-msgid "Warning: unsafe permissions on %s \"%s\"\n"
+#, fuzzy, c-format
+msgid "warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Uyarı: %s de güvensiz izinler \"%s\"\n"
 
 #: g10/misc.c:435
@@ -3137,9 +3224,11 @@ msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA şifre eklentisi yok\n"
 
 #: g10/misc.c:436
-msgid "please see http://www.gnupg.org/why-not-idea.html for more information\n"
+msgid ""
+"please see http://www.gnupg.org/why-not-idea.html for more information\n"
 msgstr ""
-"Daha fazla bilgi için lütfen http://www.gnupg.org/why-not-idea.html adresine\n"
+"Daha fazla bilgi için lütfen http://www.gnupg.org/why-not-idea.html "
+"adresine\n"
 "bakınız.\n"
 
 #: g10/parse-packet.c:119
@@ -3372,10 +3461,13 @@ msgstr "%s ...\n"
 
 #: g10/seckey-cert.c:244
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
-msgstr "UYARI: Zayıf anahtar saptandı - lütfen anahtar parolasını tekrar değiştirin.\n"
+msgstr ""
+"UYARI: Zayıf anahtar saptandı - lütfen anahtar parolasını tekrar "
+"değiştirin.\n"
 
 #: g10/sig-check.c:209
-msgid "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
+msgid ""
+"this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr "Bu, imzalar için güvenli olmayan PGP üretimi bir ElGamal anahtarı!\n"
 
 #: g10/sig-check.c:217
@@ -3398,7 +3490,9 @@ msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "Hatalı imzanın bilinmeyen bir kritik bitten kaynaklandığı sanılıyor\n"
 
 #: g10/sign.c:115
-msgid "WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
+#, c-format
+msgid ""
+"WARNING: unable to %%-expand policy url (too large).  Using unexpanded.\n"
 msgstr ""
 "UYARI: güvence adresinin uzatılması imkansız (çok büyük).\n"
 "Uzatılmadan kullanılıyor.\n"
@@ -3420,7 +3514,8 @@ msgstr "UYARI: \"%s\" dosyası boş\n"
 
 #: g10/sign.c:612
 msgid "you can only sign with PGP 2.x style keys while in --pgp2 mode\n"
-msgstr "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla imzalama yapabilirsiniz\n"
+msgstr ""
+"--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla imzalama yapabilirsiniz\n"
 
 #: g10/sign.c:637 g10/sign.c:806
 #, c-format
@@ -3577,7 +3672,8 @@ msgstr "%s: kayıt ekleme başarısız: %s\n"
 
 #: g10/tdbio.c:1439
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr "güvence veritabanı bozulmuş; lütfen \"gpg --fix-trustdb\" çalıştırın.\n"
+msgstr ""
+"güvence veritabanı bozulmuş; lütfen \"gpg --fix-trustdb\" çalıştırın.\n"
 
 #: g10/trustdb.c:202
 #, c-format
@@ -3734,10 +3830,12 @@ msgstr "%s: dizin oluşturuldu\n"
 
 #: g10/openfile.c:355
 msgid "you have to start GnuPG again, so it can read the new options file\n"
-msgstr "Yeni seçenekler dosyasının okunabilmesi için GnuPG yeniden başlatılmalıdır\n"
+msgstr ""
+"Yeni seçenekler dosyasının okunabilmesi için GnuPG yeniden başlatılmalıdır\n"
 
 #: g10/encr-data.c:91
-msgid "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "UYARI: ileti simetrik şifre içindeki zayıf bir anahtarla şifrelendi.\n"
 
 #: g10/encr-data.c:98
@@ -3751,7 +3849,9 @@ msgstr "zayıf anahtar oluşturuldu - yeniden deneniyor\n"
 #: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
-msgstr "simetrik şifre için zayıf anahtarın önlenmesi mümkün olamadı: %d kere denendi!\n"
+msgstr ""
+"simetrik şifre için zayıf anahtarın önlenmesi mümkün olamadı: %d kere "
+"denendi!\n"
 
 #: g10/delkey.c:116
 msgid "can't do that in batchmode without \"--yes\"\n"
@@ -3798,7 +3898,8 @@ msgid ""
 "ultimately trusted\n"
 msgstr ""
 "Web-of-Trust oluşturulabilmesi için GnuPG'ye hangi anahtarların son derece\n"
-"güvenli (bunlar gizli anahtarlarına erişiminiz olan anahtarlardır) olduğunun\n"
+"güvenli (bunlar gizli anahtarlarına erişiminiz olan anahtarlardır) "
+"olduğunun\n"
 "bildirilmesi gerekir. \"evet\" yanıtı bu anahtarın son derece güvenli\n"
 "olduğunun belirtilmesi için yeterlidir.\n"
 
@@ -3815,7 +3916,8 @@ msgstr ""
 " \"evet\" yazın."
 
 #: g10/helptext.c:68
-msgid "Enter the user ID of the addressee to whom you want to send the message."
+msgid ""
+"Enter the user ID of the addressee to whom you want to send the message."
 msgstr "Bu iletiyi göndereceğiniz adresin kullanıcı kimliğini giriniz."
 
 #: g10/helptext.c:72
@@ -3838,17 +3940,21 @@ msgid ""
 "this is the reason why the encryption only ElGamal key is not available in\n"
 "this menu."
 msgstr ""
-"Kullanılacak algoritmayı seçiniz.\n\n"
+"Kullanılacak algoritmayı seçiniz.\n"
+"\n"
 "DSA (DSS olarak da bilinir) sadece imzalar için kullanılan bir sayısal\n"
 "imza algoritmasıdır. Bu algoritma ElGamal algoritmasından çok daha hızlı\n"
-"doğrulandığı için önerilmektedir.\n\n"
+"doğrulandığı için önerilmektedir.\n"
+"\n"
 "ElGamal imzalar ve şifreleme için kullanılan bir algoritmadır.\n"
 "OpenPGP bu algoritmanın bu iki kullanımını birbirinden ayırır:\n"
-"sadece şifreleme ve imza+şifreleme; esas olarak aynı gibi görünmekle beraber\n"
+"sadece şifreleme ve imza+şifreleme; esas olarak aynı gibi görünmekle "
+"beraber\n"
 "imzalar için kullanılacak anahtarı oluşturacak bazı özel parametrelerin\n"
 "seçilmesini gerektirir: bu program bunu yapar ama diğer OpenPGP\n"
 "gerçeklemelerinin imza+şifreleme olayını anlaması gerekmiyorsa kullanmak\n"
-"anlamlı olur.\n\n"
+"anlamlı olur.\n"
+"\n"
 "İlk (asıl) anahtar imzalama yeteneğine sahip bir anahtar olmalıdır;\n"
 "bu durum, sadece şifreleme yapabilen ElGamal anahtarlarının neden menüde\n"
 "bulunmadığını açıklar."
@@ -3890,7 +3996,8 @@ msgstr "Anahtar tutucunun ismini giriniz"
 
 #: g10/helptext.c:130
 msgid "please enter an optional but highly suggested email address"
-msgstr "lütfen bir E-posta adresi girin (isteğe bağlı ancak kuvvetle tavsiye edilir)"
+msgstr ""
+"lütfen bir E-posta adresi girin (isteğe bağlı ancak kuvvetle tavsiye edilir)"
 
 #: g10/helptext.c:134
 msgid "Please enter an optional comment"
@@ -3955,7 +4062,8 @@ msgid ""
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
 "Bir anahtarı bir kullanıcı kimlikle imzalamadan önce kullanıcı kimliğin\n"
-"içindeki ismin, anahtarın sahibine ait olup olmadığını kontrol etmelisiniz.\n\n"
+"içindeki ismin, anahtarın sahibine ait olup olmadığını kontrol etmelisiniz.\n"
+"\n"
 "\"0\" bu kontrolu yapmadığınız ve yapmayı da bilmediğiniz anlamındadır.\n"
 "\"1\" anahtar size sahibi tarafından gönderildi ama siz bu anahtarı başka\n"
 "      kaynaklardan doğrulamadınız anlamındadır. Bu kişisel doğrulama için\n"
@@ -4033,10 +4141,11 @@ msgstr ""
 "kullanılabilir bir ikincisi var ise yapın."
 
 #: g10/helptext.c:231
+#, fuzzy
 msgid ""
 "Change the preferences of all user IDs (or just of the selected ones)\n"
 "to the current list of preferences.  The timestamp of all affected\n"
-"self-signatures fill be advanced by one second.\n"
+"self-signatures will be advanced by one second.\n"
 msgstr ""
 "Tüm kullanıcı kimlik tercihlerini (ya da seçilen birini) mevcut tercihler\n"
 "listesine çevirir. Tüm etkilenen öz-imzaların zaman damgaları bir sonraki\n"
@@ -4171,3 +4280,8 @@ msgstr "%lu anahtar denetlendi (%lu imza)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: anahtar zinciri oluşturuldu\n"
 
+#~ msgid "Do you really need such a large keysize? "
+#~ msgstr "Bu kadar büyük anahtar uzunluğuna gerçekten ihtiyacınız var mı?"
+
+#~ msgid "   signed by %08lX at %s\n"
+#~ msgstr "   %08lX tarafından %s de imzalanmış\n"
diff --git a/tools/mail-signed-keys b/tools/mail-signed-keys
index cee54b055..18709eedb 100755
--- a/tools/mail-signed-keys
+++ b/tools/mail-signed-keys
@@ -17,11 +17,13 @@ if [ "$1" = "--dry-run" ]; then
    shift
 fi
 
-if [ -z "$1" -o -z "$2" ]; then
-   echo "usage: mail-signed-keys keyring signedby" >&2
+if [ -z "$1" -o -z "$2" -o -z "$3" ]; then
+   echo "usage: mail-signed-keys keyring signedby signame" >&2
    exit 1
 fi
 
+signame="$3"
+
 if [ ! -f $1 ]; then
     echo "mail-signed-keys: '$1': no such file" >&2
     exit 1
@@ -30,7 +32,7 @@ fi
 [ -f '.#tdb.tmp' ] && rm '.#tdb.tmp'
 ro="--homedir . --no-options --trustdb-name=./.#tdb.tmp --dry-run --lock-never --no-default-keyring --keyring $1"
 
-signedby=`gpg $ro --fast-list-mode --list-keys --with-colons $2 \
+signedby=`gpg $ro --list-keys --with-colons $2 \
 	  2>/dev/null | awk -F: '$1=="pub" {print $5; exit 0}'`
 
 if [ -z "$signedby" ]; then
@@ -46,7 +48,8 @@ if [ "$dryrun" = "0" ]; then
 fi
 
 gpg $ro --check-sigs --with-colons 2>/dev/null \
-     | awk -F: -v signedby="$signedby" -v gpgopt="$ro" -v dryrun="$dryrun" '
+     | awk -F: -v signedby="$signedby" -v gpgopt="$ro" \
+       -v dryrun="$dryrun" -v signame="$signame"  '
 BEGIN	      { sendmail="/usr/lib/sendmail -oi -t " }
 $1 == "pub"   { nextkid=$5; nextuid=$10
 		if( uidcount > 0 ) { myflush() }
@@ -78,9 +81,10 @@ function myflush()
          print "Hi,"                                        | sendmail
          print ""                                           | sendmail
          print "Here you get back the signed key."          | sendmail
+	 print "Please send it yourself to a keyserver."    | sendmail
          print ""                                           | sendmail
-         print "ciao,"                                      | sendmail
-         print "     your Key Signator"                     | sendmail
+         print "Peace,"                                     | sendmail
+         print "      " signame                             | sendmail
          print ""                                           | sendmail
          cmd = "gpg " gpgopt " --export -a " kid " 2>/dev/null"
          while( (cmd | getline) > 0 ) {
diff --git a/util/ChangeLog b/util/ChangeLog
index f6040ef5c..89b5b695f 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,9 +1,17 @@
+2002-04-08  Werner Koch  <[email protected]>
+
+	Fixed filename of last entry.
+
 2002-03-29  David Shaw  <[email protected]>
 
-	* strgutil.c (print_string, utf8_to_native): If a delimiter is
+	* miscutil.c (print_string, utf8_to_native): If a delimiter is
 	used, then quote the backslash character as well.  Problem noted
 	by Rainer Perske.
 
+2002-03-15  Werner Koch  <[email protected]>
+
+	* argparse.c (optfile_parse): Fixed missing argument handling.
+
 2002-02-28  Timo Schulz  <[email protected]>
 
 	* http.c (write_server): Convert integer to a HANDLE for W32.
diff --git a/util/argparse.c b/util/argparse.c
index 96d4c2d51..8d54de9da 100644
--- a/util/argparse.c
+++ b/util/argparse.c
@@ -273,10 +273,12 @@ optfile_parse( FILE *fp, const char *filename, unsigned *lineno,
 		    arg->r_opt = -arg->r_opt;
 		if( !opts[idx].short_opt )   /* unknown command/option */
 		    arg->r_opt = (opts[idx].flags & 256)? -7:-2;
-		else if( (opts[idx].flags & 8) ) /* no argument */
-		    arg->r_opt = -3;	       /* error */
-		else			       /* no or optional argument */
+		else if( !(opts[idx].flags & 7) ) /* does not take an arg */
 		    arg->r_type = 0;	       /* okay */
+		else if( (opts[idx].flags & 8) )  /* argument is optional */
+                    arg->r_type = 0;	       /* okay */
+		else			       /* required argument */
+		    arg->r_opt = -3;	       /* error */
 		break;
 	    }
 	    else if( state == 3 ) {	       /* no argument found */