1.0.4c snapshot

27 files changed, 2142 insertions, 1822 deletions

diff --git a/AUTHORS b/AUTHORS
index 03f37abc9..2d32380ad 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -79,3 +79,4 @@ for GnuPG.
 
 The RPM specs file scripts/gnupg.spec has been contributed by
 several people.
+
diff --git a/NEWS b/NEWS
index 28ffeb278..426f81135 100644
--- a/NEWS
+++ b/NEWS
@@ -11,7 +11,8 @@
     * Secret keys are no longer imported unless you use the new option
       --allow-secret-key-import.
 
-    * Support for the gpg-agent from gpg 1.1
+    * Support for the gpg-agent from gpg 1.1 and other changes needed by
+      gpgme.
 
     * Better LFS support.
 
diff --git a/TODO b/TODO
index f3ee43892..c76a34286 100644
--- a/TODO
+++ b/TODO
@@ -1,10 +1,10 @@
 
+  * Can we output things like the preferences?      
+
   * Add Dave's UTS patches
 
   * Fix revoked subkey problem - see key 621cc013
 
-  * Don't display the "no secret for decryption available"
-
   ** Check whether the use of -u and --clearsign created 2 signatures.
      removed dups from the skclist.
 
@@ -20,10 +20,6 @@
   * If there is no secure memory, allocate more memory for the secure
     memory block or do it in all cases.
 
-  * for detached signatures:  Allow to specify a filedescriptor (maybe
-    we can use a generic way to specify filedescriptors - "-" is already
-    used to specify 0/1).
-
   * List all UserID with GOODSIG?
 
   * add a way to set expiration time for key signatures.
@@ -42,8 +38,6 @@
     use.  Depending on creation time would be nice too.  I think this is
     already done for the subkeys - check it.
 
-  * Fix localtime() in W32.
-
   * No TCP support yet for W32? arggg - should go into a separate program
     anyway.
 
@@ -87,7 +81,7 @@ Scheduled for 1.1
   * Delay the read of the passphrase-fd after a NEED_PASSPHRASE.  But this
     may break some scripts.
 
-  * Get new assembler stuff from gmgp 3.1
+  * Get new assembler stuff from gmp 3.1
 
 
 Nice to have
diff --git a/VERSION b/VERSION
index d99a1985e..a71955659 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.4b
+1.0.4c
diff --git a/checks/encryptp.test b/checks/encryptp.test
index c63fb822f..ca88d219e 100755
--- a/checks/encryptp.test
+++ b/checks/encryptp.test
@@ -4,7 +4,7 @@
 
 #info Checking encryption with a pipe
 for i in $plain_files $data_files ; do
-    $srcdir/run-gpg -e --yes -r "$usrname2" <$i | tee yy | $srcdir/run-gpg --yes > y
+    $srcdir/run-gpg -e --yes -r "$usrname2" <$i | $srcdir/run-gpg --yes > y
     cmp $i y || error "$i: mismatch"
 done
 
diff --git a/checks/run-gpg.patterns b/checks/run-gpg.patterns
index 9eb355e5b..76cf6073a 100644
--- a/checks/run-gpg.patterns
+++ b/checks/run-gpg.patterns
@@ -9,3 +9,5 @@ gpg: NOTE: secret key 439F02CA is NOT protected.
 gpg: WARNING: using insecure random number generator
 gpg: NOTE: signature key expired
 NOTE: this is a development version!
+gpg: encrypted with 
+"test two (no pp) <[email protected]>"
diff --git a/g10/ChangeLog b/g10/ChangeLog
index b4cf1cd7f..c3561d9f5 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,21 @@
+2000-12-19  Werner Koch  <[email protected]>
+
+	* status.c, status.h (cpr_get_no_help): New.
+	* keyedit.c (keyedit_menu): Use it here because we have our own
+	help list here.
+
+2000-12-18  Werner Koch  <[email protected]>
+
+	* mainproc.c (print_failed_pkenc): Don't print the sometimes
+	confusing message about unavailabe secret key.  Renamed ...
+	(print_pkenc_list): ... to this and introduced failed arg.
+	(proc_encrypted): Print the failed encryption keys and then
+	the one to be used.
+	(proc_pubkey_enc): Store also the key we are going to use.
+
+	* mainproc.c (check_sig_and_print): Don't list revoked user IDs.
+	(is_uid_revoked): New.
+
 2000-12-08  Werner Koch  <[email protected]>
 
 	* pipemode.c: Made the command work.  Currently only for
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 30302fa74..8faf141d5 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -695,7 +695,7 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
 		    have_commands = 0;
 	    }
 	    if( !have_commands ) {
-		answer = cpr_get("keyedit.prompt", _("Command> "));
+		answer = cpr_get_no_help("keyedit.prompt", _("Command> "));
 		cpr_kill_prompt();
 	    }
 	    trim_spaces(answer);
diff --git a/g10/mainproc.c b/g10/mainproc.c
index 3b1670094..884fc94a3 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -70,8 +70,7 @@ struct mainproc_context {
     IOBUF iobuf;    /* used to get the filename etc. */
     int trustletter; /* temp usage in list_node */
     ulong local_id;    /* ditto */
-    struct kidlist_item *failed_pkenc;	/* list of packets for which
-					   we do not have a secret key */
+    struct kidlist_item *pkenc_list;	/* list of encryption packets */
     struct {
         int op;
         int stop_now;
@@ -92,12 +91,12 @@ release_list( CTX c )
 	return;
     proc_tree(c, c->list );
     release_kbnode( c->list );
-    while( c->failed_pkenc ) {
-	struct kidlist_item *tmp = c->failed_pkenc->next;
-	m_free( c->failed_pkenc );
-	c->failed_pkenc = tmp;
+    while( c->pkenc_list ) {
+	struct kidlist_item *tmp = c->pkenc_list->next;
+	m_free( c->pkenc_list );
+	c->pkenc_list = tmp;
     }
-    c->failed_pkenc = NULL;
+    c->pkenc_list = NULL;
     c->list = NULL;
     c->have_data = 0;
     c->last_was_session_key = 0;
@@ -310,27 +309,30 @@ proc_pubkey_enc( CTX c, PACKET *pkt )
 
     if( result == -1 )
 	;
-    else if( !result ) {
-	if( opt.verbose > 1 )
-	    log_info( _("public key encrypted data: good DEK\n") );
-	if ( opt.show_session_key ) {
-	    int i;
-	    char *buf = m_alloc ( c->dek->keylen*2 + 20 );
-	    sprintf ( buf, "%d:", c->dek->algo );
-	    for(i=0; i < c->dek->keylen; i++ )
-		sprintf(buf+strlen(buf), "%02X", c->dek->key[i] );
-	    log_info( "session key: \"%s\"\n", buf );
-	    write_status_text ( STATUS_SESSION_KEY, buf );
-	}
-    }
-    else { /* store it for later display */
-	struct kidlist_item *x = m_alloc( sizeof *x );
-	x->kid[0] = enc->keyid[0];
-	x->kid[1] = enc->keyid[1];
-	x->pubkey_algo = enc->pubkey_algo;
-	x->reason = result;
-	x->next = c->failed_pkenc;
-	c->failed_pkenc = x;
+    else {
+        if( !result ) {
+            if( opt.verbose > 1 )
+                log_info( _("public key encrypted data: good DEK\n") );
+            if ( opt.show_session_key ) {
+                int i;
+                char *buf = m_alloc ( c->dek->keylen*2 + 20 );
+                sprintf ( buf, "%d:", c->dek->algo );
+                for(i=0; i < c->dek->keylen; i++ )
+                    sprintf(buf+strlen(buf), "%02X", c->dek->key[i] );
+                log_info( "session key: \"%s\"\n", buf );
+                write_status_text ( STATUS_SESSION_KEY, buf );
+            }
+        }
+        /* store it for later display */
+        {
+            struct kidlist_item *x = m_alloc( sizeof *x );
+            x->kid[0] = enc->keyid[0];
+            x->kid[1] = enc->keyid[1];
+            x->pubkey_algo = enc->pubkey_algo;
+            x->reason = result;
+            x->next = c->pkenc_list;
+            c->pkenc_list = x;
+        }
     }
     free_packet(pkt);
 }
@@ -342,11 +344,19 @@ proc_pubkey_enc( CTX c, PACKET *pkt )
  * not decrypt.
  */
 static void
-print_failed_pkenc( struct kidlist_item *list )
+print_pkenc_list( struct kidlist_item *list, int failed )
 {
     for( ; list; list = list->next ) {
-	PKT_public_key *pk = m_alloc_clear( sizeof *pk );
-	const char *algstr = pubkey_algo_to_string( list->pubkey_algo );
+	PKT_public_key *pk;
+	const char *algstr;
+        
+        if ( failed && !list->reason )
+            continue;
+        if ( !failed && list->reason )
+            continue;
+
+        algstr = pubkey_algo_to_string( list->pubkey_algo );
+        pk = m_alloc_clear( sizeof *pk );
 
 	if( !algstr )
 	    algstr = "[?]";
@@ -370,7 +380,6 @@ print_failed_pkenc( struct kidlist_item *list )
 	free_public_key( pk );
 
 	if( list->reason == G10ERR_NO_SECKEY ) {
-	    log_info(_("no secret key for decryption available\n"));
 	    if( is_status_enabled() ) {
 		char buf[20];
 		sprintf(buf,"%08lX%08lX", (ulong)list->kid[0],
@@ -378,7 +387,7 @@ print_failed_pkenc( struct kidlist_item *list )
 		write_status_text( STATUS_NO_SECKEY, buf );
 	    }
 	}
-	else
+	else if (list->reason)
 	    log_error(_("public key decryption failed: %s\n"),
 						g10_errstr(list->reason));
     }
@@ -390,7 +399,8 @@ proc_encrypted( CTX c, PACKET *pkt )
 {
     int result = 0;
 
-    print_failed_pkenc( c->failed_pkenc );
+    print_pkenc_list( c->pkenc_list, 1 );
+    print_pkenc_list( c->pkenc_list, 0 );
 
     write_status( STATUS_BEGIN_DECRYPTION );
 
@@ -1150,6 +1160,68 @@ do_proc_packets( CTX c, IOBUF a )
 }
 
 
+/* fixme: This code is a duplicate fro keylist.c and should be replaced
+ * by flags set in getkey.c.  gpg 1.1 already does this */
+static int
+is_uid_revoked ( KBNODE keyblock, KBNODE uidnode, u32 *mainkid )
+{
+    KBNODE node;
+    PKT_signature *selfsig = NULL; /* the latest valid self signature */
+
+    assert ( uidnode->pkt->pkttype == PKT_USER_ID );
+
+    /* first find out about the latest valid self-signature */
+    for ( node = uidnode->next; node; node = node->next ) {
+	PKT_signature *sig;
+
+	if ( node->pkt->pkttype == PKT_USER_ID
+	     || node->pkt->pkttype == PKT_PHOTO_ID
+	     || node->pkt->pkttype == PKT_PUBLIC_SUBKEY
+	     || node->pkt->pkttype == PKT_SECRET_SUBKEY )
+	    break;
+	if ( node->pkt->pkttype != PKT_SIGNATURE )
+	    continue;
+	sig = node->pkt->pkt.signature;
+	if ( mainkid[0] != sig->keyid[0] || mainkid[1] != sig->keyid[1] )
+	    continue; /* we only care about self-signatures for now */
+
+	if ( (sig->sig_class&~3) == 0x10 ) { /* regular self signature */
+	    if ( !check_key_signature( keyblock, node, NULL ) ) {
+		if ( !selfsig )
+		    selfsig = sig; /* use the first valid sig */
+		else if ( sig->timestamp > selfsig->timestamp
+			  && sig->sig_class >= selfsig->sig_class )
+		    selfsig = sig; /* but this one is newer */
+	    }
+	}
+    }
+
+    /* watch out for a newer revocation */
+    for ( node = uidnode->next; node; node = node->next ) {
+	PKT_signature *sig;
+
+	if ( node->pkt->pkttype == PKT_USER_ID
+	     || node->pkt->pkttype == PKT_PHOTO_ID
+	     || node->pkt->pkttype == PKT_PUBLIC_SUBKEY
+	     || node->pkt->pkttype == PKT_SECRET_SUBKEY )
+	    break;
+	if ( node->pkt->pkttype != PKT_SIGNATURE )
+	    continue;
+	sig = node->pkt->pkt.signature;
+	if ( mainkid[0] != sig->keyid[0] || mainkid[1] != sig->keyid[1] )
+	    continue; /* we only care about self-signatures */
+
+	if ( sig->sig_class == 0x30
+	     && (!selfsig || sig->timestamp >= selfsig->timestamp) ) {
+	    if ( !check_key_signature( keyblock, node, NULL ) )
+		return 1;
+	}
+    }
+    return 0;
+}
+
+
+
 static int
 check_sig_and_print( CTX c, KBNODE node )
 {
@@ -1207,6 +1279,8 @@ check_sig_and_print( CTX c, KBNODE node )
 	KBNODE un, keyblock;
 	char *us;
 	int count=0;
+        u32 mainkid[2];
+        int mainkid_ok = 0;
 
 	keyblock = get_pubkeyblock( sig->keyid );
 
@@ -1218,8 +1292,15 @@ check_sig_and_print( CTX c, KBNODE node )
 	 *	  about the trustworthiness of each user id, sort them.
 	 *	  Integrate this with check_signatures_trust(). */
 	for( un=keyblock; un; un = un->next ) {
-	    if( un->pkt->pkttype != PKT_USER_ID )
+            if ( !mainkid_ok && un->pkt->pkttype == PKT_PUBLIC_KEY ) {
+                keyid_from_pk( un->pkt->pkt.public_key, mainkid );
+                mainkid_ok = 1;
+            }
+	    if( !mainkid_ok || un->pkt->pkttype != PKT_USER_ID )
 		continue;
+            if ( is_uid_revoked (keyblock, un, mainkid ) )
+                continue;
+
 	    if( !count++ )
 		log_info(rc? _("BAD signature from \"")
 			   : _("Good signature from \""));
diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index dbaca3822..7ae91cb09 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -1734,6 +1734,7 @@ parse_encrypted( IOBUF inp, int pkttype, unsigned long pktlen,
 	/* fixme: add some pktlen sanity checks */
 	int version;
 
+#warning decrementing pktlen here is bad as it gives a bad valie in the listing
 	version = iobuf_get_noeof(inp); pktlen--;
 	if( version != 1 ) {
 	    log_error("encrypted_mdc packet with unknown version %d\n",
diff --git a/g10/status.c b/g10/status.c
index 8979be979..18a2ed2f5 100644
--- a/g10/status.c
+++ b/g10/status.c
@@ -507,6 +507,23 @@ cpr_enabled()
 }
 
 char *
+cpr_get_no_help( const char *keyword, const char *prompt )
+{
+    char *p;
+
+    if( opt.command_fd != -1 )
+	return do_get_from_fd ( keyword, 0, 0 );
+  #ifdef USE_SHM_COPROCESSING
+    if( opt.shm_coprocess )
+	return do_shm_get( keyword, 0, 0 );
+  #endif
+    for(;;) {
+	p = tty_get( prompt );
+        return p;
+    }
+}
+
+char *
 cpr_get( const char *keyword, const char *prompt )
 {
     char *p;
@@ -528,6 +545,7 @@ cpr_get( const char *keyword, const char *prompt )
     }
 }
 
+
 char *
 cpr_get_utf8( const char *keyword, const char *prompt )
 {
diff --git a/g10/status.h b/g10/status.h
index e3cd95a5a..cccc33400 100644
--- a/g10/status.h
+++ b/g10/status.h
@@ -103,6 +103,7 @@ void write_status_buffer ( int no,
 
 int cpr_enabled(void);
 char *cpr_get( const char *keyword, const char *prompt );
+char *cpr_get_no_help( const char *keyword, const char *prompt );
 char *cpr_get_utf8( const char *keyword, const char *prompt );
 char *cpr_get_hidden( const char *keyword, const char *prompt );
 void cpr_kill_prompt(void);
diff --git a/po/ChangeLog b/po/ChangeLog
index ca7c655bc..d3e90cca6 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-19  Werner Koch  <[email protected]>
+
+	* pl.po: Updated.
+
+	* ja.po: Justified one message.
+
 2000-10-23  Werner Koch  <[email protected]>
 
 	* ja.po: Updated.
diff --git a/po/da.po b/po/da.po
index 4285bc59a..e4af365e4 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-11-24 13:52+0100\n"
+"POT-Creation-Date: 2000-12-19 11:58+0100\n"
 "PO-Revision-Date: 2000-03-07 22:51+01:00\n"
 "Last-Translator: Birger Langkjer <[email protected]>\n"
 "Language-Team: Danish <[email protected]>\n"
@@ -663,16 +663,16 @@ msgstr ""
 " --list-keys [navne]        vis n�gler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/g10.c:426
+#: g10/g10.c:427
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
 
-#: g10/g10.c:430
+#: g10/g10.c:431
 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:433
+#: g10/g10.c:434
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -682,7 +682,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: g10/g10.c:440
+#: g10/g10.c:441
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -690,199 +690,199 @@ msgstr ""
 "\n"
 "Underst�ttede algoritmer:\n"
 
-#: g10/g10.c:519
+#: g10/g10.c:520
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/g10.c:572
+#: g10/g10.c:573
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/g10.c:716
+#: g10/g10.c:717
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: g10/g10.c:723
+#: g10/g10.c:724
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/g10.c:915
+#: g10/g10.c:925
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/g10.c:983
+#: g10/g10.c:994
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:987 g10/g10.c:996
+#: g10/g10.c:998 g10/g10.c:1007
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/g10.c:989
+#: g10/g10.c:1000
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/g10.c:992
+#: g10/g10.c:1003
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/g10.c:1011 g10/g10.c:1023
+#: g10/g10.c:1023 g10/g10.c:1035
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/g10.c:1017 g10/g10.c:1029
+#: g10/g10.c:1029 g10/g10.c:1041
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/g10.c:1033
+#: g10/g10.c:1045
 msgid "the given policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/g10.c:1036
+#: g10/g10.c:1048
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr ""
 
-#: g10/g10.c:1038
+#: g10/g10.c:1050
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/g10.c:1040
+#: g10/g10.c:1052
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/g10.c:1042
+#: g10/g10.c:1054
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:1045
+#: g10/g10.c:1057
 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:1049
+#: g10/g10.c:1061
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
 # er det klogt at overs�tte TrustDB?
-#: g10/g10.c:1134
+#: g10/g10.c:1146
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/g10.c:1140
+#: g10/g10.c:1152
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/g10.c:1147
+#: g10/g10.c:1159
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:1155
+#: g10/g10.c:1167
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1180
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/g10.c:1181
+#: g10/g10.c:1193
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1207
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/g10.c:1212
+#: g10/g10.c:1224
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1232
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1240
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1248
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1264
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key bruger-id"
 
-#: g10/g10.c:1255
+#: g10/g10.c:1267
 msgid "--delete-key user-id"
 msgstr "--delete-key bruger-id"
 
-#: g10/encode.c:265 g10/g10.c:1292 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1304 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/g10.c:1307
+#: g10/g10.c:1319
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [bruger-id] [n�glering]"
 
-#: g10/g10.c:1373
+#: g10/g10.c:1385
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:1381
+#: g10/g10.c:1393
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:1452
+#: g10/g10.c:1464
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/g10.c:1539
+#: g10/g10.c:1551
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/g10.c:1543
+#: g10/g10.c:1555
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1546 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1558 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:1756
+#: g10/g10.c:1767
 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:1762
+#: g10/g10.c:1773
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1768
+#: g10/g10.c:1779
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1776
+#: g10/g10.c:1787
 msgid "a notation value must not use any control characters\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
@@ -1558,17 +1558,17 @@ msgstr "%s: kan ikke �bne: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:324
+#: g10/encode.c:171 g10/encode.c:327
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ADVARSEL: tom fil\n"
 
-#: g10/encode.c:271
+#: g10/encode.c:274
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "l�ser fra '%s'\n"
 
-#: g10/encode.c:492
+#: g10/encode.c:497
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s krypteret for: %s\n"
@@ -1702,7 +1702,7 @@ msgstr "hemmelige n�gler import: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "hemmelige n�gler u�ndre: %lu\n"
 
-#: g10/import.c:391 g10/import.c:590
+#: g10/import.c:391 g10/import.c:600
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
@@ -1716,7 +1716,7 @@ msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:418 g10/import.c:657
+#: g10/import.c:418 g10/import.c:667
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
@@ -1730,17 +1730,17 @@ msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 msgid "no default public keyring\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
+#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
+#: g10/import.c:438 g10/import.c:496 g10/import.c:615 g10/import.c:716
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "kan ikke l�se n�glering `%s': %s\n"
 
-#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
+#: g10/import.c:441 g10/import.c:499 g10/import.c:618 g10/import.c:719
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
@@ -1755,12 +1755,12 @@ msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "n�gle %08lX: stemmer ikke med vores kopi\n"
 
-#: g10/import.c:472 g10/import.c:665
+#: g10/import.c:472 g10/import.c:675
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "n�gle %08lX: kan ikke lokalisere original n�gleblok: %s\n"
 
-#: g10/import.c:478 g10/import.c:671
+#: g10/import.c:478 g10/import.c:681
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "n�gle %08lX: kan ikke l�se original n�gleblok: %s\n"
@@ -1800,73 +1800,78 @@ msgstr ""
 msgid "key %08lX: not changed\n"
 msgstr ""
 
-#: g10/import.c:613
+#: g10/import.c:593
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr ""
+
+#: g10/import.c:623
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr ""
 
 #. we can't merge secret keys
-#: g10/import.c:617
+#: g10/import.c:627
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr ""
 
-#: g10/import.c:622
+#: g10/import.c:632
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr ""
 
-#: g10/import.c:651
+#: g10/import.c:661
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 
-#: g10/import.c:682
+#: g10/import.c:692
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 
-#: g10/import.c:714
+#: g10/import.c:724
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr ""
 
-#: g10/import.c:756
+#: g10/import.c:766
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr ""
 
-#: g10/import.c:763 g10/import.c:787
+#: g10/import.c:773 g10/import.c:797
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr ""
 
-#: g10/import.c:764
+#: g10/import.c:774
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr ""
 
-#: g10/import.c:779
+#: g10/import.c:789
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr ""
 
-#: g10/import.c:788
+#: g10/import.c:798
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr ""
 
-#: g10/import.c:815
+#: g10/import.c:825
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr ""
 
-#: g10/import.c:844
+#: g10/import.c:854
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr ""
 
-#: g10/import.c:867
+#: g10/import.c:877
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr ""
@@ -1875,32 +1880,32 @@ msgstr ""
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:892
+#: g10/import.c:902
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr ""
 
-#: g10/import.c:901
+#: g10/import.c:911
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:909
+#: g10/import.c:919
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 
-#: g10/import.c:1009
+#: g10/import.c:1019
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1060
+#: g10/import.c:1071
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr ""
 
-#: g10/import.c:1174 g10/import.c:1227
+#: g10/import.c:1185 g10/import.c:1238
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr ""
@@ -2479,114 +2484,115 @@ msgid "revoked"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:793
+#: g10/keylist.c:400 g10/mainproc.c:834
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:270
 #, c-format
 msgid "public key is %08lX\n"
 msgstr ""
 
-#: g10/mainproc.c:284
+#: g10/mainproc.c:315
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:367
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr ""
 
-#: g10/mainproc.c:336
+#: g10/mainproc.c:377
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr ""
 
-#: g10/mainproc.c:342
-msgid "no secret key for decryption available\n"
-msgstr ""
-
-#: g10/mainproc.c:351
+#: g10/mainproc.c:391
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:429
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:434
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:439
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:458
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:460
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:615
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:661 g10/mainproc.c:670
+#: g10/mainproc.c:702 g10/mainproc.c:711
 msgid "WARNING: invalid notation data found\n"
 msgstr ""
 
-#: g10/mainproc.c:673
+#: g10/mainproc.c:714
 msgid "Notation: "
 msgstr ""
 
-#: g10/mainproc.c:682
+#: g10/mainproc.c:723
 msgid "Policy: "
 msgstr "Politik: "
 
-#: g10/mainproc.c:1124
+#: g10/mainproc.c:1233
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1270
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1187 g10/mainproc.c:1198
+#: g10/mainproc.c:1305 g10/mainproc.c:1316
 msgid "BAD signature from \""
 msgstr "D�RLIG signatur fra \""
 
-#: g10/mainproc.c:1188 g10/mainproc.c:1199
+#: g10/mainproc.c:1306 g10/mainproc.c:1317
 msgid "Good signature from \""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1190
+#: g10/mainproc.c:1308
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1246
+#: g10/mainproc.c:1364
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/mainproc.c:1321
+#: g10/mainproc.c:1421 g10/mainproc.c:1436 g10/mainproc.c:1498
+#, fuzzy
+msgid "not a detached signature\n"
+msgstr "opret en separat signatur"
+
+#: g10/mainproc.c:1447
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:1372
+#: g10/mainproc.c:1502
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) signatur\n"
 
-#: g10/mainproc.c:1377
+#: g10/mainproc.c:1507
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -2706,7 +2712,11 @@ msgstr ""
 msgid "reading stdin ...\n"
 msgstr "l�ser stdin ...\n"
 
-#: g10/plaintext.c:392
+#: g10/plaintext.c:383
+msgid "no signed data\n"
+msgstr ""
+
+#: g10/plaintext.c:391
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
@@ -2824,7 +2834,7 @@ msgstr ""
 msgid "%s signature from: %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:610
+#: g10/sign.c:290 g10/sign.c:613
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
@@ -3264,14 +3274,14 @@ msgstr ""
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr ""
 
-#: g10/verify.c:82
+#: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
 
-#: g10/verify.c:147
+#: g10/verify.c:173
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index 936b78c91..7d6f91f14 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-11-24 13:52+0100\n"
+"POT-Creation-Date: 2000-12-19 11:58+0100\n"
 "PO-Revision-Date: 2000-10-15 14:30+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -672,17 +672,17 @@ msgstr ""
 " --list-keys [Namen]        Schl�ssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdr�cke\" anzeigen\n"
 
-#: g10/g10.c:426
+#: g10/g10.c:427
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Berichte �ber Bugs (Programmfehler) bitte an <[email protected]>.\n"
 "Sinn- oder Schreibfehler in den deutschen Texten bitte an <[email protected]>.\n"
 
-#: g10/g10.c:430
+#: g10/g10.c:431
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
 
-#: g10/g10.c:433
+#: g10/g10.c:434
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -692,7 +692,7 @@ msgstr ""
 "Signieren, pr�fen, verschl�sseln, entschl�sseln\n"
 "Die voreingestellte Operation ist abh�ngig von den Eingabedaten\n"
 
-#: g10/g10.c:440
+#: g10/g10.c:441
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -700,188 +700,188 @@ msgstr ""
 "\n"
 "Unterst�tzte Verfahren:\n"
 
-#: g10/g10.c:519
+#: g10/g10.c:520
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/g10.c:572
+#: g10/g10.c:573
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/g10.c:716
+#: g10/g10.c:717
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/g10.c:723
+#: g10/g10.c:724
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:915
+#: g10/g10.c:925
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ist kein g�ltiger Zeichensatz.\n"
 
-#: g10/g10.c:983
+#: g10/g10.c:994
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm k�nnte eine core-dump-Datei schreiben!\n"
 
-#: g10/g10.c:987 g10/g10.c:996
+#: g10/g10.c:998 g10/g10.c:1007
 #, 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:989
+#: g10/g10.c:1000
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/g10.c:992
+#: g10/g10.c:1003
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/g10.c:1011 g10/g10.c:1023
+#: g10/g10.c:1023 g10/g10.c:1035
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgew�hlte Verschl�sslungsverfahren ist ung�ltig\n"
 
-#: g10/g10.c:1017 g10/g10.c:1029
+#: g10/g10.c:1029 g10/g10.c:1041
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:1033
+#: g10/g10.c:1045
 msgid "the given policy URL is invalid\n"
 msgstr "Die angegebene URL f�r Richtlinien ist ung�ltig\n"
 
-#: g10/g10.c:1036
+#: g10/g10.c:1048
 #, 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:1038
+#: g10/g10.c:1050
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m�ssen gr��er als 0 sein\n"
 
-#: g10/g10.c:1040
+#: g10/g10.c:1052
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed m�ssen gr��er als 1 sein\n"
 
-#: g10/g10.c:1042
+#: g10/g10.c:1054
 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:1045
+#: g10/g10.c:1057
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:1049
+#: g10/g10.c:1061
 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:1134
+#: g10/g10.c:1146
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:1140
+#: g10/g10.c:1152
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:1147
+#: g10/g10.c:1159
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:1155
+#: g10/g10.c:1167
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1180
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:1181
+#: g10/g10.c:1193
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1207
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:1212
+#: g10/g10.c:1224
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1232
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1240
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1248
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1264
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key User-ID"
 
-#: g10/g10.c:1255
+#: g10/g10.c:1267
 msgid "--delete-key user-id"
 msgstr "--delete-key User-ID"
 
-#: g10/encode.c:265 g10/g10.c:1292 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1304 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
 
-#: g10/g10.c:1307
+#: g10/g10.c:1319
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schl�sselbund]"
 
-#: g10/g10.c:1373
+#: g10/g10.c:1385
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1381
+#: g10/g10.c:1393
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1452
+#: g10/g10.c:1464
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ung�ltiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:1539
+#: g10/g10.c:1551
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:1543
+#: g10/g10.c:1555
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1546 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1558 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:1756
+#: g10/g10.c:1767
 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:1762
+#: g10/g10.c:1773
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -889,12 +889,12 @@ msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und mu� mit einem '=' enden\n"
 
-#: g10/g10.c:1768
+#: g10/g10.c:1779
 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:1776
+#: g10/g10.c:1787
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
@@ -1647,17 +1647,17 @@ msgstr "%s: kann nicht ge�ffnet werden: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "Fehler beim Erzeugen des Mantras: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:324
+#: g10/encode.c:171 g10/encode.c:327
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: WARNUNG: Leere Datei\n"
 
-#: g10/encode.c:271
+#: g10/encode.c:274
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Lesen von '%s'\n"
 
-#: g10/encode.c:492
+#: g10/encode.c:497
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s verschl�sselt f�r: %s\n"
@@ -1791,7 +1791,7 @@ msgstr "           geheime Schl�ssel importiert: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "                 unver�nderte geh.Schl.: %lu\n"
 
-#: g10/import.c:391 g10/import.c:590
+#: g10/import.c:391 g10/import.c:600
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "Schl�ssel %08lX: Keine User-ID\n"
@@ -1805,7 +1805,7 @@ msgstr "Schl�ssel %08lX: Keine g�ltigen User-IDs\n"
 msgid "this may be caused by a missing self-signature\n"
 msgstr "dies k�nnte durch fehlende Eigenbeglaubigung verursacht worden sein\n"
 
-#: g10/import.c:418 g10/import.c:657
+#: g10/import.c:418 g10/import.c:667
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel nicht gefunden: %s\n"
@@ -1819,17 +1819,17 @@ msgstr "Schl�ssel %08lX: neuer Schl�ssel - �bersprungen\n"
 msgid "no default public keyring\n"
 msgstr "Kein voreingestellter �ffentlicher Schl�sselbund\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
+#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
+#: g10/import.c:438 g10/import.c:496 g10/import.c:615 g10/import.c:716
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "kann Schl�sselbund `%s' nicht sperren: %s\n"
 
-#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
+#: g10/import.c:441 g10/import.c:499 g10/import.c:618 g10/import.c:719
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des Schl�sselbundes `%s': %s\n"
@@ -1844,14 +1844,14 @@ msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel importiert\n"
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "Schl�ssel %08lX: Stimmt nicht mit unserer Kopie �berein\n"
 
-#: g10/import.c:472 g10/import.c:665
+#: g10/import.c:472 g10/import.c:675
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr ""
 "Schl�ssel %08lX: der lokale originale Schl�sselblocks wurde nicht gefunden: "
 "%s\n"
 
-#: g10/import.c:478 g10/import.c:671
+#: g10/import.c:478 g10/import.c:681
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr ""
@@ -1892,75 +1892,80 @@ msgstr "Schl�ssel %08lX: %d neue Unterschl�ssel\n"
 msgid "key %08lX: not changed\n"
 msgstr "Schl�ssel %08lX: Nicht ge�ndert\n"
 
-#: g10/import.c:613
+#: g10/import.c:593
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr ""
+
+#: g10/import.c:623
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "Schl�ssel %08lX: Geheimer Schl�ssel importiert\n"
 
 #. we can't merge secret keys
-#: g10/import.c:617
+#: g10/import.c:627
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "Schl�ssel %08lX: Ist bereits im geheimen Schl�sselbund\n"
 
-#: g10/import.c:622
+#: g10/import.c:632
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "Schl�ssel %08lX: geheimer Schl�ssel nicht gefunden: %s\n"
 
-#: g10/import.c:651
+#: g10/import.c:661
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "Schl�ssel %08lX: Kein �ffentlicher Schl�ssel - der Schl�sselwiderruf kann "
 "nicht angebracht werden\n"
 
-#: g10/import.c:682
+#: g10/import.c:692
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - zur�ckgewiesen\n"
 
-#: g10/import.c:714
+#: g10/import.c:724
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat importiert\n"
 
-#: g10/import.c:756
+#: g10/import.c:766
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "Schl�ssel %08lX: Keine User-ID f�r Signatur\n"
 
-#: g10/import.c:763 g10/import.c:787
+#: g10/import.c:773 g10/import.c:797
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "Schl�ssel %08lX: Nicht unterst�tztes Public-Key-Verfahren\n"
 
-#: g10/import.c:764
+#: g10/import.c:774
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Eigenbeglaubigung\n"
 
-#: g10/import.c:779
+#: g10/import.c:789
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "Schl�ssel %08lX: Kein Unterschl�ssel f�r die Schl�sselanbindung\n"
 
-#: g10/import.c:788
+#: g10/import.c:798
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung\n"
 
-#: g10/import.c:815
+#: g10/import.c:825
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "Schl�ssel %08lX: Nicht eigenbeglaubigte User-ID �bernommen'"
 
-#: g10/import.c:844
+#: g10/import.c:854
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "Schl�ssel %08lX: User-ID �bergangen '"
 
-#: g10/import.c:867
+#: g10/import.c:877
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "Schl�ssel %08lX: Unterschl�ssel ignoriert\n"
@@ -1969,33 +1974,33 @@ msgstr "Schl�ssel %08lX: Unterschl�ssel ignoriert\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:892
+#: g10/import.c:902
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr ""
 "Schl�ssel %08lX: Nicht exportf�hige Unterschrift (Klasse %02x) - �bergangen\n"
 
-#: g10/import.c:901
+#: g10/import.c:911
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat an falschem Platz - �bergangen\n"
 
-#: g10/import.c:909
+#: g10/import.c:919
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - �bergangen\n"
 
-#: g10/import.c:1009
+#: g10/import.c:1019
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "Schl�ssel %08lX: Doppelte User-ID entdeckt - zusammengef�hrt\n"
 
-#: g10/import.c:1060
+#: g10/import.c:1071
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat hinzugef�gt\n"
 
-#: g10/import.c:1174 g10/import.c:1227
+#: g10/import.c:1185 g10/import.c:1238
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "Schl�ssel %08lX: Unsere Kopie hat keine Eigenbeglaubigung\n"
@@ -2581,119 +2586,120 @@ msgid "revoked"
 msgstr "widerrufen"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:793
+#: g10/keylist.c:400 g10/mainproc.c:834
 #, c-format
 msgid " [expires: %s]"
 msgstr " [verf�llt: %s]"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:270
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "�ffentlicher Schl�ssel ist %08lX\n"
 
-#: g10/mainproc.c:284
+#: g10/mainproc.c:315
 msgid "public key encrypted data: good DEK\n"
 msgstr "Mit �ffentlichem Sch�ssel verschl�sselte Daten: Korrekte DEK\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:367
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "verschl�sselt mit %u-Bit %s Schl�ssel, ID %08lX, erzeugt %s\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:336
+#: g10/mainproc.c:377
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "verschl�sselt mit %s Schl�ssel, ID %08lX\n"
 
-#: g10/mainproc.c:342
-msgid "no secret key for decryption available\n"
-msgstr "kein geheimer Schl�ssel zur Entschl�sselung vorhanden\n"
-
-#: g10/mainproc.c:351
+#: g10/mainproc.c:391
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Entschl�sselung mit �ffentlichem Schl�ssel fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:429
 msgid "decryption okay\n"
 msgstr "Enschl�sselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:434
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Warnung: Verschl�sselte Botschaft ist manipuliert worden!\n"
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:439
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Enschl�sselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:458
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 "Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:460
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Urspr�nglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:615
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "Einzelner Widerruf - verwenden Sie \"gpg --import\" um ihn anzuwenden\n"
 
-#: g10/mainproc.c:661 g10/mainproc.c:670
+#: g10/mainproc.c:702 g10/mainproc.c:711
 msgid "WARNING: invalid notation data found\n"
 msgstr "WARNUNG: Ung�ltige \"Notation\"-Daten gefunden\n"
 
-#: g10/mainproc.c:673
+#: g10/mainproc.c:714
 msgid "Notation: "
 msgstr "\"Notation\": "
 
-#: g10/mainproc.c:682
+#: g10/mainproc.c:723
 msgid "Policy: "
 msgstr "Richtlinie: "
 
-#: g10/mainproc.c:1124
+#: g10/mainproc.c:1233
 msgid "signature verification suppressed\n"
 msgstr "Unterschriften-�berpr�fung unterdr�ckt\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1270
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Unterschrift vom %.*s, %s Schl�ssel ID %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1187 g10/mainproc.c:1198
+#: g10/mainproc.c:1305 g10/mainproc.c:1316
 msgid "BAD signature from \""
 msgstr "FALSCHE Unterschrift von \""
 
-#: g10/mainproc.c:1188 g10/mainproc.c:1199
+#: g10/mainproc.c:1306 g10/mainproc.c:1317
 msgid "Good signature from \""
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:1190
+#: g10/mainproc.c:1308
 msgid "                aka \""
 msgstr "                    alias \""
 
-#: g10/mainproc.c:1246
+#: g10/mainproc.c:1364
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht gepr�ft werden: %s\n"
 
-#: g10/mainproc.c:1321
+#: g10/mainproc.c:1421 g10/mainproc.c:1436 g10/mainproc.c:1498
+#, fuzzy
+msgid "not a detached signature\n"
+msgstr "Eine abgetrennte Unterschrift erzeugen"
+
+#: g10/mainproc.c:1447
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Unterschrift der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:1372
+#: g10/mainproc.c:1502
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:1377
+#: g10/mainproc.c:1507
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ung�ltiges root-Paket in proc_tree() entdeckt\n"
 
@@ -2823,7 +2829,12 @@ msgstr "Bitte geben Sie den Namen der Datendatei ein: "
 msgid "reading stdin ...\n"
 msgstr "lese stdin ...\n"
 
-#: g10/plaintext.c:392
+#: g10/plaintext.c:383
+#, fuzzy
+msgid "no signed data\n"
+msgstr "kann signierte Datei '%s' nicht �ffnen.\n"
+
+#: g10/plaintext.c:391
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kann signierte Datei '%s' nicht �ffnen.\n"
@@ -2949,7 +2960,7 @@ msgstr ""
 msgid "%s signature from: %s\n"
 msgstr "%s Unterschrift von: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:610
+#: g10/sign.c:290 g10/sign.c:613
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s kann nicht erzeugt werden: %s\n"
@@ -3400,7 +3411,7 @@ msgstr "konnte '%s' nicht in die 'Trust'-Datenbank hineintun: %s\n"
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "WARNUNG: Lange 'Pref'-Records k�nnen noch nicht benutzt werden\n"
 
-#: g10/verify.c:82
+#: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -3410,7 +3421,7 @@ msgstr ""
 "Denken Sie daran, da� die Datei mit der Unterschrift (.sig oder .asc)\n"
 "als erster in der Kommandozeile stehen sollte.\n"
 
-#: g10/verify.c:147
+#: g10/verify.c:173
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "Eingabezeile %u ist zu lang oder es fehlt ein LF\n"
@@ -3853,6 +3864,9 @@ msgstr "Keine Hilfe vorhanden."
 msgid "No help available for `%s'"
 msgstr "Keine Hilfe f�r '%s' vorhanden."
 
+#~ msgid "no secret key for decryption available\n"
+#~ msgstr "kein geheimer Schl�ssel zur Entschl�sselung vorhanden\n"
+
 #~ msgid ""
 #~ "RSA keys are deprecated; please consider creating a new key and use this key "
 #~ "in the future\n"
diff --git a/po/eo.po b/po/eo.po
index 76a9eeaec..956268666 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.1e\n"
-"POT-Creation-Date: 2000-11-24 13:52+0100\n"
+"POT-Creation-Date: 2000-12-19 11:58+0100\n"
 "PO-Revision-Date: 2000-08-16 23:19+01:00\n"
 "Last-Translator: Edmund GRIMLEY EVANS <[email protected]>\n"
 "Language-Team: Esperanto <[email protected]>\n"
@@ -663,15 +663,15 @@ msgstr ""
 " --list-keys [nomoj]        montri �losilojn\n"
 " --fingerprint [nomoj]      montri fingro�purojn\n"
 
-#: g10/g10.c:426
+#: g10/g10.c:427
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
 
-#: g10/g10.c:430
+#: g10/g10.c:431
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/g10.c:433
+#: g10/g10.c:434
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -681,7 +681,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/g10.c:440
+#: g10/g10.c:441
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -689,186 +689,186 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/g10.c:519
+#: g10/g10.c:520
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/g10.c:572
+#: g10/g10.c:573
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/g10.c:716
+#: g10/g10.c:717
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: g10/g10.c:723
+#: g10/g10.c:724
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/g10.c:915
+#: g10/g10.c:925
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/g10.c:983
+#: g10/g10.c:994
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/g10.c:987 g10/g10.c:996
+#: g10/g10.c:998 g10/g10.c:1007
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/g10.c:989
+#: g10/g10.c:1000
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/g10.c:992
+#: g10/g10.c:1003
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/g10.c:1011 g10/g10.c:1023
+#: g10/g10.c:1023 g10/g10.c:1035
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/g10.c:1017 g10/g10.c:1029
+#: g10/g10.c:1029 g10/g10.c:1041
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:1033
+#: g10/g10.c:1045
 msgid "the given policy URL is invalid\n"
 msgstr "la donita gvidlinia URL ne validas\n"
 
-#: g10/g10.c:1036
+#: g10/g10.c:1048
 #, 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:1038
+#: g10/g10.c:1050
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/g10.c:1040
+#: g10/g10.c:1052
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/g10.c:1042
+#: g10/g10.c:1054
 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:1045
+#: g10/g10.c:1057
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/g10.c:1049
+#: g10/g10.c:1061
 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:1134
+#: g10/g10.c:1146
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/g10.c:1140
+#: g10/g10.c:1152
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/g10.c:1147
+#: g10/g10.c:1159
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/g10.c:1155
+#: g10/g10.c:1167
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1180
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/g10.c:1181
+#: g10/g10.c:1193
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1207
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/g10.c:1212
+#: g10/g10.c:1224
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1232
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1240
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1248
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1264
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key uzantidentigilo"
 
-#: g10/g10.c:1255
+#: g10/g10.c:1267
 msgid "--delete-key user-id"
 msgstr "--delete-key uzantidentigilo"
 
-#: g10/encode.c:265 g10/g10.c:1292 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1304 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/g10.c:1307
+#: g10/g10.c:1319
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [uzantidentigilo] [�losilaro]"
 
-#: g10/g10.c:1373
+#: g10/g10.c:1385
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:1381
+#: g10/g10.c:1393
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:1452
+#: g10/g10.c:1464
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/g10.c:1539
+#: g10/g10.c:1551
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/g10.c:1543
+#: g10/g10.c:1555
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1546 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1558 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:1756
+#: g10/g10.c:1767
 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:1762
+#: g10/g10.c:1773
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -876,11 +876,11 @@ msgstr ""
 "notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
 "kaj fini per '='\n"
 
-#: g10/g10.c:1768
+#: g10/g10.c:1779
 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:1776
+#: g10/g10.c:1787
 msgid "a notation value must not use any control characters\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
@@ -1616,17 +1616,17 @@ msgstr "%s: ne povas malfermi: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:324
+#: g10/encode.c:171 g10/encode.c:327
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVERTO: malplena dosiero\n"
 
-#: g10/encode.c:271
+#: g10/encode.c:274
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "legas el '%s'\n"
 
-#: g10/encode.c:492
+#: g10/encode.c:497
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s-�ifrita por: %s\n"
@@ -1759,7 +1759,7 @@ msgstr "sekretaj �losiloj importitaj: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "sekretaj �losiloj ne�an�itaj: %lu\n"
 
-#: g10/import.c:391 g10/import.c:590
+#: g10/import.c:391 g10/import.c:600
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
@@ -1773,7 +1773,7 @@ msgstr "�losilo %08lX: mankas valida uzantidentigilo\n"
 msgid "this may be caused by a missing self-signature\n"
 msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
 
-#: g10/import.c:418 g10/import.c:657
+#: g10/import.c:418 g10/import.c:667
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n"
@@ -1787,17 +1787,17 @@ msgstr "�losilo %08lX: ne estas RFC-2440-�losilo - ignorita\n"
 msgid "no default public keyring\n"
 msgstr "mankas implicita publika �losilaro\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
+#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
+#: g10/import.c:438 g10/import.c:496 g10/import.c:615 g10/import.c:716
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "ne povas �losi la �losilaron '%s': %s\n"
 
-#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
+#: g10/import.c:441 g10/import.c:499 g10/import.c:618 g10/import.c:719
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
@@ -1812,12 +1812,12 @@ msgstr "�losilo %08lX: publika �losilo importita\n"
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "�losilo %08lX: diferencas de nia kopio\n"
 
-#: g10/import.c:472 g10/import.c:665
+#: g10/import.c:472 g10/import.c:675
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "�losilo %08lX: ne povas trovi originalan �losilblokon: %s\n"
 
-#: g10/import.c:478 g10/import.c:671
+#: g10/import.c:478 g10/import.c:681
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "�losilo %08lX: ne povas legi originalan �losilblokon: %s\n"
@@ -1857,74 +1857,79 @@ msgstr "�losilo %08lX: %d novaj sub�losiloj\n"
 msgid "key %08lX: not changed\n"
 msgstr "�losilo %08lX: ne �an�ita\n"
 
-#: g10/import.c:613
+#: g10/import.c:593
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr ""
+
+#: g10/import.c:623
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "�losilo %08lX: sekreta �losilo importita\n"
 
 #. we can't merge secret keys
-#: g10/import.c:617
+#: g10/import.c:627
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "�losilo %08lX: jam en sekreta �losilaro\n"
 
-#: g10/import.c:622
+#: g10/import.c:632
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "�losilo %08lX: sekreta �losilo ne trovita: %s\n"
 
-#: g10/import.c:651
+#: g10/import.c:661
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "�losilo %08lX: publika �losilo mankas - ne povas apliki revokatestilon\n"
 
-#: g10/import.c:682
+#: g10/import.c:692
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
 
-#: g10/import.c:714
+#: g10/import.c:724
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "�losilo %08lX: revokatestilo importita\n"
 
-#: g10/import.c:756
+#: g10/import.c:766
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo por subskribo\n"
 
-#: g10/import.c:763 g10/import.c:787
+#: g10/import.c:773 g10/import.c:797
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:764
+#: g10/import.c:774
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/import.c:779
+#: g10/import.c:789
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:788
+#: g10/import.c:798
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:815
+#: g10/import.c:825
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "�losilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
 
-#: g10/import.c:844
+#: g10/import.c:854
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "�losilo %08lX: ignoris uzantidentigilon '"
 
-#: g10/import.c:867
+#: g10/import.c:877
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "�losilo %08lX: ignoris sub�losilon\n"
@@ -1933,32 +1938,32 @@ msgstr "�losilo %08lX: ignoris sub�losilon\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:892
+#: g10/import.c:902
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:901
+#: g10/import.c:911
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
 
-#: g10/import.c:909
+#: g10/import.c:919
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - ignorita\n"
 
-#: g10/import.c:1009
+#: g10/import.c:1019
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
 
-#: g10/import.c:1060
+#: g10/import.c:1071
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: g10/import.c:1174 g10/import.c:1227
+#: g10/import.c:1185 g10/import.c:1238
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "�losilo %08lX: nia kopio ne havas mem-subskribon\n"
@@ -2546,114 +2551,115 @@ msgid "revoked"
 msgstr "rev"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:793
+#: g10/keylist.c:400 g10/mainproc.c:834
 #, c-format
 msgid " [expires: %s]"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:270
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "publika �losilo estas %08lX\n"
 
-#: g10/mainproc.c:284
+#: g10/mainproc.c:315
 msgid "public key encrypted data: good DEK\n"
 msgstr "publik�losile �ifritaj datenoj: bona DEK\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:367
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "�ifrita per %u-bita %s-�losilo, %08lX, kreita je %s\n"
 
-#: g10/mainproc.c:336
+#: g10/mainproc.c:377
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "�ifrita per %s-�losilo, %08lX\n"
 
-#: g10/mainproc.c:342
-msgid "no secret key for decryption available\n"
-msgstr "mankas sekreta �losilo por mal�ifrado\n"
-
-#: g10/mainproc.c:351
+#: g10/mainproc.c:391
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "publik�losila mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:429
 msgid "decryption okay\n"
 msgstr "mal�ifrado sukcesis\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:434
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTO: �ifrita mesa�o estis manipulita!\n"
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:439
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:458
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:460
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originala dosiernomo='%.*s'\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:615
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "memstara revoko - uzu \"gpg --import\" por apliki �in\n"
 
-#: g10/mainproc.c:661 g10/mainproc.c:670
+#: g10/mainproc.c:702 g10/mainproc.c:711
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVERTO: nevalida notacia dateno trovita\n"
 
-#: g10/mainproc.c:673
+#: g10/mainproc.c:714
 msgid "Notation: "
 msgstr "Notacio: "
 
-#: g10/mainproc.c:682
+#: g10/mainproc.c:723
 msgid "Policy: "
 msgstr "Gvidlinio: "
 
-#: g10/mainproc.c:1124
+#: g10/mainproc.c:1233
 msgid "signature verification suppressed\n"
 msgstr "kontrolo de subskribo estas mal�altita\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1270
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Subskribo farita je %.*s per %s, �losilo %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1187 g10/mainproc.c:1198
+#: g10/mainproc.c:1305 g10/mainproc.c:1316
 msgid "BAD signature from \""
 msgstr "MALBONA subskribo de \""
 
-#: g10/mainproc.c:1188 g10/mainproc.c:1199
+#: g10/mainproc.c:1306 g10/mainproc.c:1317
 msgid "Good signature from \""
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1190
+#: g10/mainproc.c:1308
 msgid "                aka \""
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1246
+#: g10/mainproc.c:1364
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/mainproc.c:1321
+#: g10/mainproc.c:1421 g10/mainproc.c:1436 g10/mainproc.c:1498
+#, fuzzy
+msgid "not a detached signature\n"
+msgstr "fari apartan subskribon"
+
+#: g10/mainproc.c:1447
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/mainproc.c:1372
+#: g10/mainproc.c:1502
 msgid "old style (PGP 2.x) signature\n"
 msgstr "malnovstila subskribo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1377
+#: g10/mainproc.c:1507
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nevalida radikpaketo trovita en proc_tree()\n"
 
@@ -2780,7 +2786,12 @@ msgstr "Bonvolu doni la nomon de la dosiero: "
 msgid "reading stdin ...\n"
 msgstr "legas la normalan enigon ...\n"
 
-#: g10/plaintext.c:392
+#: g10/plaintext.c:383
+#, fuzzy
+msgid "no signed data\n"
+msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
+
+#: g10/plaintext.c:391
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
@@ -2900,7 +2911,7 @@ msgstr "supozas malbonan subskribon pro nekonata \"critical bit\"\n"
 msgid "%s signature from: %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:610
+#: g10/sign.c:290 g10/sign.c:613
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "ne povas krei %s: %s\n"
@@ -3341,7 +3352,7 @@ msgstr "malsukcesis meti '%s' en fido-datenaron: %s\n"
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "AVERTO: ne povas trakti longajn preferoregistrojn\n"
 
-#: g10/verify.c:82
+#: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -3351,7 +3362,7 @@ msgstr ""
 "Bonvolu memori, ke la subskribodosiero (.sig a� .asc)\n"
 "devas esti la unua dosiero donita en la komandlinio.\n"
 
-#: g10/verify.c:147
+#: g10/verify.c:173
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "enigata linio %u tro longa, a� mankas linifino\n"
@@ -3757,6 +3768,9 @@ msgstr "Nenia helpo disponata"
 msgid "No help available for `%s'"
 msgstr "Nenia helpo disponata por '%s'"
 
+#~ msgid "no secret key for decryption available\n"
+#~ msgstr "mankas sekreta �losilo por mal�ifrado\n"
+
 #~ msgid ""
 #~ "RSA keys are deprecated; please consider creating a new key and use this key "
 #~ "in the future\n"
diff --git a/po/es_ES.po b/po/es_ES.po
index 8a3163ac6..43b70f1ec 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@
 # GPG version: 1.0.0
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-11-24 13:52+0100\n"
+"POT-Creation-Date: 2000-12-19 11:58+0100\n"
 "PO-Revision-Date: 1999-10-27 06:35+0200\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-13 10:49:25+0100\n"
@@ -680,15 +680,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/g10.c:426
+#: g10/g10.c:427
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
-#: g10/g10.c:430
+#: g10/g10.c:431
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/g10.c:433
+#: g10/g10.c:434
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -698,7 +698,7 @@ msgstr ""
 "Firma, comprueba, cifra o descifra.\n"
 "La operaci�n por defecto depende del tipo de datos de entrada.\n"
 
-#: g10/g10.c:440
+#: g10/g10.c:441
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -706,186 +706,186 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/g10.c:519
+#: g10/g10.c:520
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/g10.c:572
+#: g10/g10.c:573
 msgid "conflicting commands\n"
 msgstr "comandos incompatibles\n"
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/g10.c:716
+#: g10/g10.c:717
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/g10.c:723
+#: g10/g10.c:724
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/g10.c:915
+#: g10/g10.c:925
 #, 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:983
+#: g10/g10.c:994
 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:987 g10/g10.c:996
+#: g10/g10.c:998 g10/g10.c:1007
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/g10.c:989
+#: g10/g10.c:1000
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/g10.c:992
+#: g10/g10.c:1003
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/g10.c:1011 g10/g10.c:1023
+#: g10/g10.c:1023 g10/g10.c:1035
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado no es v�lido\n"
 
-#: g10/g10.c:1017 g10/g10.c:1029
+#: g10/g10.c:1029 g10/g10.c:1041
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no es v�lido\n"
 
-#: g10/g10.c:1033
+#: g10/g10.c:1045
 msgid "the given policy URL is invalid\n"
 msgstr "URL de pol�tica no v�lida\n"
 
-#: g10/g10.c:1036
+#: g10/g10.c:1048
 #, 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:1038
+#: g10/g10.c:1050
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/g10.c:1040
+#: g10/g10.c:1052
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/g10.c:1042
+#: g10/g10.c:1054
 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:1045
+#: g10/g10.c:1057
 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:1049
+#: g10/g10.c:1061
 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:1134
+#: g10/g10.c:1146
 #, 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:1140
+#: g10/g10.c:1152
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/g10.c:1147
+#: g10/g10.c:1159
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:1155
+#: g10/g10.c:1167
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1180
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/g10.c:1181
+#: g10/g10.c:1193
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1207
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/g10.c:1212
+#: g10/g10.c:1224
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1232
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1240
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1248
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [comandos]"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1264
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-usuario"
 
-#: g10/g10.c:1255
+#: g10/g10.c:1267
 msgid "--delete-key user-id"
 msgstr "--delete-key id-usuario"
 
-#: g10/encode.c:265 g10/g10.c:1292 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1304 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: g10/g10.c:1307
+#: g10/g10.c:1319
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/g10.c:1373
+#: g10/g10.c:1385
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:1381
+#: g10/g10.c:1393
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:1452
+#: g10/g10.c:1464
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n no v�lido `%s'\n"
 
-#: g10/g10.c:1539
+#: g10/g10.c:1551
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
-#: g10/g10.c:1543
+#: g10/g10.c:1555
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1546 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1558 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:1756
+#: g10/g10.c:1767
 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:1762
+#: g10/g10.c:1773
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -893,11 +893,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:1768
+#: g10/g10.c:1779
 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:1776
+#: g10/g10.c:1787
 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"
 
@@ -1643,17 +1643,17 @@ msgstr "%s: no puede abrirse: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "error creando contrase�a: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:324
+#: g10/encode.c:171 g10/encode.c:327
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATENCI�N: fichero vac�o\n"
 
-#: g10/encode.c:271
+#: g10/encode.c:274
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "leyendo desde `%s'\n"
 
-#: g10/encode.c:492
+#: g10/encode.c:497
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s cifrado para: %s\n"
@@ -1787,7 +1787,7 @@ msgstr " claves secretas importadas: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "claves secretas sin cambios: %lu\n"
 
-#: g10/import.c:391 g10/import.c:590
+#: g10/import.c:391 g10/import.c:600
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "clave %08lX: no hay identificativo de usuario\n"
@@ -1801,7 +1801,7 @@ msgstr "clave %08lX: no hay identificativos de usuario v�lidos\n"
 msgid "this may be caused by a missing self-signature\n"
 msgstr "esto puede ser debido a la ausencia de autofirma\n"
 
-#: g10/import.c:418 g10/import.c:657
+#: g10/import.c:418 g10/import.c:667
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "clave %08lX: clave p�blica no encontrada: %s\n"
@@ -1815,17 +1815,17 @@ msgstr "clave %08lX: no es conforme a rfc2440 - ignorada\n"
 msgid "no default public keyring\n"
 msgstr "no hay anillo p�blico por defecto\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
+#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
+#: g10/import.c:438 g10/import.c:496 g10/import.c:615 g10/import.c:716
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "no puede bloquearse el anillo `%s': %s\n"
 
-#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
+#: g10/import.c:441 g10/import.c:499 g10/import.c:618 g10/import.c:719
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
@@ -1840,12 +1840,12 @@ msgstr "clave %08lX: clave p�blica importada\n"
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "clave %08lX: no se corresponde con nuestra copia\n"
 
-#: g10/import.c:472 g10/import.c:665
+#: g10/import.c:472 g10/import.c:675
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "clave %08lX: no puede localizarse el bloque de claves original: %s\n"
 
-#: g10/import.c:478 g10/import.c:671
+#: g10/import.c:478 g10/import.c:681
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "clave %08lX: no puede leerse el bloque de claves original: %s\n"
@@ -1885,75 +1885,80 @@ msgstr "clave %08lX: %d nuevas subclaves\n"
 msgid "key %08lX: not changed\n"
 msgstr "clave %08lX: sin cambios\n"
 
-#: g10/import.c:613
+#: g10/import.c:593
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr ""
+
+#: g10/import.c:623
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "clave %08lX: clave secreta importada\n"
 
 #. we can't merge secret keys
-#: g10/import.c:617
+#: g10/import.c:627
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "clave %08lX: ya estaba en el anillo secreto\n"
 
-#: g10/import.c:622
+#: g10/import.c:632
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "clave %08lX: clave secreta no encontrada: %s\n"
 
-#: g10/import.c:651
+#: g10/import.c:661
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "clave %08lX: falta la clave p�blica - imposibile applicar el\n"
 "certificado de revocaci�n\n"
 
-#: g10/import.c:682
+#: g10/import.c:692
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "clave %08lX: certificado de revocaci�n no v�lido: %s - rechazado\n"
 
-#: g10/import.c:714
+#: g10/import.c:724
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "clave %08lX: certificado de revocaci�n importado\n"
 
-#: g10/import.c:756
+#: g10/import.c:766
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "clave %08lX: no hay identificativo de usuario para la firma\n"
 
-#: g10/import.c:763 g10/import.c:787
+#: g10/import.c:773 g10/import.c:797
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "clave %08lX: algoritmo de clave p�blica no soportado\n"
 
-#: g10/import.c:764
+#: g10/import.c:774
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "clave %08lX: autofirma no v�lida\n"
 
-#: g10/import.c:779
+#: g10/import.c:789
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "clave %08lX: no hay subclave para unir\n"
 
-#: g10/import.c:788
+#: g10/import.c:798
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "clave %08lX.%lu: uni�n de subclave no v�lida\n"
 
-#: g10/import.c:815
+#: g10/import.c:825
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "clave %08lX: aceptado ID de usuario sin autofirma '"
 
-#: g10/import.c:844
+#: g10/import.c:854
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "clave %08lX: ignorado ID de usuario '"
 
-#: g10/import.c:867
+#: g10/import.c:877
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "clave %08lX: subclave ignorada\n"
@@ -1962,33 +1967,33 @@ msgstr "clave %08lX: subclave ignorada\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:892
+#: g10/import.c:902
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "clave %08lX: firma no exportable (clase %02x) - ignorada\n"
 
-#: g10/import.c:901
+#: g10/import.c:911
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "clave %08lX: certificado de revocaci�n en lugar equivocado - ignorado\n"
 
-#: g10/import.c:909
+#: g10/import.c:919
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "clave %08lX: certificado de revocaci�n no valido: %s - ignorado\n"
 
-#: g10/import.c:1009
+#: g10/import.c:1019
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "clave %08lX: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:1060
+#: g10/import.c:1071
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "clave %08lX: certificado de revocaci�n a�adido\n"
 
-#: g10/import.c:1174 g10/import.c:1227
+#: g10/import.c:1185 g10/import.c:1238
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "clave %08lX: nuestra copia no tiene autofirma\n"
@@ -2577,114 +2582,115 @@ msgid "revoked"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:793
+#: g10/keylist.c:400 g10/mainproc.c:834
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "La clave caduca el %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:270
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la clave p�blica es %08lX\n"
 
-#: g10/mainproc.c:284
+#: g10/mainproc.c:315
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados de la clave p�blica: DEK bueno\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:367
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "cifrado con clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s\n"
 
-#: g10/mainproc.c:336
+#: g10/mainproc.c:377
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "cifrado con clave %s, ID %08lX\n"
 
-#: g10/mainproc.c:342
-msgid "no secret key for decryption available\n"
-msgstr "clave secreta para descifrado no disponible\n"
-
-#: g10/mainproc.c:351
+#: g10/mainproc.c:391
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave p�blica fallido: %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:429
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:434
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCI�N: �el mensaje cifrado ha sido manipulado!\n"
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:439
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:458
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitente solicit� \"s�lo-para-tus-ojos\"\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:460
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:615
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:661 g10/mainproc.c:670
+#: g10/mainproc.c:702 g10/mainproc.c:711
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATENCI�N: encontrados datos de notaci�n no v�lidos\n"
 
-#: g10/mainproc.c:673
+#: g10/mainproc.c:714
 msgid "Notation: "
 msgstr "Notaci�n: "
 
-#: g10/mainproc.c:682
+#: g10/mainproc.c:723
 msgid "Policy: "
 msgstr "Pol�tica: "
 
-#: g10/mainproc.c:1124
+#: g10/mainproc.c:1233
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificaci�n de la firma\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1270
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Firma creada el %.*s usando clave %s ID %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1187 g10/mainproc.c:1198
+#: g10/mainproc.c:1305 g10/mainproc.c:1316
 msgid "BAD signature from \""
 msgstr "Firma INCORRECTA de \""
 
-#: g10/mainproc.c:1188 g10/mainproc.c:1199
+#: g10/mainproc.c:1306 g10/mainproc.c:1317
 msgid "Good signature from \""
 msgstr "Firma correcta de \""
 
-#: g10/mainproc.c:1190
+#: g10/mainproc.c:1308
 msgid "                aka \""
 msgstr "tambi�n conocido como \""
 
-#: g10/mainproc.c:1246
+#: g10/mainproc.c:1364
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:1321
+#: g10/mainproc.c:1421 g10/mainproc.c:1436 g10/mainproc.c:1498
+#, fuzzy
+msgid "not a detached signature\n"
+msgstr "hace una firma separada"
+
+#: g10/mainproc.c:1447
 #, fuzzy, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Clase de firma desconocida"
 
-#: g10/mainproc.c:1372
+#: g10/mainproc.c:1502
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1377
+#: g10/mainproc.c:1507
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z no v�lido detectado en proc_tree()\n"
 
@@ -2815,7 +2821,12 @@ msgstr "Introduzca el nombre del fichero de datos: "
 msgid "reading stdin ...\n"
 msgstr "leyendo stdin...\n"
 
-#: g10/plaintext.c:392
+#: g10/plaintext.c:383
+#, fuzzy
+msgid "no signed data\n"
+msgstr "imposible abrir datos firmados `%s'\n"
+
+#: g10/plaintext.c:391
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposible abrir datos firmados `%s'\n"
@@ -2935,7 +2946,7 @@ msgstr "asumiendo firma incorrecta debido a un bit cr�tico desconocido\n"
 msgid "%s signature from: %s\n"
 msgstr "firma %s de: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:610
+#: g10/sign.c:290 g10/sign.c:613
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "no puede crearse %s: %s\n"
@@ -3381,14 +3392,14 @@ msgstr "fallo al poner '%s' en la tabla de confianza: %s\n"
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "ATENC�ON: todav�a no puedo tratar registros de preferencias largos\n"
 
-#: g10/verify.c:82
+#: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
 
-#: g10/verify.c:147
+#: g10/verify.c:173
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
@@ -3777,6 +3788,9 @@ msgstr "Ayuda no disponible"
 msgid "No help available for `%s'"
 msgstr "Ayuda no disponible para `%s'"
 
+#~ msgid "no secret key for decryption available\n"
+#~ msgstr "clave secreta para descifrado no disponible\n"
+
 #~ msgid ""
 #~ "RSA keys are deprecated; please consider creating a new key and use this key "
 #~ "in the future\n"
diff --git a/po/fr.po b/po/fr.po
index 9a0529b7f..b4c60f6ae 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.1h\n"
-"POT-Creation-Date: 2000-11-24 13:52+0100\n"
+"POT-Creation-Date: 2000-12-19 11:58+0100\n"
 "PO-Revision-Date: 2000-06-28 18:41+02:00\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -675,17 +675,17 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les cl�s\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/g10.c:426
+#: g10/g10.c:427
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Signaler toutes anomalies � <[email protected]> (en anglais)\n"
 "et tout probl�me de traduction � <[email protected]>.\n"
 
-#: g10/g10.c:430
+#: g10/g10.c:431
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/g10.c:433
+#: g10/g10.c:434
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -695,7 +695,7 @@ msgstr ""
 "signer, v�rifier, chiffrer ou d�chiffrer\n"
 "l'op�ration par d�faut d�pend des donn�es entr�es\n"
 
-#: g10/g10.c:440
+#: g10/g10.c:441
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -703,188 +703,188 @@ msgstr ""
 "\n"
 "Algorithmes support�s:\n"
 
-#: g10/g10.c:519
+#: g10/g10.c:520
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/g10.c:572
+#: g10/g10.c:573
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTE: pas de fichier d'options par d�faut `%s'\n"
 
-#: g10/g10.c:716
+#: g10/g10.c:717
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: g10/g10.c:723
+#: g10/g10.c:724
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/g10.c:915
+#: g10/g10.c:925
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s n'est pas une table de caract�res valide\n"
 
-#: g10/g10.c:983
+#: g10/g10.c:994
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/g10.c:987 g10/g10.c:996
+#: g10/g10.c:998 g10/g10.c:1007
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE: %s n'est pas pour une utilisation normale !\n"
 
-#: g10/g10.c:989
+#: g10/g10.c:1000
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/g10.c:992
+#: g10/g10.c:1003
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/g10.c:1011 g10/g10.c:1023
+#: g10/g10.c:1023 g10/g10.c:1035
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/g10.c:1017 g10/g10.c:1029
+#: g10/g10.c:1029 g10/g10.c:1041
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/g10.c:1033
+#: g10/g10.c:1045
 msgid "the given policy URL is invalid\n"
 msgstr "l'URL de politique donn�e est invalide\n"
 
-#: g10/g10.c:1036
+#: g10/g10.c:1048
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "l'algorithme de compression doit faire partie de l'intervalle %d..%d\n"
 
-#: g10/g10.c:1038
+#: g10/g10.c:1050
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/g10.c:1040
+#: g10/g10.c:1052
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/g10.c:1042
+#: g10/g10.c:1054
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "�max-cert-depth� doit �tre compris entre 1 et 255\n"
 
-#: g10/g10.c:1045
+#: g10/g10.c:1057
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: le mode S2K simple (0) est fortement d�conseill�\n"
 
-#: g10/g10.c:1049
+#: g10/g10.c:1061
 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:1134
+#: g10/g10.c:1146
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/g10.c:1140
+#: g10/g10.c:1152
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/g10.c:1147
+#: g10/g10.c:1159
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/g10.c:1155
+#: g10/g10.c:1167
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1180
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/g10.c:1181
+#: g10/g10.c:1193
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1207
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/g10.c:1212
+#: g10/g10.c:1224
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1232
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1240
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1248
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1264
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key utilisateur"
 
-#: g10/g10.c:1255
+#: g10/g10.c:1267
 msgid "--delete-key user-id"
 msgstr "--delete-key utilisateur"
 
-#: g10/encode.c:265 g10/g10.c:1292 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1304 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossible d'ouvrir %s: %s\n"
 
-#: g10/g10.c:1307
+#: g10/g10.c:1319
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
 
-#: g10/g10.c:1373
+#: g10/g10.c:1385
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/g10.c:1381
+#: g10/g10.c:1393
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/g10.c:1452
+#: g10/g10.c:1464
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/g10.c:1539
+#: g10/g10.c:1551
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/g10.c:1543
+#: g10/g10.c:1555
 msgid "Go ahead and type your message ...\n"
 msgstr "Continuez et tapez votre message...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1546 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1558 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir `%s'\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1767
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "le premier caract�re du nom d'une notation doit �tre un lettre ou un trait\n"
 "de soulignement\n"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1773
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -893,13 +893,13 @@ msgstr ""
 "des points ou des traits de soulignement et doit se terminer par un signe "
 "�gal\n"
 
-#: g10/g10.c:1768
+#: g10/g10.c:1779
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "les points dans le nom d'une notation doivent �tre entour�s d'autes "
 "caract�res\n"
 
-#: g10/g10.c:1776
+#: g10/g10.c:1787
 msgid "a notation value must not use any control characters\n"
 msgstr "une valeur de notation ne doit utiliser aucun caract�re de contr�le\n"
 
@@ -1645,17 +1645,17 @@ msgstr "%s: impossible d'ouvrir: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "erreur pendant la cr�ation du mot de passe: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:324
+#: g10/encode.c:171 g10/encode.c:327
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATTENTION: fichier vide\n"
 
-#: g10/encode.c:271
+#: g10/encode.c:274
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lecture de `%s'\n"
 
-#: g10/encode.c:492
+#: g10/encode.c:497
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s chiffr� pour: %s\n"
@@ -1790,7 +1790,7 @@ msgstr "       cl�s secr�tes import�es: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "      cl�s secr�tes inchang�es: %lu\n"
 
-#: g10/import.c:391 g10/import.c:590
+#: g10/import.c:391 g10/import.c:600
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "cl� %08lX: pas de nom d'utilisateur\n"
@@ -1804,7 +1804,7 @@ msgstr "cl� %08lX: pas de nom d'utilisateur valide\n"
 msgid "this may be caused by a missing self-signature\n"
 msgstr "cela peut provenir d'une auto-signature manquante\n"
 
-#: g10/import.c:418 g10/import.c:657
+#: g10/import.c:418 g10/import.c:667
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "cl� %08lX: cl� publique pas trouv�e: %s\n"
@@ -1818,17 +1818,17 @@ msgstr "cl� %08lX: ce n'est pas une cl� rfc2440 - ignor�e\n"
 msgid "no default public keyring\n"
 msgstr "pas de porte-cl�s public par d�faut\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
+#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�criture de `%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
+#: g10/import.c:438 g10/import.c:496 g10/import.c:615 g10/import.c:716
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "impossible de verrouiller le porte-cl�s `%s': %s\n"
 
-#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
+#: g10/import.c:441 g10/import.c:499 g10/import.c:618 g10/import.c:719
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
@@ -1843,12 +1843,12 @@ msgstr "cl� %08lX: cl� publique import�e\n"
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "cl� %08lX: ne ressemble pas � notre copie\n"
 
-#: g10/import.c:472 g10/import.c:665
+#: g10/import.c:472 g10/import.c:675
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "cl� %08lX: impossible de trouver le bloc de cl�s original: %s\n"
 
-#: g10/import.c:478 g10/import.c:671
+#: g10/import.c:478 g10/import.c:681
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "cl� %08lX: impossible de lire le bloc de cl�s original: %s\n"
@@ -1888,75 +1888,80 @@ msgstr "cl� %08lX: %d nouvelles sous-cl�s\n"
 msgid "key %08lX: not changed\n"
 msgstr "cl� %08lX: n'a pas chang�\n"
 
-#: g10/import.c:613
+#: g10/import.c:593
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr ""
+
+#: g10/import.c:623
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "cl� %08lX: cl� secr�te import�e\n"
 
 #. we can't merge secret keys
-#: g10/import.c:617
+#: g10/import.c:627
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "cl� %08lX: d�j� dans le porte-cl�s secret\n"
 
-#: g10/import.c:622
+#: g10/import.c:632
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "cl� %08lX: cl� secr�te pas trouv�e: %s\n"
 
-#: g10/import.c:651
+#: g10/import.c:661
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "cl� %08lX: pas de cl� publique - le certificat de r�vocation ne peut\n"
 "�tre appliqu�\n"
 
-#: g10/import.c:682
+#: g10/import.c:692
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "cl� %08lX: certificat de r�vocation invalide: %s - rejet�\n"
 
-#: g10/import.c:714
+#: g10/import.c:724
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "cl� %08lX: certificat de r�vocation import�\n"
 
-#: g10/import.c:756
+#: g10/import.c:766
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "cl� %08lX: pas d'utilisateur pour la signature\n"
 
-#: g10/import.c:763 g10/import.c:787
+#: g10/import.c:773 g10/import.c:797
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "cl� %08lX: algorithme de cl� publique non support�\n"
 
-#: g10/import.c:764
+#: g10/import.c:774
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "cl� %08lX: auto-signature invalide\n"
 
-#: g10/import.c:779
+#: g10/import.c:789
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "cl� %08lX: pas de sous-cl� pour relier la cl�\n"
 
-#: g10/import.c:788
+#: g10/import.c:798
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "cl� %08lX: liaison avec la sous-cl� invalide\n"
 
-#: g10/import.c:815
+#: g10/import.c:825
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "cl� %08lX: utilisateur non sign� par lui-m�me accept�: '"
 
-#: g10/import.c:844
+#: g10/import.c:854
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "cl� %08lX: utilisateur non pris en compte: '"
 
-#: g10/import.c:867
+#: g10/import.c:877
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "cl� %08lX: sous-cl� non prise en compte\n"
@@ -1965,32 +1970,32 @@ msgstr "cl� %08lX: sous-cl� non prise en compte\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:892
+#: g10/import.c:902
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "cl� %08lX: signature non exportable (classe %02x) - ignor�e\n"
 
-#: g10/import.c:901
+#: g10/import.c:911
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "cl� %08lX: certificat de r�vocation au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:909
+#: g10/import.c:919
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "cl� %08lX: certificat de r�vocation invalide: %s - ignor�e\n"
 
-#: g10/import.c:1009
+#: g10/import.c:1019
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "cl� %08lX: nom d'utilisateur en double fusionn�\n"
 
-#: g10/import.c:1060
+#: g10/import.c:1071
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "cl� %08lX: certificat de r�vocation ajout�\n"
 
-#: g10/import.c:1174 g10/import.c:1227
+#: g10/import.c:1185 g10/import.c:1238
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "cl� %08lX: notre copie n'a pas d'auto-signature\n"
@@ -2579,114 +2584,115 @@ msgid "revoked"
 msgstr "revcl�"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:793
+#: g10/keylist.c:400 g10/mainproc.c:834
 #, c-format
 msgid " [expires: %s]"
 msgstr " [expire: %s]"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:270
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la cl� publique est %08lX\n"
 
-#: g10/mainproc.c:284
+#: g10/mainproc.c:315
 msgid "public key encrypted data: good DEK\n"
 msgstr "donn�es chiffr�es par cl� publique: bonne cl� de chiffrement (DEK)\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:367
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "chiffr� avec une cl� de %u bits %s, ID %08lX, cr��e le %s\n"
 
-#: g10/mainproc.c:336
+#: g10/mainproc.c:377
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "chiffr� avec une cl� %s, %08lX\n"
 
-#: g10/mainproc.c:342
-msgid "no secret key for decryption available\n"
-msgstr "aucune cl� secr�te n'est disponible pour le d�chiffrement\n"
-
-#: g10/mainproc.c:351
+#: g10/mainproc.c:391
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "le d�chiffrement par cl� publique a �chou�: %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:429
 msgid "decryption okay\n"
 msgstr "le d�chiffrement a r�ussi\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:434
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENTION: le message chiffr� a �t� manipul� !\n"
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:439
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "le d�chiffrement a �chou�: %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:458
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTE: l'exp�diteur a demand� �pour vos yeux seulement�\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:460
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original: '%.*s'\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:615
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "r�vocation autonome - utilisez �gpg --import� pour l'appliquer\n"
 
-#: g10/mainproc.c:661 g10/mainproc.c:670
+#: g10/mainproc.c:702 g10/mainproc.c:711
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENTION: des donn�es de notation invalides ont �t� d�tect�es\n"
 
-#: g10/mainproc.c:673
+#: g10/mainproc.c:714
 msgid "Notation: "
 msgstr "Notation: "
 
-#: g10/mainproc.c:682
+#: g10/mainproc.c:723
 msgid "Policy: "
 msgstr "Politique: "
 
-#: g10/mainproc.c:1124
+#: g10/mainproc.c:1233
 msgid "signature verification suppressed\n"
 msgstr "v�rification de signature supprim�e\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1270
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signature faite %.*s avec une cl� %s ID %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1187 g10/mainproc.c:1198
+#: g10/mainproc.c:1305 g10/mainproc.c:1316
 msgid "BAD signature from \""
 msgstr "MAUVAISE signature de \""
 
-#: g10/mainproc.c:1188 g10/mainproc.c:1199
+#: g10/mainproc.c:1306 g10/mainproc.c:1317
 msgid "Good signature from \""
 msgstr "Bonne signature de \""
 
-#: g10/mainproc.c:1190
+#: g10/mainproc.c:1308
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1246
+#: g10/mainproc.c:1364
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de v�rifier la signature: %s\n"
 
-#: g10/mainproc.c:1321
+#: g10/mainproc.c:1421 g10/mainproc.c:1436 g10/mainproc.c:1498
+#, fuzzy
+msgid "not a detached signature\n"
+msgstr "faire une signature d�tach�e"
+
+#: g10/mainproc.c:1447
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:1372
+#: g10/mainproc.c:1502
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:1377
+#: g10/mainproc.c:1507
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
 
@@ -2817,7 +2823,12 @@ msgstr "Entrez le nom du fichier de donn�es: "
 msgid "reading stdin ...\n"
 msgstr "lecture de l'entr�e standard...\n"
 
-#: g10/plaintext.c:392
+#: g10/plaintext.c:383
+#, fuzzy
+msgid "no signed data\n"
+msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
+
+#: g10/plaintext.c:391
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
@@ -2940,7 +2951,7 @@ msgstr ""
 msgid "%s signature from: %s\n"
 msgstr "Signature %s de: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:610
+#: g10/sign.c:290 g10/sign.c:613
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossible de cr�er %s: %s\n"
@@ -3396,7 +3407,7 @@ msgstr ""
 "ATTENTION: les enregistrements de pr�f�rences longs ne sont pas encore\n"
 "support�s\n"
 
-#: g10/verify.c:82
+#: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -3406,7 +3417,7 @@ msgstr ""
 "Rappelez-vous bien que le fichier de signature (.sig ou .asc)\n"
 "doit �tre le premier fichier indiqu� sur la ligne de commande.\n"
 
-#: g10/verify.c:147
+#: g10/verify.c:173
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
@@ -3822,6 +3833,9 @@ msgstr "Pas d'aide disponible"
 msgid "No help available for `%s'"
 msgstr "Pas d'aide disponible pour `%s'"
 
+#~ msgid "no secret key for decryption available\n"
+#~ msgstr "aucune cl� secr�te n'est disponible pour le d�chiffrement\n"
+
 #~ msgid ""
 #~ "RSA keys are deprecated; please consider creating a new key and use this key "
 #~ "in the future\n"
diff --git a/po/id.po b/po/id.po
index 5c9a7997d..ad4fa9a68 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU Privacy Guard 1.0.1\n"
-"POT-Creation-Date: 2000-11-24 13:52+0100\n"
+"POT-Creation-Date: 2000-12-19 11:58+0100\n"
 "PO-Revision-Date: 2000-02-06 18:04+07:00\n"
 "Last-Translator: Tedi Heriyanto <[email protected]>\n"
 "Language-Team: Indonesia <[email protected]>\n"
@@ -663,15 +663,15 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/g10.c:426
+#: g10/g10.c:427
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Silakan laporkan kesalahan ke <[email protected]>.\n"
 
-#: g10/g10.c:430
+#: g10/g10.c:431
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/g10.c:433
+#: g10/g10.c:434
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -681,7 +681,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/g10.c:440
+#: g10/g10.c:441
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -689,186 +689,186 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/g10.c:519
+#: g10/g10.c:520
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/g10.c:572
+#: g10/g10.c:573
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: g10/g10.c:716
+#: g10/g10.c:717
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: g10/g10.c:723
+#: g10/g10.c:724
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/g10.c:915
+#: g10/g10.c:925
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/g10.c:983
+#: g10/g10.c:994
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/g10.c:987 g10/g10.c:996
+#: g10/g10.c:998 g10/g10.c:1007
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/g10.c:989
+#: g10/g10.c:1000
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/g10.c:992
+#: g10/g10.c:1003
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/g10.c:1011 g10/g10.c:1023
+#: g10/g10.c:1023 g10/g10.c:1035
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:1017 g10/g10.c:1029
+#: g10/g10.c:1029 g10/g10.c:1041
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:1033
+#: g10/g10.c:1045
 msgid "the given policy URL is invalid\n"
 msgstr "kebijakan URL yang diberikan tidak valid\n"
 
-#: g10/g10.c:1036
+#: g10/g10.c:1048
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "algoritma kompresi harus di antara %d..%d\n"
 
-#: g10/g10.c:1038
+#: g10/g10.c:1050
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/g10.c:1040
+#: g10/g10.c:1052
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/g10.c:1042
+#: g10/g10.c:1054
 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:1045
+#: g10/g10.c:1057
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/g10.c:1049
+#: g10/g10.c:1061
 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:1134
+#: g10/g10.c:1146
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/g10.c:1140
+#: g10/g10.c:1152
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/g10.c:1147
+#: g10/g10.c:1159
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/g10.c:1155
+#: g10/g10.c:1167
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1180
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/g10.c:1181
+#: g10/g10.c:1193
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1207
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/g10.c:1212
+#: g10/g10.c:1224
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1232
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1240
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1248
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1264
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-user"
 
-#: g10/g10.c:1255
+#: g10/g10.c:1267
 msgid "--delete-key user-id"
 msgstr "--delete-key id-user"
 
-#: g10/encode.c:265 g10/g10.c:1292 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1304 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "tidak dapat membuka %s: %s\n"
 
-#: g10/g10.c:1307
+#: g10/g10.c:1319
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/g10.c:1373
+#: g10/g10.c:1385
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/g10.c:1381
+#: g10/g10.c:1393
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/g10.c:1452
+#: g10/g10.c:1464
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/g10.c:1539
+#: g10/g10.c:1551
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/g10.c:1543
+#: g10/g10.c:1555
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1546 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1558 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:1756
+#: g10/g10.c:1767
 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:1762
+#: g10/g10.c:1773
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -876,11 +876,11 @@ msgstr ""
 "nama notasi hanya terdiri dari huruf, digit, titik atau garis bawah dan "
 "diakhiri dengan sebuah '='\n"
 
-#: g10/g10.c:1768
+#: g10/g10.c:1779
 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:1776
+#: g10/g10.c:1787
 msgid "a notation value must not use any control characters\n"
 msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
@@ -1612,17 +1612,17 @@ msgstr "%s: tidak dapat dibuka: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:324
+#: g10/encode.c:171 g10/encode.c:327
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: PERINGATAN: file kosong\n"
 
-#: g10/encode.c:271
+#: g10/encode.c:274
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Membaca dari `%s'\n"
 
-#: g10/encode.c:492
+#: g10/encode.c:497
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s dienkripsi untuk: %s\n"
@@ -1756,7 +1756,7 @@ msgstr "  kunci rahasia diimpor: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr " kunci rahasia tetap: %lu\n"
 
-#: g10/import.c:391 g10/import.c:590
+#: g10/import.c:391 g10/import.c:600
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
@@ -1770,7 +1770,7 @@ msgstr "kunci %08lX: tidak ada ID user yang valid\n"
 msgid "this may be caused by a missing self-signature\n"
 msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
 
-#: g10/import.c:418 g10/import.c:657
+#: g10/import.c:418 g10/import.c:667
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
@@ -1784,17 +1784,17 @@ msgstr "kunci %08lX: bukan kunci rfc2440 - dilewati\n"
 msgid "no default public keyring\n"
 msgstr "tidak ada keyring publik baku\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
+#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
+#: g10/import.c:438 g10/import.c:496 g10/import.c:615 g10/import.c:716
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "tidak dapat mengunci keyring `%s': %s\n"
 
-#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
+#: g10/import.c:441 g10/import.c:499 g10/import.c:618 g10/import.c:719
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
@@ -1809,12 +1809,12 @@ msgstr "kunci %08lX: kunci publik diimpor\n"
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
 
-#: g10/import.c:472 g10/import.c:665
+#: g10/import.c:472 g10/import.c:675
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat mengalokasi keyblock orisinal: %s\n"
 
-#: g10/import.c:478 g10/import.c:671
+#: g10/import.c:478 g10/import.c:681
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat membaca keyblok orisinal: %s\n"
@@ -1854,75 +1854,80 @@ msgstr "kunci %08lX: %d subkey baru\n"
 msgid "key %08lX: not changed\n"
 msgstr "kunci %08lX: tidak berubah\n"
 
-#: g10/import.c:613
+#: g10/import.c:593
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr ""
+
+#: g10/import.c:623
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "kunci %08lX: kunci rahasia diimpor\n"
 
 #. we can't merge secret keys
-#: g10/import.c:617
+#: g10/import.c:627
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "kunci %08lX: sudah ada di keyring rahasia\n"
 
-#: g10/import.c:622
+#: g10/import.c:632
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "kunci %08lX: kunci rahasia tidak ditemukan: %s\n"
 
-#: g10/import.c:651
+#: g10/import.c:661
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "kunci %08lX: tdk ada kunci publik-tdk dpt mengaplikasikan sertifikat "
 "pembatalan\n"
 
-#: g10/import.c:682
+#: g10/import.c:692
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - ditolak\n"
 
-#: g10/import.c:714
+#: g10/import.c:724
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "kunci %08lX: sertifikat pembatalan diimpor\n"
 
-#: g10/import.c:756
+#: g10/import.c:766
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "kunci %08lX: tidak ada ID user untuk signature\n"
 
-#: g10/import.c:763 g10/import.c:787
+#: g10/import.c:773 g10/import.c:797
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
 
-#: g10/import.c:764
+#: g10/import.c:774
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "kunci %08lX: self-signature tidak valid\n"
 
-#: g10/import.c:779
+#: g10/import.c:789
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
 
-#: g10/import.c:788
+#: g10/import.c:798
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "kunci %08lX: subkey binding tidak valid\n"
 
-#: g10/import.c:815
+#: g10/import.c:825
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "kunci %08lX: menerima ID user yang tidak self-signed "
 
-#: g10/import.c:844
+#: g10/import.c:854
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "kunci %08lX: melewati ID user "
 
-#: g10/import.c:867
+#: g10/import.c:877
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "kunci %08lX: melewati subkey\n"
@@ -1931,32 +1936,32 @@ msgstr "kunci %08lX: melewati subkey\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:892
+#: g10/import.c:902
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "kunci %08lX: signature tidak dapat diekpor (kelas %02x) - dilewati\n"
 
-#: g10/import.c:901
+#: g10/import.c:911
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan di tempat yang salah - dilewati\n"
 
-#: g10/import.c:909
+#: g10/import.c:919
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - dilewati\n"
 
-#: g10/import.c:1009
+#: g10/import.c:1019
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
 
-#: g10/import.c:1060
+#: g10/import.c:1071
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "kunci %08lX: penambahan sertifikat pembatalan\n"
 
-#: g10/import.c:1174 g10/import.c:1227
+#: g10/import.c:1185 g10/import.c:1238
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "kunci %08lX: salinan kita tidak memiliki self-signature\n"
@@ -2544,114 +2549,115 @@ msgid "revoked"
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:793
+#: g10/keylist.c:400 g10/mainproc.c:834
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "Kunci berakhir pada %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:270
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "kunci publik adalah %08lX\n"
 
-#: g10/mainproc.c:284
+#: g10/mainproc.c:315
 msgid "public key encrypted data: good DEK\n"
 msgstr "data terenkripsi dengan kunci publik: DEK baik\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:367
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "dienkripsi dengan %u-bit kunci %s, ID %08lX, tercipta %s\n"
 
-#: g10/mainproc.c:336
+#: g10/mainproc.c:377
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
 
-#: g10/mainproc.c:342
-msgid "no secret key for decryption available\n"
-msgstr "tidak tersedia kunci rahasia untuk dekripsi\n"
-
-#: g10/mainproc.c:351
+#: g10/mainproc.c:391
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "gagal dekripsi kunci publik: %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:429
 msgid "decryption okay\n"
 msgstr "dekripsi lancar\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:434
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:439
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "gagal dekripsi: %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:458
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:460
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nama file asli='%.*s'\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:615
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:661 g10/mainproc.c:670
+#: g10/mainproc.c:702 g10/mainproc.c:711
 msgid "WARNING: invalid notation data found\n"
 msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
 
-#: g10/mainproc.c:673
+#: g10/mainproc.c:714
 msgid "Notation: "
 msgstr "Notasi: "
 
-#: g10/mainproc.c:682
+#: g10/mainproc.c:723
 msgid "Policy: "
 msgstr "Kebijakan: "
 
-#: g10/mainproc.c:1124
+#: g10/mainproc.c:1233
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak optimal\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1270
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signature dibuat %.*s menggunakan kunci %s ID %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1187 g10/mainproc.c:1198
+#: g10/mainproc.c:1305 g10/mainproc.c:1316
 msgid "BAD signature from \""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1188 g10/mainproc.c:1199
+#: g10/mainproc.c:1306 g10/mainproc.c:1317
 msgid "Good signature from \""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1190
+#: g10/mainproc.c:1308
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1246
+#: g10/mainproc.c:1364
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:1321
+#: g10/mainproc.c:1421 g10/mainproc.c:1436 g10/mainproc.c:1498
+#, fuzzy
+msgid "not a detached signature\n"
+msgstr "buat detached signature"
+
+#: g10/mainproc.c:1447
 #, fuzzy, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature tidak dikenal"
 
-#: g10/mainproc.c:1372
+#: g10/mainproc.c:1502
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
 
-#: g10/mainproc.c:1377
+#: g10/mainproc.c:1507
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
@@ -2780,7 +2786,12 @@ msgstr "Silakan masukkan nama file data: "
 msgid "reading stdin ...\n"
 msgstr "membaca stdin ...\n"
 
-#: g10/plaintext.c:392
+#: g10/plaintext.c:383
+#, fuzzy
+msgid "no signed data\n"
+msgstr "tidak dapat membuka data tertandai `%s'\n"
+
+#: g10/plaintext.c:391
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "tidak dapat membuka data tertandai `%s'\n"
@@ -2899,7 +2910,7 @@ msgstr "mengasumsikan signature buruk karena ada bit kritik tidak dikenal\n"
 msgid "%s signature from: %s\n"
 msgstr "%s signature dari: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:610
+#: g10/sign.c:290 g10/sign.c:613
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
@@ -3340,14 +3351,14 @@ msgstr "gagal menaruh '%s' ke dalam trustdb: %s\n"
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "PERINGATAN: belum dapat menangani record pref panjang\n"
 
-#: g10/verify.c:82
+#: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
 
-#: g10/verify.c:147
+#: g10/verify.c:173
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
@@ -3737,6 +3748,9 @@ msgstr "Tidak tersedia bantuan"
 msgid "No help available for `%s'"
 msgstr "Tidak tersedia bantuan untuk `%s'"
 
+#~ msgid "no secret key for decryption available\n"
+#~ msgstr "tidak tersedia kunci rahasia untuk dekripsi\n"
+
 #~ msgid ""
 #~ "RSA keys are deprecated; please consider creating a new key and use this key "
 #~ "in the future\n"
diff --git a/po/it.po b/po/it.po
index b2be53f0f..d75a02944 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.0h\n"
-"POT-Creation-Date: 2000-11-24 13:52+0100\n"
+"POT-Creation-Date: 2000-12-19 11:58+0100\n"
 "PO-Revision-Date: 1999-12-08 15:51+02:00\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -666,15 +666,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/g10.c:426
+#: g10/g10.c:427
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: g10/g10.c:430
+#: g10/g10.c:431
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/g10.c:433
+#: g10/g10.c:434
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -684,7 +684,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/g10.c:440
+#: g10/g10.c:441
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -692,188 +692,188 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/g10.c:519
+#: g10/g10.c:520
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/g10.c:572
+#: g10/g10.c:573
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/g10.c:716
+#: g10/g10.c:717
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/g10.c:723
+#: g10/g10.c:724
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/g10.c:915
+#: g10/g10.c:925
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/g10.c:983
+#: g10/g10.c:994
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/g10.c:987 g10/g10.c:996
+#: g10/g10.c:998 g10/g10.c:1007
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/g10.c:989
+#: g10/g10.c:1000
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/g10.c:992
+#: g10/g10.c:1003
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/g10.c:1011 g10/g10.c:1023
+#: g10/g10.c:1023 g10/g10.c:1035
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/g10.c:1017 g10/g10.c:1029
+#: g10/g10.c:1029 g10/g10.c:1041
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:1033
+#: g10/g10.c:1045
 msgid "the given policy URL is invalid\n"
 msgstr "L'URL della policy indicato non � valido\n"
 
-#: g10/g10.c:1036
+#: g10/g10.c:1048
 #, 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:1038
+#: g10/g10.c:1050
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/g10.c:1040
+#: g10/g10.c:1052
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/g10.c:1042
+#: g10/g10.c:1054
 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:1045
+#: g10/g10.c:1057
 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:1049
+#: g10/g10.c:1061
 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:1134
+#: g10/g10.c:1146
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/g10.c:1140
+#: g10/g10.c:1152
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/g10.c:1147
+#: g10/g10.c:1159
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:1155
+#: g10/g10.c:1167
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1180
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/g10.c:1181
+#: g10/g10.c:1193
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1207
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/g10.c:1212
+#: g10/g10.c:1224
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1232
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1240
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1248
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1264
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key user-id"
 
-#: g10/g10.c:1255
+#: g10/g10.c:1267
 msgid "--delete-key user-id"
 msgstr "--delete-key user-id"
 
-#: g10/encode.c:265 g10/g10.c:1292 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1304 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/g10.c:1307
+#: g10/g10.c:1319
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/g10.c:1373
+#: g10/g10.c:1385
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1381
+#: g10/g10.c:1393
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1452
+#: g10/g10.c:1464
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/g10.c:1539
+#: g10/g10.c:1551
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/g10.c:1543
+#: g10/g10.c:1555
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1546 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1558 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1767
 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:1762
+#: g10/g10.c:1773
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -881,11 +881,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:1768
+#: g10/g10.c:1779
 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:1776
+#: g10/g10.c:1787
 msgid "a notation value must not use any control characters\n"
 msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 
@@ -1626,17 +1626,17 @@ msgstr "%s: impossibile aprire: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:324
+#: g10/encode.c:171 g10/encode.c:327
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATTENZIONE: file vuoto\n"
 
-#: g10/encode.c:271
+#: g10/encode.c:274
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lettura da `%s'\n"
 
-#: g10/encode.c:492
+#: g10/encode.c:497
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s cifrato per: %s\n"
@@ -1770,7 +1770,7 @@ msgstr "chiavi segrete importate: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "chiavi segrete non cambiate: %lu\n"
 
-#: g10/import.c:391 g10/import.c:590
+#: g10/import.c:391 g10/import.c:600
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "chiave %08lX: nessun user ID\n"
@@ -1784,7 +1784,7 @@ msgstr "chiave %08lX: nessun user ID valido\n"
 msgid "this may be caused by a missing self-signature\n"
 msgstr "questo pu� essere causato da una autofirma mancante\n"
 
-#: g10/import.c:418 g10/import.c:657
+#: g10/import.c:418 g10/import.c:667
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
@@ -1798,17 +1798,17 @@ msgstr "chiave %08lX: chiave non rfc2440 - saltata\n"
 msgid "no default public keyring\n"
 msgstr "nessun portachiavi pubblico predefinito\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
+#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
+#: g10/import.c:438 g10/import.c:496 g10/import.c:615 g10/import.c:716
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "impossibile fare il lock del portachiavi `%s': %s\n"
 
-#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
+#: g10/import.c:441 g10/import.c:499 g10/import.c:618 g10/import.c:719
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
@@ -1823,12 +1823,12 @@ msgstr "chiave %08lX: chiave pubblica importata\n"
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
 
-#: g10/import.c:472 g10/import.c:665
+#: g10/import.c:472 g10/import.c:675
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n"
 
-#: g10/import.c:478 g10/import.c:671
+#: g10/import.c:478 g10/import.c:681
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n"
@@ -1868,75 +1868,80 @@ msgstr "chiave %08lX: %d nuove subchiavi\n"
 msgid "key %08lX: not changed\n"
 msgstr "chiave %08lX: non cambiata\n"
 
-#: g10/import.c:613
+#: g10/import.c:593
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr ""
+
+#: g10/import.c:623
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "chiave %08lX: chiave segreta importata\n"
 
 #. we can't merge secret keys
-#: g10/import.c:617
+#: g10/import.c:627
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chiave %08lX: gi� nel portachiavi segreto\n"
 
-#: g10/import.c:622
+#: g10/import.c:632
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
 
-#: g10/import.c:651
+#: g10/import.c:661
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chiave %08lX: manca la chiave pubblica - impossibile applicare il\n"
 "certificato di revoca\n"
 
-#: g10/import.c:682
+#: g10/import.c:692
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n"
 
-#: g10/import.c:714
+#: g10/import.c:724
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "chiave %08lX: certificato di revoca importato\n"
 
-#: g10/import.c:756
+#: g10/import.c:766
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "chiave %08lX: nessun user ID per la firma\n"
 
-#: g10/import.c:763 g10/import.c:787
+#: g10/import.c:773 g10/import.c:797
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
 
-#: g10/import.c:764
+#: g10/import.c:774
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "chiave %08lX: autofirma non valida\n"
 
-#: g10/import.c:779
+#: g10/import.c:789
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n"
 
-#: g10/import.c:788
+#: g10/import.c:798
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chiave %08lX: legame con la subchiave non valido:\n"
 
-#: g10/import.c:815
+#: g10/import.c:825
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "chiave %08lX: accettato l'user ID non autofirmato '"
 
-#: g10/import.c:844
+#: g10/import.c:854
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chiave %08lX: saltato l'user ID '"
 
-#: g10/import.c:867
+#: g10/import.c:877
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chiave %08lX: saltata la subchiave\n"
@@ -1945,32 +1950,32 @@ msgstr "chiave %08lX: saltata la subchiave\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:892
+#: g10/import.c:902
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "chiave %08lX: firma non esportabile (classe %02x) - saltata\n"
 
-#: g10/import.c:901
+#: g10/import.c:911
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltato\n"
 
-#: g10/import.c:909
+#: g10/import.c:919
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - saltato\n"
 
-#: g10/import.c:1009
+#: g10/import.c:1019
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
 
-#: g10/import.c:1060
+#: g10/import.c:1071
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chiave %08lX: certificato di revoca aggiunto\n"
 
-#: g10/import.c:1174 g10/import.c:1227
+#: g10/import.c:1185 g10/import.c:1238
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "chiave %08lX: la nostra copia non ha autofirma\n"
@@ -2561,114 +2566,115 @@ msgid "revoked"
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:793
+#: g10/keylist.c:400 g10/mainproc.c:834
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "La chiave scadr� il %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:270
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la chiave pubblica � %08lX\n"
 
-#: g10/mainproc.c:284
+#: g10/mainproc.c:315
 msgid "public key encrypted data: good DEK\n"
 msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:367
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "cifrato con la chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s\n"
 
-#: g10/mainproc.c:336
+#: g10/mainproc.c:377
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "Cifrato con la chiave %s con ID %08lX\n"
 
-#: g10/mainproc.c:342
-msgid "no secret key for decryption available\n"
-msgstr "nessuna chiave disponibile per decifrare\n"
-
-#: g10/mainproc.c:351
+#: g10/mainproc.c:391
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:429
 msgid "decryption okay\n"
 msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:434
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato � stato manipolato!\n"
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:439
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:458
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:460
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:615
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
 
-#: g10/mainproc.c:661 g10/mainproc.c:670
+#: g10/mainproc.c:702 g10/mainproc.c:711
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
 
-#: g10/mainproc.c:673
+#: g10/mainproc.c:714
 msgid "Notation: "
 msgstr "Nota: "
 
-#: g10/mainproc.c:682
+#: g10/mainproc.c:723
 msgid "Policy: "
 msgstr "Policy: "
 
-#: g10/mainproc.c:1124
+#: g10/mainproc.c:1233
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1270
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Firma fatta %.*s usando la chiave %s con ID %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1187 g10/mainproc.c:1198
+#: g10/mainproc.c:1305 g10/mainproc.c:1316
 msgid "BAD signature from \""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:1188 g10/mainproc.c:1199
+#: g10/mainproc.c:1306 g10/mainproc.c:1317
 msgid "Good signature from \""
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1190
+#: g10/mainproc.c:1308
 msgid "                aka \""
 msgstr "    anche noto come \""
 
-#: g10/mainproc.c:1246
+#: g10/mainproc.c:1364
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:1321
+#: g10/mainproc.c:1421 g10/mainproc.c:1436 g10/mainproc.c:1498
+#, fuzzy
+msgid "not a detached signature\n"
+msgstr "fai una firma separata"
+
+#: g10/mainproc.c:1447
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:1372
+#: g10/mainproc.c:1502
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/mainproc.c:1377
+#: g10/mainproc.c:1507
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
@@ -2796,7 +2802,12 @@ msgstr "Inserisci il nome del file di dati: "
 msgid "reading stdin ...\n"
 msgstr "viene letto stdin...\n"
 
-#: g10/plaintext.c:392
+#: g10/plaintext.c:383
+#, fuzzy
+msgid "no signed data\n"
+msgstr "impossibile aprire i dati firmati `%s'\n"
+
+#: g10/plaintext.c:391
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossibile aprire i dati firmati `%s'\n"
@@ -2919,7 +2930,7 @@ msgstr ""
 msgid "%s signature from: %s\n"
 msgstr "Firma %s da: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:610
+#: g10/sign.c:290 g10/sign.c:613
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossibile creare %s: %s\n"
@@ -3364,7 +3375,7 @@ msgstr "impossibile mettere `%s' nel trustdb: %s\n"
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "ATTENZIONE: non � ancora possibile gestire record pref lunghi\n"
 
-#: g10/verify.c:82
+#: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -3374,7 +3385,7 @@ msgstr ""
 "Ricorda che il file con la firma (.sig or .asc) deve\n"
 "essere il primo file indicato sulla riga di comando.\n"
 
-#: g10/verify.c:147
+#: g10/verify.c:173
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linea di input %u troppo lunga o LF mancante\n"
@@ -3771,6 +3782,9 @@ msgstr "Non � disponibile un aiuto"
 msgid "No help available for `%s'"
 msgstr "Non � disponibile un aiuto per `%s'"
 
+#~ msgid "no secret key for decryption available\n"
+#~ msgstr "nessuna chiave disponibile per decifrare\n"
+
 #~ msgid ""
 #~ "RSA keys are deprecated; please consider creating a new key and use this key "
 #~ "in the future\n"
diff --git a/po/ja.po b/po/ja.po
index c3685a271..ecca476b4 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: 2000-11-24 13:52+0100\n"
+"POT-Creation-Date: 2000-12-19 11:58+0100\n"
 "PO-Revision-Date: 2000-10-19 23:08+09:00\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -704,15 +704,15 @@ msgstr ""
 " --list-keys [̾��]         ����ɽ��\n"
 " --fingerprint [̾��]       �����ɽ��\n"
 
-#: g10/g10.c:426
+#: g10/g10.c:427
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
 
-#: g10/g10.c:430
+#: g10/g10.c:431
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/g10.c:433
+#: g10/g10.c:434
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -722,7 +722,7 @@ msgstr ""
 "��̾�����ڡ��Ź沽������\n"
 "�����ư��ϡ����ϥǡ����˰�¸\n"
 
-#: g10/g10.c:440
+#: g10/g10.c:441
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -730,186 +730,186 @@ msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: g10/g10.c:519
+#: g10/g10.c:520
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/g10.c:572
+#: g10/g10.c:573
 msgid "conflicting commands\n"
 msgstr "���ޥ�ɤξ���\n"
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե�����`%s'������ޤ���\n"
 
-#: g10/g10.c:716
+#: g10/g10.c:717
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե�����`%s': %s\n"
 
-#: g10/g10.c:723
+#: g10/g10.c:724
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "`%s'���饪�ץ������ɤ߹��ߤޤ�\n"
 
-#: g10/g10.c:915
+#: g10/g10.c:925
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s��������ʸ������ǤϤ���ޤ���\n"
 
-#: g10/g10.c:983
+#: g10/g10.c:994
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/g10.c:987 g10/g10.c:996
+#: g10/g10.c:998 g10/g10.c:1007
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s���Ѥ��ޤ���!\n"
 
-#: g10/g10.c:989
+#: g10/g10.c:1000
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ���Ѥ��뤳�ȤϤǤ��ޤ���!\n"
 
-#: g10/g10.c:992
+#: g10/g10.c:1003
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ���Ѥ��Ƥ�̵��̣�Ǥ�!\n"
 
-#: g10/g10.c:1011 g10/g10.c:1023
+#: g10/g10.c:1023 g10/g10.c:1035
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ���̵���Ǥ�\n"
 
-#: g10/g10.c:1017 g10/g10.c:1029
+#: g10/g10.c:1029 g10/g10.c:1041
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ���̵���Ǥ�\n"
 
-#: g10/g10.c:1033
+#: g10/g10.c:1045
 msgid "the given policy URL is invalid\n"
 msgstr "��������줿�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/g10.c:1036
+#: g10/g10.c:1048
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "���̥��르�ꥺ���%d..%d���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1038
+#: g10/g10.c:1050
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:1040
+#: g10/g10.c:1052
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:1042
+#: g10/g10.c:1054
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1045
+#: g10/g10.c:1057
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/g10.c:1049
+#: g10/g10.c:1061
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1134
+#: g10/g10.c:1146
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:1140
+#: g10/g10.c:1152
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/g10.c:1147
+#: g10/g10.c:1159
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/g10.c:1155
+#: g10/g10.c:1167
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1180
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/g10.c:1181
+#: g10/g10.c:1193
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1207
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/g10.c:1212
+#: g10/g10.c:1224
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1232
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1240
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1248
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1264
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key �桼����id"
 
-#: g10/g10.c:1255
+#: g10/g10.c:1267
 msgid "--delete-key user-id"
 msgstr "--delete-key �桼����id"
 
-#: g10/encode.c:265 g10/g10.c:1292 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1304 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s�������ޤ���: %s\n"
 
-#: g10/g10.c:1307
+#: g10/g10.c:1319
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [�桼����id] [����]"
 
-#: g10/g10.c:1373
+#: g10/g10.c:1385
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:1381
+#: g10/g10.c:1393
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:1452
+#: g10/g10.c:1464
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ��`%s'�Ǥ�\n"
 
-#: g10/g10.c:1539
+#: g10/g10.c:1551
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/g10.c:1543
+#: g10/g10.c:1555
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å������򥿥��פ��Ƥ������� ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1546 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1558 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s'�������ޤ���\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1767
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "����̾����Ƭ��ʸ�����������������(_)�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1773
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -917,11 +917,11 @@ msgstr ""
 "����̾�ˤ�ʸ�����������ɥåȡ���������������Τߤ��Ѥ���\n"
 "'='�ǽ����ʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1768
+#: g10/g10.c:1779
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "����̾�ΥɥåȤ�¾��ʸ���ǰϤޤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1776
+#: g10/g10.c:1787
 msgid "a notation value must not use any control characters\n"
 msgstr "����̾���ͤ�����ʸ�����Ѥ��ƤϤ����ޤ���\n"
 
@@ -1650,17 +1650,17 @@ msgstr "%s: �����ޤ���: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:324
+#: g10/encode.c:171 g10/encode.c:327
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: �ٹ�: ���Υե�����Ǥ�\n"
 
-#: g10/encode.c:271
+#: g10/encode.c:274
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "`%s'�����ɤ߹��ߤޤ�\n"
 
-#: g10/encode.c:492
+#: g10/encode.c:497
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s�Ź沽 ������: %s\n"
@@ -1793,7 +1793,7 @@ msgstr "       ��̩�����ɹ���: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "       ̵�ѹ�����̩��: %lu\n"
 
-#: g10/import.c:391 g10/import.c:590
+#: g10/import.c:391 g10/import.c:600
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "��%08lX: �桼����ID������ޤ���\n"
@@ -1807,7 +1807,7 @@ msgstr "��%08lX: ���ѤǤ���桼����ID������ޤ���\n"
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���ʽ�̾�Τʤ������Ǥ��礦\n"
 
-#: g10/import.c:418 g10/import.c:657
+#: g10/import.c:418 g10/import.c:667
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "��%08lX: �����������Ĥ���ޤ���: %s\n"
@@ -1821,17 +1821,17 @@ msgstr "�� %08lX: ���������Ǥ� - �����å�\n"
 msgid "no default public keyring\n"
 msgstr "����θ������ؤ�����ޤ���\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
+#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "`%s'�ؤν�Ф�\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
+#: g10/import.c:438 g10/import.c:496 g10/import.c:615 g10/import.c:716
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "����`%s'����å��Ǥ��ޤ���: %s\n"
 
-#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
+#: g10/import.c:441 g10/import.c:499 g10/import.c:618 g10/import.c:719
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "����`%s'�ν���ߥ��顼: %s\n"
@@ -1846,12 +1846,12 @@ msgstr "��%08lX: ���������ɤ߹��ߤޤ���\n"
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "��%08lX: �������ʣ���ȹ礤�ޤ���\n"
 
-#: g10/import.c:472 g10/import.c:665
+#: g10/import.c:472 g10/import.c:675
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "��%08lX: ���θ��֥��å��˰��֤Ť��Ǥ��ޤ���: %s\n"
 
-#: g10/import.c:478 g10/import.c:671
+#: g10/import.c:478 g10/import.c:681
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "��%08lX: ���θ��֥��å����ɤ߹���ޤ���: %s\n"
@@ -1891,73 +1891,78 @@ msgstr "��%08lX: ������������%d��\n"
 msgid "key %08lX: not changed\n"
 msgstr "��%08lX: �ѹ��ʤ�\n"
 
-#: g10/import.c:613
+#: g10/import.c:593
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr ""
+
+#: g10/import.c:623
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "��%08lX: ��̩�����ɤ߹��ߤޤ���\n"
 
 #. we can't merge secret keys
-#: g10/import.c:617
+#: g10/import.c:627
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "��%08lX: ������̩���ؤˤ���ޤ�\n"
 
-#: g10/import.c:622
+#: g10/import.c:632
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "��%08lX: ��̩�������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:651
+#: g10/import.c:661
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr "��%08lX: ������������ޤ��� - �˴��������Ŭ�ѤǤ��ޤ���\n"
 
-#: g10/import.c:682
+#: g10/import.c:692
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "��%08lX: ̵�����˴�������: %s - ����\n"
 
-#: g10/import.c:714
+#: g10/import.c:724
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "��%08lX: �˴���������ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:756
+#: g10/import.c:766
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "��%08lX: ��̾���б�����桼����ID������ޤ���\n"
 
-#: g10/import.c:763 g10/import.c:787
+#: g10/import.c:773 g10/import.c:797
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "��%08lX: ���ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:764
+#: g10/import.c:774
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "��%08lX: ̵���ʼ��ʽ�̾�Ǥ�\n"
 
-#: g10/import.c:779
+#: g10/import.c:789
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "��%08lX: �����б���������������ޤ���\n"
 
-#: g10/import.c:788
+#: g10/import.c:798
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "��%08lX: ̵�����������б��Ǥ�\n"
 
-#: g10/import.c:815
+#: g10/import.c:825
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "��%08lX: ��������̤���ʽ�̾�Υ桼����ID '"
 
-#: g10/import.c:844
+#: g10/import.c:854
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "��%08lX: �����åפ����桼����ID '"
 
-#: g10/import.c:867
+#: g10/import.c:877
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "��%08lX: �����åפ�������\n"
@@ -1966,32 +1971,32 @@ msgstr "��%08lX: �����åפ�������\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:892
+#: g10/import.c:902
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "��%08lX: ��Ф��ԲĤʽ�̾ (���饹%02x) - �����å�\n"
 
-#: g10/import.c:901
+#: g10/import.c:911
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "��%08lX: �˴������񤬸��ä����ꤵ��Ƥ��ޤ� - �����å�\n"
 
-#: g10/import.c:909
+#: g10/import.c:919
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "��%08lX: ̵�����˴�������: %s - �����å�\n"
 
-#: g10/import.c:1009
+#: g10/import.c:1019
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "��%08lX: ��ʣ�����桼����ID�θ��� - ʻ��\n"
 
-#: g10/import.c:1060
+#: g10/import.c:1071
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "��%08lX: �˴���������ɲ�\n"
 
-#: g10/import.c:1174 g10/import.c:1227
+#: g10/import.c:1185 g10/import.c:1238
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "��%08lX: �������ʣ���ˤϼ��ʽ�̾������ޤ���\n"
@@ -2576,114 +2581,115 @@ msgid "revoked"
 msgstr "�˴��Ѥ�"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:793
+#: g10/keylist.c:400 g10/mainproc.c:834
 #, c-format
 msgid " [expires: %s]"
 msgstr " [ͭ������: %s]"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:270
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "��������%08lX�Ǥ�\n"
 
-#: g10/mainproc.c:284
+#: g10/mainproc.c:315
 msgid "public key encrypted data: good DEK\n"
 msgstr "�������ǰŹ沽���줿�ǡ���: ������DEK�Ǥ�\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:367
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "%u-�ӥå�%s��, ID %08lX�ǰŹ沽%s�ˤǤ��ޤ���\n"
 
-#: g10/mainproc.c:336
+#: g10/mainproc.c:377
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "%s��, ID %08lX�ǰŹ沽����ޤ���\n"
 
-#: g10/mainproc.c:342
-msgid "no secret key for decryption available\n"
-msgstr "�����ɬ�פ���̩���������ޤ���\n"
-
-#: g10/mainproc.c:351
+#: g10/mainproc.c:391
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "������������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:429
 msgid "decryption okay\n"
 msgstr "���������\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:434
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "�ٹ�: �Ź沽���줿��å������ϲ��⤵��Ƥ��ޤ�!\n"
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:439
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:458
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "����: �����Ԥϡ����ˤ���פ褦�˵��Ƥ��ޤ�\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:460
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "���Υե�����̾='%.*s'\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:615
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "��Ω�˴�����gpg --import�פ�Ȥä�Ŭ�Ѥ��Ƥ�������\n"
 
-#: g10/mainproc.c:661 g10/mainproc.c:670
+#: g10/mainproc.c:702 g10/mainproc.c:711
 msgid "WARNING: invalid notation data found\n"
 msgstr "�ٹ�: ̵��������ǡ���������ޤ�\n"
 
-#: g10/mainproc.c:673
+#: g10/mainproc.c:714
 msgid "Notation: "
 msgstr "����: "
 
-#: g10/mainproc.c:682
+#: g10/mainproc.c:723
 msgid "Policy: "
 msgstr "�ݥꥷ��: "
 
-#: g10/mainproc.c:1124
+#: g10/mainproc.c:1233
 msgid "signature verification suppressed\n"
 msgstr "��̾�θ��ڤ��ά\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1270
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "%.*s ��%s��ID %08lX�ˤ���̾\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1187 g10/mainproc.c:1198
+#: g10/mainproc.c:1305 g10/mainproc.c:1316
 msgid "BAD signature from \""
 msgstr "������ ��̾: \""
 
-#: g10/mainproc.c:1188 g10/mainproc.c:1199
+#: g10/mainproc.c:1306 g10/mainproc.c:1317
 msgid "Good signature from \""
 msgstr "��������̾: \""
 
-#: g10/mainproc.c:1190
+#: g10/mainproc.c:1308
 msgid "                aka \""
-msgstr "               ��̾ \""
+msgstr "       ��̾ \""
 
-#: g10/mainproc.c:1246
+#: g10/mainproc.c:1364
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "��̾�򸡾ڤǤ��ޤ���: %s\n"
 
-#: g10/mainproc.c:1321
+#: g10/mainproc.c:1421 g10/mainproc.c:1436 g10/mainproc.c:1498
+#, fuzzy
+msgid "not a detached signature\n"
+msgstr "ʬΥ��̾�����"
+
+#: g10/mainproc.c:1447
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���饹0x%02x����Ω��̾\n"
 
-#: g10/mainproc.c:1372
+#: g10/mainproc.c:1502
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�Ť����� (PGP 2.x) �ν�̾\n"
 
-#: g10/mainproc.c:1377
+#: g10/mainproc.c:1507
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() �����̵���ʥѥ��åȤ򸡽Ф��ޤ���\n"
 
@@ -2814,7 +2820,12 @@ msgstr "�ǡ������ե������̾��������: "
 msgid "reading stdin ...\n"
 msgstr "ɸ�����Ϥ���ɹ����� ...\n"
 
-#: g10/plaintext.c:392
+#: g10/plaintext.c:383
+#, fuzzy
+msgid "no signed data\n"
+msgstr "��̾���줿�ǡ���`%s'�������ޤ���\n"
+
+#: g10/plaintext.c:391
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "��̾���줿�ǡ���`%s'�������ޤ���\n"
@@ -2933,7 +2944,7 @@ msgstr "̤�ΤΥ���ƥ����롦�ӥåȤ����ä��Τǡ���̾���������Ȥߤʤ��ޤ�\n"
 msgid "%s signature from: %s\n"
 msgstr "%s��̾����̾��: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:610
+#: g10/sign.c:290 g10/sign.c:613
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s���Ǥ��ޤ���: %s\n"
@@ -3374,7 +3385,7 @@ msgstr "'%s'�ο��ѥǡ����١����ؤ���Ͽ�˼��Ԥ��ޤ���: %s\n"
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "�ٹ�: �ޤ� long pref �쥳���ɤϼ�갷���ޤ���\n"
 
-#: g10/verify.c:82
+#: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -3384,7 +3395,7 @@ msgstr ""
 "(.sig��.asc)�����ޥ�ɹԤκǽ�Ǥʤ����\n"
 "�ʤ�ʤ����Ȥ�ǰƬ�ˤ����Ƥ���������\n"
 
-#: g10/verify.c:147
+#: g10/verify.c:173
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "���Ϥ�%u���ܤ�Ĺ�����뤫��LF���ʤ��褦�Ǥ�\n"
@@ -3782,3 +3793,6 @@ msgstr "�إ�פϤ���ޤ���"
 #, c-format
 msgid "No help available for `%s'"
 msgstr "`%s'�Υإ�פϤ���ޤ���"
+
+#~ msgid "no secret key for decryption available\n"
+#~ msgstr "�����ɬ�פ���̩���������ޤ���\n"
diff --git a/po/nl.po b/po/nl.po
index 01a9c4484..cc76d86ee 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-11-24 13:52+0100\n"
+"POT-Creation-Date: 2000-12-19 11:58+0100\n"
 "PO-Revision-Date: 2000-02-20 21:30+01:00\n"
 "Last-Translator: Ivo Timmermans <[email protected]>\n"
 "Language-Team: Dutch <[email protected]>\n"
@@ -663,17 +663,17 @@ msgstr ""
 " --list-keys [namen]         toon sleutels\n"
 " --fingerprints [namen]      toon vingerafdrukken\n"
 
-#: g10/g10.c:426
+#: g10/g10.c:427
 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:430
+#: g10/g10.c:431
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Gebruik: gpg [opties] [bestanden] (-h voor hulp)"
 
-#: g10/g10.c:433
+#: g10/g10.c:434
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -683,7 +683,7 @@ msgstr ""
 "onderteken, controleer, versleutel of decodeer de ingevoerde gegevens\n"
 "standaardactie hangt af van de gegevens\n"
 
-#: g10/g10.c:440
+#: g10/g10.c:441
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -691,188 +691,188 @@ msgstr ""
 "\n"
 "Ondersteunde algoritmes:\n"
 
-#: g10/g10.c:519
+#: g10/g10.c:520
 msgid "usage: gpg [options] "
 msgstr "gebruik: gpg [opties] "
 
-#: g10/g10.c:572
+#: g10/g10.c:573
 msgid "conflicting commands\n"
 msgstr "tegenstrijdige commando's\n"
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "LET OP: geen bestand `%s' met standaardopties\n"
 
-#: g10/g10.c:716
+#: g10/g10.c:717
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "optiebestand `%s': %s\n"
 
-#: g10/g10.c:723
+#: g10/g10.c:724
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "opties inlezen van `%s'\n"
 
-#: g10/g10.c:915
+#: g10/g10.c:925
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s is een onbekende tekenverzameling\n"
 
-#: g10/g10.c:983
+#: g10/g10.c:994
 msgid "WARNING: program may create a core file!\n"
 msgstr "LET OP: programma zou een geheugendump kunnen maken!\n"
 
-#: g10/g10.c:987 g10/g10.c:996
+#: g10/g10.c:998 g10/g10.c:1007
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "LET OP: %s is niet voor gewoon gebruik!\n"
 
-#: g10/g10.c:989
+#: g10/g10.c:1000
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s is niet toegestaan met deze %s!\n"
 
-#: g10/g10.c:992
+#: g10/g10.c:1003
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s heeft geen betekenis met %s!\n"
 
-#: g10/g10.c:1011 g10/g10.c:1023
+#: g10/g10.c:1023 g10/g10.c:1035
 msgid "selected cipher algorithm is invalid\n"
 msgstr "geselecteerd versleutelalgoritme is ongeldig\n"
 
-#: g10/g10.c:1017 g10/g10.c:1029
+#: g10/g10.c:1029 g10/g10.c:1041
 msgid "selected digest algorithm is invalid\n"
 msgstr "geselecteerd controle-algoritme is ongeldig\n"
 
-#: g10/g10.c:1033
+#: g10/g10.c:1045
 msgid "the given policy URL is invalid\n"
 msgstr "de gegeven beleids-URL is ongeldig\n"
 
-#: g10/g10.c:1036
+#: g10/g10.c:1048
 #, 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:1038
+#: g10/g10.c:1050
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed(?) moet groter zijn dan 0\n"
 
-#: g10/g10.c:1040
+#: g10/g10.c:1052
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed(?) moet groter zijn dan 1\n"
 
-#: g10/g10.c:1042
+#: g10/g10.c:1054
 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:1045
+#: g10/g10.c:1057
 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:1049
+#: g10/g10.c:1061
 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:1134
+#: g10/g10.c:1146
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "fout bij het initialiseren van de vertrouwensdatabase: %s\n"
 
-#: g10/g10.c:1140
+#: g10/g10.c:1152
 msgid "--store [filename]"
 msgstr "--store [bestandsnaam]"
 
-#: g10/g10.c:1147
+#: g10/g10.c:1159
 msgid "--symmetric [filename]"
 msgstr "--symmetric [bestandsnaam]"
 
-#: g10/g10.c:1155
+#: g10/g10.c:1167
 msgid "--encrypt [filename]"
 msgstr "--encrypt [bestandsnaam]"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1180
 msgid "--sign [filename]"
 msgstr "--sign [bestandsnaam]"
 
-#: g10/g10.c:1181
+#: g10/g10.c:1193
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [bestandsnaam]"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1207
 msgid "--clearsign [filename]"
 msgstr "--clearsign [bestandsnaam]"
 
-#: g10/g10.c:1212
+#: g10/g10.c:1224
 msgid "--decrypt [filename]"
 msgstr "--decrypt [bestandsnaam]"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1232
 msgid "--sign-key user-id"
 msgstr "--sign-key gebruikersidentificatie"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1240
 msgid "--lsign-key user-id"
 msgstr "--lsign-key gebruikers-identificatie"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1248
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key gebruikersidentificatie [opdrachten]"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1264
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key gebruikersidentificatie"
 
-#: g10/g10.c:1255
+#: g10/g10.c:1267
 msgid "--delete-key user-id"
 msgstr "--delete-key gebruikersidentificatie"
 
-#: g10/encode.c:265 g10/g10.c:1292 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1304 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan %s niet openen: %s\n"
 
-#: g10/g10.c:1307
+#: g10/g10.c:1319
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [gebruikersidentificatie] [sleutelbos]"
 
-#: g10/g10.c:1373
+#: g10/g10.c:1385
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "opheffen van beveiliging mislukt: %s\n"
 
-#: g10/g10.c:1381
+#: g10/g10.c:1393
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "beveiligen mislukt: %s\n"
 
-#: g10/g10.c:1452
+#: g10/g10.c:1464
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ongeldig frommelalgoritme `%s'\n"
 
-#: g10/g10.c:1539
+#: g10/g10.c:1551
 msgid "[filename]"
 msgstr "[bestandsnaam]"
 
-#: g10/g10.c:1543
+#: g10/g10.c:1555
 msgid "Go ahead and type your message ...\n"
 msgstr "Gaat uw gang, type het bericht ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1546 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1558 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:1756
+#: g10/g10.c:1767
 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:1762
+#: g10/g10.c:1773
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -880,11 +880,11 @@ msgstr ""
 "een notitienaam mag alleen letters, cijfers, punten of underscores bevatten "
 "en eindig met een =\n"
 
-#: g10/g10.c:1768
+#: g10/g10.c:1779
 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:1776
+#: g10/g10.c:1787
 msgid "a notation value must not use any control characters\n"
 msgstr "een notitienaam mag geen controletekens bevatten\n"
 
@@ -1638,17 +1638,17 @@ msgstr "%s: kon niet openen: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "fout tijdens aanmake sleuteltekst: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:324
+#: g10/encode.c:171 g10/encode.c:327
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: LET OP: leeg bestand\n"
 
-#: g10/encode.c:271
+#: g10/encode.c:274
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lezen uit `%s'\n"
 
-#: g10/encode.c:492
+#: g10/encode.c:497
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s versleuteld voor: %s\n"
@@ -1782,7 +1782,7 @@ msgstr "geheime sleutels ge�mporteerd: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "onveranderde geheime sleutels: %lu\n"
 
-#: g10/import.c:391 g10/import.c:590
+#: g10/import.c:391 g10/import.c:600
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "sleutel %08lX: geen gebruikersidentificatie\n"
@@ -1797,7 +1797,7 @@ msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 "dit zou veroorzaakt kunnen worden door een ontbrekende zelf-ondertkening\n"
 
-#: g10/import.c:418 g10/import.c:657
+#: g10/import.c:418 g10/import.c:667
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "sleutel %08lX: openbare sleutel niet gevonden: %s\n"
@@ -1811,17 +1811,17 @@ msgstr "sleutel %08lx: geen sleutel volgens rfc2240 - overgeslagen\n"
 msgid "no default public keyring\n"
 msgstr "geen standaard openbare sleutelbos\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
+#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "schrijven naar `%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
+#: g10/import.c:438 g10/import.c:496 g10/import.c:615 g10/import.c:716
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "kan sleutelbos `%s' niet vergrendelen: %s\n"
 
-#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
+#: g10/import.c:441 g10/import.c:499 g10/import.c:618 g10/import.c:719
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fout bij schrijven van de sleutelbos `%s': %s\n"
@@ -1836,12 +1836,12 @@ msgstr "sleutel %08lX: openbare sleutel ge�mporteerd\n"
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "sleutel %08lX: komt niet overeen met onze kopie\n"
 
-#: g10/import.c:472 g10/import.c:665
+#: g10/import.c:472 g10/import.c:675
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "sleutel %08lX: kan originele sleutelblok niet vinden: %s\n"
 
-#: g10/import.c:478 g10/import.c:671
+#: g10/import.c:478 g10/import.c:681
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "sleutel %08lX: kan origineel sleutelblok niet lezen: %s\n"
@@ -1881,76 +1881,81 @@ msgstr "sleutel %08lX: %d nieuwe subsleutels\n"
 msgid "key %08lX: not changed\n"
 msgstr "sleutel %08lX: niet veranderd\n"
 
-#: g10/import.c:613
+#: g10/import.c:593
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr ""
+
+#: g10/import.c:623
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "sleutel %08lX: geheime sleutel ge�mporteerd\n"
 
 #. we can't merge secret keys
-#: g10/import.c:617
+#: g10/import.c:627
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "sleutel %08lX: reeds aanwezig in de geheime sleutelbos\n"
 
-#: g10/import.c:622
+#: g10/import.c:632
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "sleutel %08lX: geheime sleutel niet gevonden: %s\n"
 
-#: g10/import.c:651
+#: g10/import.c:661
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "sleutel %08lX: geen openbare sleutel - kan terugtrekkingscertificaat niet "
 "toepassen\n"
 
-#: g10/import.c:682
+#: g10/import.c:692
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "sleutel %08lX: ongeldig terugtrekkingscertificaat: %s - afgewezen\n"
 
-#: g10/import.c:714
+#: g10/import.c:724
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "sleutel %08lX: terugtrekkingscertificaat ge�mporteerd\n"
 
-#: g10/import.c:756
+#: g10/import.c:766
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "sleutel %08lX: geen gebruikersidentificatie voor ondertekening\n"
 
-#: g10/import.c:763 g10/import.c:787
+#: g10/import.c:773 g10/import.c:797
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "sleutel %08lX: openbaar sleutel algoritme niet ondersteund\n"
 
-#: g10/import.c:764
+#: g10/import.c:774
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "sleutel %08lX: ongeldige eigen ondertekening\n"
 
-#: g10/import.c:779
+#: g10/import.c:789
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "sleutel %08lX: geen subsleutel voor sleutelbinding\n"
 
-#: g10/import.c:788
+#: g10/import.c:798
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "sleutel %08lX: ongeldige subsleutelbinding\n"
 
-#: g10/import.c:815
+#: g10/import.c:825
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr ""
 "sleutel %08lX: niet zelfondertekende gebruikersidentificatie geaccepteerd '"
 
-#: g10/import.c:844
+#: g10/import.c:854
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "sleutel %08lX: gebruikersidentificatie overgeslagen '"
 
-#: g10/import.c:867
+#: g10/import.c:877
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "sleutel %08lX: subsleutel overgeslagen\n"
@@ -1959,37 +1964,37 @@ msgstr "sleutel %08lX: subsleutel overgeslagen\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:892
+#: g10/import.c:902
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr ""
 "sleutel %08lX: niet exporteerbare ondertekening (klasse %02x) - "
 "overgeslagen\n"
 
-#: g10/import.c:901
+#: g10/import.c:911
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "sleutel %08lX: terugtrekkingscertificaat op de verkeerde plek - "
 "overgeslagen\n"
 
-#: g10/import.c:909
+#: g10/import.c:919
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "sleutel %08lX: ongeldig terugtrekkingscertificaat: %s - overgeslagen\n"
 
-#: g10/import.c:1009
+#: g10/import.c:1019
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr ""
 "sleutel %08lX: dubbele gebruikersidentificatie gevonden - samengevoegd\n"
 
-#: g10/import.c:1060
+#: g10/import.c:1071
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "sleutel %08lX: terugtrekkingscertificaat toegevoegd\n"
 
-#: g10/import.c:1174 g10/import.c:1227
+#: g10/import.c:1185 g10/import.c:1238
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "sleutel %08lX: onze versie heeft geen zelfondertekening\n"
@@ -2580,115 +2585,116 @@ msgid "revoked"
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:793
+#: g10/keylist.c:400 g10/mainproc.c:834
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "Sleutel verloopt op %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:270
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "openbare sleutel is %08lX\n"
 
-#: g10/mainproc.c:284
+#: g10/mainproc.c:315
 msgid "public key encrypted data: good DEK\n"
 msgstr "gegevens versleuteld met een openbare sleutel: goede DEK\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:367
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "versleuteld met %u-bit %s sleutel, nummer %08lX, gemaakt op %s\n"
 
-#: g10/mainproc.c:336
+#: g10/mainproc.c:377
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "versleuteld met %s sleutel, nummer %08lX\n"
 
-#: g10/mainproc.c:342
-msgid "no secret key for decryption available\n"
-msgstr "geheime sleutel voor ontsleuteling is niet beschikbaar\n"
-
-#: g10/mainproc.c:351
+#: g10/mainproc.c:391
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "openbare sleutel-ontsleuteling ging niet: %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:429
 msgid "decryption okay\n"
 msgstr "ontsleutelen ging goed\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:434
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "LET OP: het versleutelde bericht is veranderd!\n"
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:439
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ontsleuteling mislukte: %s\n"
 
 # Dit kan wel Engels blijven.. toch?
-#: g10/mainproc.c:417
+#: g10/mainproc.c:458
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "LET OP: afzender vroeg om \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:460
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originele bestandsnaam='%.*s'\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:615
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "alleenstaande intrekking - gebruik \"gpg --import\" om uit te voeren\n"
 
-#: g10/mainproc.c:661 g10/mainproc.c:670
+#: g10/mainproc.c:702 g10/mainproc.c:711
 msgid "WARNING: invalid notation data found\n"
 msgstr "LET OP: ongeldige aantekeningen gevonden\n"
 
-#: g10/mainproc.c:673
+#: g10/mainproc.c:714
 msgid "Notation: "
 msgstr "Aantekening: "
 
-#: g10/mainproc.c:682
+#: g10/mainproc.c:723
 msgid "Policy: "
 msgstr "Beleid: "
 
-#: g10/mainproc.c:1124
+#: g10/mainproc.c:1233
 msgid "signature verification suppressed\n"
 msgstr "controle van de ondertekening overgeslagen\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1270
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Ondertekening gemaakt op %.*s met %s sleutel nummer %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1187 g10/mainproc.c:1198
+#: g10/mainproc.c:1305 g10/mainproc.c:1316
 msgid "BAD signature from \""
 msgstr "FOUTE ondertekening van \""
 
-#: g10/mainproc.c:1188 g10/mainproc.c:1199
+#: g10/mainproc.c:1306 g10/mainproc.c:1317
 msgid "Good signature from \""
 msgstr "Correcte ondertekening van \""
 
-#: g10/mainproc.c:1190
+#: g10/mainproc.c:1308
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1246
+#: g10/mainproc.c:1364
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ondertekening niet controleren: %s\n"
 
-#: g10/mainproc.c:1321
+#: g10/mainproc.c:1421 g10/mainproc.c:1436 g10/mainproc.c:1498
+#, fuzzy
+msgid "not a detached signature\n"
+msgstr "maak een losstaande ondertekening"
+
+#: g10/mainproc.c:1447
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "losstaande ondertekening van type 0x%02x\n"
 
-#: g10/mainproc.c:1372
+#: g10/mainproc.c:1502
 msgid "old style (PGP 2.x) signature\n"
 msgstr "oude stijl (PGP 2.x) ondertekening\n"
 
-#: g10/mainproc.c:1377
+#: g10/mainproc.c:1507
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ongeldig hoofdpakket gevonden in proc_tree()\n"
 
@@ -2816,7 +2822,12 @@ msgstr "Geef de naam van het gegevensbestand: "
 msgid "reading stdin ...\n"
 msgstr "lezen uit standaard invoer ...\n"
 
-#: g10/plaintext.c:392
+#: g10/plaintext.c:383
+#, fuzzy
+msgid "no signed data\n"
+msgstr "kan ondertekende gegevens `%s' niet openen\n"
+
+#: g10/plaintext.c:391
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kan ondertekende gegevens `%s' niet openen\n"
@@ -2938,7 +2949,7 @@ msgstr "foutieve ondertekening aangenomen wegens een onbekende kritische bit\n"
 msgid "%s signature from: %s\n"
 msgstr "%s ondertekening van: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:610
+#: g10/sign.c:290 g10/sign.c:613
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "kan %s niet aanmaken: %s\n"
@@ -3387,7 +3398,7 @@ msgstr "kon '%s' niet invoegen in de vertrouwensdatabase: %s\n"
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "LET OP: kan nog geen lange voorkeursblokken verwerken\n"
 
-#: g10/verify.c:82
+#: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -3397,7 +3408,7 @@ msgstr ""
 "Onthoud dat het bestand met de ondertekening (.sig of .asc) het eerste\n"
 "bestand van de commandoregel moet zijn.\n"
 
-#: g10/verify.c:147
+#: g10/verify.c:173
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "invoerregel %u is te lang, of ontbrekende LF\n"
@@ -3797,6 +3808,9 @@ msgstr "Geen hulp beschikbaar"
 msgid "No help available for `%s'"
 msgstr "Geen hulp beschikbaar voor `%s'"
 
+#~ msgid "no secret key for decryption available\n"
+#~ msgstr "geheime sleutel voor ontsleuteling is niet beschikbaar\n"
+
 #~ msgid ""
 #~ "RSA keys are deprecated; please consider creating a new key and use this key "
 #~ "in the future\n"
diff --git a/po/pl.po b/po/pl.po
index 05ad56ffb..ccc77932f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,14 +1,14 @@
 # Gnu Privacy Guard.
-# Copyright (C) 1998, 1999 Free Software Foundation, Inc.
-# Janusz A. Urbanowicz <[email protected]>, 1998, 1999.
+# Copyright (C) 1998-1999 Free Software Foundation, Inc.
+# Janusz A. Urbanowicz <[email protected]>, 1999, 2000.
 #
-# To be included in GnuPG 1.0.1
+# To be included in GnuPG 1.0.5
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-11-24 13:52+0100\n"
-"PO-Revision-Date: 1999-12-05 21:29+01:00\n"
+"Project-Id-Version: gnupg-1.0.4\n"
+"POT-Creation-Date: 2000-12-19 11:58+0100\n"
+"PO-Revision-Date: 2000-10-18 22:54+02:00\n"
 "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr "operacja niemo�liwa do wykonania bez dost�pnej pami�ci bezpiecznej\n"
 
 #: util/secmem.c:300
 msgid "(you may have used the wrong program for this task)\n"
-msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dla tego zadania)\n"
+msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 
 #: util/miscutil.c:277 util/miscutil.c:306
 msgid "yes"
@@ -85,7 +85,7 @@ msgstr "niepoprawny klucz publiczny"
 
 #: util/errors.c:60
 msgid "bad secret key"
-msgstr "niepoprawny klucz tajny"
+msgstr "niepoprawny klucz prywatny"
 
 #: util/errors.c:61
 msgid "bad signature"
@@ -101,7 +101,7 @@ msgstr "niepoprawne wyra�enie przej�ciowe"
 
 #: util/errors.c:64
 msgid "public key not found"
-msgstr "nie odnaleziono klucza publicznego"
+msgstr "klucz publiczny nie odnaleziony"
 
 #: util/errors.c:65
 msgid "unknown cipher algorithm"
@@ -129,7 +129,7 @@ msgstr "klucz tajny nie jest dost�pny"
 
 #: util/errors.c:71
 msgid "wrong secret key used"
-msgstr "u�yty zosta� niew�a�ciwy klucz tajny"
+msgstr "zosta� u�yty niew�a�ciwy klucz tajny"
 
 #: util/errors.c:72
 msgid "not supported"
@@ -137,7 +137,7 @@ msgstr "nie jest obs�ugiwany"
 
 #: util/errors.c:73
 msgid "bad key"
-msgstr "niepoprawny klucz"
+msgstr "klucz niepoprawny"
 
 #: util/errors.c:74
 msgid "file read error"
@@ -213,7 +213,7 @@ msgstr "b��d przy usuwaniu pliku"
 
 #: util/errors.c:92
 msgid "unexpected data"
-msgstr "nieoczekiwane dane"
+msgstr "nieoczekiowane dane"
 
 #: util/errors.c:93
 msgid "timestamp conflict"
@@ -241,7 +241,7 @@ msgstr "niepoprawny URI"
 
 #: util/errors.c:99
 msgid "unsupported URI"
-msgstr "URI nie obs�ugiwanego typu"
+msgstr "URI nie jest obs�ugiwany"
 
 #: util/errors.c:100
 msgid "network error"
@@ -249,11 +249,11 @@ msgstr "b��d sieci"
 
 #: util/errors.c:102
 msgid "not encrypted"
-msgstr "nie jest zaszyfrowany"
+msgstr "nie zaszyfrowany"
 
 #: util/errors.c:103
 msgid "not processed"
-msgstr "nie przetworzony"
+msgstr "nie zosta� przetworzony"
 
 #: util/logger.c:224
 #, c-format
@@ -271,51 +271,52 @@ msgid "can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� %s: %s\n"
 
 #: cipher/random.c:315
-#, fuzzy, c-format
+#, c-format
 msgid "can't stat `%s': %s\n"
-msgstr "nie mo�na otworzy� %s: %s\n"
+msgstr "nie mo�na sprawdzi� %s: %s\n"
 
 #: cipher/random.c:320
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
-msgstr ""
+msgstr "'%s' nie jest zwyk�ym plikiem - zostaje pomini�ty\n"
 
 #: cipher/random.c:325
 msgid "note: random_seed file is empty\n"
-msgstr ""
+msgstr "uwaga: plik random_seed jest pusty\n"
 
 #: cipher/random.c:331
 msgid "warning: invalid size of random_seed file - not used\n"
 msgstr ""
+"ostrze�enie: plik random_seed ma niew�a�ciwy rozmiar - nie zostanie u�yty\n"
 
 #: cipher/random.c:339
-#, fuzzy, c-format
+#, c-format
 msgid "can't read `%s': %s\n"
-msgstr "nie mo�na otworzy� %s: %s\n"
+msgstr "nie mo�na odczyta� %s: %s\n"
 
 #: cipher/random.c:377
 msgid "note: random_seed file not updated\n"
-msgstr ""
+msgstr "uwaga: plik random_seed nie jest uaktualniony\n"
 
 #: cipher/random.c:397
-#, fuzzy, c-format
+#, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nie mo�na stworzy� %s: %s\n"
 
 #: cipher/random.c:404
-#, fuzzy, c-format
+#, c-format
 msgid "can't write `%s': %s\n"
-msgstr "nie mo�na otworzy� %s: %s\n"
+msgstr "nie mo�na zapisa� %s: %s\n"
 
 #: cipher/random.c:407
-#, fuzzy, c-format
+#, c-format
 msgid "can't close `%s': %s\n"
-msgstr "nie mo�na otworzy� %s: %s\n"
+msgstr "nie mo�na zamkn�� %s: %s\n"
 
 #: cipher/random.c:418
 #, c-format
 msgid "too many random bits requested; the limit is %d\n"
-msgstr ""
+msgstr "��danie zbyt wielu losowych bit�w; ograniczenie wynosi %d\n"
 
 #: cipher/random.c:650
 msgid "WARNING: using insecure random number generator!!\n"
@@ -367,7 +368,7 @@ msgstr "|[plik]|z�o�enie podpisu na czytelnym dokumencie"
 
 #: g10/g10.c:214
 msgid "make a detached signature"
-msgstr "sporz�dzenie podpisu oddzielonego od dokumentu"
+msgstr "z�o�enie podpisu oddzielonego od dokumentu"
 
 #: g10/g10.c:215
 msgid "encrypt data"
@@ -379,7 +380,7 @@ msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
 #: g10/g10.c:217
 msgid "store only"
-msgstr "tylko zapis do pliku"
+msgstr "tylko zapis"
 
 #: g10/g10.c:218
 msgid "decrypt data (default)"
@@ -435,7 +436,7 @@ msgstr "podpisanie lub modyfikacja klucza"
 
 #: g10/g10.c:234
 msgid "generate a revocation certificate"
-msgstr "tworzenie certyfikatu uniewa�nienia klucza"
+msgstr "generacja certyfikatu uniewa�nienia klucza"
 
 #: g10/g10.c:235
 msgid "export keys"
@@ -451,7 +452,7 @@ msgstr "import kluczy z serwera kluczy"
 
 #: g10/g10.c:241
 msgid "import/merge keys"
-msgstr "import/do��czanie kluczy"
+msgstr "import/do��czenie kluczy"
 
 #: g10/g10.c:243
 msgid "list only the sequence of packets"
@@ -501,11 +502,11 @@ msgstr ""
 
 #: g10/g10.c:263
 msgid "create ascii armored output"
-msgstr "plik wynikowy b�dzie w opakowaniu ASCII"
+msgstr "plik wynikowy w opakowaniu ASCII"
 
 #: g10/g10.c:265
 msgid "|NAME|encrypt for NAME"
-msgstr "|NAZWA|szyfrowanie dla adresata NAZWA"
+msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
 #: g10/g10.c:268
 msgid "|NAME|use NAME as default recipient"
@@ -646,13 +647,15 @@ msgstr "usuni�cie identyfikator�w kluczy z pakiet�w"
 
 #: g10/g10.c:317
 msgid "|NAME=VALUE|use this notation data"
-msgstr "|NAZWA=TRE��|adnotacje"
+msgstr "|NAZWA=WARTO��|adnotacje"
 
 #: g10/g10.c:320
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
+"@\n"
+"(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
 
 #: g10/g10.c:323
 msgid ""
@@ -675,15 +678,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/g10.c:426
+#: g10/g10.c:427
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: g10/g10.c:430
+#: g10/g10.c:431
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/g10.c:433
+#: g10/g10.c:434
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -693,7 +696,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/g10.c:440
+#: g10/g10.c:441
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -701,186 +704,186 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/g10.c:519
+#: g10/g10.c:520
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/g10.c:572
+#: g10/g10.c:573
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji '%s'\n"
 
-#: g10/g10.c:716
+#: g10/g10.c:717
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji '%s': %s\n"
 
-#: g10/g10.c:723
+#: g10/g10.c:724
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z '%s'\n"
 
-#: g10/g10.c:915
+#: g10/g10.c:925
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/g10.c:983
+#: g10/g10.c:994
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/g10.c:987 g10/g10.c:996
+#: g10/g10.c:998 g10/g10.c:1007
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/g10.c:989
+#: g10/g10.c:1000
 #, c-format
 msgid "%s not allowed with %s!\n"
-msgstr "%s jest niedozwolony z %s!\n"
+msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/g10.c:992
+#: g10/g10.c:1003
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu z %s!\n"
 
-#: g10/g10.c:1011 g10/g10.c:1023
+#: g10/g10.c:1023 g10/g10.c:1035
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/g10.c:1017 g10/g10.c:1029
+#: g10/g10.c:1029 g10/g10.c:1041
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm geenracji skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/g10.c:1033
+#: g10/g10.c:1045
 msgid "the given policy URL is invalid\n"
 msgstr "podany URL regulaminu jest niepoprawny\n"
 
-#: g10/g10.c:1036
+#: g10/g10.c:1048
 #, 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:1038
+#: g10/g10.c:1050
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/g10.c:1040
+#: g10/g10.c:1052
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/g10.c:1042
+#: g10/g10.c:1054
 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:1045
+#: g10/g10.c:1057
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/g10.c:1049
+#: g10/g10.c:1061
 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:1134
+#: g10/g10.c:1146
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1140
+#: g10/g10.c:1152
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/g10.c:1147
+#: g10/g10.c:1159
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:1155
+#: g10/g10.c:1167
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1180
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/g10.c:1181
+#: g10/g10.c:1193
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1207
 msgid "--clearsign [filename]"
-msgstr "--clearsign [plik]"
+msgstr "--clearsign [plik]\""
 
-#: g10/g10.c:1212
+#: g10/g10.c:1224
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1232
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1240
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1248
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1264
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key nazwa u�ytkownika"
 
-#: g10/g10.c:1255
+#: g10/g10.c:1267
 msgid "--delete-key user-id"
 msgstr "--delete-key nazwa u�ytkownika"
 
-#: g10/encode.c:265 g10/g10.c:1292 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1304 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "nie mo�na otworzy� %s: %s\n"
 
-#: g10/g10.c:1307
+#: g10/g10.c:1319
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
 
-#: g10/g10.c:1373
+#: g10/g10.c:1385
 #, c-format
 msgid "dearmoring failed: %s\n"
-msgstr "usuni�cie opakowania ASCII nie powiod�o si�: %s\n"
+msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1381
+#: g10/g10.c:1393
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1452
+#: g10/g10.c:1464
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu '%s'\n"
 
-#: g10/g10.c:1539
+#: g10/g10.c:1551
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/g10.c:1543
+#: g10/g10.c:1555
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1546 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1558 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:1756
+#: g10/g10.c:1767
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
-msgstr "adnotacja musi zaczyna� si� od litery lub podkre�lenia\n"
+msgstr "adnotacja musi zaczyna� si� od podkre�lenia lub litery\n"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1773
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -888,11 +891,11 @@ msgstr ""
 "nazwa adnotacji mo�e zawiera� tylko litery, cyfry, kropki,\n"
 "podkre�lenia, i musi ko�czy� si� '='\n"
 
-#: g10/g10.c:1768
+#: g10/g10.c:1779
 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:1776
+#: g10/g10.c:1787
 msgid "a notation value must not use any control characters\n"
 msgstr "warto�� adnotacji nie mo�e zawiera� znak�w steruj�cych\n"
 
@@ -949,7 +952,7 @@ msgstr "B��d sumy CRC; %06lx - %06lx\n"
 
 #: g10/armor.c:765
 msgid "premature eof (in Trailer)\n"
-msgstr "przedwczesny koniec pliku (w zako�czeniu)\n"
+msgstr "przedwczesny koniec pliku (w linii ko�cz�cej)\n"
 
 #: g10/armor.c:769
 msgid "error in trailer line\n"
@@ -957,7 +960,7 @@ msgstr "b��d w linii ko�cz�cej\n"
 
 #: g10/armor.c:915
 msgid "For info see http://www.gnupg.org"
-msgstr ""
+msgstr "Dalsze informacje znajduj� si� na http://www.gnupg.org/"
 
 #: g10/armor.c:1043
 msgid "no valid OpenPGP data found.\n"
@@ -987,33 +990,31 @@ msgstr "Odcisk klucza:"
 
 #: g10/pkclist.c:116
 msgid "No reason specified"
-msgstr ""
+msgstr "Nie podano przyczyny"
 
 #: g10/pkclist.c:118
-#, fuzzy
 msgid "Key is superseded"
-msgstr "Klucz jest chroniony.\n"
+msgstr "Klucz zosta� zast�piony"
 
 #: g10/pkclist.c:120
-#, fuzzy
 msgid "Key has been compromised"
-msgstr "Ten klucz zosta� wy��czony z u�ycia"
+msgstr "Klucz zosta� skompromitowany"
 
 #: g10/pkclist.c:122
 msgid "Key is no longer used"
-msgstr ""
+msgstr "Klucz nie jest ju� u�ywany"
 
 #: g10/pkclist.c:124
 msgid "User ID is no longer valid"
-msgstr ""
+msgstr "Identyfikator u�ytkownika przesta� by� poprawny"
 
 #: g10/pkclist.c:128
 msgid "Reason for revocation: "
-msgstr ""
+msgstr "Pow�d uniewa�nienia: "
 
 #: g10/pkclist.c:145
 msgid "Revocation comment: "
-msgstr ""
+msgstr "Komentarz do uniewa�nienia: "
 
 #. a string with valid answers
 #: g10/pkclist.c:303
@@ -1109,7 +1110,7 @@ msgstr "klucz %08lX: klucz zosta� uniewa�niony!\n"
 
 #: g10/pkclist.c:464 g10/pkclist.c:476 g10/pkclist.c:598
 msgid "Use this key anyway? "
-msgstr "U�y� tego klucza mimo wszystko? "
+msgstr "U�y� tego klucza pomimo to? "
 
 #: g10/pkclist.c:469
 #, c-format
@@ -1202,13 +1203,12 @@ msgstr "             Ten podpis prawdopodobnie jest FA�SZERSTWEM.\n"
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
-"OSTRZE�ENIE: Ten klucz nie jest po�wiadczony wystarczaj�co zaufanymi "
-"podpisami!\n"
+"OSTRZE�ENIE: Tego klucza nie po�wiadczaj� wystarczaj�c zaufanyne podpisy!\n"
 
 #: g10/pkclist.c:717
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
-"             Nie ma pewno�ci �e ten podpis zosta� z�o�ony przez "
+"             Nie ma pewno�ci �e ten podpis zosta� z�o�nony przez "
 "w�a�ciciela.\n"
 
 #: g10/pkclist.c:819 g10/pkclist.c:841 g10/pkclist.c:967 g10/pkclist.c:1012
@@ -1226,7 +1226,7 @@ msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
 msgstr ""
-"Nie poda�e�(a�) identyfikatora u�ytkownika (user ID).\n"
+"Nie poda�e� identyfikatora u�ytkownika (user ID). \n"
 "Mo�na to zrobi� za pomoc� opcji \"-r\".\n"
 
 #: g10/pkclist.c:864
@@ -1277,14 +1277,14 @@ msgid "writing key binding signature\n"
 msgstr "zapis podpisu wi���cego klucz\n"
 
 #: g10/keygen.c:262 g10/keygen.c:346 g10/keygen.c:436
-#, fuzzy, c-format
+#, c-format
 msgid "keysize invalid; using %u bits\n"
-msgstr "��dana d�ugo�� klucza to %u bity.\n"
+msgstr "niew�a�ciwa d�ugo�� klucza; wykorzystano %u bit�w\n"
 
 #: g10/keygen.c:267 g10/keygen.c:351 g10/keygen.c:441
-#, fuzzy, c-format
+#, c-format
 msgid "keysize rounded up to %u bits\n"
-msgstr "zaokr�glono do %u bit�w\n"
+msgstr "rozmair klucza zaokr�glony do %u bit�w\n"
 
 #: g10/keygen.c:540
 msgid "Please select what kind of key you want:\n"
@@ -1311,9 +1311,9 @@ msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (do szyfrowania i podpisywania)\n"
 
 #: g10/keygen.c:548
-#, fuzzy, c-format
+#, c-format
 msgid "   (%d) RSA (sign and encrypt)\n"
-msgstr "   (%d) Klucz dla algorytmu ElGamala (do szyfrowania i podpisywania)\n"
+msgstr "   (%d) Klucz dla algorytmu RSA (do szyfrowania i podpisywania)\n"
 
 #: g10/keygen.c:552
 msgid "Your selection? "
@@ -1353,9 +1353,9 @@ msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "D�ugo�� klucza zbyt ma�a; minimalna dopuszczona wynosi 768 bit�w.\n"
 
 #: g10/keygen.c:613
-#, fuzzy
 msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "D�ugo�� klucza zbyt ma�a; minimalna dopuszczona wynosi 768 bit�w.\n"
+msgstr ""
+"D�ugo�� klucza zbyt ma�a; minimalna dopuszczalna dla RSA wynosi 1024 bity.\n"
 
 #. It is ridiculous and an annoyance to use larger key sizes!
 #. * GnuPG can handle much larger sizes; but it takes an eternity
@@ -1443,8 +1443,8 @@ msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
-"Tw�j system nie potrafi poprawnie wy�wietla� dat po roku 2036.\n"
-"Jednak�e poprawnie obs�ugiwane s� daty do roku 2106.\n"
+"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:741
 msgid "Is this correct (y/n)? "
@@ -1463,7 +1463,7 @@ msgstr ""
 "Musisz okre�li� identyfikator u�ytkownika aby mo�na by�o rozpozna� tw�j\n"
 "klucz; program z�o�y go z twojego imienia i nazwiska, komentarza i adresu\n"
 "poczty elektronicznej. B�dzie on mia� tak� posta�:\n"
-"    \"Tadeusz �ele�ski (Boy) <[email protected]>\"\n"
+"    \"Tadeusz �ele�ski (Boy) <[email protected]>\"\n"
 "\n"
 
 #: g10/keygen.c:796
@@ -1488,7 +1488,7 @@ msgstr "Adres poczty elektronicznej: "
 
 #: g10/keygen.c:827
 msgid "Not a valid email address\n"
-msgstr "to nie jest poprawny adres poczty elektronicznej\n"
+msgstr "To nie jest poprawny adres poczty elektronicznej\n"
 
 #: g10/keygen.c:835
 msgid "Comment: "
@@ -1517,27 +1517,28 @@ msgstr ""
 #: g10/keygen.c:874
 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:879
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
 #: g10/keygen.c:889
-#, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr ""
 "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, \n"
-"przej�� (D)alej czy (W)yj�� z programu? "
+"czy (W)yj��? "
 
 #: g10/keygen.c:890
 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? "
+"przej�� (D)alej czy (W)yj�� z programu ? "
 
 #: g10/keygen.c:909
 msgid "Please correct the error first\n"
-msgstr ""
+msgstr "Najpierw trzeba poprawi� ten b��d\n"
 
 #: g10/keygen.c:947
 msgid ""
@@ -1560,7 +1561,7 @@ msgid ""
 "using this program with the option \"--edit-key\".\n"
 "\n"
 msgstr ""
-"Nie chcesz poda� wyra�enia przej�ciowego (has�a) - to *z�y* pomys�!\n"
+"Nie chcesz poda� wyra�enia przej�ciowego (has�a) - to z�y pomys�!\n"
 "W ka�dej chwili mo�esz ustawi� wyra�enie przej�ciowe u�ywaj�c tego programu\n"
 "i opcji \"--edit-key\".\n"
 "\n"
@@ -1576,8 +1577,8 @@ msgstr ""
 "generowania\n"
 "liczb pierszych jest wykonanywanie w tym czasie innych dzia�a� (pisanie na\n"
 "klawiaturzeze, poruszanie myszk�, odwo�anie si� do dysk�w); dzi�ki temu\n"
-"generator liczb losowych ma mo�liwo�� zebrania odpowiedniej ilo�ci entropii. "
-"\n"
+"generator liczb losowych ma mo�liwo�� zebrania odpowiedniej ilo�ci "
+"entropii.\n"
 
 #: g10/keygen.c:1431
 msgid "DSA keypair will have 1024 bits.\n"
@@ -1588,18 +1589,18 @@ msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza zosta�a anulowana.\n"
 
 #: g10/keygen.c:1571
-#, fuzzy, c-format
+#, c-format
 msgid "writing public key to `%s'\n"
-msgstr "zapis certyfikatu publicznego w '%s'\n"
+msgstr "zapisuj� klucz publiczny w '%s'\n"
 
 #: g10/keygen.c:1572
-#, fuzzy, c-format
+#, c-format
 msgid "writing secret key to `%s'\n"
-msgstr "zapis tajnego certyfikatu w '%s'\n"
+msgstr "zapisuj� klucz tajny w '%s'\n"
 
 #: g10/keygen.c:1668
 msgid "public and secret key created and signed.\n"
-msgstr "klucze publiczny i tajny zosta�y stworzone i podpisane.\n"
+msgstr "tajny i publiczny klucz zosta�y utworzone i podpisane.\n"
 
 #: g10/keygen.c:1673
 msgid ""
@@ -1619,7 +1620,7 @@ msgstr "Generacja klucza nie powiod�a si�: %s\n"
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
-"klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
+"klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
 #: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
@@ -1632,7 +1633,7 @@ msgstr ""
 
 #: g10/keygen.c:1769
 msgid "Really create? "
-msgstr "Na pewno generowa�? "
+msgstr "Na pewno utworzy�? "
 
 #: g10/encode.c:91 g10/openfile.c:178 g10/openfile.c:288 g10/tdbio.c:454
 #: g10/tdbio.c:515
@@ -1645,17 +1646,17 @@ msgstr "%s: nie mo�na otworzy�: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "b��d podczs tworzenia wyra�enia przej�ciowego (has�a): %s\n"
 
-#: g10/encode.c:171 g10/encode.c:324
+#: g10/encode.c:171 g10/encode.c:327
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: OSTRZE�ENIE: plik jest pusty\n"
 
-#: g10/encode.c:271
+#: g10/encode.c:274
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "odczyt z '%s'\n"
 
-#: g10/encode.c:492
+#: g10/encode.c:497
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s zaszyfrowany dla: %s\n"
@@ -1663,7 +1664,7 @@ msgstr "%s/%s zaszyfrowany dla: %s\n"
 #: g10/export.c:153
 #, c-format
 msgid "%s: user not found: %s\n"
-msgstr "%s: nie znaleziono u�ytkownika: %s\n"
+msgstr "%s: nie znaleziono u�ytkownika %s\n"
 
 #: g10/export.c:162
 #, c-format
@@ -1676,9 +1677,9 @@ msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "klucz %08lX: nie jest w formacie RFC 2440 - pomini�ty\n"
 
 #: g10/export.c:182
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX: not protected - skipped\n"
-msgstr "klucz %08lX: nie jest w formacie RFC 2440 - pomini�ty\n"
+msgstr "klucz %08lX: nie jest chroniony - pomini�ty\n"
 
 #: g10/export.c:232
 msgid "WARNING: nothing exported\n"
@@ -1710,9 +1711,8 @@ msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "u�ywany jest podklucz %08lX zamiast klucza g��wnego %08lX\n"
 
 #: g10/getkey.c:2050
-#, fuzzy
 msgid "[User id not found]"
-msgstr "%s: nie znaleziono u�ytkownika\n"
+msgstr "[brak identyfikatora u�ytkownika]"
 
 #: g10/import.c:182
 #, c-format
@@ -1735,9 +1735,9 @@ msgid "Total number processed: %lu\n"
 msgstr "Og�em przetworzonych kluczy: %lu\n"
 
 #: g10/import.c:206
-#, fuzzy, c-format
+#, c-format
 msgid "      skipped new keys: %lu\n"
-msgstr "            nowych podkluczy: %lu\n"
+msgstr "   pomini�tych nowych kluczy: %lu\n"
 
 #: g10/import.c:209
 #, c-format
@@ -1789,7 +1789,7 @@ msgstr "     tajnych kluczy dodanych: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "    tajnych kluczy bez zmian: %lu\n"
 
-#: g10/import.c:391 g10/import.c:590
+#: g10/import.c:391 g10/import.c:600
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
@@ -1803,31 +1803,31 @@ msgstr "klucz %08lX: brak poprawnych identyfikator�w u�ytkownika\n"
 msgid "this may be caused by a missing self-signature\n"
 msgstr "to mo�e by� spowodowane brakiem podpisu w�a�ciciela klucza\n"
 
-#: g10/import.c:418 g10/import.c:657
+#: g10/import.c:418 g10/import.c:667
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "klucz %08lX: brak klucza publicznego: %s\n"
 
 #: g10/import.c:423
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX: new key - skipped\n"
-msgstr "klucz %08lX: nie jest w formacie RFC 2440 - pomini�ty\n"
+msgstr "klucz %08lX: nowy klucz - pomini�ty\n"
 
 #: g10/import.c:431
 msgid "no default public keyring\n"
 msgstr "brak domy�lnego zbioru kluczy publicznych\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
+#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
+#: g10/import.c:438 g10/import.c:496 g10/import.c:615 g10/import.c:716
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "nie mo�na zablokowa� zbioru kluczy publicznych '%s': %s\n"
 
-#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
+#: g10/import.c:441 g10/import.c:499 g10/import.c:618 g10/import.c:719
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
@@ -1835,19 +1835,19 @@ msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
 #: g10/import.c:446
 #, c-format
 msgid "key %08lX: public key imported\n"
-msgstr "klucz %08lX: klucz publiczny do��czony do zbioru\n"
+msgstr "klucz %08lX: klucz publiczny wczytano do zbioru\n"
 
 #: g10/import.c:463
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "klucz %08lX: nie zgadza si� z lokalnie posiadan� kopi�\n"
 
-#: g10/import.c:472 g10/import.c:665
+#: g10/import.c:472 g10/import.c:675
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "klucz %08lX: brak oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:478 g10/import.c:671
+#: g10/import.c:478 g10/import.c:681
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "klucz %08lX: nie mo�na odczyta� oryginalnego bloku klucza; %s\n"
@@ -1887,78 +1887,81 @@ msgstr "klucz %08lX: %d nowych podkluczy\n"
 msgid "key %08lX: not changed\n"
 msgstr "klucz %08lX: bez zmian\n"
 
-#: g10/import.c:613
+#: g10/import.c:593
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr ""
+
+#: g10/import.c:623
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "Klucz %08lX: klucz tajny wczytany do zbioru\n"
 
 #. we can't merge secret keys
-#: g10/import.c:617
+#: g10/import.c:627
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "Klucz %08lX: ten klucz ju� znajduje si� w zbiorze\n"
 
-#: g10/import.c:622
+#: g10/import.c:632
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "klucz %08lX: brak klucza tajnego: %s\n"
 
-#: g10/import.c:651
+#: g10/import.c:661
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "klucz %08lX: brak klucza publicznego - wczytany certyfikat \n"
 "uniwa�nienia nie mo�e by� zastosowany\n"
 
-#: g10/import.c:682
+#: g10/import.c:692
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
-msgstr ""
-"klucz %08lX: niepoprawny certyfikat uniewa�nienia:\n"
-"%s - odrzucony\n"
+msgstr "klucz %08lX: niepoprawny certyfikat uniewa�nienia: %s - odrzucony\n"
 
-#: g10/import.c:714
+#: g10/import.c:724
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "klucz %08lX: wczytany certyfikat uniewa�nienia\n"
 
-#: g10/import.c:756
+#: g10/import.c:766
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika do podpisu\n"
 
-#: g10/import.c:763 g10/import.c:787
+#: g10/import.c:773 g10/import.c:797
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr ""
 "klucz %08lX: nie obs�ugiwany algorytm szyfrowania z kluczem publicznym\n"
 
-#: g10/import.c:764
+#: g10/import.c:774
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "klucz %08lX: niepoprawny podpis w�a�ciciela klucza\n"
 
-#: g10/import.c:779
+#: g10/import.c:789
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "klucz %08lX: brak podklucza do dowi�zania\n"
 
-#: g10/import.c:788
+#: g10/import.c:798
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "klucz %08lX: niepoprawne dowi�zanie podklucza\n"
 
-#: g10/import.c:815
+#: g10/import.c:825
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "klucz %08lX: przyj�to identyfikator nie podpisany nim samym '"
 
-#: g10/import.c:844
+#: g10/import.c:854
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "klucz %08lX: pomini�to identyfikator u�ytkownika '"
 
-#: g10/import.c:867
+#: g10/import.c:877
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "klucz %08lX: podklucz pomini�ty\n"
@@ -1967,34 +1970,34 @@ msgstr "klucz %08lX: podklucz pomini�ty\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:892
+#: g10/import.c:902
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "klucz %08lX: podpis nieeksportowalny (klasa %02x) - pomini�ty\n"
 
-#: g10/import.c:901
+#: g10/import.c:911
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "klucz %08lX: certyfikat uniewa�nienia umieszczony w niew�a�ciwym \n"
 "miejscu - zosta� pomini�ty\n"
 
-#: g10/import.c:909
+#: g10/import.c:919
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "klucz %08lX: niepoprawny certyfikat uniewa�nienia: %s - pomini�ty\n"
 
-#: g10/import.c:1009
+#: g10/import.c:1019
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "key %08lX: powt�rzony identyfikator u�ytkownika - do��czony\n"
 
-#: g10/import.c:1060
+#: g10/import.c:1071
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "klucz %08lX: dodany certyfikat uniewa�nienia\n"
 
-#: g10/import.c:1174 g10/import.c:1227
+#: g10/import.c:1185 g10/import.c:1238
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "klucz %08lX: dost�pna kopia nie jest podpisana ni� sam�\n"
@@ -2066,7 +2069,7 @@ msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr ""
-"Czy jeste� naprawd� pewien �e chcesz podpisa� ten klucz\n"
+"Czy jeste� naprawd� pewien �e chcesz podpisa� ten klucz \n"
 "swoim kluczem: \""
 
 #: g10/keyedit.c:342
@@ -2091,9 +2094,8 @@ msgid "This key is not protected.\n"
 msgstr "Ten klucz nie jest chroniony.\n"
 
 #: g10/keyedit.c:431
-#, fuzzy
 msgid "Secret parts of primary key are not available.\n"
-msgstr "klucz tajny nie jest dost�pny"
+msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
 #: g10/keyedit.c:435
 msgid "Key is protected.\n"
@@ -2126,7 +2128,7 @@ msgstr "Czy na pewno chcesz to zrobi�? "
 
 #: g10/keyedit.c:539
 msgid "moving a key signature to the correct place\n"
-msgstr "przeniesienie podpis klucza na w�a�ciwe miejsce\n"
+msgstr "przenosz� podpis klucza na w�a�ciwe miejsce\n"
 
 #: g10/keyedit.c:580
 msgid "quit this menu"
@@ -2222,7 +2224,7 @@ msgstr "z�o�enie lokalnego podpisu na kluczu"
 
 #: g10/keyedit.c:595
 msgid "debug"
-msgstr "�ledzenie"
+msgstr "�ledzenia"
 
 #: g10/keyedit.c:596
 msgid "adduid"
@@ -2258,11 +2260,11 @@ msgstr "usuni�cie podklucza"
 
 #: g10/keyedit.c:600
 msgid "delsig"
-msgstr "lpodpis"
+msgstr "uspod"
 
 #: g10/keyedit.c:600
 msgid "delete signatures"
-msgstr "lista podpis�w"
+msgstr "usuni�cie podpis�w"
 
 #: g10/keyedit.c:601
 msgid "expire"
@@ -2360,7 +2362,7 @@ msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
 
 #: g10/keyedit.c:732
 msgid "Please use the command \"toggle\" first.\n"
-msgstr ""
+msgstr "Najpierw trzeba u�y� polecenia \"prze�\".\n"
 
 #: g10/keyedit.c:779
 msgid "Really sign all user IDs? "
@@ -2432,40 +2434,39 @@ msgstr "naniesienie poprawek na kluczu tajnym nie powiod�o si�: %s\n"
 #: g10/keyedit.c:986
 msgid "Key not changed so no update needed.\n"
 msgstr ""
-"Klucz nie zosta� zmieniony wi�c nanoszenie poprawek nie jest konieczne.\n"
+"Klucz nie zosta� zmieniony wi�c naniesienie poprawek nie jest konieczne.\n"
 
 #: g10/keyedit.c:1001
 msgid "Invalid command  (try \"help\")\n"
-msgstr "Niepoprawne polecenie  (spr�buj \"help\")\n"
+msgstr "Niepoprawna komenda  (spr�buj \"help\")\n"
 
 #: g10/keyedit.c:1081 g10/keyedit.c:1107
 #, c-format
 msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
-msgstr ""
+msgstr "%s%c %4u%c/%08lX  utworzony: %s wygasa %s"
 
 #: g10/keyedit.c:1090
 #, c-format
 msgid " trust: %c/%c"
-msgstr ""
+msgstr "zaufanie: %c/%c"
 
 #: g10/keyedit.c:1094
 msgid "This key has been disabled"
-msgstr "Ten klucz zosta� wy��czony z u�ycia"
+msgstr "Ten klucz zosta� wy��czony z u�ytku"
 
 #: g10/keyedit.c:1123
-#, fuzzy, c-format
+#, c-format
 msgid "rev! subkey has been revoked: %s\n"
-msgstr "klucz %08lX: podklucz zosta� uniewa�niony!\n"
+msgstr "podklucz zosta� uniewa�niony: %s\n"
 
 #: g10/keyedit.c:1126
-#, fuzzy
 msgid "rev- faked revocation found\n"
-msgstr "   nowych uniewa�nie� kluczy: %lu\n"
+msgstr "fa�szywy certyfikat uniewa�nienia\n"
 
 #: g10/keyedit.c:1128
 #, c-format
 msgid "rev? problem checking revocation: %s\n"
-msgstr ""
+msgstr "problem przy sprawdzaniu uniewa�nienia: %s\n"
 
 #: g10/keyedit.c:1366
 msgid "Delete this good signature? (y/N/q)"
@@ -2551,17 +2552,17 @@ msgstr "Stworzy� certyfikat uniewa�nienia tego podpisu? (t/N)"
 #. FIXME: detect duplicates here
 #: g10/keyedit.c:1773
 msgid "You have signed these user IDs:\n"
-msgstr "Te identyfikatory s� podpisane przez ciebie:\n"
+msgstr "Te identyfikatory u�ytkownik�w s� podpisane przez Ciebie:\n"
 
 #: g10/keyedit.c:1787 g10/keyedit.c:1822
 #, c-format
 msgid "   signed by %08lX at %s\n"
-msgstr "   podpisany kluczem %08lX w %s\n"
+msgstr "podpisany przez %08lX w %s\n"
 
 #: g10/keyedit.c:1792
 #, c-format
 msgid "   revoked by %08lX at %s\n"
-msgstr "uniewa�niony kluczem %08lX w %s\n"
+msgstr "uniewa�niony przez %08lX w %s\n"
 
 #: g10/keyedit.c:1812
 msgid "You are about to revoke these signatures:\n"
@@ -2573,96 +2574,90 @@ msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N)"
 
 #: g10/keyedit.c:1859
 msgid "no secret key\n"
-msgstr "brak klucza tajnego\n"
+msgstr "brak klucza prywatnego\n"
 
 #: g10/keylist.c:158
-#, fuzzy
 msgid "invalid"
-msgstr "b��d w opakowaniu ASCII"
+msgstr "niepoprawny"
 
 #: g10/keylist.c:178
-#, fuzzy
 msgid "revoked"
-msgstr "unpkl"
+msgstr "uniewa�niony"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:793
-#, fuzzy, c-format
+#: g10/keylist.c:400 g10/mainproc.c:834
+#, c-format
 msgid " [expires: %s]"
-msgstr "Data wa�no�ci klucza: %s\n"
+msgstr "[wygasa :%s]"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:270
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "klucz publiczny %08lX\n"
 
-#: g10/mainproc.c:284
+#: g10/mainproc.c:315
 msgid "public key encrypted data: good DEK\n"
 msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:367
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "d�ugo�� %u bit�w, typ %s, klucz %08lX, stworzony %s\n"
 
-#: g10/mainproc.c:336
+#: g10/mainproc.c:377
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "zaszyfrowane kluczem %s, o identyfikatorze %08lX\n"
 
-#: g10/mainproc.c:342
-msgid "no secret key for decryption available\n"
-msgstr "odszyfrowuj�cy klucz tajny do jest niedost�pny\n"
-
-#: g10/mainproc.c:351
+#: g10/mainproc.c:391
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "b��d odszyfrowywania kluczem publicznym: %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:429
 msgid "decryption okay\n"
 msgstr "odszyfrowane poprawnie\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:434
 msgid "WARNING: encrypted message has been manipulated!\n"
-msgstr "OSTRZE�ENIE: dokonano manipulacji zaszyfrowan� wiadomo�ci�!\n"
+msgstr "OSTRZE�ENIE: zaszyfrowana wiadomo�� by�a manipulowana!\n"
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:439
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:458
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
-msgstr "UWAGA: nadawca zaznaczy� �e wiadomo�� nie powinna by� zapisywana!\n"
+msgstr "UWAGA: nadawca zaznaczy� �e wiadomo�� nie powinna by� zapisywana\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:460
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:615
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
-"oddzielony certyfikat uniewa�nienia - wywo�aj \"gpg --import\" aby go u�y�\n"
+"osobny certyfikat uniewa�nienia - u�yj \"gpg --import\" aby go przyj��\n"
 
-#: g10/mainproc.c:661 g10/mainproc.c:670
+#: g10/mainproc.c:702 g10/mainproc.c:711
 msgid "WARNING: invalid notation data found\n"
 msgstr "OSTRZE�ENIE: niepoprawne dane w adnotacji\n"
 
-#: g10/mainproc.c:673
+#: g10/mainproc.c:714
 msgid "Notation: "
-msgstr "Adnotacja: "
+msgstr "Adnotacja:"
 
-#: g10/mainproc.c:682
+#: g10/mainproc.c:723
 msgid "Policy: "
-msgstr "Regulamin: "
+msgstr "Regulamin:"
 
-#: g10/mainproc.c:1124
+#: g10/mainproc.c:1233
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1270
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
@@ -2670,33 +2665,38 @@ msgstr ""
 "z u�yciem klucza o identyfikatorze %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1187 g10/mainproc.c:1198
+#: g10/mainproc.c:1305 g10/mainproc.c:1316
 msgid "BAD signature from \""
 msgstr "NIEPOPRAWNY podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1188 g10/mainproc.c:1199
+#: g10/mainproc.c:1306 g10/mainproc.c:1317
 msgid "Good signature from \""
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1190
+#: g10/mainproc.c:1308
 msgid "                aka \""
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1246
+#: g10/mainproc.c:1364
 #, c-format
 msgid "Can't check signature: %s\n"
-msgstr "Nie mo�na sprawdzi� podpisu: %s\n"
+msgstr "Nie mog� sprawdzi� podpisu: %s\n"
 
-#: g10/mainproc.c:1321
+#: g10/mainproc.c:1421 g10/mainproc.c:1436 g10/mainproc.c:1498
+#, fuzzy
+msgid "not a detached signature\n"
+msgstr "z�o�enie podpisu oddzielonego od dokumentu"
+
+#: g10/mainproc.c:1447
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
-msgstr "oddzielony podpis klasy 0x%02x\n"
+msgstr "osobny podpis klasy 0x%02x\n"
 
-#: g10/mainproc.c:1372
+#: g10/mainproc.c:1502
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:1377
+#: g10/mainproc.c:1507
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
@@ -2713,13 +2713,12 @@ msgstr "Nie nale�y u�ywa� algorytm�w do�wiadczalnych!\n"
 #, fuzzy
 msgid "this cipher algorithm is deprecated; please use a more standard one!x\n"
 msgstr ""
-"ten algorytm szyfruj�cy jest odradzany; prosz� u�ywa� bardziej "
-"standardowych!\n"
+"odradza si� stosowanie tego algortmu; prosz� u�ywa� bardziej standardowych!\n"
 
 #: g10/parse-packet.c:119
 #, c-format
 msgid "can't handle public key algorithm %d\n"
-msgstr "algorytm klucza publicznego niemo�liwy do obs�u�enia: %d\n"
+msgstr "nie mo�na obs�u�y� tego algorytmu klucza publicznego: %d\n"
 
 #: g10/parse-packet.c:990
 #, c-format
@@ -2735,16 +2734,14 @@ msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
 #: g10/hkp.c:170 g10/passphrase.c:248
-#, fuzzy, c-format
+#, c-format
 msgid "can't connect to `%s': %s\n"
-msgstr "nie mo�na otworzy� %s: %s\n"
+msgstr "nie mo�na po��czy� si� z %s: %s\n"
 
 #: g10/passphrase.c:313 g10/passphrase.c:557
 #, c-format
 msgid " (main key ID %08lX)"
-msgstr ""
-" \n"
-"(identyfikator g��wnego klucza %08lX)"
+msgstr " (g��wny ID klucza %08lX)"
 
 #: g10/passphrase.c:323
 #, fuzzy, c-format
@@ -2815,11 +2812,11 @@ msgstr "Powt�rzone wyra�enie przej�ciowe: "
 #: g10/plaintext.c:67
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
-"dane nie zosta�y zapisane; nale�y u�y� opcji \"--output\" aby je zapisa�\n"
+"dane nie zosta�y zapisane; aby to zrobi�, nale�y u�y� opcji \"--output\"\n"
 
 #: g10/plaintext.c:324
 msgid "Detached signature.\n"
-msgstr "Podpis oddzielony.\n"
+msgstr "Podpis oddzielony od danych.\n"
 
 #: g10/plaintext.c:328
 msgid "Please enter name of data file: "
@@ -2827,9 +2824,14 @@ msgstr "Nazwa pliku danych: "
 
 #: g10/plaintext.c:349
 msgid "reading stdin ...\n"
-msgstr "odczyt ze strumienia standardowego wej�cia...\n"
+msgstr "czytam strumie� standardowego wej�cia\n"
 
-#: g10/plaintext.c:392
+#: g10/plaintext.c:383
+#, fuzzy
+msgid "no signed data\n"
+msgstr "nie mo�na otworzy� podpisanego pliku '%s'\n"
+
+#: g10/plaintext.c:391
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nie mo�na otworzy� podpisanego pliku '%s'\n"
@@ -2837,7 +2839,7 @@ msgstr "nie mo�na otworzy� podpisanego pliku '%s'\n"
 #: g10/pubkey-enc.c:76
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
-msgstr "adresat anonimowy; pr�ba klucza tajnego %08lX ...\n"
+msgstr "adresat anonimowy; pr�buj� klucz tajny %08lX ...\n"
 
 #: g10/pubkey-enc.c:82
 msgid "okay, we are the anonymous recipient.\n"
@@ -2848,9 +2850,9 @@ msgid "old encoding of the DEK is not supported\n"
 msgstr "stary, nie obs�ugiwany algorytm szyfrowania klucza sesyjnego\n"
 
 #: g10/pubkey-enc.c:153
-#, fuzzy, c-format
+#, c-format
 msgid "cipher algorithm %d is unknown or disabled\n"
-msgstr "%d - algorytm ochrony nie obs�ugiwany\n"
+msgstr "algorytm szyfruj�cy %d jest nieznany, b�d� zosta� wy��czony\n"
 
 #: g10/pubkey-enc.c:192
 #, c-format
@@ -2858,53 +2860,52 @@ msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "UWAGA: brak algorytmu szyfruj�cego %d w ustawieniach\n"
 
 #: g10/pubkey-enc.c:198
-#, fuzzy, c-format
+#, c-format
 msgid "NOTE: secret key %08lX expired at %s\n"
-msgstr "UWAGA: klucz podpisuj�cy przekroczy� dat� wa�no�ci %s\n"
+msgstr "UWAGA: wa�no�� klucza tajnego %08lX wygas�a %s\n"
 
 #: g10/hkp.c:72
 #, c-format
 msgid "requesting key %08lX from %s ...\n"
-msgstr ""
+msgstr "zapytanie o klucz %08lX w %s ...\n"
 
 #: g10/hkp.c:85
-#, fuzzy, c-format
+#, c-format
 msgid "can't get key from keyserver: %s\n"
-msgstr "niemo�liwy jest zapis do zbioru kluczy: %s\n"
+msgstr "nie mo�na pobra� klucza z serwera: %s\n"
 
 #: g10/hkp.c:109 g10/hkp.c:148
 msgid "no keyserver known (use option --keyserver)\n"
-msgstr ""
+msgstr "brak znanyk serwer�w kluczy (u�yj opcji --keyserver)\n"
 
 #: g10/hkp.c:117
-#, fuzzy, c-format
+#, c-format
 msgid "%s: not a valid key ID\n"
-msgstr "'%s\" nie jest w�a�ciwym identyfikatorem klucza\n"
+msgstr "%s: nie jest poprawnym identyfikatorem klucza\n"
 
 #: g10/hkp.c:194
-#, fuzzy, c-format
+#, c-format
 msgid "error sending to `%s': %s\n"
-msgstr "b��d odczytu '%s': %s\n"
+msgstr "b��d przy wysy�aniu do '%s': %s\n"
 
 #: g10/hkp.c:206
 #, c-format
 msgid "success sending to `%s' (status=%u)\n"
-msgstr ""
+msgstr "wysy�anie do '%s' powiod�o si� (status=%u)\n"
 
 #: g10/hkp.c:209
 #, c-format
 msgid "failed sending to `%s': status=%u\n"
-msgstr ""
+msgstr "wysy�anie do '%s' nie powiod�o si� (status=%u)\n"
 
 #: g10/seckey-cert.c:53
-#, fuzzy
 msgid "secret key parts are not available\n"
-msgstr "klucz tajny nie jest dost�pny"
+msgstr "tajne cz�ci klucza s� niedost�pne\n"
 
 #: g10/seckey-cert.c:59
 #, c-format
 msgid "protection algorithm %d is not supported\n"
-msgstr "%d - algorytm ochrony nie obs�ugiwany\n"
+msgstr "algorytm ochrony %d nie jest obs�ugiwany\n"
 
 #: g10/seckey-cert.c:186
 msgid "Invalid passphrase; please try again ...\n"
@@ -2947,17 +2948,17 @@ msgstr "UWAGA: klucz podpisuj�cy przekroczy� dat� wa�no�ci %s\n"
 #: g10/sig-check.c:393
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
-"przyj�to niewa�no�� podpisu z powodu ustawienia nieznanego bitu krytycznego\n"
+"przyj�to niewa�no�� podpisu z powonu ustawienia nieznanego bitu krytycznego\n"
 
 #: g10/sign.c:140
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s podpis z�o�ony przez: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:610
+#: g10/sign.c:290 g10/sign.c:613
 #, c-format
 msgid "can't create %s: %s\n"
-msgstr "nie mo�na stworzy� %s: %s\n"
+msgstr "nie mog� utworzy� %s: %s\n"
 
 #: g10/sign.c:388
 msgid "signing:"
@@ -2971,7 +2972,7 @@ msgstr "OSTRZE�ENIE: plik '%s' jest pusty\n"
 #: g10/textfilter.c:134
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
-msgstr "nie mo�na obs�u�y� linii tekstu d�u�szej ni� %d znak�w\n"
+msgstr "nie mog� obs�u�y� linii tekstu d�u�szej ni� %d znak�w\n"
 
 #: g10/textfilter.c:231
 #, c-format
@@ -3005,22 +3006,22 @@ msgstr "%s: katalog nie istnieje!\n"
 #: g10/openfile.c:226 g10/openfile.c:295 g10/ringedit.c:1369 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
-msgstr "%s: nie mo�na utworzy�: %s\n"
+msgstr "%s: nie mog� utworzy�: %s\n"
 
 #: g10/tdbio.c:459 g10/tdbio.c:508
 #, c-format
 msgid "%s: can't create lock\n"
-msgstr "%s: nie mo�na utworzy� blokady\n"
+msgstr "%s: nie mog� utworzy� blokady\n"
 
 #: g10/tdbio.c:473
 #, c-format
 msgid "%s: failed to create version record: %s"
-msgstr "%s: utworzenie zapisu o wersji nie powiod�o si�: %s"
+msgstr "%s: stworzenie zapisu o wersji nie powiod�o si�: %s"
 
 #: g10/tdbio.c:477
 #, c-format
 msgid "%s: invalid trustdb created\n"
-msgstr "%s: utworzono niepoprawny plik bazy zaufania\n"
+msgstr "%s: stworzony niepoprawny plik bazy zaufania\n"
 
 #: g10/tdbio.c:480
 #, c-format
@@ -3066,7 +3067,7 @@ msgstr "baza zaufania: procedura read() (n=%d) zawiod�a: %s\n"
 #: g10/tdbio.c:1264
 #, c-format
 msgid "%s: not a trustdb file\n"
-msgstr "%s: nie jest plikiem bazy zaufania\n"
+msgstr "%s: to nie jest plik bazy zaufania\n"
 
 #: g10/tdbio.c:1280
 #, c-format
@@ -3081,7 +3082,7 @@ msgstr "%s: niew�a�ciwa wersja pliku %d\n"
 #: g10/tdbio.c:1589
 #, c-format
 msgid "%s: error reading free record: %s\n"
-msgstr "%s: b��d odczytu wolnego wpisu: %s\n"
+msgstr "%s: b��d odczytu pustego wpisu: %s\n"
 
 #: g10/tdbio.c:1597
 #, c-format
@@ -3101,7 +3102,7 @@ msgstr "%s: dopisanie rekordu nie powiod�o si�: %s\n"
 #: g10/tdbio.c:1748
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
-"Baza zaufania jest uszkodzona; prosz� uruchomi� \"gpgm --fix-trust-db\".\n"
+"Baza zaufania jest uszkodzona; prosz� uruchomi� \"gpg --fix-trustdb\".\n"
 
 #: g10/trustdb.c:169
 #, c-format
@@ -3149,9 +3150,9 @@ msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: funkcja search_record zawiod�a: %s\n"
 
 #: g10/trustdb.c:474
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid long keyID\n"
-msgstr "'%s\" nie jest w�a�ciwym identyfikatorem klucza\n"
+msgstr "'%s' nie jest w�a�ciwym identyfikatorem klucza\n"
 
 #: g10/trustdb.c:501
 #, c-format
@@ -3177,7 +3178,7 @@ msgstr "Klucz %08lX: zaakceptowany jako klucz zaufany.\n"
 #, c-format
 msgid "key %08lX: no public key for trusted key - skipped\n"
 msgstr ""
-"klucz %08lX: brak klucza publicznego dla klucza zaufanego - pomini�ty\n"
+"klucz %08lX: brak klucza publicznego dla zaufanego klucza - pomini�ty\n"
 
 #: g10/trustdb.c:565
 #, c-format
@@ -3324,7 +3325,7 @@ msgstr "lid %lu: wpis katalogowy bez bloku klucza - pomini�ty\n"
 #: g10/trustdb.c:1873
 #, c-format
 msgid "\t%lu due to new pubkeys\n"
-msgstr "\t%lu z powodu nowych kluczy publicznych\n"
+msgstr "        %lu z powodu nowych podkluczy\n"
 
 #: g10/trustdb.c:1875
 #, c-format
@@ -3394,26 +3395,26 @@ msgstr "brak u�ytkownika '%s' w bazie zaufania - dodano\n"
 #: g10/trustdb.c:2589
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
-msgstr "umieszczenie '%s' w bazie zaufania nie powiod�o si�: %s\n"
+msgstr "umieszczenie '%s' w Bazie Zaufania nie powiod�o si�: %s\n"
 
 #: g10/trustdb.c:2775 g10/trustdb.c:2805
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "OSTRZE�ENIE: d�ugie wpisy ustawie� jeszcze nie s� obs�ugiwane.\n"
 
-#: g10/verify.c:82
+#: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
-"podpis niemo�liwy do sprawdzenia.\n"
-"Nale�y pami�ta� aby plik zawieraj�cy podpis (.sig lub .asc)<\n"
-"by� pierwszym plikiem podanym w linii polece�.\n"
+"nie mo�na sprawdzi� podpisu.\n"
+"Nale�y pami�ta� o podawaniu pliku podpisu (.sig lub .asc) jako pierwszego\n"
+"argumentu linii polece�.\n"
 
-#: g10/verify.c:147
+#: g10/verify.c:173
 #, c-format
 msgid "input line %u too long or missing LF\n"
-msgstr "linia wej�ciowa %u jest zbyt d�uga lub brakuje jej zako�czenia\n"
+msgstr "linia wej�cia %u zbyt d�uga lub brak znaku LF\n"
 
 #: g10/ringedit.c:302
 #, c-format
@@ -3441,12 +3442,12 @@ msgstr "%s zosta� utworzony\n"
 
 #: g10/ringedit.c:1554
 msgid "Please fix this possible security flaw\n"
-msgstr "Prosz� usun�� to naruszenie zasad bezpiecze�stwa.\n"
+msgstr "Prosz� usun�� to naruszenie zasad bezpiecze�stwa\n"
 
 #: g10/skclist.c:88 g10/skclist.c:125
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
-"klucz nie jest oznaczony jako niepewny - nie mo�na go u�y� z atrap�\n"
+"klucz nie jest oznaczony jako niepewny - nie mo�na go u�y� z atrap� \n"
 "generatora liczb losowych!\n"
 
 #: g10/skclist.c:113
@@ -3499,7 +3500,7 @@ msgstr "%s: stworzono nowy plik ustawie�\n"
 #: g10/openfile.c:338
 #, c-format
 msgid "%s: can't create directory: %s\n"
-msgstr "%s: nie mo�na utworzy� katalogu: %s\n"
+msgstr "%s: nie mog� utworzy� katalogu: %s\n"
 
 #: g10/openfile.c:341
 #, c-format
@@ -3508,7 +3509,7 @@ msgstr "%s: katalog utworzony\n"
 
 #: g10/openfile.c:343
 msgid "you have to start GnuPG again, so it can read the new options file\n"
-msgstr "musisz uruchomi� GnuPG od nowa aby wczyta� nowe ustawienia\n"
+msgstr "aby u�y� nowego pliku ustawie�, nale�y od nowa uruchomi� GnuPG\n"
 
 #: g10/encr-data.c:66
 #, c-format
@@ -3539,15 +3540,15 @@ msgstr ""
 
 #: g10/delkey.c:94
 msgid "there is a secret key for this public key!\n"
-msgstr "dla tego klucza publicznego istnieje klucz tajny!\n"
+msgstr "jest klucz tajny do tego klucza publicznego!\n"
 
 #: g10/delkey.c:96
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr "nale�y najpierw go usun�� opcj� \"--delete-secret-key\".\n"
+msgstr "aby go usun�� nalezy najpierw u�y� opcji \"--delete-secret-key\".\n"
 
 #: g10/delkey.c:114
 msgid "can't do that in batchmode without \"--yes\"\n"
-msgstr "nie dzia�a w trybie wsadowym bez opcji \"--yes\"\n"
+msgstr "bez opcji \"--yes\" nie dzia�a w trybie wsadowym\n"
 
 #: g10/delkey.c:136
 msgid "Delete this key from the keyring? "
@@ -3555,7 +3556,7 @@ msgstr "Usun�� ten klucz ze zbioru? "
 
 #: g10/delkey.c:144
 msgid "This is a secret key! - really delete? "
-msgstr "To jest klucz tajny - czy na pewno go usun��? "
+msgstr "To jest klucz tajny! - czy na pewno go usun��? "
 
 #: g10/helptext.c:47
 msgid ""
@@ -3606,22 +3607,22 @@ msgid ""
 msgstr ""
 "Wyb�r algorytmu.\n"
 "\n"
-"DSA (zwany te� DSS) to algorytm podpisu cyfrowego, i tylko do sk�adania\n"
-"podpis�w mo�e on by� u�ywany. Jest to preferowany algorytm poniewa� "
-"sk�adane\n"
-"nim podpisy sprawdza si� du�o szybciej ni� te sk�adane algorytmem ElGamala.\n"
+"DSA (zwany te� DSS) to algorytm podpisu cyfrowego i tylko do sk�adania\n"
+"podpis�w mo�e by� u�ywany. Jest to preferowany algorytm poniewa�\n"
+"sk�adane nim podpisy sprawdza si� du�o szybciej ni� te sk�adane\n"
+"algorytmem ElGamala.\n"
 "\n"
-"Algorytm ElGamala mo�e by� u�ywany zar�wno do podpis�w jak i do "
-"szyfrowania.\n"
-"Standard OpenPGP rozr�nia dwa typy tego algorytmu - tylko do szyfrowania,\n"
-"oraz do szyfrowania i podpisywania. Faktycznie algorytm pozostaje bez zmian\n"
-"ale pewne parametry musz� by� odpowiednio dobrane aby stworzy� klucz kt�rym\n"
-"mo�na sk�ada� bezpieczne podpisy. Ten program obs�uguje oba typy ale inne\n"
-"implementacje nie musz� rozumie� kluczy do podpis�w i szyfrowania\n"
+"Algorytm ElGamala mo�e by� u�ywany zar�wno do podpis�w jak i do\n"
+"szyfrowania.  Standard OpenPGP rozr�nia dwa typy tego algorytmu -\n"
+"tylko do szyfrowania, oraz do szyfrowania i podpisywania. Faktycznie\n"
+"algorytm pozostaje bez zmian ale pewne parametry musz� by� odpowiednio\n"
+"dobrane aby stworzy� klucz kt�rym mo�na sk�ada� bezpieczne\n"
+"podpisy. Ten program obs�uguje oba typy ale inne implementacje nnie\n"
+"musz� rozumie� kluczy do podpis�w i szyfrowania\n"
 "\n"
-"G��wny klucz musi by� kluczem podpisuj�cym, jest to powodem dla kt�rego w "
-"tym\n"
-"menu nie ma mo�no�ci wyboru klucza ElGamala do szyfrowania."
+"G��wny klucz musi by� kluczem podpisuj�cym, jest to powodem dla\n"
+"kt�rego w tym menu nie ma mo�no�ci wyboru klucza ElGamala do\n"
+"szyfrowania."
 
 #: g10/helptext.c:85
 msgid ""
@@ -3629,10 +3630,9 @@ msgid ""
 "because they are not supported by all programs and signatures created\n"
 "with them are quite large and very slow to verify."
 msgstr ""
-"Ten typ klucza jest zdefiniowany w RFC2440, jednak�e jest on odradzany gdy�\n"
-"nie jest obs�ugiwany przez wszystkie programy, a podpisy nim sk�adane s� "
-"du�e\n"
-"i ich sprawdzanie trwa d�ugo."
+"Ten typ klucza jest zdefiniowany w RFC2440, jednak�e jest on odradzany\n"
+"gdy� nie jest obs�ugiwany przez wszystkie programy, a podpisy nim\n"
+"sk�adane s� du�e i ich sprawdzanie trwa d�ugo."
 
 #: g10/helptext.c:92
 msgid "Enter the size of the key"
@@ -3641,7 +3641,7 @@ msgstr "Wprowad� rozmiar klucza"
 #: g10/helptext.c:96 g10/helptext.c:101 g10/helptext.c:113 g10/helptext.c:145
 #: g10/helptext.c:150 g10/helptext.c:155 g10/helptext.c:160
 msgid "Answer \"yes\" or \"no\""
-msgstr "Odpowiedz \"tak\" lub \"nie\"."
+msgstr "Odpowied� \"tak\" lub \"nie\"."
 
 #: g10/helptext.c:106
 msgid ""
@@ -3650,9 +3650,10 @@ msgid ""
 "get a good error response - instead the system tries to interpret\n"
 "the given value as an interval."
 msgstr ""
-"Wprowad� ��dan� warto�� (jak w znaku zach�ty). Mo�na tu poda� dat� w\n"
-"formacie ISO (RRRR-MM-DD) ale nie da to w�a�ciwej obs�ugi b��d�w - system\n"
-"pr�buje interpretowa� podan� warto�� jako okres."
+"Wprowad� ��dan� warto�� (jak w znaku zach�ty).  \n"
+"Mo�na tu poda� dat� w formacie ISO (RRRR-MM-DD) ale nie da to\n"
+"w�a�ciwej obs�ugi b��d�w - system pr�buje interpretowa� podan� warto��\n"
+"jako okres."
 
 #: g10/helptext.c:118
 msgid "Enter the name of the key holder"
@@ -3720,17 +3721,17 @@ msgid ""
 "know which key was used because this signing key might establish\n"
 "a trust connection through another already certified key."
 msgstr ""
-"Ten podpis nie mo�e zosta� potwierdzony poniewa� nie masz\n"
+"Ten podpis nie mo�e zosta� potwierdzony poniewa� nie ma\n"
 "odpowiadaj�cego mu klucza publicznego. Nale�y od�o�y� usuni�cie tego\n"
-"podpisu do czasu, kiedy oka�e si� kt�ry klucz zosta� u�yty, poniewa� w\n"
-"momencie uzyskania tego klucza mo�e pojawi� si� �cie�ka zaufania\n"
+"podpisu do czasu, kiedy oka�e si� kt�ry klucz zosta� u�yty, poniewa�\n"
+"w momencie uzyskania tego klucza mo�e pojawi� si� �cie�ka zaufania\n"
 "pomi�dzy tym a innym, ju� po�wiadczonym kluczem."
 
 #: g10/helptext.c:189
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
-msgstr "Ten podpis jest niepoprawny. Ma sens usuni�cie go z bazy kluczy."
+msgstr "Ten podpis jest niepoprawny. Mo�na usuni�� go z bazy kluczy."
 
 #: g10/helptext.c:193
 msgid ""
@@ -3761,7 +3762,7 @@ msgstr ""
 
 #: g10/helptext.c:213
 msgid "Give the name of the file to which the signature applies"
-msgstr "Nazwa pliku kt�rego dotyczy podpis"
+msgstr "Podaj nazw� pliku kt�rego dotyczy ten podpis"
 
 #: g10/helptext.c:218
 msgid "Answer \"yes\" if it is okay to overwrite the file"
@@ -3789,6 +3790,17 @@ msgid ""
 "      Use this to state that the user ID should not longer be used;\n"
 "      this is normally used to mark an email address invalid.\n"
 msgstr ""
+"Nalezy poda� pow�d uniewa�nienia klucza. W zale�no�ci od kontekstu mo�na\n"
+"go wybra� z listy:\n"
+"  \"Klucz zosta� skompromitowany\"\n"
+"      Masz powody uwa�a� �e tw�j klucz tajny dosta� si� w niepowo�ane r�ce.\n"
+"  \"Klucz zosta� zast�piony\"\n"
+"      Klucz zosta� zast�piony nowym.\n"
+"  \"Klucz nie jest ju� u�ywany\"\n"
+"      Klucz zosta� wycofany z u�ycia.\n"
+"  \"Identyfikator u�ytkownika przesta� by� poprawny\"\n"
+"      Identyfikator u�ytkownika (najcz�ciej adres e-mail przesta� by� \n"
+"      poprawny.\n"
 
 #: g10/helptext.c:245
 msgid ""
@@ -3796,6 +3808,9 @@ msgid ""
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
+"Je�li chcesz, mo�esz poda� opis powodu wystawienia certyfikatu\n"
+"uniewa�nienia. Opis powinien byc zwi�z�y. \n"
+"Pusta linia ko�czy wprowadzanie tekstu.\n"
 
 #: g10/helptext.c:260
 msgid "No help available"
@@ -3806,18 +3821,14 @@ msgstr "Pomoc niedost�pna"
 msgid "No help available for `%s'"
 msgstr "Brak pomocy o '%s'"
 
-#~ msgid ""
-#~ "RSA keys are deprecated; please consider creating a new key and use this key "
-#~ "in the future\n"
-#~ msgstr ""
-#~ "Klucze RSA s� odradzane; prosz� rozwa�y� przej�cie na inne algorytmy po\n"
-#~ "wygenerowaniu odpowiednich kluczy.\n"
+#~ msgid "no secret key for decryption available\n"
+#~ msgstr "odszyfrowuj�cy klucz tajny do jest niedost�pny\n"
 
 #~ msgid "set debugging flags"
 #~ msgstr "ustawienie opcji �ledzenia wykonania programu"
 
 #~ msgid "enable full debugging"
-#~ msgstr "w��czenie pe�nego �ledzenia programu"
+#~ msgstr "umo�liwienie pe�nego �ledzenia programu"
 
 #~ msgid "do not write comment packets"
 #~ msgstr "nie zapisywa� pakiet�w z komentarzem"
@@ -3835,6 +3846,14 @@ msgstr "Brak pomocy o '%s'"
 #~ msgid "Key generation can only be used in interactive mode\n"
 #~ msgstr "Generacj� klucza mo�na wykonywa� tylko w trybie interaktywnym\n"
 
+#~ msgid ""
+#~ "RSA keys are deprecated; please consider creating a new key and use this key "
+#~ "in the future\n"
+#~ msgstr ""
+#~ "Odradza si� stosowanie kluczy RSA; prosz� rozwa�y� przej�cie na inne "
+#~ "algorytmy\n"
+#~ "po wygenerowaniu odpowiednich kluczy.\n"
+
 #~ msgid "print all message digests"
 #~ msgstr "wszystkie skr�ty wiadomo�ci"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4c3756ded..db355437e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-11-24 13:52+0100\n"
+"POT-Creation-Date: 2000-12-19 11:58+0100\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-20 23:46:36-0200\n"
 "From: Thiago Jung Bauermann <[email protected]>\n"
@@ -690,15 +690,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:426
+#: g10/g10.c:427
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:430
+#: g10/g10.c:431
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/g10.c:433
+#: g10/g10.c:434
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -708,7 +708,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/g10.c:440
+#: g10/g10.c:441
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -716,189 +716,189 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:519
+#: g10/g10.c:520
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:572
+#: g10/g10.c:573
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/g10.c:716
+#: g10/g10.c:717
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: g10/g10.c:723
+#: g10/g10.c:724
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/g10.c:915
+#: g10/g10.c:925
 #, 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:983
+#: g10/g10.c:994
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/g10.c:987 g10/g10.c:996
+#: g10/g10.c:998 g10/g10.c:1007
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/g10.c:989
+#: g10/g10.c:1000
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:992
+#: g10/g10.c:1003
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:1011 g10/g10.c:1023
+#: g10/g10.c:1023 g10/g10.c:1035
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1017 g10/g10.c:1029
+#: g10/g10.c:1029 g10/g10.c:1041
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1033
+#: g10/g10.c:1045
 msgid "the given policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:1036
+#: g10/g10.c:1048
 #, 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:1038
+#: g10/g10.c:1050
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:1040
+#: g10/g10.c:1052
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:1042
+#: g10/g10.c:1054
 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:1045
+#: g10/g10.c:1057
 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:1049
+#: g10/g10.c:1061
 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:1134
+#: g10/g10.c:1146
 #, 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:1140
+#: g10/g10.c:1152
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/g10.c:1147
+#: g10/g10.c:1159
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:1155
+#: g10/g10.c:1167
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1180
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/g10.c:1181
+#: g10/g10.c:1193
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1207
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/g10.c:1212
+#: g10/g10.c:1224
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1232
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1240
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1248
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1264
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-usu�rio"
 
-#: g10/g10.c:1255
+#: g10/g10.c:1267
 msgid "--delete-key user-id"
 msgstr "--delete-key id-usu�rio"
 
-#: g10/encode.c:265 g10/g10.c:1292 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1304 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/g10.c:1307
+#: g10/g10.c:1319
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usu�rio] [chaveiro]"
 
-#: g10/g10.c:1373
+#: g10/g10.c:1385
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1381
+#: g10/g10.c:1393
 #, 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:1452
+#: g10/g10.c:1464
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/g10.c:1539
+#: g10/g10.c:1551
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/g10.c:1543
+#: g10/g10.c:1555
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1546 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1558 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:1756
+#: g10/g10.c:1767
 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:1762
+#: g10/g10.c:1773
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -906,12 +906,12 @@ msgstr ""
 "um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:1768
+#: g10/g10.c:1779
 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:1776
+#: g10/g10.c:1787
 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"
 
@@ -1652,17 +1652,17 @@ msgstr "%s: imposs�vel abrir: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:324
+#: g10/encode.c:171 g10/encode.c:327
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVISO: arquivo vazio\n"
 
-#: g10/encode.c:271
+#: g10/encode.c:274
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:492
+#: g10/encode.c:497
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s criptografado para: %s\n"
@@ -1796,7 +1796,7 @@ msgstr "  chaves secretas importadas: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:391 g10/import.c:590
+#: g10/import.c:391 g10/import.c:600
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "chave %08lX: sem ID de usu�rio\n"
@@ -1810,7 +1810,7 @@ msgstr "chave %08lX: sem IDs de usu�rios v�lidos\n"
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/import.c:418 g10/import.c:657
+#: g10/import.c:418 g10/import.c:667
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
@@ -1824,17 +1824,17 @@ msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 msgid "no default public keyring\n"
 msgstr "sem chaveiro p�blico padr�o\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
+#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
+#: g10/import.c:438 g10/import.c:496 g10/import.c:615 g10/import.c:716
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "imposs�vel bloquear chaveiro `%s': %s\n"
 
-#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
+#: g10/import.c:441 g10/import.c:499 g10/import.c:618 g10/import.c:719
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
@@ -1849,12 +1849,12 @@ msgstr "chave %08lX: chave p�blica importada\n"
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
 
-#: g10/import.c:472 g10/import.c:665
+#: g10/import.c:472 g10/import.c:675
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
 
-#: g10/import.c:478 g10/import.c:671
+#: g10/import.c:478 g10/import.c:681
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
@@ -1894,75 +1894,80 @@ msgstr "chave %08lX: %d novas subchaves\n"
 msgid "key %08lX: not changed\n"
 msgstr "chave %08lX: n�o modificada\n"
 
-#: g10/import.c:613
+#: g10/import.c:593
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr ""
+
+#: g10/import.c:623
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
 #. we can't merge secret keys
-#: g10/import.c:617
+#: g10/import.c:627
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no chaveiro secreto\n"
 
-#: g10/import.c:622
+#: g10/import.c:632
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
 
-#: g10/import.c:651
+#: g10/import.c:661
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: sem chave p�blica - imposs�vel aplicar certificado\n"
 "de revoga��o\n"
 
-#: g10/import.c:682
+#: g10/import.c:692
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
 
-#: g10/import.c:714
+#: g10/import.c:724
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revoga��o importado\n"
 
-#: g10/import.c:756
+#: g10/import.c:766
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de usu�rio para assinatura\n"
 
-#: g10/import.c:763 g10/import.c:787
+#: g10/import.c:773 g10/import.c:797
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:764
+#: g10/import.c:774
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/import.c:779
+#: g10/import.c:789
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:788
+#: g10/import.c:798
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:815
+#: g10/import.c:825
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "chave %08lX: aceito ID de usu�rio sem auto-assinatura '"
 
-#: g10/import.c:844
+#: g10/import.c:854
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chave %08lX: ignorado ID de usu�rio '"
 
-#: g10/import.c:867
+#: g10/import.c:877
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
@@ -1971,32 +1976,32 @@ msgstr "chave %08lX: subchave ignorada\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:892
+#: g10/import.c:902
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:901
+#: g10/import.c:911
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
 
-#: g10/import.c:909
+#: g10/import.c:919
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorada\n"
 
-#: g10/import.c:1009
+#: g10/import.c:1019
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de usu�rio duplicado - unido\n"
 
-#: g10/import.c:1060
+#: g10/import.c:1071
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/import.c:1174 g10/import.c:1227
+#: g10/import.c:1185 g10/import.c:1238
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "chave %08lX: nossa c�pia n�o tem auto-assinatura\n"
@@ -2587,114 +2592,115 @@ msgid "revoked"
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:793
+#: g10/keylist.c:400 g10/mainproc.c:834
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "A chave expira em %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:270
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:284
+#: g10/mainproc.c:315
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados criptografados com chave p�blica: DEK v�lido\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:367
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "criptografado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:336
+#: g10/mainproc.c:377
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "criptografado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:342
-msgid "no secret key for decryption available\n"
-msgstr "nenhuma chave secreta para descriptografia dispon�vel\n"
-
-#: g10/mainproc.c:351
+#: g10/mainproc.c:391
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descriptografia de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:429
 msgid "decryption okay\n"
 msgstr "descriptografia correta\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:434
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem criptografada foi manipulada!\n"
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:439
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:458
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:460
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome de arquivo original='%.*s'\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:615
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoga��o isolada - use \"gpg --import\" para aplic�-la\n"
 
-#: g10/mainproc.c:661 g10/mainproc.c:670
+#: g10/mainproc.c:702 g10/mainproc.c:711
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 
-#: g10/mainproc.c:673
+#: g10/mainproc.c:714
 msgid "Notation: "
 msgstr "Nota��o: "
 
-#: g10/mainproc.c:682
+#: g10/mainproc.c:723
 msgid "Policy: "
 msgstr "Pol�tica: "
 
-#: g10/mainproc.c:1124
+#: g10/mainproc.c:1233
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1270
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1187 g10/mainproc.c:1198
+#: g10/mainproc.c:1305 g10/mainproc.c:1316
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRETA de \""
 
-#: g10/mainproc.c:1188 g10/mainproc.c:1199
+#: g10/mainproc.c:1306 g10/mainproc.c:1317
 msgid "Good signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1190
+#: g10/mainproc.c:1308
 msgid "                aka \""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1246
+#: g10/mainproc.c:1364
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1321
+#: g10/mainproc.c:1421 g10/mainproc.c:1436 g10/mainproc.c:1498
+#, fuzzy
+msgid "not a detached signature\n"
+msgstr "fazer uma assinatura separada"
+
+#: g10/mainproc.c:1447
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura isolada da classe 0x%02x\n"
 
-#: g10/mainproc.c:1372
+#: g10/mainproc.c:1502
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1377
+#: g10/mainproc.c:1507
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -2824,7 +2830,12 @@ msgstr "Por favor digite o nome do arquivo de dados: "
 msgid "reading stdin ...\n"
 msgstr "lendo de \"stdin\" ...\n"
 
-#: g10/plaintext.c:392
+#: g10/plaintext.c:383
+#, fuzzy
+msgid "no signed data\n"
+msgstr "imposs�vel abrir dados assinados `%s'\n"
+
+#: g10/plaintext.c:391
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
@@ -2944,7 +2955,7 @@ msgstr "assumindo assinatura incorreta devido a um bit cr�tico desconhecido\n"
 msgid "%s signature from: %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:610
+#: g10/sign.c:290 g10/sign.c:613
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
@@ -3390,7 +3401,7 @@ msgstr "falha ao colocar `%s' no banco de dados de confiabilidade: %s\n"
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "AVISO: ainda � imposs�vel manipular registros de prefer�ncias longos\n"
 
-#: g10/verify.c:82
+#: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -3400,7 +3411,7 @@ msgstr ""
 "Por favor lembre-se de que o arquivo com a assinatura (.sig ou .asc)\n"
 "deve ser o primeiro arquivo dado na linha de comando.\n"
 
-#: g10/verify.c:147
+#: g10/verify.c:173
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linha %u muito longa ou sem LF\n"
@@ -3793,6 +3804,9 @@ msgstr "Nenhuma ajuda dispon�vel"
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
 
+#~ msgid "no secret key for decryption available\n"
+#~ msgstr "nenhuma chave secreta para descriptografia dispon�vel\n"
+
 #~ msgid ""
 #~ "RSA keys are deprecated; please consider creating a new key and use this key "
 #~ "in the future\n"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 40e9632d3..7a031b6eb 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
-"POT-Creation-Date: 2000-11-24 13:52+0100\n"
+"POT-Creation-Date: 2000-12-19 11:58+0100\n"
 "PO-Revision-Date: 1999-09-09 20:28+0000\n"
 "Last-Translator: Pedro Morais <[email protected]>\n"
 "Language-Team: pt\n"
@@ -682,15 +682,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:426
+#: g10/g10.c:427
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:430
+#: g10/g10.c:431
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/g10.c:433
+#: g10/g10.c:434
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -700,7 +700,7 @@ msgstr ""
 "assina, verifica, encripta ou desencripta\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/g10.c:440
+#: g10/g10.c:441
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -708,189 +708,189 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:519
+#: g10/g10.c:520
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:572
+#: g10/g10.c:573
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 #, 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:716
+#: g10/g10.c:717
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: g10/g10.c:723
+#: g10/g10.c:724
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/g10.c:915
+#: g10/g10.c:925
 #, 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:983
+#: g10/g10.c:994
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/g10.c:987 g10/g10.c:996
+#: g10/g10.c:998 g10/g10.c:1007
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/g10.c:989
+#: g10/g10.c:1000
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:992
+#: g10/g10.c:1003
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:1011 g10/g10.c:1023
+#: g10/g10.c:1023 g10/g10.c:1035
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1017 g10/g10.c:1029
+#: g10/g10.c:1029 g10/g10.c:1041
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1033
+#: g10/g10.c:1045
 msgid "the given policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:1036
+#: g10/g10.c:1048
 #, 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:1038
+#: g10/g10.c:1050
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:1040
+#: g10/g10.c:1052
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:1042
+#: g10/g10.c:1054
 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:1045
+#: g10/g10.c:1057
 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:1049
+#: g10/g10.c:1061
 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:1134
+#: g10/g10.c:1146
 #, 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:1140
+#: g10/g10.c:1152
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/g10.c:1147
+#: g10/g10.c:1159
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:1155
+#: g10/g10.c:1167
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1180
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/g10.c:1181
+#: g10/g10.c:1193
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1207
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/g10.c:1212
+#: g10/g10.c:1224
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1232
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1240
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1248
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1264
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-utilizador"
 
-#: g10/g10.c:1255
+#: g10/g10.c:1267
 msgid "--delete-key user-id"
 msgstr "--delete-key id-utilizador"
 
-#: g10/encode.c:265 g10/g10.c:1292 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1304 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/g10.c:1307
+#: g10/g10.c:1319
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/g10.c:1373
+#: g10/g10.c:1385
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1381
+#: g10/g10.c:1393
 #, 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:1452
+#: g10/g10.c:1464
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/g10.c:1539
+#: g10/g10.c:1551
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/g10.c:1543
+#: g10/g10.c:1555
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1546 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1558 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:1756
+#: g10/g10.c:1767
 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:1762
+#: g10/g10.c:1773
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -898,12 +898,12 @@ msgstr ""
 "um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:1768
+#: g10/g10.c:1779
 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:1776
+#: g10/g10.c:1787
 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"
 
@@ -1646,17 +1646,17 @@ msgstr "%s: imposs�vel abrir: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:324
+#: g10/encode.c:171 g10/encode.c:327
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVISO: ficheiro vazio\n"
 
-#: g10/encode.c:271
+#: g10/encode.c:274
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:492
+#: g10/encode.c:497
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s encriptado para: %s\n"
@@ -1790,7 +1790,7 @@ msgstr "  chaves secretas importadas: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:391 g10/import.c:590
+#: g10/import.c:391 g10/import.c:600
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
@@ -1804,7 +1804,7 @@ msgstr "chave %08lX: sem IDs de utilizadores v�lidos\n"
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/import.c:418 g10/import.c:657
+#: g10/import.c:418 g10/import.c:667
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
@@ -1818,17 +1818,17 @@ msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 msgid "no default public keyring\n"
 msgstr "sem porta-chaves p�blico padr�o\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
+#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
+#: g10/import.c:438 g10/import.c:496 g10/import.c:615 g10/import.c:716
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "imposs�vel trancar porta-chaves `%s': %s\n"
 
-#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
+#: g10/import.c:441 g10/import.c:499 g10/import.c:618 g10/import.c:719
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
@@ -1843,12 +1843,12 @@ msgstr "chave %08lX: chave p�blica importada\n"
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
 
-#: g10/import.c:472 g10/import.c:665
+#: g10/import.c:472 g10/import.c:675
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
 
-#: g10/import.c:478 g10/import.c:671
+#: g10/import.c:478 g10/import.c:681
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
@@ -1888,75 +1888,80 @@ msgstr "chave %08lX: %d novas subchaves\n"
 msgid "key %08lX: not changed\n"
 msgstr "chave %08lX: n�o modificada\n"
 
-#: g10/import.c:613
+#: g10/import.c:593
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr ""
+
+#: g10/import.c:623
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
 #. we can't merge secret keys
-#: g10/import.c:617
+#: g10/import.c:627
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no porta-chaves secreto\n"
 
-#: g10/import.c:622
+#: g10/import.c:632
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
 
-#: g10/import.c:651
+#: g10/import.c:661
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: sem chave p�blica - imposs�vel aplicar certificado\n"
 "de revoga��o\n"
 
-#: g10/import.c:682
+#: g10/import.c:692
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
 
-#: g10/import.c:714
+#: g10/import.c:724
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revoga��o importado\n"
 
-#: g10/import.c:756
+#: g10/import.c:766
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de utilizador para assinatura\n"
 
-#: g10/import.c:763 g10/import.c:787
+#: g10/import.c:773 g10/import.c:797
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:764
+#: g10/import.c:774
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/import.c:779
+#: g10/import.c:789
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:788
+#: g10/import.c:798
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:815
+#: g10/import.c:825
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '"
 
-#: g10/import.c:844
+#: g10/import.c:854
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chave %08lX: ignorado ID de utilizador '"
 
-#: g10/import.c:867
+#: g10/import.c:877
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
@@ -1965,32 +1970,32 @@ msgstr "chave %08lX: subchave ignorada\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:892
+#: g10/import.c:902
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:901
+#: g10/import.c:911
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorado\n"
 
-#: g10/import.c:909
+#: g10/import.c:919
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorado\n"
 
-#: g10/import.c:1009
+#: g10/import.c:1019
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
 
-#: g10/import.c:1060
+#: g10/import.c:1071
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/import.c:1174 g10/import.c:1227
+#: g10/import.c:1185 g10/import.c:1238
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "chave %08lX: a nossa c�pia n�o tem auto-assinatura\n"
@@ -2581,114 +2586,115 @@ msgid "revoked"
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:793
+#: g10/keylist.c:400 g10/mainproc.c:834
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "A chave expira em %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:270
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:284
+#: g10/mainproc.c:315
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados encriptados com chave p�blica: DEK v�lido\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:367
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "encriptado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:336
+#: g10/mainproc.c:377
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "encriptado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:342
-msgid "no secret key for decryption available\n"
-msgstr "nenhuma chave secreta para desencripta��o dispon�vel\n"
-
-#: g10/mainproc.c:351
+#: g10/mainproc.c:391
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "desencripta��o de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:429
 msgid "decryption okay\n"
 msgstr "desencripta��o correcta\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:434
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem encriptada foi manipulada!\n"
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:439
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "desencripta��o falhou: %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:458
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:460
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro original='%.*s'\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:615
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca��o solit�ria - utilize \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:661 g10/mainproc.c:670
+#: g10/mainproc.c:702 g10/mainproc.c:711
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 
-#: g10/mainproc.c:673
+#: g10/mainproc.c:714
 msgid "Notation: "
 msgstr "Nota��o: "
 
-#: g10/mainproc.c:682
+#: g10/mainproc.c:723
 msgid "Policy: "
 msgstr "Pol�tica: "
 
-#: g10/mainproc.c:1124
+#: g10/mainproc.c:1233
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1270
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1187 g10/mainproc.c:1198
+#: g10/mainproc.c:1305 g10/mainproc.c:1316
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1188 g10/mainproc.c:1199
+#: g10/mainproc.c:1306 g10/mainproc.c:1317
 msgid "Good signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1190
+#: g10/mainproc.c:1308
 msgid "                aka \""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1246
+#: g10/mainproc.c:1364
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1321
+#: g10/mainproc.c:1421 g10/mainproc.c:1436 g10/mainproc.c:1498
+#, fuzzy
+msgid "not a detached signature\n"
+msgstr "fazer uma assinatura separada"
+
+#: g10/mainproc.c:1447
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/mainproc.c:1372
+#: g10/mainproc.c:1502
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1377
+#: g10/mainproc.c:1507
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -2817,7 +2823,12 @@ msgstr "Por favor digite o nome do ficheiro de dados: "
 msgid "reading stdin ...\n"
 msgstr "lendo do \"stdin\" ...\n"
 
-#: g10/plaintext.c:392
+#: g10/plaintext.c:383
+#, fuzzy
+msgid "no signed data\n"
+msgstr "imposs�vel abrir dados assinados `%s'\n"
+
+#: g10/plaintext.c:391
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
@@ -2937,7 +2948,7 @@ msgstr "assumindo assinatura incorrecta devido a um bit cr�tico desconhecido\n"
 msgid "%s signature from: %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:610
+#: g10/sign.c:290 g10/sign.c:613
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
@@ -3382,7 +3393,7 @@ msgstr "falha ao colocar `%s' na base de dados de confian�a: %s\n"
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "AVISO: ainda � imposs�vel manipular registos de prefer�ncias longos\n"
 
-#: g10/verify.c:82
+#: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -3392,7 +3403,7 @@ msgstr ""
 "N�o se esque�a que o ficheiro com a assinatura (.sig ou .asc)\n"
 "deve ser o primeiro a ser dado na linha de comando.\n"
 
-#: g10/verify.c:147
+#: g10/verify.c:173
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "linha de entrada %u demasiado longa ou falta o LF\n"
@@ -3781,6 +3792,9 @@ msgstr "Nenhuma ajuda dispon�vel"
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
 
+#~ msgid "no secret key for decryption available\n"
+#~ msgstr "nenhuma chave secreta para desencripta��o dispon�vel\n"
+
 #~ msgid ""
 #~ "RSA keys are deprecated; please consider creating a new key and use this key "
 #~ "in the future\n"
diff --git a/po/ru.po b/po/ru.po
index 1c7d07a71..1c63b3702 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@
 # QingLong <qinglong@Bolizm> (couldn't send an email to let you know)
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-11-24 13:52+0100\n"
+"POT-Creation-Date: 2000-12-19 11:58+0100\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-01-26 22:08:36+0100\n"
 "From: Gregory Steuck <[email protected]>\n"
@@ -739,17 +739,17 @@ msgstr ""
 " --list-keys [names]        �������� ������ ������\n"
 " --fingerprint [names]      �������� \"��������� �������\" ������\n"
 
-#: g10/g10.c:426
+#: g10/g10.c:427
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "����������, ����������� ��������� �� ������� �� ������ "
 "<[email protected]>.\n"
 
-#: g10/g10.c:430
+#: g10/g10.c:431
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�������������: gpg [���������] [�����] (-h ��� ������)"
 
-#: g10/g10.c:433
+#: g10/g10.c:434
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -759,7 +759,7 @@ msgstr ""
 "�����������, ��������� �������, ������� ��� ��������������\n"
 "����� ������ ������� �� ������� ������\n"
 
-#: g10/g10.c:440
+#: g10/g10.c:441
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -767,202 +767,202 @@ msgstr ""
 "\n"
 "�������������� ���������:\n"
 
-#: g10/g10.c:519
+#: g10/g10.c:520
 msgid "usage: gpg [options] "
 msgstr "�������������: gpg [���������] "
 
-#: g10/g10.c:572
+#: g10/g10.c:573
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Kommandos\n"
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 #, fuzzy, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "���������: ���� ���������� �� ��������� `%s' �����������\n"
 
-#: g10/g10.c:716
+#: g10/g10.c:717
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���� ���������� `%s': %s\n"
 
-#: g10/g10.c:723
+#: g10/g10.c:724
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� ��������� �� `%s'\n"
 
-#: g10/g10.c:915
+#: g10/g10.c:925
 #, fuzzy, c-format
 msgid "%s is not a valid character set\n"
 msgstr "������������ ������ � �����������.\n"
 
-#: g10/g10.c:983
+#: g10/g10.c:994
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:987 g10/g10.c:996
+#: g10/g10.c:998 g10/g10.c:1007
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/g10.c:989
+#: g10/g10.c:1000
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr ""
 
-#: g10/g10.c:992
+#: g10/g10.c:1003
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr ""
 
-#: g10/g10.c:1011 g10/g10.c:1023
+#: g10/g10.c:1023 g10/g10.c:1035
 msgid "selected cipher algorithm is invalid\n"
 msgstr "������ ������������ �������� ����������\n"
 
-#: g10/g10.c:1017 g10/g10.c:1029
+#: g10/g10.c:1029 g10/g10.c:1041
 msgid "selected digest algorithm is invalid\n"
 msgstr "������ ������������ ��������-��������\n"
 
-#: g10/g10.c:1033
+#: g10/g10.c:1045
 msgid "the given policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:1036
+#: g10/g10.c:1048
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "�������� �������� ����� ����� �������� �� %d �� %d\n"
 
-#: g10/g10.c:1038
+#: g10/g10.c:1050
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ ���� ������ 0\n"
 
-#: g10/g10.c:1040
+#: g10/g10.c:1052
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ ���� ������ 1\n"
 
-#: g10/g10.c:1042
+#: g10/g10.c:1054
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:1045
+#: g10/g10.c:1057
 #, fuzzy
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "���������: ������� S2K ����� (0) ����� �� �������������\n"
 
-#: g10/g10.c:1049
+#: g10/g10.c:1061
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "������������ ����� S2K: ������ ���� 0, 1 ��� 3\n"
 
-#: g10/g10.c:1134
+#: g10/g10.c:1146
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "������ ������������� ���� ������ �������: %s\n"
 
-#: g10/g10.c:1140
+#: g10/g10.c:1152
 msgid "--store [filename]"
 msgstr "--store [��� �����]"
 
-#: g10/g10.c:1147
+#: g10/g10.c:1159
 msgid "--symmetric [filename]"
 msgstr "--symmetric [��� �����]"
 
-#: g10/g10.c:1155
+#: g10/g10.c:1167
 msgid "--encrypt [filename]"
 msgstr "--encrypt [��� �����]"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1180
 msgid "--sign [filename]"
 msgstr "--sign [��� �����]"
 
-#: g10/g10.c:1181
+#: g10/g10.c:1193
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [��� �����]"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1207
 msgid "--clearsign [filename]"
 msgstr "--clearsign [��� �����]"
 
-#: g10/g10.c:1212
+#: g10/g10.c:1224
 msgid "--decrypt [filename]"
 msgstr "--decrypt [��� �����]"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1232
 msgid "--sign-key user-id"
 msgstr ""
 
-#: g10/g10.c:1228
+#: g10/g10.c:1240
 #, fuzzy
 msgid "--lsign-key user-id"
 msgstr "--delete-key ���-������������"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1248
 #, fuzzy
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key ���-������������"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1264
 #, fuzzy
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key ���-������������"
 
-#: g10/g10.c:1255
+#: g10/g10.c:1267
 #, fuzzy
 msgid "--delete-key user-id"
 msgstr "--delete-key ���-������������"
 
-#: g10/encode.c:265 g10/g10.c:1292 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1304 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "���������� ������� ���� `%s': %s\n"
 
-#: g10/g10.c:1307
+#: g10/g10.c:1319
 #, fuzzy
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [������������� ������������] [������ ������]"
 
-#: g10/g10.c:1373
+#: g10/g10.c:1385
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "������ �������������: %s\n"
 
-#: g10/g10.c:1381
+#: g10/g10.c:1393
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "������ �����������: %s\n"
 
-#: g10/g10.c:1452
+#: g10/g10.c:1464
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "������������ ���-�������� `%s'\n"
 
-#: g10/g10.c:1539
+#: g10/g10.c:1551
 msgid "[filename]"
 msgstr "[��� �����]"
 
-#: g10/g10.c:1543
+#: g10/g10.c:1555
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/decrypt.c:59 g10/g10.c:1546 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1558 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "���������� ������� ���� `%s'\n"
 
-#: g10/g10.c:1756
+#: g10/g10.c:1767
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 
-#: g10/g10.c:1762
+#: g10/g10.c:1773
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1768
+#: g10/g10.c:1779
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1776
+#: g10/g10.c:1787
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
@@ -1713,17 +1713,17 @@ msgstr "%s: ���������� �������: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "������ ��� �������� �������� �����: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:324
+#: g10/encode.c:171 g10/encode.c:327
 #, fuzzy, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ��������������: ������ ����.\n"
 
-#: g10/encode.c:271
+#: g10/encode.c:274
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "�������� �� `%s'\n"
 
-#: g10/encode.c:492
+#: g10/encode.c:497
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s ����������� ���: %s\n"
@@ -1860,7 +1860,7 @@ msgstr "���� %08lX: ��������� ���� ������������\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "����������� ������������ ��������� ����"
 
-#: g10/import.c:391 g10/import.c:590
+#: g10/import.c:391 g10/import.c:600
 #, fuzzy, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "���� %08lX: ��� �������������� ������������\n"
@@ -1874,7 +1874,7 @@ msgstr "���� %08lX: ��� ���������� ��������������� �������������\n"
 msgid "this may be caused by a missing self-signature\n"
 msgstr "��� ����� ���� ������� ����������� ����-�������\n"
 
-#: g10/import.c:418 g10/import.c:657
+#: g10/import.c:418 g10/import.c:667
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "���� %08lX: �������� ���� �� ������: %s\n"
@@ -1888,17 +1888,17 @@ msgstr "��������� ���� %08lX: �� ����� ���������������� ��������� �����.\n"
 msgid "no default public keyring\n"
 msgstr "��� ������ �������� ������ �� ���������\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
+#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "������������ � `%s'\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
+#: g10/import.c:438 g10/import.c:496 g10/import.c:615 g10/import.c:716
 #, fuzzy, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "���������� ������������� ������ �������� ������: %s\n"
 
-#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
+#: g10/import.c:441 g10/import.c:499 g10/import.c:618 g10/import.c:719
 #, fuzzy, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
@@ -1913,12 +1913,12 @@ msgstr "���� %08lX: �������� ���� ������������\n"
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "���� %08lX: �� ��������� � ����� ������\n"
 
-#: g10/import.c:472 g10/import.c:665
+#: g10/import.c:472 g10/import.c:675
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "���� %08lX: ���������� ���������� original keyblock: %s\n"
 
-#: g10/import.c:478 g10/import.c:671
+#: g10/import.c:478 g10/import.c:681
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "���� %08lX: ���������� ��������� original keyblock: %s\n"
@@ -1958,75 +1958,80 @@ msgstr "���� %08lX: %d ����� ���-������\n"
 msgid "key %08lX: not changed\n"
 msgstr "���� %08lX: �� �������\n"
 
-#: g10/import.c:613
+#: g10/import.c:593
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr ""
+
+#: g10/import.c:623
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "���� %08lX: ��������� ���� ������������\n"
 
 #. we can't merge secret keys
-#: g10/import.c:617
+#: g10/import.c:627
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "���� %08lX: ��� �� ������ ��������� ������\n"
 
-#: g10/import.c:622
+#: g10/import.c:632
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "���� %08lX: ��������� ���� �� ������: %s\n"
 
-#: g10/import.c:651
+#: g10/import.c:661
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "���� %08lX: ��� ��������� ����� - ���������� ��������� ���������� "
 "����������\n"
 
-#: g10/import.c:682
+#: g10/import.c:692
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "���� %08lX: ������������ ���������� ����������: %s - ���������\n"
 
-#: g10/import.c:714
+#: g10/import.c:724
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "���� %08lX: ���������� ���������� ������������\n"
 
-#: g10/import.c:756
+#: g10/import.c:766
 #, fuzzy, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "���� %08lX: ��� �������������� ������������ ��� �������\n"
 
-#: g10/import.c:763 g10/import.c:787
+#: g10/import.c:773 g10/import.c:797
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "���� %08lX: ���������������� �������� ��������� �����\n"
 
-#: g10/import.c:764
+#: g10/import.c:774
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "���� %08lX: ������������ ����-�������\n"
 
-#: g10/import.c:779
+#: g10/import.c:789
 #, fuzzy, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "���� %08lX: ��� �������������� ������������\n"
 
-#: g10/import.c:788
+#: g10/import.c:798
 #, fuzzy, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "���� %08lX: ��� ���������� ��������������� �������������\n"
 
-#: g10/import.c:815
+#: g10/import.c:825
 #, fuzzy, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "���� %08lX: �������� ������������� ������������ '"
 
-#: g10/import.c:844
+#: g10/import.c:854
 #, fuzzy, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "���� %08lX: �������� ������������� ������������ '"
 
-#: g10/import.c:867
+#: g10/import.c:877
 #, fuzzy, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "���� %08lX: 1 ����� ���-����\n"
@@ -2035,32 +2040,32 @@ msgstr "���� %08lX: 1 ����� ���-����\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:892
+#: g10/import.c:902
 #, fuzzy, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "���� %08lX: ���������� ���������� � ������������ ����� - ��������\n"
 
-#: g10/import.c:901
+#: g10/import.c:911
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "���� %08lX: ���������� ���������� � ������������ ����� - ��������\n"
 
-#: g10/import.c:909
+#: g10/import.c:919
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "���� %08lX: ������������ ���������� ����������: %s - ��������\n"
 
-#: g10/import.c:1009
+#: g10/import.c:1019
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1060
+#: g10/import.c:1071
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "���� %08lX: ���������� ���������� ��������\n"
 
-#: g10/import.c:1174 g10/import.c:1227
+#: g10/import.c:1185 g10/import.c:1238
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "���� %08lX: ���� ����� �� ����� ����-�������\n"
@@ -2696,119 +2701,119 @@ msgid "revoked"
 msgstr "����"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:793
+#: g10/keylist.c:400 g10/mainproc.c:834
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "���� ��������� �� %s\n"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:270
 #, fuzzy, c-format
 msgid "public key is %08lX\n"
 msgstr "�������� ���� �� ������"
 
-#: g10/mainproc.c:284
+#: g10/mainproc.c:315
 #, fuzzy
 msgid "public key encrypted data: good DEK\n"
 msgstr "����������� �������� ������ �� ������� %s\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:367
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "(%u-��� %s ����, ID %08lX, ������ %s)\n"
 
-#: g10/mainproc.c:336
+#: g10/mainproc.c:377
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "������� ������� %.*s, ��������� %s ���� %08lX\n"
 
-#: g10/mainproc.c:342
-#, fuzzy
-msgid "no secret key for decryption available\n"
-msgstr "��������� ���� �� ����������"
-
-#: g10/mainproc.c:351
+#: g10/mainproc.c:391
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "����������� �������� ������ �� ������� %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:429
 #, fuzzy
 msgid "decryption okay\n"
 msgstr "����������� �� �������: %s\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:434
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:439
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "����������� �� �������: %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:458
 #, fuzzy
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "���������: ����������� �������� \"������-���-�����-����\"\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:460
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:615
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:661 g10/mainproc.c:670
+#: g10/mainproc.c:702 g10/mainproc.c:711
 #, fuzzy
 msgid "WARNING: invalid notation data found\n"
 msgstr "�� ������� ���������� RFC1991 ��� OpenPGP ������.\n"
 
-#: g10/mainproc.c:673
+#: g10/mainproc.c:714
 msgid "Notation: "
 msgstr ""
 
-#: g10/mainproc.c:682
+#: g10/mainproc.c:723
 msgid "Policy: "
 msgstr ""
 
-#: g10/mainproc.c:1124
+#: g10/mainproc.c:1233
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1270
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "������� ������� %.*s, ��������� %s ���� %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1187 g10/mainproc.c:1198
+#: g10/mainproc.c:1305 g10/mainproc.c:1316
 msgid "BAD signature from \""
 msgstr "������ ������� �� \""
 
-#: g10/mainproc.c:1188 g10/mainproc.c:1199
+#: g10/mainproc.c:1306 g10/mainproc.c:1317
 msgid "Good signature from \""
 msgstr "������� ������� �� \""
 
-#: g10/mainproc.c:1190
+#: g10/mainproc.c:1308
 msgid "                aka \""
 msgstr ""
 
-#: g10/mainproc.c:1246
+#: g10/mainproc.c:1364
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "���������� ��������� �������: %s\n"
 
-#: g10/mainproc.c:1321
+#: g10/mainproc.c:1421 g10/mainproc.c:1436 g10/mainproc.c:1498
+#, fuzzy
+msgid "not a detached signature\n"
+msgstr "������� ��������� �������"
+
+#: g10/mainproc.c:1447
 #, fuzzy, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "������� ������������ ����"
 
-#: g10/mainproc.c:1372
+#: g10/mainproc.c:1502
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:1377
+#: g10/mainproc.c:1507
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -2953,7 +2958,12 @@ msgstr "����������, ������� ��� ����� ������: "
 msgid "reading stdin ...\n"
 msgstr ""
 
-#: g10/plaintext.c:392
+#: g10/plaintext.c:383
+#, fuzzy
+msgid "no signed data\n"
+msgstr "���������� ������� ����������� ������ `%s' .\n"
+
+#: g10/plaintext.c:391
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "���������� ������� ����������� ������ `%s' .\n"
@@ -3074,7 +3084,7 @@ msgstr ""
 msgid "%s signature from: %s\n"
 msgstr "������ ������� �� \""
 
-#: g10/sign.c:290 g10/sign.c:610
+#: g10/sign.c:290 g10/sign.c:613
 #, fuzzy, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s: ���������� �������: %s\n"
@@ -3527,14 +3537,14 @@ msgstr "������ ������������� ���� ������ �������: %s\n"
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr ""
 
-#: g10/verify.c:82
+#: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
 
-#: g10/verify.c:147
+#: g10/verify.c:173
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr ""
@@ -3881,6 +3891,10 @@ msgstr "������ �����������."
 msgid "No help available for `%s'"
 msgstr "������ ��� `%s' �����������."
 
+#, fuzzy
+#~ msgid "no secret key for decryption available\n"
+#~ msgstr "��������� ���� �� ����������"
+
 #~ msgid ""
 #~ "RSA keys are deprecated; please consider creating a new key and use this key "
 #~ "in the future\n"
diff --git a/po/sv.po b/po/sv.po
index 4e5c4c82f..0720217ae 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.1e\n"
-"POT-Creation-Date: 2000-11-24 13:52+0100\n"
+"POT-Creation-Date: 2000-12-19 11:58+0100\n"
 "PO-Revision-Date: 2000-04-23 16:43+02:00\n"
 "Last-Translator: Daniel Resare <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -678,17 +678,17 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/g10.c:426
+#: g10/g10.c:427
 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:430
+#: g10/g10.c:431
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Anv�ndning: gpg [flaggor] [filer] (-h f�r hj�lp)"
 
-#: g10/g10.c:433
+#: g10/g10.c:434
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -698,7 +698,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "vilken operation som utf�rs beror p� programmets indata\n"
 
-#: g10/g10.c:440
+#: g10/g10.c:441
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -706,66 +706,66 @@ msgstr ""
 "\n"
 "St�dda algoritmer:\n"
 
-#: g10/g10.c:519
+#: g10/g10.c:520
 msgid "usage: gpg [options] "
 msgstr "anv�ndning: gpg [flaggor] "
 
-#: g10/g10.c:572
+#: g10/g10.c:573
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
-#: g10/g10.c:712
+#: g10/g10.c:713
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTERA: inst�llningsfilen \"%s\" saknas\n"
 
-#: g10/g10.c:716
+#: g10/g10.c:717
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inst�llningsfil \"%s\": %s\n"
 
-#: g10/g10.c:723
+#: g10/g10.c:724
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser flaggor fr�n \"%s\"\n"
 
-#: g10/g10.c:915
+#: g10/g10.c:925
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s �r ingen giltig teckentabell\n"
 
-#: g10/g10.c:983
+#: g10/g10.c:994
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
 
-#: g10/g10.c:987 g10/g10.c:996
+#: g10/g10.c:998 g10/g10.c:1007
 #, 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:989
+#: g10/g10.c:1000
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �r inte till�ten tillsammans med %s!\n"
 
-#: g10/g10.c:992
+#: g10/g10.c:1003
 #, 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:1011 g10/g10.c:1023
+#: g10/g10.c:1023 g10/g10.c:1035
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen �r ogiltig\n"
 
-#: g10/g10.c:1017 g10/g10.c:1029
+#: g10/g10.c:1029 g10/g10.c:1041
 msgid "selected digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen �r ogiltig\n"
 
-#: g10/g10.c:1033
+#: g10/g10.c:1045
 msgid "the given policy URL is invalid\n"
 msgstr "angiven URL �r ogiltig\n"
 
-#: g10/g10.c:1036
+#: g10/g10.c:1048
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "kompressionsalgoritmen m�ste vara i intervallet %d..%d\n"
@@ -776,127 +776,127 @@ 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:1038
+#: g10/g10.c:1050
 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:1040
+#: g10/g10.c:1052
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" m�ste vara st�rre �n 1\n"
 
-#: g10/g10.c:1042
+#: g10/g10.c:1054
 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:1045
+#: g10/g10.c:1057
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTERA: enkelt S2K-l�ge (0) rekommenderas inte\n"
 
-#: g10/g10.c:1049
+#: g10/g10.c:1061
 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:1134
+#: g10/g10.c:1146
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/g10.c:1140
+#: g10/g10.c:1152
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/g10.c:1147
+#: g10/g10.c:1159
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/g10.c:1155
+#: g10/g10.c:1167
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/g10.c:1168
+#: g10/g10.c:1180
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/g10.c:1181
+#: g10/g10.c:1193
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:1195
+#: g10/g10.c:1207
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/g10.c:1212
+#: g10/g10.c:1224
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/g10.c:1220
+#: g10/g10.c:1232
 msgid "--sign-key user-id"
 msgstr "--sign-key anv�ndaridentitet"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1240
 msgid "--lsign-key user-id"
 msgstr "--lsign-key anv�ndaridentitet"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1248
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key anv�ndaridentitet [kommandon]"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1264
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key anv�ndaridentitet"
 
-#: g10/g10.c:1255
+#: g10/g10.c:1267
 msgid "--delete-key user-id"
 msgstr "--delete-key anv�ndaridentitet"
 
 # Filnamn b�de med och utan fnuttar finns. lite ologiskt. Vill n�gon
 # fixa en patch?
-#: g10/encode.c:265 g10/g10.c:1292 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1304 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan inte �ppna %s: %s\n"
 
-#: g10/g10.c:1307
+#: g10/g10.c:1319
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [anv�ndaridentitet] [nyckelring]"
 
-#: g10/g10.c:1373
+#: g10/g10.c:1385
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort skalet: %s\n"
 
-#: g10/g10.c:1381
+#: g10/g10.c:1393
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa skal: %s\n"
 
-#: g10/g10.c:1452
+#: g10/g10.c:1464
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "felaktig hash-algoritm \"%s\"\n"
 
-#: g10/g10.c:1539
+#: g10/g10.c:1551
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/g10.c:1543
+#: g10/g10.c:1555
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande h�r ...\n"
 
 # se f�rra kommentaren
-#: g10/decrypt.c:59 g10/g10.c:1546 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1558 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:1756
+#: g10/g10.c:1767
 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:1762
+#: g10/g10.c:1773
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -904,11 +904,11 @@ msgstr ""
 "ett notationsnamn kan bara inneh�lla bokst�ver, siffror, punkter eller\n"
 "understrykningstecken och sluta med ett likhetstecken\n"
 
-#: g10/g10.c:1768
+#: g10/g10.c:1779
 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:1776
+#: g10/g10.c:1787
 msgid "a notation value must not use any control characters\n"
 msgstr "ett notationsv�rde f�r inte ineh�lla n�gra kontrolltecken\n"
 
@@ -1656,17 +1656,17 @@ msgstr "%s: kan inte �ppna: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "fel vid skapandet av l�senordsfras: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:324
+#: g10/encode.c:171 g10/encode.c:327
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: VARNING: tom fil\n"
 
-#: g10/encode.c:271
+#: g10/encode.c:274
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "l�ser fr�n \"%s\"\n"
 
-#: g10/encode.c:492
+#: g10/encode.c:497
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s krypterad f�r: %s\n"
@@ -1800,7 +1800,7 @@ msgstr "antal importerade hemliga nycklar: %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "antal of�r�ndrade hemliga nycklar: %lu\n"
 
-#: g10/import.c:391 g10/import.c:590
+#: g10/import.c:391 g10/import.c:600
 #, c-format
 msgid "key %08lX: no user ID\n"
 msgstr "nyckel %08lX: ingen anv�ndaridentitet\n"
@@ -1814,7 +1814,7 @@ msgstr "nyckel %08lX: inga giltiga anv�ndaridentiteter\n"
 msgid "this may be caused by a missing self-signature\n"
 msgstr "detta kan bero p� att det saknas en sj�lvsignatur\n"
 
-#: g10/import.c:418 g10/import.c:657
+#: g10/import.c:418 g10/import.c:667
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "nyckel %08lX: hittade ingen publik nyckel: %s\n"
@@ -1828,17 +1828,17 @@ msgstr "nyckeln %08lX f�ljer inte standarden RFC2440 - �verhoppad\n"
 msgid "no default public keyring\n"
 msgstr "ingen f�rvald publik nyckel\n"
 
-#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:615
+#: g10/import.c:435 g10/openfile.c:230 g10/sign.c:295 g10/sign.c:618
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver till \"%s\"\n"
 
-#: g10/import.c:438 g10/import.c:496 g10/import.c:605 g10/import.c:706
+#: g10/import.c:438 g10/import.c:496 g10/import.c:615 g10/import.c:716
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "kan inte l�sa nyckelringen \"%s\": %s\n"
 
-#: g10/import.c:441 g10/import.c:499 g10/import.c:608 g10/import.c:709
+#: g10/import.c:441 g10/import.c:499 g10/import.c:618 g10/import.c:719
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
@@ -1853,12 +1853,12 @@ msgstr "nyckel %08lX: importerade publik nyckel\n"
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "nyckel %08lX: matchar inte v�r lokala kopia\n"
 
-#: g10/import.c:472 g10/import.c:665
+#: g10/import.c:472 g10/import.c:675
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "nyckel %08lX: kan inte hitta det ursprungliga nyckelblocket: %s\n"
 
-#: g10/import.c:478 g10/import.c:671
+#: g10/import.c:478 g10/import.c:681
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "nyckel %08lX: kan inte l�sa det ursprungliga nyckelblocket %s\n"
@@ -1898,76 +1898,81 @@ msgstr "nyckel %08lX: %d nya undernycklar\n"
 msgid "key %08lX: not changed\n"
 msgstr "nyckel %08lX: inte f�r�ndrad\n"
 
-#: g10/import.c:613
+#: g10/import.c:593
+#, c-format
+msgid "secret key %08lX not imported (use %s to allow for it)\n"
+msgstr ""
+
+#: g10/import.c:623
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "nyckel %08lX: den hemliga nyckeln �r importerad\n"
 
 #. we can't merge secret keys
-#: g10/import.c:617
+#: g10/import.c:627
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "nyckel %08lX: finns redan i den hemliga nyckelringen\n"
 
-#: g10/import.c:622
+#: g10/import.c:632
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "nyckel %08lX: hittade inte den hemliga nyckeln: %s\n"
 
-#: g10/import.c:651
+#: g10/import.c:661
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "nyckel %08lX: ingen publik nyckel - kan inte till�mpa "
 "�terkallelsecertifikatet\n"
 
-#: g10/import.c:682
+#: g10/import.c:692
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "nyckel %08lX: ogiltigt �terkallelsecertifikat: %s - avvisat\n"
 
-#: g10/import.c:714
+#: g10/import.c:724
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "nyckel %08lX: �terkallelsecertifikat importerat\n"
 
-#: g10/import.c:756
+#: g10/import.c:766
 #, c-format
 msgid "key %08lX: no user ID for signature\n"
 msgstr "nyckel %08lX: ingen anv�ndaridentitet f�r signaturen\n"
 
-#: g10/import.c:763 g10/import.c:787
+#: g10/import.c:773 g10/import.c:797
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "nyckel %08lX: algoritmen f�r publik nyckel ej st�dd\n"
 
-#: g10/import.c:764
+#: g10/import.c:774
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "nyckel %08lX: ogiltig sj�lvsignatur\n"
 
-#: g10/import.c:779
+#: g10/import.c:789
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "nyckel %08lX: ingen undernyckel f�r nyckelbindning\n"
 
-#: g10/import.c:788
+#: g10/import.c:798
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "nyckel %08lX: ogiltig undernyckelbindning\n"
 
 # vad inneb�r fnutten i slutet?
-#: g10/import.c:815
+#: g10/import.c:825
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "nyckel %08lX: accepterade icke sj�lvsignerad anv�ndaridentitet '"
 
-#: g10/import.c:844
+#: g10/import.c:854
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "nyckel %08lX: hoppade �ver anv�ndaridentitet '"
 
-#: g10/import.c:867
+#: g10/import.c:877
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "nyckel %08lX: hoppade �ver undernyckel\n"
@@ -1976,32 +1981,32 @@ msgstr "nyckel %08lX: hoppade �ver undernyckel\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:892
+#: g10/import.c:902
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "nyckel %08lX: icke exporterbar signatur (klass %02x) - hoppade �ver\n"
 
-#: g10/import.c:901
+#: g10/import.c:911
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "nyckel %08lX: �terkallelsecertifikat p� fel plats - hoppade �ver\n"
 
-#: g10/import.c:909
+#: g10/import.c:919
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "nyckel %08lX: felaktigt �terkallelsecertifikat: %s - hoppade �ver\n"
 
-#: g10/import.c:1009
+#: g10/import.c:1019
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "nyckel %08lX: anv�ndaridentitet hittades tv� g�nger - slog ihop\n"
 
-#: g10/import.c:1060
+#: g10/import.c:1071
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "nyckel %08lX: lade till �terkallelsecertifikat\n"
 
-#: g10/import.c:1174 g10/import.c:1227
+#: g10/import.c:1185 g10/import.c:1238
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "nyckel %08lX: v�r kopia har ingen sj�lvsignatur\n"
@@ -2593,12 +2598,12 @@ msgid "revoked"
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:793
+#: g10/keylist.c:400 g10/mainproc.c:834
 #, c-format
 msgid " [expires: %s]"
 msgstr "[g�r ut: %s]"
 
-#: g10/mainproc.c:240
+#: g10/mainproc.c:270
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "den publika nyckeln �r %08lX\n"
@@ -2610,107 +2615,108 @@ msgstr "den publika nyckeln �r %08lX\n"
 # r�tt publik nyckel att kryptera datat med. Jag tycker
 # inte att svenska �vers�ttningen �r mycket obskyrare �n engelska
 # originalet iallafall.
-#: g10/mainproc.c:284
+#: g10/mainproc.c:315
 msgid "public key encrypted data: good DEK\n"
 msgstr "data krypterad med publik nyckel: korrekt krypteringsnyckel\n"
 
-#: g10/mainproc.c:326
+#: g10/mainproc.c:367
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "krypterad med %u-bitars %s-nyckel, ID %08lX, skapad %s\n"
 
-#: g10/mainproc.c:336
+#: g10/mainproc.c:377
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "krypterad med %s-nyckel, ID %08lX\n"
 
-#: g10/mainproc.c:342
-msgid "no secret key for decryption available\n"
-msgstr "det finns ingen hemlig nyckel tillg�nglig f�r dekryptering\n"
-
-#: g10/mainproc.c:351
+#: g10/mainproc.c:391
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "dekryptering med publik nyckel misslyckades: %s\n"
 
-#: g10/mainproc.c:388
+#: g10/mainproc.c:429
 msgid "decryption okay\n"
 msgstr "dekrypteringen lyckades\n"
 
-#: g10/mainproc.c:393
+#: g10/mainproc.c:434
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VARNING: det krypterade meddelandet har �ndrats!\n"
 
-#: g10/mainproc.c:398
+#: g10/mainproc.c:439
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/mainproc.c:417
+#: g10/mainproc.c:458
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTERA: avs�ndaren efterfr�gade \"endast-f�r-dina-�gon\"\n"
 
-#: g10/mainproc.c:419
+#: g10/mainproc.c:460
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "ursprungligt filnamn=\"%.*s\"\n"
 
-#: g10/mainproc.c:574
+#: g10/mainproc.c:615
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "frist�ende �terkallelsecertifikat - anv�nd \"gpg --import\" f�r\n"
 "att applicera\n"
 
-#: g10/mainproc.c:661 g10/mainproc.c:670
+#: g10/mainproc.c:702 g10/mainproc.c:711
 msgid "WARNING: invalid notation data found\n"
 msgstr "VARNING: ogiltig notationsdata hittades\n"
 
-#: g10/mainproc.c:673
+#: g10/mainproc.c:714
 msgid "Notation: "
 msgstr "Notation: "
 
 # finns det n�gon bra svensk �vers�ttning av policy?
-#: g10/mainproc.c:682
+#: g10/mainproc.c:723
 msgid "Policy: "
 msgstr "Policy: "
 
-#: g10/mainproc.c:1124
+#: g10/mainproc.c:1233
 msgid "signature verification suppressed\n"
 msgstr "signaturen verifierades inte\n"
 
-#: g10/mainproc.c:1161
+#: g10/mainproc.c:1270
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signerades %.*s med hj�lp av %s-nyckeln med ID %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1187 g10/mainproc.c:1198
+#: g10/mainproc.c:1305 g10/mainproc.c:1316
 msgid "BAD signature from \""
 msgstr "FELAKTIG signatur fr�n \""
 
-#: g10/mainproc.c:1188 g10/mainproc.c:1199
+#: g10/mainproc.c:1306 g10/mainproc.c:1317
 msgid "Good signature from \""
 msgstr "Korrekt signatur fr�n \""
 
-#: g10/mainproc.c:1190
+#: g10/mainproc.c:1308
 msgid "                aka \""
 msgstr "      �ven k�nd som \""
 
-#: g10/mainproc.c:1246
+#: g10/mainproc.c:1364
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte verifiera signaturen: %s\n"
 
-#: g10/mainproc.c:1321
+#: g10/mainproc.c:1421 g10/mainproc.c:1436 g10/mainproc.c:1498
+#, fuzzy
+msgid "not a detached signature\n"
+msgstr "skapa en signatur i en separat fil"
+
+#: g10/mainproc.c:1447
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "frist�ende signatur av klassen 0x%02x\n"
 
-#: g10/mainproc.c:1372
+#: g10/mainproc.c:1502
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
 
-#: g10/mainproc.c:1377
+#: g10/mainproc.c:1507
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "felaktigt rotpaket hittades i proc_tree()\n"
 
@@ -2839,7 +2845,12 @@ msgstr "Ange namnet p� datafilen: "
 msgid "reading stdin ...\n"
 msgstr "l�ser fr�n standard in ...\n"
 
-#: g10/plaintext.c:392
+#: g10/plaintext.c:383
+#, fuzzy
+msgid "no signed data\n"
+msgstr "kan inte �ppna signerad data \"%s\"\n"
+
+#: g10/plaintext.c:391
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kan inte �ppna signerad data \"%s\"\n"
@@ -2960,7 +2971,7 @@ msgstr ""
 msgid "%s signature from: %s\n"
 msgstr "%s-signatur fr�n: %s\n"
 
-#: g10/sign.c:290 g10/sign.c:610
+#: g10/sign.c:290 g10/sign.c:613
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "kan inte skapa %s: %s\n"
@@ -3410,7 +3421,7 @@ msgstr "misslyckades med att placera \"%s\" i tillitsdatabasen: %s\n"
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "VARNING: kan �nnu inte hantera l�nga inst�llningsposter\n"
 
-#: g10/verify.c:82
+#: g10/verify.c:108
 msgid ""
 "the signature could not be verified.\n"
 "Please remember that the signature file (.sig or .asc)\n"
@@ -3420,7 +3431,7 @@ msgstr ""
 "Kom ih�g att signaturfilen (.sig eller .asc)\n"
 "ska vara den f�rst angivna filen p� kommandoraden\n"
 
-#: g10/verify.c:147
+#: g10/verify.c:173
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "raden %u �r f�r l�ng, eller saknar nyradstecken\n"
@@ -3838,6 +3849,9 @@ msgstr "Det finns ingen hj�lp tillg�nglig"
 msgid "No help available for `%s'"
 msgstr "Det finns ingen hj�lp tillg�nglig f�r \"%s\""
 
+#~ msgid "no secret key for decryption available\n"
+#~ msgstr "det finns ingen hemlig nyckel tillg�nglig f�r dekryptering\n"
+
 # maila gnupg-bugs om konstigt felmeddelande, man skapar nycklar i pluralis
 #~ msgid ""
 #~ "RSA keys are deprecated; please consider creating a new key and use this key "