See ChangeLog: Thu Jun 10 14:18:23 CEST 1999 Werner Koch

18 files changed, 2581 insertions, 2540 deletions

diff --git a/ChangeLog b/ChangeLog
index c03f7b609..90d7db3d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 10 14:18:23 CEST 1999  Werner Koch  <[email protected]>
+
+
+	* configure.in (ZLIB,GDBM): Check both, header and lib.
+
 Sat Jun  5 15:30:33 CEST 1999  Werner Koch  <[email protected]>
 
 	* pkclist.c (key_present_in_pk_list): New (Michael).
diff --git a/Makefile.am b/Makefile.am
index 1651d0a49..9793c146d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,14 +31,6 @@ cvs-put:
 cvs-sync: cvs-get cvs-put
 
 
-tobold-get:
-	rsync -Cavuzb --exclude scratch --exclude .deps \
-		      tobold:gnupg/ .
-
-tobold-put:
-	rsync -Cavuzb --exclude scratch --exclude .deps \
-		      . tobold:gnupg/
-
 
 .PHONY: cvs-get cvs-put cvs-sync
 
diff --git a/NEWS b/NEWS
index cb919eab2..6bd9bab49 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,8 @@
 
     * latin-2 character set works (--charset=iso-8859-2).
 
+    * New option --with-key-data to list the public key parameters
+
 
 Noteworthy changes in version 0.9.7
 -----------------------------------
diff --git a/TODO b/TODO
index 47ceaa70b..d88e2b8c6 100644
--- a/TODO
+++ b/TODO
@@ -29,6 +29,7 @@
 
   * convert the given user ID to UTF-8 and add an option to suppress this.
 
+
 Nice to have
 ------------
   * Let take --help an option to select some topics.
diff --git a/VERSION b/VERSION
index 13e3d744c..2f3b0fdfb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.9.7a
+0.9.7b
diff --git a/configure.in b/configure.in
index 2faf657c2..a414e64d6 100644
--- a/configure.in
+++ b/configure.in
@@ -224,10 +224,18 @@ AC_SUBST(USE_NLS)
 AC_SUBST(USE_INCLUDED_LIBINTL)
 fi
 
+dnl
+dnl There are lot of misconfigured systems.  We include
+dnl gdbm support only if the lib and the header is installed.
+dnl
 if test "$try_gdbm" = yes; then
-AC_CHECK_LIB(gdbm,gdbm_firstkey)
+AC_CHECK_HEADERS(gdbm.h)
+if test "$ac_cv_header_gdbm_h" = yes ; then
+  AC_CHECK_LIB(gdbm,gdbm_firstkey)
+fi
 fi
 
+
 dnl Solaris needs -lsocket and -lnsl. Unisys system includes
 dnl gethostbyname in libsocket but needs libnsl for socket.
 AC_CHECK_LIB(nsl, gethostbyname)
@@ -494,26 +502,29 @@ AC_SUBST(MPI_SFLAGS)
 
 dnl Do we have zlib? Must do it here because Solaris failed
 dnl when compiling a conftest (due to the "-lz" from LIBS).
+use_local_zlib=yes
 if test "$g10_force_zlib" = "yes"; then
-    ZLIBS="../zlib/libzlib.a"
+  :
+else
+  AC_CHECK_HEADERS(zlib.h)
+  if test "$ac_cv_header_zlib_h" = yes ; then
+      AC_CHECK_LIB(z,deflateInit2_,use_local_zlib=no,:)
+  fi
+fi
+
+if test "use_local_zlib" = yes ; then
     AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, true)
     GNUPG_LINK_FILES(zlib/zlib.h, zlib.h )
     GNUPG_LINK_FILES(zlib/zconf.h, zconf.h )
+    ZLIBS="../zlib/libzlib.a"
 else
-AC_CHECK_HEADERS(zlib.h)
-if test "$ac_cv_header_zlib_h" = yes ; then
-    LIBS="$LIBS -lz"
-    ZLIBS=
     AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, false)
-else
-    ZLIBS="../zlib/libzlib.a"
-    AM_CONDITIONAL(ENABLE_LOCAL_ZLIB, true)
-    GNUPG_LINK_FILES(zlib/zlib.h, zlib.h )
-    GNUPG_LINK_FILES(zlib/zconf.h, zconf.h )
-fi
+    ZLIBS=
+    LIBS="-lz $LIBS"
 fi
 AC_SUBST(ZLIBS)
 
+
 changequote(,)dnl
 tmp_pat='[a-zA-Z]'
 changequote([,])dnl
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 53870b45f..f29c39654 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,13 @@
+Thu Jun 10 14:18:23 CEST 1999  Werner Koch  <[email protected]>
+
+
+	* free-packet.c (free_encrypted): Fixed EOF case (Remi).
+	(free_plaintext): Ditto.
+
+	* helptext.c (keyedit.delsig.unknown): New (Remi).
+	* keyedit.c (print_and_check_one_sig): Add arg print_without_key and
+	changed all callers to make use of it (Remi):
+
 Tue Jun  8 13:36:25 CEST 1999  Werner Koch  <[email protected]>
 
 	* keylist.c (print_key_data): New and called elsewhere.
diff --git a/g10/free-packet.c b/g10/free-packet.c
index 5d74544fc..0a61e222c 100644
--- a/g10/free-packet.c
+++ b/g10/free-packet.c
@@ -244,8 +244,13 @@ free_encrypted( PKT_encrypted *ed )
 		;
 	}
 	else {
-	    while( ed->len ) /* skip the packet */
-		ed->len -= iobuf_read( ed->buf, NULL, ed->len );
+	   while( ed->len ) { /* skip the packet */
+	       int n = iobuf_read( ed->buf, NULL, ed->len );
+	       if( n == -1 )
+		   ed->len = 0;
+	       else
+		   ed->len -= n;
+	   }
 	}
     }
     m_free(ed);
@@ -261,8 +266,13 @@ free_plaintext( PKT_plaintext *pt )
 		;
 	}
 	else {
-	    while( pt->len ) /* skip the packet */
-		pt->len -= iobuf_read( pt->buf, NULL, pt->len );
+	   while( pt->len ) { /* skip the packet */
+	       int n = iobuf_read( pt->buf, NULL, pt->len );
+	       if( n == -1 )
+		   pt->len = 0;
+	       else
+		   pt->len -= n;
+	   }
 	}
     }
     m_free(pt);
diff --git a/g10/helptext.c b/g10/helptext.c
index 7643f96db..7e573469a 100644
--- a/g10/helptext.c
+++ b/g10/helptext.c
@@ -178,10 +178,15 @@ static struct helptexts { const char *key; const char *help; } helptexts[] = {
  "to delete this signature may be important to establish a trust\n"
  "connection to the key or another key certified by this key."
 },
+{ N_("keyedit.delsig.unknown"),
+ "This signature can't be checked because you don't have the\n"
+ "corresponding key.  You should postpone its deletion until you\n"
+ "know which key was used because this signing key might establish"
+ "a trust connection through another already certified key."
+},
 { N_("keyedit.delsig.invalid"),
  "The signature is not valid.  It does make sense to remove it from\n"
- "your keyring if it is really invalid and not just unchecked due to\n"
- "a missing public key (marked by \"sig?\")."
+ "your keyring."
 },
 { N_("keyedit.delsig.selfsig"),
  "This is a signature which binds the user ID to the key. It is\n"
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 5777e7181..6035f7d2b 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -111,7 +111,7 @@ get_keyblock_byname( KBNODE *keyblock, KBPOS *kbpos, const char *username )
 static int
 print_and_check_one_sig( KBNODE keyblock, KBNODE node,
 			 int *inv_sigs, int *no_key, int *oth_err,
-					int *is_selfsig )
+                        int *is_selfsig, int print_without_key )
 {
     PKT_signature *sig = node->pkt->pkt.signature;
     int rc, sigrc;
@@ -141,7 +141,7 @@ print_and_check_one_sig( KBNODE keyblock, KBNODE node,
 	    ++*oth_err;
 	break;
     }
-    if( sigrc != '?' ) {
+    if( sigrc != '?' || print_without_key ) {
 	tty_printf("%s%c       %08lX %s   ",
 		is_rev? "rev":"sig",
 		sigrc, sig->keyid[1], datestr_from_sig(sig));
@@ -205,7 +205,7 @@ check_all_keysigs( KBNODE keyblock, int only_selected )
 	    int selfsig;
 
 	    if( print_and_check_one_sig( keyblock, node, &inv_sigs,
-					 &no_key, &oth_err, &selfsig ) ) {
+                                        &no_key, &oth_err, &selfsig, 0 ) ) {
 		if( selfsig )
 		    has_selfsig = 1;
 	    }
@@ -1275,24 +1275,33 @@ menu_delsig( KBNODE pub_keyblock )
 	    uid = (node->flag & NODFLG_SELUID)? node->pkt->pkt.user_id : NULL;
 	}
 	else if( uid && node->pkt->pkttype == PKT_SIGNATURE ) {
-	    int okay, valid, selfsig;
+           int okay, valid, selfsig, inv_sig, no_key, other_err;
 
 	    tty_printf("uid  ");
 	    tty_print_string( uid->name, uid->len );
 	    tty_printf("\n");
 
+           okay = inv_sig = no_key = other_err = 0;
 	    valid = print_and_check_one_sig( pub_keyblock, node,
-					     NULL, NULL, NULL, &selfsig );
-
-	    okay = valid ? cpr_get_answer_yes_no_quit(
-			       "keyedit.delsig.valid",
-			      _("Delete this good signature? (y/N/q)"))
-			 : cpr_get_answer_yes_no_quit(
-			       "keyedit.delsig.invalid",
-			      _("Delete this invalid signature? (y/N/q)"));
+                                            &inv_sig, &no_key, &other_err,
+                                            &selfsig, 1 );
+
+           if( valid )
+               okay = cpr_get_answer_yes_no_quit(
+                   "keyedit.delsig.valid",
+                   _("Delete this good signature? (y/N/q)"));
+           else if( inv_sig || other_err )
+               okay = cpr_get_answer_yes_no_quit(
+                   "keyedit.delsig.invalid",
+                   _("Delete this invalid signature? (y/N/q)"));
+           else if( no_key )
+               okay = cpr_get_answer_yes_no_quit(
+                   "keyedit.delsig.unknown",
+                   _("Delete this unknown signature? (y/N/q)"));
+           
 	    if( okay == -1 )
 		break;
-	    if( okay && !cpr_get_answer_is_yes(
+           if( okay && selfsig && !cpr_get_answer_is_yes(
 			       "keyedit.delsig.selfsig",
 			      _("Really delete this self-signature? (y/N)") ))
 		okay = 0;
diff --git a/po/ChangeLog b/po/ChangeLog
index 4b9bfcba5..ba64ae99c 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,10 @@
+Thu Jun 10 14:18:23 CEST 1999  Werner Koch  <[email protected]>
+
+
+	* it.po: Updated (Marco).
+
+	* es_ES.po: Updated (Urko).
+
 Wed Jun  2 14:17:19 CEST 1999  Werner Koch  <[email protected]>
 
 	* es_ES.po: Some patches (Urko Lusa).
diff --git a/po/de.po b/po/de.po
index 184169e11..48f4973a2 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,7 +3,7 @@
 # Walter Koch <[email protected]>, 1998.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-05-30 21:55+0200\n"
+"POT-Creation-Date: 1999-06-08 21:26+0200\n"
 "PO-Revision-Date: 1999-05-30 21:56+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -262,7 +262,7 @@ msgstr ""
 "BENUTZEN SIE DIE DURCH DIESES PROGRAMM ERZEUGTEN DATEN NICHT!\n"
 "\n"
 
-#: cipher/rndlinux.c:110
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -274,7 +274,7 @@ msgstr ""
 "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n"
 "(Es werden noch %d Byte ben�tigt.)\n"
 
-#: g10/g10.c:167
+#: g10/g10.c:169
 msgid ""
 "@Commands:\n"
 " "
@@ -282,131 +282,131 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: g10/g10.c:169
+#: g10/g10.c:171
 msgid "|[file]|make a signature"
 msgstr "|[Datei]|Eine Unterschrift erzeugen"
 
-#: g10/g10.c:170
+#: g10/g10.c:172
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/g10.c:171
+#: g10/g10.c:173
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/g10.c:172
+#: g10/g10.c:174
 msgid "encrypt data"
 msgstr "Daten verschl�sseln"
 
-#: g10/g10.c:173
+#: g10/g10.c:175
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschl�sseln"
 
-#: g10/g10.c:174
+#: g10/g10.c:176
 msgid "store only"
 msgstr "Nur speichern"
 
-#: g10/g10.c:175
+#: g10/g10.c:177
 msgid "decrypt data (default)"
 msgstr "Daten entschl�sseln (Voreinstellung)"
 
-#: g10/g10.c:176
+#: g10/g10.c:178
 msgid "verify a signature"
 msgstr "Signatur pr�fen"
 
-#: g10/g10.c:177
+#: g10/g10.c:179
 msgid "list keys"
 msgstr "Liste der Schl�ssel"
 
-#: g10/g10.c:179
+#: g10/g10.c:181
 msgid "list keys and signatures"
 msgstr "Liste der Schl�ssel und ihrer Signaturen"
 
-#: g10/g10.c:180
+#: g10/g10.c:182
 msgid "check key signatures"
 msgstr "Signaturen der Schl�ssel pr�fen"
 
-#: g10/g10.c:181
+#: g10/g10.c:183
 msgid "list keys and fingerprints"
 msgstr "Liste der Schl�ssel und ihrer \"Fingerabdr�cke\""
 
-#: g10/g10.c:182
+#: g10/g10.c:184
 msgid "list secret keys"
 msgstr "Liste der geheimen Schl�ssel"
 
-#: g10/g10.c:183
+#: g10/g10.c:185
 msgid "generate a new key pair"
 msgstr "Ein neues Schl�sselpaar erzeugen"
 
-#: g10/g10.c:184
+#: g10/g10.c:186
 msgid "remove key from the public keyring"
 msgstr "Schl�ssel entfernen"
 
-#: g10/g10.c:185
+#: g10/g10.c:187
 msgid "sign or edit a key"
 msgstr "Unterschreiben oder Bearbeiten eines Schl�ssels"
 
-#: g10/g10.c:186
+#: g10/g10.c:188
 msgid "generate a revocation certificate"
 msgstr "Ein Schl�sselwiderruf-Zertifikat erzeugen"
 
-#: g10/g10.c:187
+#: g10/g10.c:189
 msgid "export keys"
 msgstr "Schl�ssel exportieren"
 
-#: g10/g10.c:188
+#: g10/g10.c:190
 msgid "export keys to a key server"
 msgstr "Schl�ssel zu einem Schl�sselserver exportieren"
 
-#: g10/g10.c:189
+#: g10/g10.c:191
 msgid "import keys from a key server"
 msgstr "Schl�ssel von einem Schl�sselserver importieren"
 
-#: g10/g10.c:192
+#: g10/g10.c:194
 msgid "import/merge keys"
 msgstr "Schl�ssel importieren/kombinieren"
 
-#: g10/g10.c:194
+#: g10/g10.c:196
 msgid "list only the sequence of packets"
 msgstr "Lediglich die Struktur der Datenpakete anzeigen"
 
-#: g10/g10.c:196
+#: g10/g10.c:198
 msgid "export the ownertrust values"
 msgstr "Exportieren der \"Owner trust\" Werte"
 
-#: g10/g10.c:198
+#: g10/g10.c:200
 msgid "import ownertrust values"
 msgstr "Importieren der \"Owner trust\" Werte"
 
-#: g10/g10.c:200
+#: g10/g10.c:202
 msgid "|[NAMES]|update the trust database"
 msgstr "|[NAMEN]|�ndern der \"Trust\"-Datenbank"
 
-#: g10/g10.c:202
+#: g10/g10.c:204
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMEN]|�berpr�fen der \"Trust\"-Datenbank"
 
-#: g10/g10.c:203
+#: g10/g10.c:205
 msgid "fix a corrupted trust database"
 msgstr "Reparieren einer besch�digten \"Trust\"-Datenbank"
 
-#: g10/g10.c:204
+#: g10/g10.c:206
 msgid "De-Armor a file or stdin"
 msgstr "Datei oder stdin von der ASCII-H�lle befreien"
 
-#: g10/g10.c:205
+#: g10/g10.c:207
 msgid "En-Armor a file or stdin"
 msgstr "Datei oder stdin in eine ASCII-H�lle einpacken"
 
-#: g10/g10.c:206
+#: g10/g10.c:208
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests f�r die Dateien ausgeben"
 
-#: g10/g10.c:207
+#: g10/g10.c:209
 msgid "print all message digests"
 msgstr "Message-Digests f�r die Eingabedaten ausgeben"
 
-#: g10/g10.c:213
+#: g10/g10.c:215
 msgid ""
 "@\n"
 "Options:\n"
@@ -416,152 +416,152 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/g10.c:215
+#: g10/g10.c:217
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-H�lle versehen"
 
-#: g10/g10.c:216
+#: g10/g10.c:218
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschl�sseln f�r NAME"
 
-#: g10/g10.c:220
+#: g10/g10.c:222
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/g10.c:221
+#: g10/g10.c:223
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine Kompr.)"
 
-#: g10/g10.c:223
+#: g10/g10.c:225
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/g10.c:224
+#: g10/g10.c:226
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/g10.c:225
+#: g10/g10.c:227
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: g10/g10.c:226
+#: g10/g10.c:228
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
-#: g10/g10.c:227
+#: g10/g10.c:229
 msgid "force v3 signatures"
 msgstr "v3 Signaturen erzwingen"
 
-#: g10/g10.c:228
+#: g10/g10.c:230
 msgid "always use a MDC for encryption"
 msgstr "Beim Verschl�sseln ein Siegel (MDC) verwenden"
 
-#: g10/g10.c:229
+#: g10/g10.c:231
 msgid "do not make any changes"
 msgstr "Keine wirklichen �nderungen durchf�hren"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:231
+#: g10/g10.c:233
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: g10/g10.c:232
+#: g10/g10.c:234
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: g10/g10.c:233
+#: g10/g10.c:235
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: g10/g10.c:234
+#: g10/g10.c:236
 msgid "add this keyring to the list of keyrings"
 msgstr "Als �ffentlichen Schl�sselbund mitbenutzen"
 
-#: g10/g10.c:235
+#: g10/g10.c:237
 msgid "add this secret keyring to the list"
 msgstr "Als geheimen Schl�sselbund mitbenutzen"
 
-#: g10/g10.c:236
+#: g10/g10.c:238
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten Schl�ssel benutzen"
 
-#: g10/g10.c:237
+#: g10/g10.c:239
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|Schl�ssel bei diesem Server nachschlagen"
 
-#: g10/g10.c:238
+#: g10/g10.c:240
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|Terminalzeichensatz NAME benutzen"
 
-#: g10/g10.c:239
+#: g10/g10.c:241
 msgid "read options from file"
 msgstr "Optionen aus der Datei lesen"
 
-#: g10/g10.c:241
+#: g10/g10.c:243
 msgid "set debugging flags"
 msgstr "Debug-Flags einschalten"
 
-#: g10/g10.c:242
+#: g10/g10.c:244
 msgid "enable full debugging"
 msgstr "Alle Debug-Flags einschalten"
 
-#: g10/g10.c:243
+#: g10/g10.c:245
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
-#: g10/g10.c:244
+#: g10/g10.c:246
 msgid "do not write comment packets"
 msgstr "Keine Kommentarpakete schreiben"
 
-#: g10/g10.c:245
+#: g10/g10.c:247
 msgid "(default is 1)"
 msgstr "Ben�tigte Vollvertrauen (Voreinstellung 1)"
 
-#: g10/g10.c:246
+#: g10/g10.c:248
 msgid "(default is 3)"
 msgstr "Ben�tigte Teilvertrauen (Voreinstellung 3)"
 
-#: g10/g10.c:248
+#: g10/g10.c:250
 msgid "|FILE|load extension module FILE"
 msgstr "|DATEI|Erweiterungsmodul DATEI laden"
 
-#: g10/g10.c:249
+#: g10/g10.c:251
 msgid "emulate the mode described in RFC1991"
 msgstr "Den in RFC1991 beschriebenen Modus nachahmen"
 
-#: g10/g10.c:250
+#: g10/g10.c:252
 msgid "|N|use passphrase mode N"
 msgstr "|N|Verwenden des Mantra-Modus N"
 
-#: g10/g10.c:252
+#: g10/g10.c:254
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|Das Hashverfahren NAME f�r Mantras benutzen"
 
-#: g10/g10.c:254
+#: g10/g10.c:256
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|Das Verschl�.verfahren NAME f�r Mantras benutzen"
 
-#: g10/g10.c:255
+#: g10/g10.c:257
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Das Verschl�.verfahren NAME benutzen"
 
-#: g10/g10.c:256
+#: g10/g10.c:258
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Das Hashverfahren NAME benutzen"
 
-#: g10/g10.c:257
+#: g10/g10.c:259
 msgid "|N|use compress algorithm N"
 msgstr "|N|Die Komprimierverfahren N benutzen"
 
-#: g10/g10.c:258
+#: g10/g10.c:260
 msgid "throw keyid field of encrypted packets"
 msgstr "Entferne die Absender-ID verschl�sselter Pakete"
 
-#: g10/g10.c:259
+#: g10/g10.c:261
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=WERT|verwende diese \"notation\"-Daten"
 
-#: g10/g10.c:261
+#: g10/g10.c:263
 msgid ""
 "@\n"
 "Examples:\n"
@@ -581,15 +581,15 @@ msgstr ""
 " --list-keys [Namen]        Schl�ssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdr�cke\" anzeigen\n"
 
-#: g10/g10.c:333
+#: g10/g10.c:337
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Berichte �ber Bugs (Programmfehler) bitte an <[email protected]>.\n"
 
-#: g10/g10.c:337
+#: g10/g10.c:341
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
 
-#: g10/g10.c:340
+#: g10/g10.c:344
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -599,7 +599,7 @@ msgstr ""
 "Signieren, pr�fen, verschl�sseln, entschl�sseln\n"
 "Die voreingestellte Operation ist abh�ngig von den Eingabedaten\n"
 
-#: g10/g10.c:345
+#: g10/g10.c:349
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -607,161 +607,161 @@ msgstr ""
 "\n"
 "Unterst�tzte Verfahren:\n"
 
-#: g10/g10.c:419
+#: g10/g10.c:423
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/g10.c:459
+#: g10/g10.c:463
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/g10.c:586
+#: g10/g10.c:595
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/g10.c:590
+#: g10/g10.c:599
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/g10.c:597
+#: g10/g10.c:606
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:744
+#: g10/g10.c:755
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ist kein g�ltiger Zeichensatz.\n"
 
-#: g10/g10.c:788 g10/g10.c:800
+#: g10/g10.c:799 g10/g10.c:811
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgew�hlte Verschl�sslungsverfahren ist ung�ltig\n"
 
-#: g10/g10.c:794 g10/g10.c:806
+#: g10/g10.c:805 g10/g10.c:817
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:810
+#: g10/g10.c:821
 msgid "the given policy URL is invalid\n"
 msgstr "Die angegebene URL f�r Richtlinien ist ung�ltig\n"
 
-#: g10/g10.c:813
+#: g10/g10.c:824
 #, 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:815
+#: g10/g10.c:826
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m�ssen gr��er als 0 sein\n"
 
-#: g10/g10.c:817
+#: g10/g10.c:828
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed m�ssen gr��er als 1 sein\n"
 
-#: g10/g10.c:819
+#: g10/g10.c:830
 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:822
+#: g10/g10.c:833
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:826
+#: g10/g10.c:837
 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:903
+#: g10/g10.c:914
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:909
+#: g10/g10.c:920
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:916
+#: g10/g10.c:927
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:924
+#: g10/g10.c:935
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:937
+#: g10/g10.c:948
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:950
+#: g10/g10.c:961
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:964
+#: g10/g10.c:975
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:976
+#: g10/g10.c:987
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:985
+#: g10/g10.c:996
 msgid "--edit-key username [commands]"
 msgstr "--edit-key Username [Befehle]"
 
-#: g10/g10.c:999
+#: g10/g10.c:1010
 msgid "--delete-secret-key username"
 msgstr "--delete-secret-key Username"
 
-#: g10/g10.c:1002
+#: g10/g10.c:1013
 msgid "--delete-key username"
 msgstr "--delete-key Benutzername"
 
-#: g10/encode.c:231 g10/g10.c:1025 g10/sign.c:366
+#: g10/encode.c:231 g10/g10.c:1036 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
 
-#: g10/g10.c:1036
+#: g10/g10.c:1047
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [Benutzername] [Keyring]"
 
-#: g10/g10.c:1095
+#: g10/g10.c:1106
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1103
+#: g10/g10.c:1114
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1169
+#: g10/g10.c:1180
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ung�ltiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:1244
+#: g10/g10.c:1255
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1259
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1251 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1262 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht ge�ffnet werden\n"
 
-#: g10/g10.c:1418
+#: g10/g10.c:1429
 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:1424
+#: g10/g10.c:1435
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -769,11 +769,12 @@ msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und mu� mit einem '=' enden\n"
 
-#: g10/g10.c:1430
+#: g10/g10.c:1441
 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"
+msgstr ""
+"Punkte in einem \"notation\"-Namen m�ssen von anderen Zeichen umgeben sein\n"
 
-#: g10/g10.c:1438
+#: g10/g10.c:1449
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
@@ -1055,12 +1056,17 @@ msgstr ""
 "         Es ist nicht sicher, da� die Signatur wirklich dem vorgeblichen "
 "Besitzer geh�rt.\n"
 
-#: g10/pkclist.c:569 g10/pkclist.c:582 g10/pkclist.c:645 g10/pkclist.c:673
+#: g10/pkclist.c:580 g10/pkclist.c:602 g10/pkclist.c:665 g10/pkclist.c:705
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: �bersprungen: %s\n"
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:588 g10/pkclist.c:687
+#, fuzzy, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr "%s: Schl�sselblock Leseproblem: %s\n"
+
+#: g10/pkclist.c:611
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1068,20 +1074,20 @@ msgstr ""
 "Sie gaben keine User-ID angegeben (Benutzen Sie die Option \"-r\").\n"
 "\n"
 
-#: g10/pkclist.c:596
+#: g10/pkclist.c:616
 msgid "Enter the user ID: "
 msgstr "Geben Sie die User-ID ein: "
 
-#: g10/pkclist.c:607
+#: g10/pkclist.c:627
 msgid "No such user ID.\n"
 msgstr "Keine solche User-ID vorhanden.\n"
 
-#: g10/pkclist.c:653
+#: g10/pkclist.c:673
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: Fehler beim Pr�fen des Schl�ssels: %s\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:711
 msgid "no valid addressees\n"
 msgstr "Keine g�ltigen Adressaten\n"
 
@@ -1415,7 +1421,7 @@ msgstr ""
 msgid "Really create? "
 msgstr "Wirklich erzeugen? "
 
-#: g10/encode.c:91 g10/openfile.c:88 g10/openfile.c:176 g10/tdbio.c:467
+#: g10/encode.c:91 g10/openfile.c:118 g10/openfile.c:208 g10/tdbio.c:467
 #: g10/tdbio.c:528
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1572,7 +1578,7 @@ msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel nicht gefunden: %s\n"
 msgid "no default public keyring\n"
 msgstr "Kein voreingestellter �ffentlicher Schl�sselbund\n"
 
-#: g10/import.c:376 g10/openfile.c:117 g10/sign.c:268 g10/sign.c:559
+#: g10/import.c:376 g10/openfile.c:148 g10/sign.c:268 g10/sign.c:559
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
@@ -2325,11 +2331,11 @@ msgstr "                    alias \""
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht gepr�ft werden: %s\n"
 
-#: g10/mainproc.c:1096
+#: g10/mainproc.c:1109
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:1101
+#: g10/mainproc.c:1114
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ung�ltiges root-Paket in proc_tree() entdeckt\n"
 
@@ -2403,15 +2409,15 @@ msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "Daten wurden nicht gespeichert; verwenden Sie daf�r die Option \"--output\"\n"
 
-#: g10/plaintext.c:208
+#: g10/plaintext.c:266
 msgid "Please enter name of data file: "
 msgstr "Bitte geben Sie den Namen der Datendatei ein: "
 
-#: g10/plaintext.c:229
+#: g10/plaintext.c:287
 msgid "reading stdin ...\n"
 msgstr "lese stdin ...\n"
 
-#: g10/plaintext.c:302
+#: g10/plaintext.c:360
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kann signierte Datei '%s' nicht �ffnen.\n"
@@ -2547,7 +2553,7 @@ msgstr "%s: Verzeichnis erzeugt\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: Verzeichnis existiert nicht!\n"
 
-#: g10/openfile.c:113 g10/openfile.c:183 g10/ringedit.c:1344 g10/tdbio.c:457
+#: g10/openfile.c:144 g10/openfile.c:215 g10/ringedit.c:1344 g10/tdbio.c:457
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: kann nicht erzeugt werden: %s\n"
@@ -3106,16 +3112,21 @@ msgstr "Datei '%s' existiert bereits. "
 msgid "Overwrite (y/N)? "
 msgstr "�berschreiben (j/N)? "
 
-#: g10/openfile.c:92
+#: g10/openfile.c:97
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr ""
+
+#: g10/openfile.c:122
 msgid "writing to stdout\n"
 msgstr "Schreiben auf die Standardausgabe\n"
 
-#: g10/openfile.c:149
+#: g10/openfile.c:181
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "die unterzeichneten Daten sind wohl in '%s'\n"
 
-#: g10/openfile.c:199
+#: g10/openfile.c:231
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: neue Optionendatei erstellt\n"
@@ -3338,12 +3349,13 @@ msgstr ""
 # "This is a valid signature on the key; you normally don't want\n"
 # "to delete this signature may be important to establish a trust\n"
 # "connection to the key or another key certified by this key."
-#: g10/helptext.c:176  
+#: g10/helptext.c:176
 msgid "keyedit.delsig.valid"
 msgstr ""
 "Dies ist eine g�ltige Beglaubigung f�r den Schl�ssel. Es ist normalerweise\n"
 "unn�tig sie zu l�schen. Sie ist m�glicherweise sogar notwendig, um einen\n"
-"Trust-Weg zu diesem oder einem durch diesen Schl�ssel beglaubigten Schl�ssel\n"
+"Trust-Weg zu diesem oder einem durch diesen Schl�ssel beglaubigten "
+"Schl�ssel\n"
 "herzustellen"
 
 # ("keyedit.delsig.invalid"),
@@ -3352,7 +3364,8 @@ msgstr ""
 # "a missing public key (marked by \"sig?\")."
 #: g10/helptext.c:181
 msgid "keyedit.delsig.invalid"
-msgstr "Diese Beglaubigung ist ung�ltig. Es ist sinnvoll sie aus Ihrem\n"
+msgstr ""
+"Diese Beglaubigung ist ung�ltig. Es ist sinnvoll sie aus Ihrem\n"
 "Schl�sselbund zu entfernen, sofern sie wirklich ung�ltig ist und nicht nur\n"
 "wegen eines fehlenden �ff.Schl�ssel (\"sig?\") unkontrollierbar ist."
 
@@ -3369,7 +3382,8 @@ msgstr ""
 "es nicht gut, solche Beglaubigungen zu entfernen. Um ehrlich zu sein:\n"
 "Es kann sein, da� GnuPG solche Schl�ssel gar nicht mehr benutzen kann.\n"
 "Sie sollten diese Eigenbeglaubigung also nur dann entfernen, wenn sie aus\n"
-"irgendeinem Grund nicht g�ltig ist und eine zweite Beglaubigung verf�gbar ist."
+"irgendeinem Grund nicht g�ltig ist und eine zweite Beglaubigung verf�gbar "
+"ist."
 
 # ################################
 # ####### Help msgids ############
@@ -3385,7 +3399,8 @@ msgstr ""
 "bekannte Texte sind eine SCHLECHTE Wahl, da diese mit Sicherheit online\n"
 "verf�gbar sind und durch entsprechende Programme zum Raten des Mantras\n"
 "benutzt werden.  S�tze mit pers�nlicher Bedeutung, die auch noch durch\n"
-"falsche Gro�-/Kleinschreibung und eingestreute Sonderzeichen ver�ndert werden,\n"
+"falsche Gro�-/Kleinschreibung und eingestreute Sonderzeichen ver�ndert "
+"werden,\n"
 "sind i.d.R. eine gute Wahl"
 
 #: g10/helptext.c:202
diff --git a/po/es_ES.po b/po/es_ES.po
index ed997d2e6..3082f74d5 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -3,10 +3,12 @@
 # I've tried to mantain the terminology used by Armando Ramos
 # <[email protected]> is his PGP 2.3.6i translation.
 # I also got inspiration from it.po by Marco d'Itri <[email protected]>
+#
+# GPG version: 0.9.7
 msgid ""
 msgstr ""
 "POT-Creation-Date: 1999-05-23 15:36+0200\n"
-"PO-Revision-Date: 1999-05-29 13:16+0200\n"
+"PO-Revision-Date: 1999-06-06 18:33+0200\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-13 10:49:25+0100\n"
 "From: Urko Lusa <[email protected]>\n"
@@ -126,7 +128,7 @@ msgstr "Error de lectura"
 
 #: util/errors.c:75
 msgid "file write error"
-msgstr "Error de escritura"
+msgstr "error de escritura"
 
 #: util/errors.c:76
 msgid "unknown compress algorithm"
@@ -213,37 +215,30 @@ msgid "weak key"
 msgstr "Clave d�bil"
 
 #: util/errors.c:97
-#, fuzzy
 msgid "invalid argument"
-msgstr "Armadura no v�lida"
+msgstr "argumento no v�lido"
 
 #: util/errors.c:98
-#, fuzzy
 msgid "bad URI"
-msgstr "MPI incorrecto"
+msgstr "URI incorrecto"
 
 #: util/errors.c:99
-#, fuzzy
 msgid "unsupported URI"
-msgstr "No soportado"
+msgstr "URI no soportado"
 
 #: util/errors.c:100
-#, fuzzy
 msgid "network error"
-msgstr "Error general"
+msgstr "error de red"
 
 #: util/errors.c:102
-#, fuzzy
 msgid "not encrypted"
-msgstr "datos cifrados %s\n"
+msgstr "no cifrado"
 
 #: util/logger.c:218
-#, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
-msgstr "�Oh! vaya... esto es un bug (%s:%d:%s)\n"
+msgstr "... esto es un bug (%s:%d:%s)\n"
 
 #: util/logger.c:224
-#, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Ha encontrado Vd. un bug... (%s:%d)\n"
 
@@ -266,7 +261,6 @@ msgstr ""
 "\n"
 
 #: cipher/rndlinux.c:110
-#, c-format
 msgid ""
 "\n"
 "Not enough random bytes available.  Please do some other work to give\n"
@@ -319,11 +313,11 @@ msgstr "verifica una firma"
 
 #: g10/g10.c:175
 msgid "list keys"
-msgstr "lista las claves"
+msgstr "lista claves"
 
 #: g10/g10.c:177
 msgid "list keys and signatures"
-msgstr "lista las claves y firmas"
+msgstr "lista claves y firmas"
 
 #: g10/g10.c:178
 msgid "check key signatures"
@@ -331,11 +325,11 @@ msgstr "comprueba las firmas de las claves"
 
 #: g10/g10.c:179
 msgid "list keys and fingerprints"
-msgstr "lista las claves y huellas dactilares"
+msgstr "lista claves y huellas dactilares"
 
 #: g10/g10.c:180
 msgid "list secret keys"
-msgstr "lista las claves secretas"
+msgstr "lista claves secretas"
 
 #: g10/g10.c:181
 msgid "generate a new key pair"
@@ -355,19 +349,19 @@ msgstr "genera un certificado de revocaci�n"
 
 #: g10/g10.c:185
 msgid "export keys"
-msgstr "exporta las claves"
+msgstr "exporta claves"
 
 #: g10/g10.c:186
 msgid "export keys to a key server"
-msgstr ""
+msgstr "exporta claves a un servidor de claves"
 
 #: g10/g10.c:187
 msgid "import keys from a key server"
-msgstr ""
+msgstr "importa claves desde un servidor de claves"
 
 #: g10/g10.c:190
 msgid "import/merge keys"
-msgstr "importa/fusiona las claves"
+msgstr "importa/fusiona claves"
 
 #: g10/g10.c:192
 msgid "list only the sequence of packets"
@@ -403,7 +397,7 @@ msgstr "crea la armadura a un fichero o stdin"
 
 #: g10/g10.c:204
 msgid "|algo [files]|print message digests"
-msgstr "|algo [files]|imprime res�menes de mensaje"
+msgstr "|algo [ficheros]|imprime res�menes de mensaje"
 
 #: g10/g10.c:205
 msgid "print all message digests"
@@ -424,9 +418,8 @@ msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
 #: g10/g10.c:214
-#, fuzzy
 msgid "|NAME|encrypt for NAME"
-msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
+msgstr "|NOMBRE|cifra para NOMBRE"
 
 #: g10/g10.c:218
 msgid "use this user-id to sign or decrypt"
@@ -457,13 +450,12 @@ msgid "force v3 signatures"
 msgstr "fuerza firmas v3"
 
 #: g10/g10.c:226
-#, fuzzy
 msgid "always use a MDC for encryption"
-msgstr "usa este usuario para cifrar"
+msgstr "siempre usa un MCD para cifrar"
 
 #: g10/g10.c:227
 msgid "do not make any changes"
-msgstr ""
+msgstr "no hace ning�n cambio"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
 #: g10/g10.c:229
@@ -492,7 +484,7 @@ msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
 #: g10/g10.c:235
 msgid "|HOST|use this keyserver to lookup keys"
-msgstr ""
+msgstr "|SERVIDOR|usa este servidor de claves"
 
 #: g10/g10.c:236
 msgid "|NAME|set terminal charset to NAME"
@@ -601,8 +593,8 @@ msgid ""
 "default operation depends on the input data\n"
 msgstr ""
 "Sintaxis: gpg [opciones] [ficheros]\n"
-"firma, comprueba, cifra o descifra\n"
-"la operaci�n por defecto depende del tipo de datos de entrada\n"
+"Firma, comprueba, cifra o descifra.\n"
+"La operaci�n por defecto depende del tipo de datos de entrada.\n"
 
 #: g10/g10.c:339
 msgid ""
@@ -621,22 +613,18 @@ msgid "conflicting commands\n"
 msgstr "comandos incompatibles\n"
 
 #: g10/g10.c:580
-#, c-format
 msgid "NOTE: no default option file `%s'\n"
-msgstr "NOTA: no existe fichero de opciones predefinido `%s'\n"
+msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
 #: g10/g10.c:584
-#, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
 #: g10/g10.c:591
-#, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
 #: g10/g10.c:737
-#, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s no es un juego de caracteres v�lido\n"
 
@@ -649,7 +637,6 @@ msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no es v�lido\n"
 
 #: g10/g10.c:801
-#, 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"
 
@@ -674,7 +661,6 @@ 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:891
-#, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
 
@@ -708,7 +694,7 @@ msgstr "--decrypt [nombre_fichero]"
 
 #: g10/g10.c:973
 msgid "--edit-key username [commands]"
-msgstr "--edit-key nombre_usuario"
+msgstr "--edit-key nombre_usuario [comandos]"
 
 #: g10/g10.c:987
 msgid "--delete-secret-key username"
@@ -719,7 +705,6 @@ msgid "--delete-key username"
 msgstr "--delete-key nombre_usuario"
 
 #: g10/encode.c:231 g10/g10.c:1013 g10/sign.c:311
-#, c-format
 msgid "can't open %s: %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
@@ -728,17 +713,14 @@ msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [id_usuario] [anillo]"
 
 #: g10/g10.c:1083
-#, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
 #: g10/g10.c:1091
-#, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
 #: g10/g10.c:1157
-#, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n no v�lido `%s'\n"
 
@@ -748,15 +730,13 @@ msgstr "[nombre_fichero]"
 
 #: g10/g10.c:1236
 msgid "Go ahead and type your message ...\n"
-msgstr "Adelante, teclee el mensaje ...\n"
+msgstr "Adelante, teclee su mensaje ...\n"
 
 #: g10/decrypt.c:59 g10/g10.c:1239 g10/verify.c:66
-#, c-format
 msgid "can't open `%s'\n"
 msgstr "no puede abrirse `%s'\n"
 
 #: g10/armor.c:296
-#, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
@@ -785,7 +765,6 @@ msgid "unexpected armor:"
 msgstr "armadura inesperada"
 
 #: g10/armor.c:629
-#, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracteres no v�lidos radix64 %02x ignorados\n"
 
@@ -802,7 +781,6 @@ msgid "malformed CRC\n"
 msgstr "Suma de comprobaci�n mal creada\n"
 
 #: g10/armor.c:714
-#, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "Error en suma de comprobaci�n: %06lx - %06lx\n"
 
@@ -819,17 +797,16 @@ msgid "no valid OpenPGP data found.\n"
 msgstr "no se han encontrados datos OpenPGP v�lidos\n"
 
 #: g10/armor.c:1005
-#, c-format
 msgid "invalid armor: line longer than %d characters\n"
-msgstr "armadura inv�lida: l�nea m�s larga de %d caracteres\n"
+msgstr "armadura incorrecta: l�nea m�s larga de %d caracteres\n"
 
 #: g10/armor.c:1009
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
-msgstr "caracter \"quoted printable\" en la armadura - probablemente se us� un MTA defectuoso\n"
+msgstr "caracter \"quoted printable\" en la armadura - probablemente se us�\n"
+"un MTA defectuoso\n"
 
 #: g10/pkclist.c:137
-#, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
 "%4u%c/%08lX %s \""
@@ -903,6 +880,7 @@ msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
 msgstr "No se ha encontrado ning�n certificado sin valor de confianza.\n"
+"\n"
 
 #: g10/pkclist.c:264
 msgid ""
@@ -913,36 +891,30 @@ msgstr ""
 "\n"
 
 #: g10/pkclist.c:281
-#, c-format
 msgid "key %08lX: key has been revoked!\n"
-msgstr "%08lX: �Esta clave ha sido retirada!\n"
+msgstr "clave %08lX: �esta clave ha sido revocada!\n"
 
 #: g10/pkclist.c:287 g10/pkclist.c:297 g10/pkclist.c:403
 msgid "Use this key anyway? "
 msgstr "�Usar esta clave de todas formas? "
 
 #: g10/pkclist.c:291
-#, fuzzy, c-format
 msgid "key %08lX: subkey has been revoked!\n"
-msgstr "%08lX: �Esta clave ha sido retirada!\n"
+msgstr "clave %08lX: �esta subclave ha sido revocada!\n"
 
 #: g10/pkclist.c:321
-#, c-format
 msgid "%08lX: key has expired\n"
-msgstr "%08lX: �Esta clave est� caducada!\n"
+msgstr "%08lX: clave caducada\n"
 
 #: g10/pkclist.c:327
-#, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr "%08lX: no hay informaci�n para calcular la probabilidad de confianza\n"
 
 #: g10/pkclist.c:341
-#, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: �Esta clave NO es de confianza!\n"
 
 #: g10/pkclist.c:347
-#, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
 "but it is accepted anyway\n"
@@ -984,7 +956,6 @@ msgid "         This could mean that the signature is forgery.\n"
 msgstr "          Esto puede significar que la firma est� falsificada.\n"
 
 #: g10/pkclist.c:459
-#, fuzzy
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATENCI�N: �Esta clave ha sido revocada por su propietario!\n"
 
@@ -1021,7 +992,6 @@ msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         No es seguro que la firma pertenezca al propietario.\n"
 
 #: g10/pkclist.c:569 g10/pkclist.c:582 g10/pkclist.c:645 g10/pkclist.c:673
-#, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
@@ -1042,7 +1012,6 @@ msgid "No such user ID.\n"
 msgstr "ID de usuario inexistente.\n"
 
 #: g10/pkclist.c:653
-#, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: error comprobando la clave: %s\n"
 
@@ -1063,27 +1032,22 @@ msgid "Please select what kind of key you want:\n"
 msgstr "Por favor seleccione tipo de clave deseado:\n"
 
 #: g10/keygen.c:388
-#, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA y ElGamal (por defecto)\n"
 
 #: g10/keygen.c:389
-#, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (s�lo firma)\n"
 
 #: g10/keygen.c:391
-#, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (s�lo cifrado)\n"
 
 #: g10/keygen.c:392
-#, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firma y cifrado)\n"
 
 #: g10/keygen.c:394
-#, c-format
 msgid "   (%d) ElGamal in a v3 packet\n"
 msgstr "   (%d) ElGamal en un paquete v3\n"
 
@@ -1100,7 +1064,6 @@ msgid "Invalid selection.\n"
 msgstr "Elecci�n no v�lida.\n"
 
 #: g10/keygen.c:442
-#, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
 "              minimum keysize is  768 bits\n"
@@ -1110,7 +1073,7 @@ msgstr ""
 "Listo para generar un nuevo par de claves %s.\n"
 "              el tama�o m�nimo es 768 bits\n"
 "        el tama�o por defecto es 1024 bits\n"
-" el tama�o m�ximo recomendado en 2048 bits\n"
+" el tama�o m�ximo recomendado es 2048 bits\n"
 
 #: g10/keygen.c:449
 msgid "What keysize do you want? (1024) "
@@ -1133,9 +1096,8 @@ msgstr "tama�o insuficiente; 768 es el valor m�nimo permitido\n"
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
 #: g10/keygen.c:466
-#, fuzzy, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "tama�o insuficiente; 768 es el valor m�nimo permitido\n"
+msgstr "tama�o excesivo; %d es el m�ximo valor permitido.\n"
 
 #: g10/keygen.c:471
 msgid ""
@@ -1163,12 +1125,10 @@ msgid "Do you really need such a large keysize? "
 msgstr "�De verdad necesita una clave tan grande? "
 
 #: g10/keygen.c:489
-#, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "El tama�o requerido es de %u bits\n"
 
 #: g10/keygen.c:492 g10/keygen.c:496
-#, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
@@ -1202,7 +1162,6 @@ msgstr "La clave nunca caduca\n"
 
 #. print the date when the key expires
 #: g10/keygen.c:546
-#, c-format
 msgid "Key expires at %s\n"
 msgstr "La clave caduca el %s\n"
 
@@ -1261,12 +1220,10 @@ msgid "Invalid character in comment\n"
 msgstr "Caracter no v�lido en el comentario\n"
 
 #: g10/keygen.c:669
-#, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� usando el juego de caracteres `%s'.\n"
 
 #: g10/keygen.c:675
-#, c-format
 msgid ""
 "You selected this USER-ID:\n"
 "    \"%s\"\n"
@@ -1309,7 +1266,6 @@ msgstr ""
 "\n"
 
 #: g10/keygen.c:775
-#, fuzzy
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1335,12 +1291,10 @@ msgid "Key generation cancelled.\n"
 msgstr "Creaci�n de claves cancelada.\n"
 
 #: g10/keygen.c:869
-#, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "escribiendo certificado p�blico en `%s'\n"
 
 #: g10/keygen.c:870
-#, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "escribiendo certificado privado en `%s'\n"
 
@@ -1349,35 +1303,30 @@ msgid "public and secret key created and signed.\n"
 msgstr "Claves p�blica y secreta creadas y firmadas.\n"
 
 #: g10/keygen.c:949
-#, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
 msgstr ""
 "Tenga en cuenta que esta clave no puede ser usada para cifrado. Puede usar\n"
-"el comando \"--add-key\" para crear una clave secundaria con este "
-"prop�sito.\n"
+"el comando \"--edit-key\" para crear una clave secundaria con este prop�sito.\n"
 
 #: g10/keygen.c:963 g10/keygen.c:1062
-#, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
 #: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:52
-#, fuzzy, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
-"clave p�blica creada %lu %s en el futuro (salto en el tiempo o problemas con "
-"el reloj)\n"
+"clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
+"problemas con el reloj)\n"
 
 #: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:54
-#, fuzzy, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
-"clave p�blica creada %lu %s en el futuro (salto en el tiempo o problemas con "
-"el reloj)\n"
+"clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
+"problemas con el reloj)\n"
 
 #: g10/keygen.c:1040
 msgid "Really create? "
@@ -1385,42 +1334,34 @@ msgstr "�Crear de verdad? "
 
 #: g10/encode.c:91 g10/openfile.c:88 g10/openfile.c:176 g10/tdbio.c:467
 #: g10/tdbio.c:528
-#, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: no puede abrirse: %s\n"
 
 #: g10/encode.c:113
-#, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creando contrase�a: %s\n"
 
 #: g10/encode.c:167 g10/encode.c:287
-#, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATENCI�N: fichero vac�o\n"
 
 #: g10/encode.c:237
-#, c-format
 msgid "reading from `%s'\n"
 msgstr "leyendo desde `%s'\n"
 
 #: g10/encode.c:417
-#, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s cifrado para: %s\n"
 
 #: g10/export.c:147
-#, c-format
 msgid "%s: user not found: %s\n"
 msgstr "%s: usuario no encontrado: %s\n"
 
 #: g10/export.c:156
-#, c-format
 msgid "certificate read problem: %s\n"
 msgstr "problema en la lectura del certificado: %s\n"
 
 #: g10/export.c:165
-#, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
 msgstr "clave %08lX: no es conforme a rfc2440 - ignorada\n"
 
@@ -1437,92 +1378,74 @@ msgid "too many entries in unk cache - disabled\n"
 msgstr "demasiados registros en la cache unk - anulada\n"
 
 #: g10/getkey.c:1535 g10/getkey.c:1591
-#, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "usando clave secundaria %08lX en vez de clave primaria %08lX\n"
 
 #: g10/import.c:116
-#, fuzzy, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
 #: g10/import.c:160
-#, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloque de tipo %d\n"
 
 #: g10/import.c:167 g10/trustdb.c:2560 g10/trustdb.c:2668
-#, c-format
 msgid "%lu keys so far processed\n"
 msgstr "hasta ahora se han procesado %lu claves\n"
 
 #: g10/import.c:172
-#, fuzzy, c-format
 msgid "error reading `%s': %s\n"
-msgstr "error lectura registro de clave: %s\n"
+msgstr "error leyendo `%s': %s\n"
 
 #: g10/import.c:175
-#, c-format
 msgid "Total number processed: %lu\n"
-msgstr "         Cantidad total procesada: %lu\n"
+msgstr "   Cantidad total procesada: %lu\n"
 
 #: g10/import.c:177
-#, c-format
 msgid "          w/o user IDs: %lu\n"
-msgstr "    sin identificativo de usuario: %lu\n"
+msgstr "         sin identificativo: %lu\n"
 
 #: g10/import.c:179
-#, c-format
 msgid "              imported: %lu"
-msgstr "                       importadas: %lu"
+msgstr "                 importadas: %lu"
 
 #: g10/import.c:185
-#, c-format
 msgid "             unchanged: %lu\n"
-msgstr "                      sin cambios: %lu\n"
+msgstr "                sin cambios: %lu\n"
 
 #: g10/import.c:187
-#, c-format
 msgid "          new user IDs: %lu\n"
-msgstr "nuevos identificativos de usuario: %lu\n"
+msgstr "     nuevos identificativos: %lu\n"
 
 #: g10/import.c:189
-#, c-format
 msgid "           new subkeys: %lu\n"
-msgstr "                nuevas sub-claves: %lu\n"
+msgstr "           nuevas subclaves: %lu\n"
 
 #: g10/import.c:191
-#, c-format
 msgid "        new signatures: %lu\n"
-msgstr "                    nuevas firmas: %lu\n"
+msgstr "              nuevas firmas: %lu\n"
 
 #: g10/import.c:193
-#, c-format
 msgid "   new key revocations: %lu\n"
-msgstr "     nuevas revocaciones de clave: %lu\n"
+msgstr "        nuevas revocaciones: %lu\n"
 
 #: g10/import.c:195
-#, c-format
 msgid "      secret keys read: %lu\n"
-msgstr "           claves secretas le�das: %lu\n"
+msgstr "     claves secretas le�das: %lu\n"
 
 #: g10/import.c:197
-#, c-format
 msgid "  secret keys imported: %lu\n"
-msgstr "       claves secretas importadas: %lu\n"
+msgstr " claves secretas importadas: %lu\n"
 
 #: g10/import.c:199
-#, c-format
 msgid " secret keys unchanged: %lu\n"
-msgstr "      claves secretas sin cambios: %lu\n"
+msgstr "claves secretas sin cambios: %lu\n"
 
 #: g10/import.c:342 g10/import.c:529
-#, c-format
 msgid "key %08lX: no user id\n"
 msgstr "clave %08lX: no hay identificativo de usuario\n"
 
 #: g10/import.c:353
-#, c-format
 msgid "key %08lX: no valid user ids\n"
 msgstr "clave %08lX: no hay identificativos de usuario v�lidos\n"
 
@@ -1531,7 +1454,6 @@ 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:366 g10/import.c:596
-#, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "clave %08lX: clave p�blica no encontrada: %s\n"
 
@@ -1540,191 +1462,154 @@ msgid "no default public keyring\n"
 msgstr "no hay anillo p�blico por defecto\n"
 
 #: g10/import.c:376 g10/openfile.c:117 g10/sign.c:215 g10/sign.c:501
-#, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
 
 #: g10/import.c:379 g10/import.c:435
-#, fuzzy
 msgid "can't lock keyring `%': %s\n"
 msgstr "no puede bloquearse el anillo p�blico `%s': %s\n"
 
 #: g10/import.c:382
-#, fuzzy
 msgid "error writing keyring `%': %s\n"
-msgstr "%s: error escritura registro de versi�n: %s\n"
+msgstr "error escribiendo anillo `%s': %s\n"
 
 #: g10/import.c:387
-#, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "clave %08lX: clave p�blica importada\n"
 
 #: g10/import.c:399
-#, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "clave %08lX: no se corresponde con nuestra copia\n"
 
 #: g10/import.c:411 g10/import.c:604
-#, 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:417 g10/import.c:610
-#, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "clave %08lX: no puede leerse el bloque de claves original: %s\n"
 
 #: g10/import.c:438 g10/import.c:547 g10/import.c:648
-#, fuzzy, c-format
 msgid "error writing keyring `%s': %s\n"
-msgstr "%s: error escritura registro de versi�n: %s\n"
+msgstr "error escribiendo anillo `%s': %s\n"
 
 #: g10/import.c:444
-#, c-format
 msgid "key %08lX: 1 new user-id\n"
 msgstr "clave %08lX: 1 nuevo identificativo de usuario\n"
 
 #: g10/import.c:447
-#, c-format
 msgid "key %08lX: %d new user-ids\n"
 msgstr "clave %08lX: %d nuevos identificativos de usuario\n"
 
 #: g10/import.c:450
-#, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "clave %08lX: 1 nueva firma\n"
 
 #: g10/import.c:453
-#, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "clave %08lX: %d nuevas firmas\n"
 
 #: g10/import.c:456
-#, c-format
 msgid "key %08lX: 1 new subkey\n"
-msgstr "clave %08lX: 1 nueva sub-clave\n"
+msgstr "clave %08lX: 1 nueva subclave\n"
 
 #: g10/import.c:459
-#, c-format
 msgid "key %08lX: %d new subkeys\n"
-msgstr "clave %08lX: %d nuevas sub-claves\n"
+msgstr "clave %08lX: %d nuevas subclaves\n"
 
 #: g10/import.c:469
-#, c-format
 msgid "key %08lX: not changed\n"
 msgstr "clave %08lX: sin cambios\n"
 
 #: g10/import.c:544 g10/import.c:645
-#, fuzzy, c-format
 msgid "can't lock keyring `%s': %s\n"
-msgstr "no puede bloquearse el anillo p�blico `%s': %s\n"
+msgstr "no puede bloquearse el anillo `%s': %s\n"
 
 #: g10/import.c:552
-#, c-format
 msgid "key %08lX: secret key imported\n"
-msgstr "clave %08lX: clave secreta importata\n"
+msgstr "clave %08lX: clave secreta importada\n"
 
 #. we can't merge secret keys
 #: g10/import.c:556
-#, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "clave %08lX: ya estaba en el anillo secreto\n"
 
 #: g10/import.c:561
-#, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "clave %08lX: clave secreta no encontrada: %s\n"
 
 #: g10/import.c:590
-#, 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:621
-#, 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:653
-#, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "clave %08lX: certificado de revocaci�n importado\n"
 
 #: g10/import.c:686
-#, 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:693 g10/import.c:717
-#, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "clave %08lX: algoritmo de clave p�blica no soportado\n"
 
 #: g10/import.c:694
-#, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "clave %08lX: autofirma no v�lida\n"
 
 #: g10/import.c:709
-#, fuzzy, c-format
 msgid "key %08lX: no subkey for key binding\n"
-msgstr "clave %08lX.%lu: buena uni�n de sub-clave\n"
+msgstr "clave %08lX: no hay subclave para unir\n"
 
 #: g10/import.c:718
-#, fuzzy, c-format
 msgid "key %08lX: invalid subkey binding\n"
-msgstr "clave %08lX.%lu: uni�n de sub-clave no v�lida\n"
+msgstr "clave %08lX.%lu: uni�n de subclave no v�lida\n"
 
 #: g10/import.c:750
-#, c-format
 msgid "key %08lX: skipped userid '"
 msgstr "clave %08lX: ignorado identificativo de usuario '"
 
 #: g10/import.c:773
-#, fuzzy, c-format
 msgid "key %08lX: skipped subkey\n"
-msgstr "clave %08lX: 1 nueva sub-clave\n"
+msgstr "clave %08lX: subclave ignorada\n"
 
 #. here we violate the rfc a bit by still allowing
 #. * 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:798
-#, fuzzy, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
-msgstr ""
-"clave %08lX: certificado de revocaci�n en lugar equivocado - ignorado\n"
+msgstr "clave %08lX: firma no exportable (clase %02x) - ignorada\n"
 
 #: g10/import.c:807
-#, 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:815
-#, 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:915
-#, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
-msgstr ""
+msgstr "clave %08lX: detectado usuario duplicado - fusionada\n"
 
 #: g10/import.c:966
-#, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "clave %08lX: certificado de revocaci�n a�adido\n"
 
 #: g10/import.c:1079 g10/import.c:1134
-#, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "clave %08lX: nuestra copia no tiene autofirma\n"
 
 #: g10/keyedit.c:91
-#, c-format
 msgid "%s: user not found\n"
 msgstr "%s: usuario no encontrado\n"
 
@@ -1741,7 +1626,6 @@ msgid "1 bad signature\n"
 msgstr "1 firma incorrecta\n"
 
 #: g10/keyedit.c:198
-#, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firmas incorrectas\n"
 
@@ -1750,7 +1634,6 @@ msgid "1 signature not checked due to a missing key\n"
 msgstr "1 firma no comprobada por falta de clave\n"
 
 #: g10/keyedit.c:202
-#, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d firmas no comprobadas por falta de clave\n"
 
@@ -1759,7 +1642,6 @@ msgid "1 signature not checked due to an error\n"
 msgstr "1 firma no comprobada por causa de un error\n"
 
 #: g10/keyedit.c:206
-#, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firmas no comprobadas por causa de un error\n"
 
@@ -1768,19 +1650,16 @@ msgid "1 user id without valid self-signature detected\n"
 msgstr "Detectado 1 identificativo de usuario sin autofirma v�lida\n"
 
 #: g10/keyedit.c:210
-#, c-format
 msgid "%d user ids without valid self-signatures detected\n"
 msgstr "Detectados %d identificativos de usuario sin autofirma v�lida\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
 #: g10/keyedit.c:290
-#, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Ya firmada por la clave %08lX\n"
 
 #: g10/keyedit.c:298
-#, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada que firmar con la clave %08lX\n"
 
@@ -1797,13 +1676,13 @@ msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
 msgstr "La firma se marcar� como no exportable.\n"
+"\n"
 
 #: g10/keyedit.c:321
 msgid "Really sign? "
 msgstr "�Firmar de verdad? "
 
 #: g10/keyedit.c:347 g10/keyedit.c:1688 g10/keyedit.c:1737 g10/sign.c:75
-#, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
 
@@ -1816,7 +1695,6 @@ msgid "Key is protected.\n"
 msgstr "La clave est� protegida.\n"
 
 #: g10/keyedit.c:420
-#, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No puede editarse esta clave: %s\n"
 
@@ -1938,9 +1816,8 @@ msgid "lsign"
 msgstr "firmando:"
 
 #: g10/keyedit.c:551
-#, fuzzy
 msgid "sign the key locally"
-msgstr "firma la clave"
+msgstr "firma la clave localmente"
 
 #: g10/keyedit.c:552
 msgid "debug"
@@ -2027,18 +1904,16 @@ msgid "revsig"
 msgstr ""
 
 #: g10/keyedit.c:564
-#, fuzzy
 msgid "revoke signatures"
-msgstr "fuerza firmas v3"
+msgstr "revoca firmas"
 
 #: g10/keyedit.c:565
 msgid "revkey"
 msgstr ""
 
 #: g10/keyedit.c:565
-#, fuzzy
 msgid "revoke a secondary key"
-msgstr "borra una clave secundaria"
+msgstr "revoca una clave secundaria"
 
 #: g10/keyedit.c:584
 msgid "can't do that in batchmode\n"
@@ -2056,7 +1931,7 @@ msgstr "Comando> "
 
 #: g10/keyedit.c:669
 msgid "Need the secret key to do this.\n"
-msgstr "Se necesita la clave secreta para hacer esto\n"
+msgstr "Se necesita la clave secreta para hacer esto.\n"
 
 #: g10/keyedit.c:691
 msgid "Save changes? "
@@ -2067,12 +1942,10 @@ msgid "Quit without saving? "
 msgstr "�Salir sin grabar? "
 
 #: g10/keyedit.c:704
-#, c-format
 msgid "update failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
 #: g10/keyedit.c:711
-#, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
@@ -2081,7 +1954,6 @@ msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
 
 #: g10/keyedit.c:721 g10/keyedit.c:780
-#, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "actualizaci�n de confianza fallida: %s\n"
 
@@ -2122,14 +1994,12 @@ msgid "Do you really want to delete this key? "
 msgstr "�Borrar realmente esta clave? "
 
 #: g10/keyedit.c:846
-#, fuzzy
 msgid "Do you really want to revoke the selected keys? "
-msgstr "�Borrar realmente las claves seleccionadas? "
+msgstr "�Revocar realmente las claves seleccionadas? "
 
 #: g10/keyedit.c:847
-#, fuzzy
 msgid "Do you really want to revoke this key? "
-msgstr "�Borrar realmente esta clave? "
+msgstr "�Revocar realmente esta clave? "
 
 #: g10/keyedit.c:901
 msgid "Invalid command  (try \"help\")\n"
@@ -2141,7 +2011,7 @@ msgstr "Por favor, quite la selecci�n de las claves secretas.\n"
 
 #: g10/keyedit.c:1299
 msgid "Please select at most one secondary key.\n"
-msgstr "Por favor, seleccione como m�ximo una clave secundaria\n"
+msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
 
 #: g10/keyedit.c:1303
 msgid "Changing exiration time for a secondary key.\n"
@@ -2160,46 +2030,40 @@ msgid "No corresponding signature in secret ring\n"
 msgstr "No hay firma correspondiente en anillo secreto\n"
 
 #: g10/keyedit.c:1422
-#, c-format
 msgid "No user id with index %d\n"
 msgstr "No hay ning�n identificativo de usuario con el �ndice %d\n"
 
 #: g10/keyedit.c:1468
-#, c-format
 msgid "No secondary key with index %d\n"
 msgstr "No hay ninguna clave secundaria con el �ndice %d\n"
 
 #: g10/keyedit.c:1566
-#, fuzzy
 msgid "user ID: \""
-msgstr "Introduzca el ID de usuario: "
+msgstr "ID de usuario: \""
 
 #: g10/keyedit.c:1569
-#, fuzzy, c-format
 msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
-msgstr "Nada que firmar con la clave %08lX\n"
+msgstr ""
+"\"\n"
+"firmada con su clave %08lX el %s\n"
 
 #: g10/keyedit.c:1573
-#, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N)"
-msgstr "genera un certificado de revocaci�n"
+msgstr "�Crear un certificado de revocaci�n para esta clave (s/N)?"
 
 #: g10/keyedit.c:1653
-#, fuzzy
 msgid "Really create the revocation certificates? (y/N)"
-msgstr "genera un certificado de revocaci�n"
+msgstr "�Crear los certificados de revocaci�n realmente? (s/N)"
 
 #: g10/keyedit.c:1676
-#, fuzzy
 msgid "no secret key\n"
-msgstr "Clave secreta incorrecta"
+msgstr "no hay clave secreta\n"
 
 #: g10/mainproc.c:184
-#, fuzzy, c-format
 msgid "public key is %08lX\n"
-msgstr "Clave p�blica no encontrada"
+msgstr "la clave p�blica es %08lX\n"
 
 #: g10/mainproc.c:212
 msgid "public key encrypted data: good DEK\n"
@@ -2223,7 +2087,6 @@ msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCI�N: �el mensaje cifrado ha sido manipulado!\n"
 
 #: g10/mainproc.c:257
-#, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
@@ -2232,7 +2095,6 @@ msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitente solicit� \"s�lo-para-tus-ojos\"\n"
 
 #: g10/mainproc.c:277
-#, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
@@ -2241,7 +2103,6 @@ msgid "signature verification suppressed\n"
 msgstr "suprimida la verificaci�n de la firma\n"
 
 #: g10/mainproc.c:896
-#, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Firma creada %.*s usando identificativo de clave %s %08lX\n"
 
@@ -2255,12 +2116,10 @@ msgid "Good signature from \""
 msgstr "Firma correcta de \""
 
 #: g10/mainproc.c:925
-#, fuzzy
 msgid "                aka \""
-msgstr "                       importadas: %lu"
+msgstr "tambi�n conocido como \""
 
 #: g10/mainproc.c:975
-#, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
@@ -2273,7 +2132,6 @@ msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z no v�lido detectado en proc_tree()\n"
 
 #: g10/misc.c:93
-#, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "no se pueden desactivar los core dumps: %s\n"
 
@@ -2296,18 +2154,16 @@ msgstr ""
 #: g10/misc.c:239
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
-"este algoritmo de cifrado est� en desuso; considere el uso de uno m�s "
+"este algoritmo de cifrado est� en desuso, considere el uso de uno m�s "
 "est�ndar.\n"
 
 #: g10/parse-packet.c:112
-#, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "no puedo manejar el algoritmo de clave p�blica %d\n"
 
 #: g10/parse-packet.c:872
-#, c-format
 msgid "subpacket of type %d has critical bit set\n"
-msgstr "el sub-paquete de tipo %d tiene el bit cr�tico activado\n"
+msgstr "el subpaquete de tipo %d tiene el bit cr�tico activado\n"
 
 #: g10/passphrase.c:157
 msgid ""
@@ -2320,12 +2176,10 @@ msgstr ""
 "del usuario: \""
 
 #: g10/passphrase.c:166
-#, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s"
 
 #: g10/passphrase.c:171
-#, c-format
 msgid " (main key ID %08lX)"
 msgstr "(ID clave primaria %08lX)"
 
@@ -2350,30 +2204,26 @@ msgid "reading stdin ...\n"
 msgstr "leyendo stdin...\n"
 
 #: g10/plaintext.c:302
-#, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposible abrir datos firmados `%s'\n"
 
 #: g10/pubkey-enc.c:79
-#, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "destinatario an�nimo, probando clave secreta %08lX ...\n"
 
 #: g10/pubkey-enc.c:85
 msgid "okay, we are the anonymous recipient.\n"
-msgstr "De acuerdo, somos el destinatario an�nimo.\n"
+msgstr "de acuerdo, somos el destinatario an�nimo.\n"
 
 #: g10/pubkey-enc.c:137
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la codificaci�n vieja de DEK no est� soportada\n"
 
 #: g10/pubkey-enc.c:191
-#, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "NOTA: algoritmo de cifrado %d no encontrado en las preferencias\n"
 
 #: g10/seckey-cert.c:55
-#, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "el algoritmo de protecci�n %d no est� soportado\n"
 
@@ -2386,7 +2236,6 @@ msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "ATENCI�N: detectada clave d�bil - por favor cambie la contrase�a.\n"
 
 #: g10/sig-check.c:187
-#, fuzzy
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr "asumiendo firma mala debido a un bit cr�tico desconocido\n"
 
@@ -2398,60 +2247,50 @@ msgstr ""
 "firmas!\n"
 
 #: g10/sig-check.c:291
-#, fuzzy, c-format
 msgid "public key is %lu second newer than the signature\n"
-msgstr "lid %lu: identificativo de usuario sin firma\n"
+msgstr "la clave p�blica es %lu segundos m�s nueva que la firma\n"
 
 #: g10/sig-check.c:292
-#, fuzzy, c-format
 msgid "public key is %lu seconds newer than the signature\n"
-msgstr "lid %lu: identificativo de usuario sin firma\n"
+msgstr  "la clave p�blica es %lu segundos m�s nueva que la firma\n"
 
 #: g10/sig-check.c:308
-#, c-format
 msgid "NOTE: signature key expired %s\n"
-msgstr "ATENCI�N clave de la firma caducada el %s\n"
+msgstr "NOTA: clave de la firma caducada el %s\n"
 
 #: g10/sig-check.c:365
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "asumiendo firma mala debido a un bit cr�tico desconocido\n"
 
 #: g10/sign.c:79
-#, c-format
 msgid "%s signature from: %s\n"
 msgstr "firma %s de %s\n"
 
 #: g10/sign.c:210 g10/sign.c:496
-#, c-format
 msgid "can't create %s: %s\n"
-msgstr "no puede crearse `%s': %s\n"
+msgstr "no puede crearse %s: %s\n"
 
 #: g10/sign.c:306
 msgid "signing:"
 msgstr "firmando:"
 
 #: g10/sign.c:346
-#, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATENCI�N `%s' es un fichero vac�o\n"
 
 #: g10/textfilter.c:128
-#, fuzzy, c-format
 msgid "can't handle text lines longer than %d characters\n"
-msgstr "armadura inv�lida: l�nea m�s larga de %d caracteres\n"
+msgstr "no se pueden manejar l�neas de texto de m�s de %d caracteres\n"
 
 #: g10/textfilter.c:197
-#, fuzzy, c-format
 msgid "input line longer than %d characters\n"
-msgstr "armadura inv�lida: l�nea m�s larga de %d caracteres\n"
+msgstr "l�nea de longitud superior a %d caracteres\n"
 
 #: g10/tdbio.c:116 g10/tdbio.c:1505
-#, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "registro base de datos de confianza %lu: lseek fallido: %s\n"
 
 #: g10/tdbio.c:122 g10/tdbio.c:1512
-#, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 "resgisto base de datos de confianza %lu: escritura fallida (n=%d): %s\n"
@@ -2461,118 +2300,95 @@ msgid "trustdb transaction too large\n"
 msgstr "transacci�n en la base de datos de confianza demasiado grande\n"
 
 #: g10/tdbio.c:424
-#, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: no puede abrirse: %s\n"
 
 #: g10/ringedit.c:296 g10/tdbio.c:444
-#, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: no puede crearse el directorio: %s\n"
 
 #: g10/ringedit.c:302 g10/tdbio.c:447
-#, c-format
 msgid "%s: directory created\n"
-msgstr "%s: se ha creado el directorio\n"
+msgstr "%s: directorio creado\n"
 
 #: g10/tdbio.c:451
-#, c-format
 msgid "%s: directory does not exist!\n"
-msgstr "%s: el directorio no existe\n"
+msgstr "%s: �el directorio no existe!\n"
 
 #: g10/openfile.c:113 g10/openfile.c:183 g10/ringedit.c:1344 g10/tdbio.c:457
-#, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: no puede crearse: %s\n"
 
 #: g10/tdbio.c:472 g10/tdbio.c:521
-#, fuzzy, c-format
 msgid "%s: can't create lock\n"
-msgstr "%s: no puede crearse: %s\n"
+msgstr "%s: no puede crearse bloqueo\n"
 
 #: g10/tdbio.c:486
-#, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: fallo en la creaci�n del registro de versi�n: %s"
 
 #: g10/tdbio.c:490
-#, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: se ha creado base de datos de confianza no v�lida\n"
 
 #: g10/tdbio.c:493
-#, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: se ha creado base de datos de confianza\n"
 
 #: g10/tdbio.c:530
-#, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de datos de confianza no v�lida\n"
 
 #: g10/tdbio.c:563
-#, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: fallo en la creaci�n de la tabla hash: %s\n"
 
 #: g10/tdbio.c:571
-#, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error actualizando el registro de versi�n: %s\n"
 
 #: g10/tdbio.c:587 g10/tdbio.c:626 g10/tdbio.c:648 g10/tdbio.c:678
 #: g10/tdbio.c:703 g10/tdbio.c:1438 g10/tdbio.c:1465
-#, c-format
 msgid "%s: error reading version record: %s\n"
-msgstr "%s: error lectura registro de versi�n: %s\n"
+msgstr "%s: error leyendo registro de versi�n: %s\n"
 
 #: g10/tdbio.c:600 g10/tdbio.c:659
-#, c-format
 msgid "%s: error writing version record: %s\n"
-msgstr "%s: error escritura registro de versi�n: %s\n"
+msgstr "%s: error escribiendo registro de versi�n: %s\n"
 
 #: g10/tdbio.c:1132
-#, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de datos de confianza: fallo lseek: %s\n"
 
 #: g10/tdbio.c:1140
-#, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de datos de confianza: error lectura (n=%d): %s\n"
 
 #: g10/tdbio.c:1161
-#, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: no es una base de datos de confianza\n"
 
 #: g10/tdbio.c:1177
-#, c-format
 msgid "%s: version record with recnum %lu\n"
-msgstr "%s: registro de versi�n con numero de registro %lu\n"
+msgstr "%s: registro de versi�n con n�mero de registro %lu\n"
 
 #: g10/tdbio.c:1182
-#, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi�n del fichero %d no v�lida\n"
 
 #: g10/tdbio.c:1471
-#, c-format
 msgid "%s: error reading free record: %s\n"
-msgstr "%s: error lectura registro libre: %s\n"
+msgstr "%s: error leyendo registro libre: %s\n"
 
 #: g10/tdbio.c:1479
-#, c-format
 msgid "%s: error writing dir record: %s\n"
-msgstr "%s: error escritura registro de directorio: %s\n"
+msgstr "%s: error escribiendo registro de directorio: %s\n"
 
 #: g10/tdbio.c:1489
-#, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: fallo en poner a cero un registro: %s\n"
 
 #: g10/tdbio.c:1519
-#, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: fallo al a�adir un registro: %s\n"
 
@@ -2583,99 +2399,80 @@ msgstr ""
 "\"gpgm --fix-trust-db\".\n"
 
 #: g10/trustdb.c:163
-#, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "registro de confianza %lu, petici�n tipo %d: fallo lectura: %s\n"
 
 #: g10/trustdb.c:178
-#, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "registro de confianza %lu, tipo %d: fallo escritura: %s\n"
 
 #: g10/trustdb.c:192
-#, c-format
 msgid "trust record %lu: delete failed: %s\n"
 msgstr "registro de confianza %lu: fallo al borrar: %s\n"
 
 #: g10/trustdb.c:206
-#, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallo sincronizaci�n: %s\n"
 
 #: g10/trustdb.c:386
-#, c-format
 msgid "error reading dir record for LID %lu: %s\n"
-msgstr "error lectura registro de directorio del LID %lu: %s\n"
+msgstr "error leyendo registro de directorio del LID %lu: %s\n"
 
 #: g10/trustdb.c:393
-#, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
 msgstr "lid %lu: esperaba registro directorio, encontrado tipo %d\n"
 
 #: g10/trustdb.c:398
-#, c-format
 msgid "no primary key for LID %lu\n"
 msgstr "no hay clave primaria para el LID %lu\n"
 
 #: g10/trustdb.c:403
-#, c-format
 msgid "error reading primary key for LID %lu: %s\n"
-msgstr "error lectura clave primaria para el LID %lu: %s\n"
+msgstr "error leyendo clave primaria para el LID %lu: %s\n"
 
 #: g10/trustdb.c:442
-#, c-format
 msgid "get_dir_record: search_record failed: %s\n"
 msgstr "get_dir_record: search_record fallida: %s\n"
 
 #: g10/trustdb.c:510
-#, c-format
 msgid "NOTE: secret key %08lX is NOT protected.\n"
 msgstr "NOTA: la clave secreta %08lX NO est� protegida.\n"
 
 #: g10/trustdb.c:518
-#, c-format
 msgid "key %08lX: secret key without public key - skipped\n"
 msgstr "clave %08lX: clave secreta sin clave p�blica - ignorada\n"
 
 #: g10/trustdb.c:525
-#, c-format
 msgid "key %08lX: secret and public key don't match\n"
 msgstr "clave %08lX: las claves p�blica y secreta no se corresponden\n"
 
 #: g10/trustdb.c:535
-#, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "clave %08lX: imposible incluirla en la base de datos de confianza\n"
 
 #: g10/trustdb.c:541
-#, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "clave %08lX: petici�n de registro fallida\n"
 
 #: g10/trustdb.c:550
-#, c-format
 msgid "key %08lX: already in trusted key table\n"
 msgstr "clave %08lX: ya est� en la tabla de confianza\n"
 
 #: g10/trustdb.c:553
-#, c-format
 msgid "key %08lX: accepted as trusted key.\n"
 msgstr "clave %08lX: aceptada como clave de confianza.\n"
 
 #: g10/trustdb.c:561
-#, c-format
 msgid "enumerate secret keys failed: %s\n"
 msgstr "enum_secret_keys fallido: %s\n"
 
 #: g10/trustdb.c:851
-#, c-format
 msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n"
 msgstr ""
 "NOTA: el registro de firma %lu[%d] est� en la lista\n"
 "de b�squeda de %lu pero est� marcado como comprobado\n"
 
 #: g10/trustdb.c:855
-#, c-format
 msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but not marked\n"
 msgstr ""
 "NOTA: el registro de firma %lu[%d] est� en la lista\n"
@@ -2683,31 +2480,26 @@ msgstr ""
 
 #. we need the dir record
 #: g10/trustdb.c:862
-#, c-format
 msgid "sig rec %lu[%d] in hintlist of %lu does not point to a dir record\n"
 msgstr ""
 "El registro de firma %lu[%d] en la lista de b�squeda de %lu\n"
 "no apunta a un registro de directorio\n"
 
 #: g10/trustdb.c:868
-#, c-format
 msgid "lid %lu: no primary key\n"
 msgstr "lid %lu: ninguna clave primaria\n"
 
 #: g10/trustdb.c:901
-#, c-format
 msgid "lid %lu: user id not found in keyblock\n"
 msgstr ""
 "lid %lu: no se ha encontrado identificativo de usuario\n"
 "en el bloque de clave\n"
 
 #: g10/trustdb.c:905
-#, c-format
 msgid "lid %lu: user id without signature\n"
 msgstr "lid %lu: identificativo de usuario sin firma\n"
 
 #: g10/trustdb.c:912
-#, c-format
 msgid "lid %lu: self-signature in hintlist\n"
 msgstr "lid %lu: autofirma en lista de b�squeda\n"
 
@@ -2724,59 +2516,50 @@ msgid "very strange: no public key\n"
 msgstr "muy raro: no hay clave p�blica\n"
 
 #: g10/trustdb.c:982
-#, c-format
 msgid "hintlist %lu[%d] of %lu does not point to a dir record\n"
 msgstr ""
 "la lista de b�squeda %lu[%d] de %lu no apunta a\n"
 "un registro de directorio\n"
 
 #: g10/trustdb.c:988
-#, c-format
 msgid "lid %lu does not have a key\n"
 msgstr "lid %lu no dispone de clave\n"
 
 #: g10/trustdb.c:998
-#, c-format
 msgid "lid %lu: can't get keyblock: %s\n"
 msgstr "lid %lu: no puedo obtener el bloque de clave: %s\n"
 
 #: g10/trustdb.c:1055 g10/trustdb.c:2030
-#, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir fallida: %s\n"
 
 #: g10/trustdb.c:1210
-#, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
-msgstr "clave %08lX.%lu: buena uni�n de sub-clave\n"
+msgstr "clave %08lX.%lu: buena uni�n de subclave\n"
 
 #: g10/trustdb.c:1216 g10/trustdb.c:1259
-#, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
-msgstr "clave %08lX.%lu: uni�n de sub-clave no v�lida\n"
+msgstr "clave %08lX.%lu: uni�n de subclave no v�lida\n"
 
 #: g10/trustdb.c:1232
-#, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "clave %08lX.%lu: revocaci�n de clave v�lida\n"
 
 #: g10/trustdb.c:1238
-#, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "clave %08lX.%lu: revocaci�n de clave no v�lida: %s\n"
 
 #: g10/trustdb.c:1253
-#, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
-msgstr "clave %08lX.%lu: revocaci�n de sub-clave v�lida\n"
+msgstr "clave %08lX.%lu: revocaci�n de subclave v�lida\n"
 
 #: g10/trustdb.c:1360
 msgid "Good self-signature"
-msgstr "autofirma buena"
+msgstr "Autofirma buena"
 
 #: g10/trustdb.c:1371
 msgid "Invalid self-signature"
-msgstr "autofirma no v�lida"
+msgstr "Autofirma no v�lida"
 
 #: g10/trustdb.c:1403
 msgid "Valid user ID revocation skipped due to a newer self signature\n"
@@ -2789,31 +2572,28 @@ msgid "Valid user ID revocation\n"
 msgstr "Revocaci�n identificativo de usuario v�lida.\n"
 
 #: g10/trustdb.c:1417
-#, fuzzy
 msgid "Invalid user ID revocation"
 msgstr "Revocaci�n identificativo de usuario no v�lida.\n"
 
 #: g10/trustdb.c:1512
 msgid "Too many preferences"
-msgstr "demasiadas preferencias"
+msgstr "Demasiadas preferencias"
 
 #: g10/trustdb.c:1526
 msgid "Too many preference items"
-msgstr "demasiados items de preferencias"
+msgstr "Demasiados �tems de preferencias"
 
 #: g10/trustdb.c:1549 g10/trustdb.c:3075 g10/trustdb.c:3105
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "ATENC�ON: todav�a no puedo tratar registros de preferencias largos\n"
 
 #: g10/trustdb.c:1654
-#, fuzzy
 msgid "duplicated certificate - deleted"
-msgstr "Certificado duplicado - eliminado"
+msgstr "certificado duplicado - eliminado"
 
 #: g10/trustdb.c:1692
-#, fuzzy
 msgid "public key not anymore available"
-msgstr "Clave secreta no disponible"
+msgstr "clave p�blica no disponible"
 
 #: g10/trustdb.c:1702 g10/trustdb.c:1791
 msgid "Invalid certificate revocation"
@@ -2829,7 +2609,6 @@ msgid "uid %08lX.%lu/%02X%02X: has shadow dir %lu but is not yet marked.\n"
 msgstr ""
 
 #: g10/trustdb.c:1734
-#, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "registro de firma %lu[%d] apunta al registro equivocado.\n"
 
@@ -2848,154 +2627,124 @@ msgid "Ooops, no user ids\n"
 msgstr "Oh oh, no hay identificativos de usuario\n"
 
 #: g10/trustdb.c:2529
-#, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: inserci�n fallida: %s\n"
 
 #: g10/trustdb.c:2534
-#, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: inserci�n fallida: %s\n"
 
 #: g10/trustdb.c:2540
-#, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: insertada\n"
 
 #: g10/trustdb.c:2545 g10/trustdb.c:2654
-#, c-format
 msgid "lid %lu: update failed: %s\n"
 msgstr "lid %lu: actualizaci�n fallida: %s\n"
 
 #: g10/trustdb.c:2551 g10/trustdb.c:2660
-#, c-format
 msgid "lid %lu: updated\n"
 msgstr "lid %lu: actualizado\n"
 
 #: g10/trustdb.c:2556 g10/trustdb.c:2664
-#, c-format
 msgid "lid %lu: okay\n"
 msgstr "lid %lu: bien\n"
 
 #: g10/trustdb.c:2562 g10/trustdb.c:2671
-#, c-format
 msgid "%lu keys processed\n"
 msgstr "se han procesado %lu claves\n"
 
 #: g10/trustdb.c:2564 g10/trustdb.c:2675
-#, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu claves con errores\n"
 
 #: g10/trustdb.c:2566 g10/trustdb.c:2677
-#, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu claves actualizadas\n"
 
 #: g10/trustdb.c:2568
-#, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu claves insertadas\n"
 
 #: g10/trustdb.c:2571
-#, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enumeraci�n bloques de clave fallido: %s\n"
 
 #: g10/trustdb.c:2598
-#, c-format
 msgid "%s: keyblock read problem: %s\n"
 msgstr "%s: problema lectura del bloque de clave: %s\n"
 
 #: g10/trustdb.c:2612
-#, c-format
 msgid "%s: update failed: %s\n"
 msgstr "%s: actualizaci�n fallida: %s\n"
 
 #: g10/trustdb.c:2615
-#, c-format
 msgid "%s: updated\n"
 msgstr "%s: actualizada\n"
 
 #: g10/trustdb.c:2617
-#, c-format
 msgid "%s: okay\n"
 msgstr "%s: bien\n"
 
 #: g10/trustdb.c:2632
-#, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: registro de directiorio sin clave - ignorado\n"
 
 #: g10/trustdb.c:2645
-#, c-format
 msgid "lid %lu: keyblock not found: %s\n"
 msgstr "lid %lu: bloque de clave no encontrado: %s\n"
 
 #: g10/trustdb.c:2673
-#, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu claves ignoradas\n"
 
 #: g10/trustdb.c:2743
-#, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: b�squeda registro directorio fallida: %s\n"
 
 #: g10/trustdb.c:2750
-#, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "clave %08lX: inserci�n del registro de confianza fallida: %s\n"
 
 #: g10/trustdb.c:2754
-#, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "clave %08lX.%lu: incluida en la base de datos de confianza\n"
 
 #: g10/trustdb.c:2762
-#, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "clave %08lX.%lu: creada en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
 #: g10/trustdb.c:2769
-#, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "clave %08lX.%lu: caducada el %s\n"
 
 #: g10/trustdb.c:2777
-#, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "clave %08lX.%lu: comprobaci�n de confianza fallida: %s\n"
 
 #: g10/trustdb.c:2881
-#, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "usuario '%s' no encontrado: %s\n"
 
 #: g10/trustdb.c:2883
-#, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problema buscando '%s' en la tabla de confianza: %s\n"
 
 #: g10/trustdb.c:2886
-#, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "usuario '%s' no est� en la tabla de confianza - insertando\n"
 
 #: g10/trustdb.c:2889
-#, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "fallo al poner '%s' en la tabla de confianza: %s\n"
 
 #: g10/ringedit.c:316
-#, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: no se puede crear el anillo: %s\n"
 
 #: g10/ringedit.c:333 g10/ringedit.c:1349
-#, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anillo creado\n"
 
@@ -3004,12 +2753,10 @@ msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATENCI�N: existen 2 ficheros con informaci�n confidencial.\n"
 
 #: g10/ringedit.c:1527
-#, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s es el que no se ha modificado\n"
 
 #: g10/ringedit.c:1528
-#, c-format
 msgid "%s is the new one\n"
 msgstr "%s es el nuevo\n"
 
@@ -3022,22 +2769,19 @@ msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 
 #: g10/skclist.c:113
-#, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s' ignorado: %s\n"
 
 #: g10/skclist.c:119
-#, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
 "signatures!\n"
 msgstr ""
-"`%s' ignorada: �esta es una clave ElGamal generada por PGP\n"
-" que NO es segura para las firmas!\n"
+"`%s' ignorada: esta es una clave ElGamal generada por PGP que NO es "
+"segura para las firmas\n"
 
 #. do not overwrite
 #: g10/openfile.c:65
-#, c-format
 msgid "File `%s' exists. "
 msgstr "El fichero `%s' ya existe. "
 
@@ -3050,22 +2794,18 @@ msgid "writing to stdout\n"
 msgstr "escribiendo en stdout\n"
 
 #: g10/openfile.c:149
-#, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "asumiendo que hay datos firmados en `%s'\n"
 
 #: g10/openfile.c:199
-#, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: se ha creado un nuevo fichero de opciones\n"
 
 #: g10/encr-data.c:66
-#, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados %s\n"
 
 #: g10/encr-data.c:68
-#, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado con algoritmo desconocido %d\n"
 
@@ -3080,7 +2820,6 @@ msgid "weak key created - retrying\n"
 msgstr "creada clave d�bil - reintentando\n"
 
 #: g10/seskey.c:57
-#, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
 "�imposible evitar clave d�bil para cifrado sim�trico despu�s de %d "
@@ -3204,7 +2943,6 @@ msgid "No help available"
 msgstr "Ayuda no disponible"
 
 #: g10/helptext.c:216
-#, c-format
 msgid "No help available for `%s'"
 msgstr "Ayuda no disponible para `%s'"
 
diff --git a/po/fr.po b/po/fr.po
index 105f46b76..252ffa1cd 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 0.9.7\n"
-"POT-Creation-Date: 1999-05-24 20:18+0200\n"
+"POT-Creation-Date: 1999-06-08 21:26+0200\n"
 "PO-Revision-Date: 1999-05-24 21:48+02:00\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -27,14 +27,23 @@ msgstr ""
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(vous avez peut-�tre utilis� le mauvais programme pour cette tache)\n"
 
-#: util/miscutil.c:156
+#: util/miscutil.c:156 util/miscutil.c:173
 msgid "yes"
 msgstr "oui"
 
-#: util/miscutil.c:157
+#: util/miscutil.c:157 util/miscutil.c:175
 msgid "yY"
 msgstr "oO"
 
+#: g10/keyedit.c:559 util/miscutil.c:174
+msgid "quit"
+msgstr "quitter"
+
+#: util/miscutil.c:176
+#, fuzzy
+msgid "qQ"
+msgstr "q"
+
 #: util/errors.c:54
 msgid "general error"
 msgstr "erreur g�n�rale"
@@ -256,7 +265,7 @@ msgstr ""
 "N'UTILISEZ PAS LES DONN�ES G�N�R�ES PAR CE PROGRAMME !!\n"
 "\n"
 
-#: cipher/rndlinux.c:110
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -267,7 +276,7 @@ msgstr ""
 "Il n'y a pas assez d'octets al�atoires disponibles. Faites autre chose\n"
 "pour que l'OS puisse amasser plus d'entropie ! (il faut %d octets de plus)\n"
 
-#: g10/g10.c:165
+#: g10/g10.c:169
 msgid ""
 "@Commands:\n"
 " "
@@ -275,132 +284,132 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: g10/g10.c:167
+#: g10/g10.c:171
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/g10.c:168
+#: g10/g10.c:172
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/g10.c:169
+#: g10/g10.c:173
 msgid "make a detached signature"
 msgstr "faire une signature d�tach�e"
 
-#: g10/g10.c:170
+#: g10/g10.c:174
 msgid "encrypt data"
 msgstr "chiffrer les donn�es"
 
-#: g10/g10.c:171
+#: g10/g10.c:175
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement sym�trique seulement"
 
-#: g10/g10.c:172
+#: g10/g10.c:176
 msgid "store only"
 msgstr "pas d'action"
 
-#: g10/g10.c:173
+#: g10/g10.c:177
 msgid "decrypt data (default)"
 msgstr "d�chiffrer les donn�es (d�faut)"
 
-#: g10/g10.c:174
+#: g10/g10.c:178
 msgid "verify a signature"
 msgstr "v�rifier une signature"
 
-#: g10/g10.c:175
+#: g10/g10.c:179
 msgid "list keys"
 msgstr "lister les cl�s"
 
-#: g10/g10.c:177
+#: g10/g10.c:181
 msgid "list keys and signatures"
 msgstr "lister les cl�s et les signatures"
 
-#: g10/g10.c:178
+#: g10/g10.c:182
 msgid "check key signatures"
 msgstr "v�rifier les signatures des cl�s"
 
-#: g10/g10.c:179
+#: g10/g10.c:183
 msgid "list keys and fingerprints"
 msgstr "lister les cl�s et les empreintes"
 
-#: g10/g10.c:180
+#: g10/g10.c:184
 msgid "list secret keys"
 msgstr "lister les cl�s secr�tes"
 
-#: g10/g10.c:181
+#: g10/g10.c:185
 msgid "generate a new key pair"
 msgstr "g�n�rer une nouvelle paire de cl�s"
 
-#: g10/g10.c:182
+#: g10/g10.c:186
 msgid "remove key from the public keyring"
 msgstr "enlever la cl� du porte-cl�s public"
 
-#: g10/g10.c:183
+#: g10/g10.c:187
 msgid "sign or edit a key"
 msgstr "signer ou �diter une cl�"
 
-#: g10/g10.c:184
+#: g10/g10.c:188
 msgid "generate a revocation certificate"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: g10/g10.c:185
+#: g10/g10.c:189
 msgid "export keys"
 msgstr "exporter les cl�s"
 
-#: g10/g10.c:186
+#: g10/g10.c:190
 msgid "export keys to a key server"
 msgstr "exporter les cl�s vers un serveur de cl�s"
 
-#: g10/g10.c:187
+#: g10/g10.c:191
 msgid "import keys from a key server"
 msgstr "importer les cl�s d'un serveur de cl�s"
 
-#: g10/g10.c:190
+#: g10/g10.c:194
 msgid "import/merge keys"
 msgstr "importer/fusionner les cl�s"
 
-#: g10/g10.c:192
+#: g10/g10.c:196
 msgid "list only the sequence of packets"
 msgstr "ne lister que les paquets"
 
-#: g10/g10.c:194
+#: g10/g10.c:198
 msgid "export the ownertrust values"
 msgstr "exporter les indices de confiance"
 
-#: g10/g10.c:196
+#: g10/g10.c:200
 msgid "import ownertrust values"
 msgstr "importer les indices de confiance"
 
 #
-#: g10/g10.c:198
+#: g10/g10.c:202
 msgid "|[NAMES]|update the trust database"
 msgstr "|[NOMS]|mettre la base de confiance � jour"
 
-#: g10/g10.c:200
+#: g10/g10.c:204
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMS]|v�rifier la base de confiance"
 
-#: g10/g10.c:201
+#: g10/g10.c:205
 msgid "fix a corrupted trust database"
 msgstr "r�parer une base de confiance corrompue"
 
-#: g10/g10.c:202
+#: g10/g10.c:206
 msgid "De-Armor a file or stdin"
 msgstr "Enlever l'armure d'un fichier ou de stdin"
 
-#: g10/g10.c:203
+#: g10/g10.c:207
 msgid "En-Armor a file or stdin"
 msgstr "Mettre une armure � un fichier ou � stdin"
 
-#: g10/g10.c:204
+#: g10/g10.c:208
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/g10.c:205
+#: g10/g10.c:209
 msgid "print all message digests"
 msgstr "�crire toutes les fonctions de hachage"
 
-#: g10/g10.c:211
+#: g10/g10.c:215
 msgid ""
 "@\n"
 "Options:\n"
@@ -410,150 +419,154 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/g10.c:213
+#: g10/g10.c:217
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: g10/g10.c:214
+#: g10/g10.c:218
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/g10.c:218
+#: g10/g10.c:222
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou d�chiffrer"
 
-#: g10/g10.c:219
+#: g10/g10.c:223
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 d�sactive)"
 
-#: g10/g10.c:221
+#: g10/g10.c:225
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/g10.c:222
+#: g10/g10.c:226
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/g10.c:223
+#: g10/g10.c:227
 msgid "verbose"
 msgstr "bavard"
 
-#: g10/g10.c:224
+#: g10/g10.c:228
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
 #
-#: g10/g10.c:225
+#: g10/g10.c:229
 msgid "force v3 signatures"
 msgstr "forcer les signatures en v3"
 
-#: g10/g10.c:226
+#: g10/g10.c:230
 msgid "always use a MDC for encryption"
 msgstr "toujours utiliser un sceau pour le chiffrement"
 
-#: g10/g10.c:227
+#: g10/g10.c:231
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:229
+#: g10/g10.c:233
 msgid "batch mode: never ask"
 msgstr "mode automatique : ne jamais rien demander"
 
-#: g10/g10.c:230
+#: g10/g10.c:234
 msgid "assume yes on most questions"
 msgstr "r�pondre oui � la plupart des questions"
 
-#: g10/g10.c:231
+#: g10/g10.c:235
 msgid "assume no on most questions"
 msgstr "r�pondre non � la plupart des questions"
 
-#: g10/g10.c:232
+#: g10/g10.c:236
 msgid "add this keyring to the list of keyrings"
 msgstr "ajouter ce porte-cl�s � la liste des porte-cl�s"
 
-#: g10/g10.c:233
+#: g10/g10.c:237
 msgid "add this secret keyring to the list"
 msgstr "ajouter ce porte-cl�s secret � la liste"
 
-#: g10/g10.c:234
+#: g10/g10.c:238
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|utiliser NOM comme cl� secr�te par d�faut"
 
-#: g10/g10.c:235
+#: g10/g10.c:239
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|H�TE|utiliser ce serveur pour chercher des cl�s"
 
-#: g10/g10.c:236
+#: g10/g10.c:240
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|le terminal utilise la table de caract�res NOM"
 
-#: g10/g10.c:237
+#: g10/g10.c:241
 msgid "read options from file"
 msgstr "lire les options du fichier"
 
-#: g10/g10.c:239
+#: g10/g10.c:243
 msgid "set debugging flags"
 msgstr "choisir les attributs de d�boguage"
 
-#: g10/g10.c:240
+#: g10/g10.c:244
 msgid "enable full debugging"
 msgstr "permettre un d�boguage complet"
 
-#: g10/g10.c:241
+#: g10/g10.c:245
 msgid "|FD|write status info to this FD"
 msgstr "|FD|�crire l'�tat sur ce descripteur"
 
-#: g10/g10.c:242
+#: g10/g10.c:246
 msgid "do not write comment packets"
 msgstr "ne pas �crire de paquets de commentaire"
 
-#: g10/g10.c:243
+#: g10/g10.c:247
 msgid "(default is 1)"
 msgstr "nombre de signatures compl�tes requises (1)"
 
-#: g10/g10.c:244
+#: g10/g10.c:248
 msgid "(default is 3)"
 msgstr "nombre de signatures marginales requises (3)"
 
-#: g10/g10.c:246
+#: g10/g10.c:250
 msgid "|FILE|load extension module FILE"
 msgstr "|FICH|charger le module d'extension FICH"
 
-#: g10/g10.c:247
+#: g10/g10.c:251
 msgid "emulate the mode described in RFC1991"
 msgstr "imiter le mode d�crit dans la RFC1991"
 
 # FIXMOI : faudra trouver mieux ...
-#: g10/g10.c:248
+#: g10/g10.c:252
 msgid "|N|use passphrase mode N"
 msgstr "|N|utiliser le mode de codage des mots de passe N"
 
-#: g10/g10.c:250
+#: g10/g10.c:254
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le hachage NOM pour les mots de passe"
 
-#: g10/g10.c:252
+#: g10/g10.c:256
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe"
 
-#: g10/g10.c:253
+#: g10/g10.c:257
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
 
-#: g10/g10.c:254
+#: g10/g10.c:258
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|utiliser la fonction de hachage NOM"
 
-#: g10/g10.c:255
+#: g10/g10.c:259
 msgid "|N|use compress algorithm N"
 msgstr "|N|utiliser l'algorithme de compression N"
 
-#: g10/g10.c:256
+#: g10/g10.c:260
 msgid "throw keyid field of encrypted packets"
 msgstr "supprimer l'identification des paquets chiffr�s"
 
-#: g10/g10.c:258
+#: g10/g10.c:261
+msgid "|NAME=VALUE|use this notation data"
+msgstr ""
+
+#: g10/g10.c:263
 msgid ""
 "@\n"
 "Examples:\n"
@@ -573,15 +586,15 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les cl�s\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/g10.c:327
+#: g10/g10.c:337
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Rapporter toutes anomalies � <[email protected]>.\n"
 
-#: g10/g10.c:331
+#: g10/g10.c:341
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/g10.c:334
+#: g10/g10.c:344
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -591,7 +604,7 @@ msgstr ""
 "signer, v�rifier, chiffer ou d�chiffrer\n"
 "l'op�ration par d�faut d�pend des donn�es entr�es\n"
 
-#: g10/g10.c:339
+#: g10/g10.c:349
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -599,149 +612,172 @@ msgstr ""
 "\n"
 "Algorithmes support�s:\n"
 
-#: g10/g10.c:413
+#: g10/g10.c:423
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/g10.c:453
+#: g10/g10.c:463
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/g10.c:580
+#: g10/g10.c:595
 #, 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:584
+#: g10/g10.c:599
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s' : %s\n"
 
-#: g10/g10.c:591
+#: g10/g10.c:606
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:755
 #, 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:780 g10/g10.c:792
+#: g10/g10.c:799 g10/g10.c:811
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/g10.c:786 g10/g10.c:798
+#: g10/g10.c:805 g10/g10.c:817
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/g10.c:801
+#: g10/g10.c:821
+msgid "the given policy URL is invalid\n"
+msgstr ""
+
+#: g10/g10.c:824
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "l'algorithme de compression doit faire partie de l'�chelle %d..%d\n"
 
-#: g10/g10.c:803
+#: g10/g10.c:826
 msgid "completes-needed must be greater than 0\n"
 msgstr "� completes-needed � doit �tre sup�rieur � 0\n"
 
-#: g10/g10.c:805
+#: g10/g10.c:828
 msgid "marginals-needed must be greater than 1\n"
 msgstr "� marginals-needed � doit �tre sup�rieur � 1\n"
 
-#: g10/g10.c:807
+#: g10/g10.c:830
 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:810
+#: g10/g10.c:833
 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:814
+#: g10/g10.c:837
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K invalide ; doit �tre 0, 1 ou 3\n"
 
-#: g10/g10.c:891
+#: g10/g10.c:914
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "n'a pas pu initialiser la base de confiance : %s\n"
 
-#: g10/g10.c:897
+#: g10/g10.c:920
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/g10.c:904
+#: g10/g10.c:927
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/g10.c:912
+#: g10/g10.c:935
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/g10.c:925
+#: g10/g10.c:948
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/g10.c:938
+#: g10/g10.c:961
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:952
+#: g10/g10.c:975
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/g10.c:964
+#: g10/g10.c:987
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/g10.c:973
+#: g10/g10.c:996
 msgid "--edit-key username [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/g10.c:987
+#: g10/g10.c:1010
 msgid "--delete-secret-key username"
 msgstr "--delete-secret-key utilisateur"
 
-#: g10/g10.c:990
+#: g10/g10.c:1013
 msgid "--delete-key username"
 msgstr "--delete-key utilisateur"
 
-#: g10/encode.c:231 g10/g10.c:1013 g10/sign.c:311
+#: g10/encode.c:231 g10/g10.c:1036 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "ne peut ouvrir %s: %s\n"
 
-#: g10/g10.c:1024
+#: g10/g10.c:1047
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
 
-#: g10/g10.c:1083
+#: g10/g10.c:1106
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "suppression d'armure non r�ussie : %s\n"
 
-#: g10/g10.c:1091
+#: g10/g10.c:1114
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "construction d'armure non r�ussie : %s \n"
 
-#: g10/g10.c:1157
+#: g10/g10.c:1180
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1255
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1259
 msgid "Go ahead and type your message ...\n"
 msgstr "Continuez et tapez votre message...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1239 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1262 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne peut ouvrir `%s'\n"
 
+#: g10/g10.c:1429
+msgid ""
+"the first character of a notation name must be a letter or an underscore\n"
+msgstr ""
+
+#: g10/g10.c:1435
+msgid ""
+"a notation name must have only letters, digits, dots or underscores and end "
+"with an '='\n"
+msgstr ""
+
+#: g10/g10.c:1441
+msgid "dots in a notation name must be surrounded by other characters\n"
+msgstr ""
+
+#: g10/g10.c:1449
+msgid "a notation value must not use any control characters\n"
+msgstr ""
+
 #: g10/armor.c:296
 #, c-format
 msgid "armor: %s\n"
@@ -1013,12 +1049,17 @@ msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "         Il n'est pas s�r que la signature appartient � son propri�taire.\n"
 
-#: g10/pkclist.c:569 g10/pkclist.c:582 g10/pkclist.c:645 g10/pkclist.c:673
+#: g10/pkclist.c:580 g10/pkclist.c:602 g10/pkclist.c:665 g10/pkclist.c:705
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s : ignor� : %s\n"
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:588 g10/pkclist.c:687
+#, fuzzy, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr "%s : probl�me de lecture du bloc de cl�s : %s\n"
+
+#: g10/pkclist.c:611
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1027,20 +1068,20 @@ msgstr ""
 "\"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:596
+#: g10/pkclist.c:616
 msgid "Enter the user ID: "
 msgstr "Entrez le nom d'utilisateur : "
 
-#: g10/pkclist.c:607
+#: g10/pkclist.c:627
 msgid "No such user ID.\n"
 msgstr "Pas de tel utilisateur.\n"
 
-#: g10/pkclist.c:653
+#: g10/pkclist.c:673
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s : erreur pendant la v�rification de la cl� : %s\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:711
 msgid "no valid addressees\n"
 msgstr "pas de destinataire valide\n"
 
@@ -1285,7 +1326,7 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour prot�ger votre cl� secr�te.\n"
 "\n"
 
-#: g10/keyedit.c:433 g10/keygen.c:748
+#: g10/keyedit.c:455 g10/keygen.c:748
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "le mot de passe n'a pas �t� r�p�t� � l'identique ; recommencez.\n"
 
@@ -1354,7 +1395,7 @@ msgid "Key generation failed: %s\n"
 msgstr "La g�n�ration de cl� a �chou� : %s\n"
 
 # on s'amuse comme on peut...
-#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:52
+#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:105
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1362,7 +1403,7 @@ msgstr ""
 "la cl� a �t� cr��e %lu seconde dans le futur (discontinuit� temporelle ou\n"
 "probl�me d'horloge)\n"
 
-#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:54
+#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:107
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1374,7 +1415,7 @@ msgstr ""
 msgid "Really create? "
 msgstr "Cr�er vraiment ? "
 
-#: g10/encode.c:91 g10/openfile.c:88 g10/openfile.c:176 g10/tdbio.c:467
+#: g10/encode.c:91 g10/openfile.c:118 g10/openfile.c:208 g10/tdbio.c:467
 #: g10/tdbio.c:528
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1532,18 +1573,20 @@ msgstr "cl� %08lX : cl� publique pas trouv�e: %s\n"
 msgid "no default public keyring\n"
 msgstr "pas de porte-cl�s public par d�faut\n"
 
-#: g10/import.c:376 g10/openfile.c:117 g10/sign.c:215 g10/sign.c:501
+#: g10/import.c:376 g10/openfile.c:148 g10/sign.c:268 g10/sign.c:559
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�criture de `%s'\n"
 
-#: g10/import.c:379 g10/import.c:435
-msgid "can't lock keyring `%': %s\n"
-msgstr "ne peut verrouiller le porte-cl�s `%' : %s\n"
+#: g10/import.c:379 g10/import.c:435 g10/import.c:544 g10/import.c:645
+#, c-format
+msgid "can't lock keyring `%s': %s\n"
+msgstr "ne peut verrouiller le porte-cl�s `%s' : %s\n"
 
-#: g10/import.c:382
-msgid "error writing keyring `%': %s\n"
-msgstr "erreur durant la lecture du porte-cl�s `%' : %s\n"
+#: g10/import.c:382 g10/import.c:438 g10/import.c:547 g10/import.c:648
+#, c-format
+msgid "error writing keyring `%s': %s\n"
+msgstr "erreur durant l'�criture du porte-cl�s `%s' : %s\n"
 
 #: g10/import.c:387
 #, c-format
@@ -1565,11 +1608,6 @@ msgstr "cl� %08lX : ne peut trouver le bloc de cl�s original : %s\n"
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "cl� %08lX : ne peut lire le bloc de cl�s original : %s\n"
 
-#: g10/import.c:438 g10/import.c:547 g10/import.c:648
-#, c-format
-msgid "error writing keyring `%s': %s\n"
-msgstr "erreur durant l'�criture du porte-cl�s `%s' : %s\n"
-
 #: g10/import.c:444
 #, c-format
 msgid "key %08lX: 1 new user-id\n"
@@ -1605,11 +1643,6 @@ 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:544 g10/import.c:645
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "ne peut verrouiller le porte-cl�s `%s' : %s\n"
-
 #: g10/import.c:552
 #, c-format
 msgid "key %08lX: secret key imported\n"
@@ -1712,68 +1745,68 @@ msgstr "cl� %08lX : certificat de r�vocation ajout�\n"
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "cl� %08lX : notre copie n'a pas d'auto-signature\n"
 
-#: g10/keyedit.c:91
+#: g10/keyedit.c:92
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s : utilisateur non trouv�\n"
 
-#: g10/keyedit.c:177
+#: g10/keyedit.c:153
 msgid "[revocation]"
 msgstr "[r�vocation]"
 
-#: g10/keyedit.c:178
+#: g10/keyedit.c:154
 msgid "[self-signature]"
 msgstr "[auto-signature]"
 
-#: g10/keyedit.c:196
+#: g10/keyedit.c:218
 msgid "1 bad signature\n"
 msgstr "une mauvaise signature\n"
 
-#: g10/keyedit.c:198
+#: g10/keyedit.c:220
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d mauvaises signatures\n"
 
-#: g10/keyedit.c:200
+#: g10/keyedit.c:222
 msgid "1 signature not checked due to a missing key\n"
 msgstr "une signature non v�rifi�e � cause d'une cl� manquante\n"
 
-#: g10/keyedit.c:202
+#: g10/keyedit.c:224
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signatures non v�rifi�es � cause de cl�s manquantes\n"
 
-#: g10/keyedit.c:204
+#: g10/keyedit.c:226
 msgid "1 signature not checked due to an error\n"
 msgstr "une signature non v�rifi�e � cause d'une erreur\n"
 
-#: g10/keyedit.c:206
+#: g10/keyedit.c:228
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signatures non v�rifi�es � cause d'erreurs\n"
 
-#: g10/keyedit.c:208
+#: g10/keyedit.c:230
 msgid "1 user id without valid self-signature detected\n"
 msgstr "un nom d'utilisateur sans auto-signature valide d�tect�\n"
 
-#: g10/keyedit.c:210
+#: g10/keyedit.c:232
 #, c-format
 msgid "%d user ids without valid self-signatures detected\n"
 msgstr "%d nom d'utilisateurs sans auto-signature valide d�tect�\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:290
+#: g10/keyedit.c:312
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "D�j� sign� par la cl� %08lX\n"
 
-#: g10/keyedit.c:298
+#: g10/keyedit.c:320
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Rien � signer avec la cl� %08lX\n"
 
-#: g10/keyedit.c:307
+#: g10/keyedit.c:329
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -1781,7 +1814,7 @@ msgstr ""
 "Etes-vous vraiment s�r(e) que vous voulez signer cette cl�\n"
 "avec la v�tre : \""
 
-#: g10/keyedit.c:316
+#: g10/keyedit.c:338
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -1789,35 +1822,35 @@ msgstr ""
 "La signature sera marqu�e comme non-exportable.\n"
 "\n"
 
-#: g10/keyedit.c:321
+#: g10/keyedit.c:343
 msgid "Really sign? "
 msgstr "Signer r�ellement ? "
 
-#: g10/keyedit.c:347 g10/keyedit.c:1688 g10/keyedit.c:1737 g10/sign.c:75
+#: g10/keyedit.c:369 g10/keyedit.c:1779 g10/keyedit.c:1828 g10/sign.c:128
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a �chou� : %s\n"
 
-#: g10/keyedit.c:400
+#: g10/keyedit.c:422
 msgid "This key is not protected.\n"
 msgstr "Cette cl� n'est pas prot�g�e.\n"
 
-#: g10/keyedit.c:403
+#: g10/keyedit.c:425
 msgid "Key is protected.\n"
 msgstr "La cl� est prot�g�e.\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:442
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ne peut �diter cette cl� : %s\n"
 
-#: g10/keyedit.c:425
+#: g10/keyedit.c:447
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr "Entrez le nouveau mot de passe pour cette cl� secr�te.\n"
 
-#: g10/keyedit.c:437
+#: g10/keyedit.c:459
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -1826,341 +1859,375 @@ msgstr ""
 "*mauvaise* id�e\n"
 "\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:462
 msgid "Do you really want to do this? "
 msgstr "Voulez-vous vraiment faire cela? "
 
-#: g10/keyedit.c:501
+#: g10/keyedit.c:523
 msgid "moving a key signature to the correct place\n"
 msgstr "replacer la signature d'une cl� � l'endroit correct\n"
 
-#: g10/keyedit.c:537
-msgid "quit"
-msgstr "quitter"
-
-#: g10/keyedit.c:537
+#: g10/keyedit.c:559
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:560
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:561
 msgid "save"
 msgstr "enregistrer"
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:561
 msgid "save and quit"
 msgstr "enregistrer et quitter"
 
 # FIXMOI : si je mets aide �a va demander de taper "aide"...
-#: g10/keyedit.c:540
+#: g10/keyedit.c:562
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:562
 msgid "show this help"
 msgstr "afficher cette aide"
 
 # g10/keyedit.c:556 ???
-#: g10/keyedit.c:542
+#: g10/keyedit.c:564
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:564
 msgid "show fingerprint"
 msgstr "afficher l'empreinte"
 
-#: g10/keyedit.c:543
+#: g10/keyedit.c:565
 msgid "list"
 msgstr "lister"
 
-#: g10/keyedit.c:543
+#: g10/keyedit.c:565
 msgid "list key and user ids"
 msgstr "lister la cl� et les noms d'utilisateurs"
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:566
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:545
+#: g10/keyedit.c:567
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:545
+#: g10/keyedit.c:567
 msgid "select user id N"
 msgstr "s�lectionner le nom d'utilisateur N"
 
-#: g10/keyedit.c:546
+#: g10/keyedit.c:568
 msgid "key"
 msgstr "cl�"
 
-#: g10/keyedit.c:546
+#: g10/keyedit.c:568
 msgid "select secondary key N"
 msgstr "s�lectionner la cl� secondaire N"
 
-#: g10/keyedit.c:547
+#: g10/keyedit.c:569
 msgid "check"
 msgstr "v�rifier"
 
-#: g10/keyedit.c:547
+#: g10/keyedit.c:569
 msgid "list signatures"
 msgstr "lister les signatures"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:570
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:549
+#: g10/keyedit.c:571
 msgid "sign"
 msgstr "signer"
 
-#: g10/keyedit.c:549
+#: g10/keyedit.c:571
 msgid "sign the key"
 msgstr "signer la cl�"
 
-#: g10/keyedit.c:550
+#: g10/keyedit.c:572
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:551
+#: g10/keyedit.c:573
 msgid "lsign"
 msgstr "lsigner"
 
-#: g10/keyedit.c:551
+#: g10/keyedit.c:573
 msgid "sign the key locally"
 msgstr "signer la cl� localement"
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:574
 msgid "debug"
 msgstr "d�boguer"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:575
 msgid "adduid"
 msgstr "aj.ut"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:575
 msgid "add a user id"
 msgstr "ajouter un utilisateur"
 
-#: g10/keyedit.c:554
+#: g10/keyedit.c:576
 msgid "deluid"
 msgstr "suppr.ut"
 
-#: g10/keyedit.c:554
+#: g10/keyedit.c:576
 msgid "delete user id"
 msgstr "enlever un utilisateur"
 
-#: g10/keyedit.c:555
+#: g10/keyedit.c:577
 msgid "addkey"
 msgstr "aj.cl�"
 
-#: g10/keyedit.c:555
+#: g10/keyedit.c:577
 msgid "add a secondary key"
 msgstr "ajouter une cl� secondaire"
 
-#: g10/keyedit.c:556
+#: g10/keyedit.c:578
 msgid "delkey"
 msgstr "suppr.cl�"
 
-#: g10/keyedit.c:556
+#: g10/keyedit.c:578
 msgid "delete a secondary key"
 msgstr "enlever une cl� secondaire"
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:579
+#, fuzzy
+msgid "delsig"
+msgstr "lsigner"
+
+#: g10/keyedit.c:579
+#, fuzzy
+msgid "delete signatures"
+msgstr "lister les signatures"
+
+#: g10/keyedit.c:580
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:580
 msgid "change the expire date"
 msgstr "changer la date d'expiration"
 
-#: g10/keyedit.c:558
+#: g10/keyedit.c:581
 msgid "toggle"
 msgstr "changer"
 
-#: g10/keyedit.c:558
+#: g10/keyedit.c:581
 msgid "toggle between secret and public key listing"
 msgstr "passer de la liste des cl�s secr�tes aux cl�s priv�es et inversement"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:583
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:584
 msgid "pref"
 msgstr "pr�f"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:584
 msgid "list preferences"
 msgstr "lister les pr�f�rences"
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:585
 msgid "passwd"
 msgstr "mot.pas"
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:585
 msgid "change the passphrase"
 msgstr "changer le mot de passe"
 
-#: g10/keyedit.c:563
+#: g10/keyedit.c:586
 msgid "trust"
 msgstr "confi."
 
-#: g10/keyedit.c:563
+#: g10/keyedit.c:586
 msgid "change the ownertrust"
 msgstr "changer la confiance"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:587
 msgid "revsig"
 msgstr "revsig"
 
 #
-#: g10/keyedit.c:564
+#: g10/keyedit.c:587
 msgid "revoke signatures"
 msgstr "r�voquer les signatures"
 
-#: g10/keyedit.c:565
+#: g10/keyedit.c:588
 msgid "revkey"
 msgstr "revcl�"
 
-#: g10/keyedit.c:565
+#: g10/keyedit.c:588
 msgid "revoke a secondary key"
 msgstr "r�voquer une cl� secondaire"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:607
 msgid "can't do that in batchmode\n"
 msgstr "impossible de faire cela en mode automatique\n"
 
 #. check that they match
 #. FIXME: check that they both match
-#: g10/keyedit.c:613
+#: g10/keyedit.c:636
 msgid "Secret key is available.\n"
 msgstr "La cl� secr�te est disponible.\n"
 
-#: g10/keyedit.c:642
+#: g10/keyedit.c:665
 msgid "Command> "
 msgstr "Commande> "
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:692
 msgid "Need the secret key to do this.\n"
 msgstr "Il faut la cl� secr�te pour faire cela.\n"
 
-#: g10/keyedit.c:691
+#: g10/keyedit.c:714
 msgid "Save changes? "
 msgstr "Enregistrer les changements? "
 
-#: g10/keyedit.c:694
+#: g10/keyedit.c:717
 msgid "Quit without saving? "
 msgstr "Quitter sans enregistrer? "
 
-#: g10/keyedit.c:704
+#: g10/keyedit.c:727
 #, c-format
 msgid "update failed: %s\n"
 msgstr "la mise � jour a �chou� : %s\n"
 
-#: g10/keyedit.c:711
+#: g10/keyedit.c:734
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "la mise � jour de la cl� secr�te a �chou� : %s\n"
 
-#: g10/keyedit.c:718
+#: g10/keyedit.c:741
 msgid "Key not changed so no update needed.\n"
 msgstr "La cl� n'a pas chang� donc la mise � jour est inutile.\n"
 
-#: g10/keyedit.c:721 g10/keyedit.c:780
+#: g10/keyedit.c:744 g10/keyedit.c:803
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "la mise � jour de la base de confiance a �chou� : %s\n"
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:777
 msgid "Really sign all user ids? "
 msgstr "Signer vraiment tous les utilisateurs ? "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:778
 msgid "Hint: Select the user ids to sign\n"
 msgstr "Aide : S�lectionner les utilisateurs � signer\n"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:814 g10/keyedit.c:835
 msgid "You must select at least one user id.\n"
 msgstr "Vous devez s�lectionner au moins un utilisateur.\n"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:816
 msgid "You can't delete the last user id!\n"
 msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:819
 msgid "Really remove all selected user ids? "
 msgstr "Enlever r�ellement tous les utilisateurs s�lectionn�s ? "
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:820
 msgid "Really remove this user id? "
 msgstr "Enlever r�ellement cet utilisateur ? "
 
-#: g10/keyedit.c:820 g10/keyedit.c:842
+#: g10/keyedit.c:856 g10/keyedit.c:878
 msgid "You must select at least one key.\n"
 msgstr "Vous devez s�lectionner au moins une cl�.\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:860
 msgid "Do you really want to delete the selected keys? "
 msgstr "Voulez-vous vraiment supprimer les cl�s s�lectionn�es ? "
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:861
 msgid "Do you really want to delete this key? "
 msgstr "Voulez-vous vraiment supprimer cette cl� ? "
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:882
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Voulez-vous vraiment r�voquer les cl�s s�lectionn�es ? "
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:883
 msgid "Do you really want to revoke this key? "
 msgstr "Voulez-vous vraiment r�voquer cette cl� ? "
 
-#: g10/keyedit.c:901
+#: g10/keyedit.c:937
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez � help �)\n"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1289
+msgid "Delete this good signature? (y/N/q)"
+msgstr ""
+
+#: g10/keyedit.c:1292
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr ""
+
+#: g10/keyedit.c:1297
+#, fuzzy
+msgid "Really delete this self-signature? (y/N)"
+msgstr "Faut-il vraiment g�n�rer les certificats de r�vocation ? (o/N)"
+
+#: g10/keyedit.c:1311
+#, fuzzy, c-format
+msgid "Deleted %d signature.\n"
+msgstr "%d mauvaises signatures\n"
+
+#: g10/keyedit.c:1312
+#, fuzzy, c-format
+msgid "Deleted %d signatures.\n"
+msgstr "%d mauvaises signatures\n"
+
+#: g10/keyedit.c:1315
+#, fuzzy
+msgid "Nothing deleted.\n"
+msgstr "ATTENTION : rien n'a �t� export�\n"
+
+#: g10/keyedit.c:1384
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les s�lections des cl�s secr�tes.\n"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1390
 msgid "Please select at most one secondary key.\n"
 msgstr "Vous devez s�lectionner au plus une cl� secondaire.\n"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1394
 msgid "Changing exiration time for a secondary key.\n"
 msgstr "Changer la date d'expiration d'une cl� secondaire.\n"
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1396
 msgid "Changing exiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la cl� principale.\n"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1437
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vous ne pouvez pas changer la date d'expiration d'une cl� v3\n"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1453
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1513
 #, c-format
 msgid "No user id with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1559
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Pas de cl� secondaire avec l'index %d\n"
 
-#: g10/keyedit.c:1566
+#: g10/keyedit.c:1657
 msgid "user ID: \""
 msgstr "nom d'utilisateur : � "
 
-#: g10/keyedit.c:1569
+#: g10/keyedit.c:1660
 #, c-format
 msgid ""
 "\"\n"
@@ -2169,15 +2236,15 @@ msgstr ""
 " �\n"
 "sign� avec votre cl� %08lX � %s\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1664
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "G�n�rer un certificat de r�vocation pour cette signature ? (o/N)"
 
-#: g10/keyedit.c:1653
+#: g10/keyedit.c:1744
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Faut-il vraiment g�n�rer les certificats de r�vocation ? (o/N)"
 
-#: g10/keyedit.c:1676
+#: g10/keyedit.c:1767
 msgid "no secret key\n"
 msgstr "pas de cl� secr�te\n"
 
@@ -2221,38 +2288,51 @@ msgstr "NOTE : l'exp�diteur a demand� � pour vos yeux seulement �\n"
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original : '%.*s'\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:505 g10/mainproc.c:514
+#, fuzzy
+msgid "WARNING: invalid notation data found\n"
+msgstr "aucune donn�e OpenPGP valide n'a �t� trouv�e.\n"
+
+#: g10/mainproc.c:517
+msgid "Notation: "
+msgstr ""
+
+#: g10/mainproc.c:524
+msgid "Policy: "
+msgstr ""
+
+#: g10/mainproc.c:929
 msgid "signature verification suppressed\n"
 msgstr "v�rification de signature supprim�e\n"
 
-#: g10/mainproc.c:896
+#: g10/mainproc.c:935
 #, 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:922 g10/mainproc.c:933
+#: g10/mainproc.c:961 g10/mainproc.c:972
 msgid "BAD signature from \""
 msgstr "MAUVAISE signature de \""
 
-#: g10/mainproc.c:923 g10/mainproc.c:934
+#: g10/mainproc.c:962 g10/mainproc.c:973
 msgid "Good signature from \""
 msgstr "Bonne signature de \""
 
-#: g10/mainproc.c:925
+#: g10/mainproc.c:964
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:975
+#: g10/mainproc.c:1015
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne peut v�rifier la signature : %s\n"
 
-#: g10/mainproc.c:1056
+#: g10/mainproc.c:1109
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:1061
+#: g10/mainproc.c:1114
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
 
@@ -2288,7 +2368,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "ne peut g�rer l'algorithme � cl� publique %d\n"
 
-#: g10/parse-packet.c:872
+#: g10/parse-packet.c:931
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un sous-paquet de type %d poss�de un bit critique\n"
@@ -2327,15 +2407,15 @@ msgstr ""
 "donn�es non enregistr�es ; utilisez l'option \"--output\" pour\n"
 "les enregistrer\n"
 
-#: g10/plaintext.c:208
+#: g10/plaintext.c:266
 msgid "Please enter name of data file: "
 msgstr "Entrez le nom d'un fichier de donn�es : "
 
-#: g10/plaintext.c:229
+#: g10/plaintext.c:287
 msgid "reading stdin ...\n"
 msgstr "lecture de l'entr�e standard...\n"
 
-#: g10/plaintext.c:302
+#: g10/plaintext.c:360
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "ne peut ouvir les donn�es sign�es `%s'\n"
@@ -2405,21 +2485,21 @@ msgstr ""
 "la signature est suppos�e �tre fausse car un bit critique est\n"
 "inconnu\n"
 
-#: g10/sign.c:79
+#: g10/sign.c:132
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "Signature %s de : %s\n"
 
-#: g10/sign.c:210 g10/sign.c:496
+#: g10/sign.c:263 g10/sign.c:554
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "ne peut cr�er %s : %s\n"
 
-#: g10/sign.c:306
+#: g10/sign.c:361
 msgid "signing:"
 msgstr "signature :"
 
-#: g10/sign.c:346
+#: g10/sign.c:401
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATTENTION : `%s' est un fichier vide\n"
@@ -2470,7 +2550,7 @@ msgstr "%s : r�pertoire cr��\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s : le r�pertoire n'existe pas !\n"
 
-#: g10/openfile.c:113 g10/openfile.c:183 g10/ringedit.c:1344 g10/tdbio.c:457
+#: g10/openfile.c:144 g10/openfile.c:215 g10/ringedit.c:1344 g10/tdbio.c:457
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s : ne peut cr�er : %s\n"
@@ -3046,16 +3126,21 @@ msgstr "Le fichier `%s' existe. "
 msgid "Overwrite (y/N)? "
 msgstr "R��crire (o/N)? "
 
-#: g10/openfile.c:92
+#: g10/openfile.c:97
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr ""
+
+#: g10/openfile.c:122
 msgid "writing to stdout\n"
 msgstr "�criture vers la sortie standard\n"
 
-#: g10/openfile.c:149
+#: g10/openfile.c:181
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "les donn�es sign�es sont suppos�es �tre dans `%s'\n"
 
-#: g10/openfile.c:199
+#: g10/openfile.c:231
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s : nouveau fichier d'options cr��\n"
@@ -3216,30 +3301,50 @@ msgstr ""
 msgid "keyedit.remove.subkey.okay"
 msgstr "Entrez � oui � s'il faut vraiment supprimer la sous-cl�"
 
-#: g10/helptext.c:175
+#: g10/helptext.c:176
+#, fuzzy
+msgid "keyedit.delsig.valid"
+msgstr "R�pondez � oui � si vous voulez signer TOUS les noms d'utilisateurs"
+
+#: g10/helptext.c:181
+#, fuzzy
+msgid "keyedit.delsig.invalid"
+msgstr "R�pondez � oui � si vous voulez signer TOUS les noms d'utilisateurs"
+
+#: g10/helptext.c:186
+msgid "keyedit.delsig.selfsig"
+msgstr ""
+
+#: g10/helptext.c:195
 msgid "passphrase.enter"
 msgstr ""
 "Entrez le mot de passe ; c'est une phrase secr�te \n"
 "  Blurb, blurb,.... "
 
-#: g10/helptext.c:182
+#: g10/helptext.c:202
 msgid "passphrase.repeat"
 msgstr ""
 "R�p�tez le dernier mot de passe, pour �tre s�r de ce que vous avez tap�."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:206
 msgid "detached_signature.filename"
 msgstr "Donnez le nom du fichier auquel la signature se rapporte"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:210
 msgid "openfile.overwrite.okay"
 msgstr "Entrez � oui � s'il faut vraiment r��crire le fichier"
 
-#: g10/helptext.c:204
+#: g10/helptext.c:224
 msgid "No help available"
 msgstr "Pas d'aide disponible"
 
-#: g10/helptext.c:216
+#: g10/helptext.c:236
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Pas d'aide disponible pour `%s'"
+
+#~ msgid "can't lock keyring `%': %s\n"
+#~ msgstr "ne peut verrouiller le porte-cl�s `%' : %s\n"
+
+#~ msgid "error writing keyring `%': %s\n"
+#~ msgstr "erreur durant la lecture du porte-cl�s `%' : %s\n"
diff --git a/po/it.po b/po/it.po
index cb7b21827..eb34c2578 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,12 +1,12 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) 1998 Free Software Foundation, Inc.
-# Marco d'Itri <[email protected]>, 1998.
+# GnuPG italian translation
+# Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+# Marco d'Itri <[email protected]>, 1998, 1999.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg-0.4.3\n"
-"POT-Creation-Date: 1999-05-23 15:36+0200\n"
-"PO-Revision-Date: 1998-11-09 16:19+01:00\n"
+"Project-Id-Version: gnupg-0.9.7\n"
+"POT-Creation-Date: 1999-05-06 13:37+0200\n"
+"PO-Revision-Date: 1999-05-15 18:09+02:00\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,11 @@ msgstr "Attenzione: si sta usando memoria insicura!\n"
 
 #: util/secmem.c:249
 msgid "operation is not possible without initialized secure memory\n"
-msgstr ""
+msgstr "l'operazione non � possibile senza memoria sicura inizializzata\n"
 
 #: util/secmem.c:250
 msgid "(you may have used the wrong program for this task)\n"
-msgstr ""
+msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 
 #: util/miscutil.c:156
 msgid "yes"
@@ -34,262 +34,213 @@ msgid "yY"
 msgstr "sS"
 
 #: util/errors.c:54
-#, fuzzy
 msgid "general error"
-msgstr "Errore generale"
+msgstr "errore generale"
 
 #: util/errors.c:55
-#, fuzzy
 msgid "unknown packet type"
-msgstr "Tipo del pacchetto sconosciuto"
+msgstr "pacchetto di tipo sconosciuto"
 
 #: util/errors.c:56
-#, fuzzy
 msgid "unknown version"
-msgstr "Versione sconosciuta"
+msgstr "versione sconosciuta"
 
 #: util/errors.c:57
-#, fuzzy
 msgid "unknown pubkey algorithm"
-msgstr "Algoritmo della chiave pubblica sconosciuto"
+msgstr "algoritmo della chiave pubblica sconosciuto"
 
 #: util/errors.c:58
-#, fuzzy
 msgid "unknown digest algorithm"
-msgstr "Algoritmo del digest sconosciuto"
+msgstr "algoritmo del digest sconosciuto"
 
 #: util/errors.c:59
-#, fuzzy
 msgid "bad public key"
-msgstr "Chiave pubblica errata o danneggiata"
+msgstr "chiave pubblica errata"
 
 #: util/errors.c:60
-#, fuzzy
 msgid "bad secret key"
-msgstr "Chiave segreta errata o danneggiata"
+msgstr "chiave segreta errata"
 
 #: util/errors.c:61
-#, fuzzy
 msgid "bad signature"
-msgstr "Firma errata o danneggiata"
+msgstr "firma errata"
 
 #: util/errors.c:62
-#, fuzzy
 msgid "checksum error"
-msgstr "Checksum errato"
+msgstr "codice di controllo errato"
 
 #: util/errors.c:63
-#, fuzzy
 msgid "bad passphrase"
-msgstr "Passphrase errata"
+msgstr "passphrase errata"
 
 #: util/errors.c:64
-#, fuzzy
 msgid "public key not found"
-msgstr "Chiave pubblica non trovata"
+msgstr "chiave pubblica non trovata"
 
 #: util/errors.c:65
-#, fuzzy
 msgid "unknown cipher algorithm"
-msgstr "Algoritmo di cifratura sconosciuto"
+msgstr "algoritmo di cifratura sconosciuto"
 
 #: util/errors.c:66
-#, fuzzy
 msgid "can't open the keyring"
-msgstr "Impossibile aprire il portachiavi"
+msgstr "impossibile aprire il portachiavi"
 
 #: util/errors.c:67
-#, fuzzy
 msgid "invalid packet"
-msgstr "Pacchetto non valido"
+msgstr "pacchetto non valido"
 
 #: util/errors.c:68
-#, fuzzy
 msgid "invalid armor"
-msgstr "Armatura non valida"
+msgstr "armatura non valida"
 
 #: util/errors.c:69
-#, fuzzy
 msgid "no such user id"
-msgstr "User id inesistente"
+msgstr "l'user ID non esiste"
 
 #: util/errors.c:70
-#, fuzzy
 msgid "secret key not available"
-msgstr "La chiave segreta non � disponibile."
+msgstr "la chiave segreta non � disponibile"
 
 #: util/errors.c:71
-#, fuzzy
 msgid "wrong secret key used"
-msgstr "� stata usata la chiave segreta sbagliata"
+msgstr "� stata usata la chiave segreta sbagliata"
 
 #: util/errors.c:72
-#, fuzzy
 msgid "not supported"
-msgstr "Non gestito"
+msgstr "non gestito"
 
 #: util/errors.c:73
-#, fuzzy
 msgid "bad key"
-msgstr "Chiave danneggiata"
+msgstr "chiave sbagliata"
 
 #: util/errors.c:74
-#, fuzzy
 msgid "file read error"
-msgstr "Errore durante la lettura del file"
+msgstr "errore durante la lettura del file"
 
 #: util/errors.c:75
-#, fuzzy
 msgid "file write error"
-msgstr "Errore durante la scrittura del file"
+msgstr "errore durante la scrittura del file"
 
 #: util/errors.c:76
-#, fuzzy
 msgid "unknown compress algorithm"
-msgstr "Algoritmo di compressione sconosciuto"
+msgstr "algoritmo di compressione sconosciuto"
 
 #: util/errors.c:77
-#, fuzzy
 msgid "file open error"
-msgstr "Errore durante l'apertura del file"
+msgstr "errore durante l'apertura del file"
 
 #: util/errors.c:78
-#, fuzzy
 msgid "file create error"
-msgstr "Errore durante la creazione del file"
+msgstr "errore durante la creazione del file"
 
 #: util/errors.c:79
-#, fuzzy
 msgid "invalid passphrase"
-msgstr "Passphrase non valida"
+msgstr "passphrase non valida"
 
 #: util/errors.c:80
-#, fuzzy
 msgid "unimplemented pubkey algorithm"
-msgstr "Algoritmo della chiave pubblica non implementato"
+msgstr "algoritmo della chiave pubblica non implementato"
 
 #: util/errors.c:81
-#, fuzzy
 msgid "unimplemented cipher algorithm"
-msgstr "Algoritmo di cifratura non implementato"
+msgstr "algoritmo di cifratura non implementato"
 
 #: util/errors.c:82
-#, fuzzy
 msgid "unknown signature class"
-msgstr "Classe della firma sconosciuta."
+msgstr "classe della firma sconosciuta."
 
 #: util/errors.c:83
-#, fuzzy
 msgid "trust database error"
-msgstr "Errore nel database della fiducia"
+msgstr "errore nel database della fiducia"
 
 #: util/errors.c:84
-#, fuzzy
 msgid "bad MPI"
 msgstr "MPI danneggiato"
 
 #: util/errors.c:85
-#, fuzzy
 msgid "resource limit"
-msgstr "Limite della risorsa"
+msgstr "limite della risorsa"
 
 #: util/errors.c:86
-#, fuzzy
 msgid "invalid keyring"
-msgstr "Portachiavi non valido"
+msgstr "portachiavi non valido"
 
 #: util/errors.c:87
-#, fuzzy
 msgid "bad certificate"
-msgstr "Certificato danneggiato"
+msgstr "certificato danneggiato"
 
 #: util/errors.c:88
-#, fuzzy
 msgid "malformed user id"
-msgstr "User id malformato"
+msgstr "user id malformato"
 
 #: util/errors.c:89
-#, fuzzy
 msgid "file close error"
-msgstr "Errore durante la chiusura del file"
+msgstr "errore durante la chiusura del file"
 
 #: util/errors.c:90
-#, fuzzy
 msgid "file rename error"
-msgstr "Errore durante la rinominazione del file"
+msgstr "errore durante la rinominazione del file"
 
 #: util/errors.c:91
-#, fuzzy
 msgid "file delete error"
-msgstr "Errore durante la cancellazione del file"
+msgstr "errore durante la cancellazione del file"
 
 #: util/errors.c:92
-#, fuzzy
 msgid "unexpected data"
-msgstr "Dati inaspettati"
+msgstr "dati inattesi"
 
 #: util/errors.c:93
-#, fuzzy
 msgid "timestamp conflict"
-msgstr "Date in conflitto"
+msgstr "date in conflitto"
 
 #: util/errors.c:94
-#, fuzzy
 msgid "unusable pubkey algorithm"
-msgstr "Algoritmo della chiave pubblica non utilizzabile"
+msgstr "algoritmo della chiave pubblica non utilizzabile"
 
 #: util/errors.c:95
-#, fuzzy
 msgid "file exists"
-msgstr "Il file esiste"
+msgstr "il file esiste"
 
 #: util/errors.c:96
-#, fuzzy
 msgid "weak key"
-msgstr "Chiave debole"
+msgstr "chiave debole"
 
 #: util/errors.c:97
-#, fuzzy
 msgid "invalid argument"
-msgstr "Armatura non valida"
+msgstr "armatura non valida"
 
 #: util/errors.c:98
-#, fuzzy
 msgid "bad URI"
-msgstr "MPI danneggiato"
+msgstr "URI non valida"
 
 #: util/errors.c:99
-#, fuzzy
 msgid "unsupported URI"
-msgstr "Non gestito"
+msgstr "URI non gestito"
 
 #: util/errors.c:100
-#, fuzzy
 msgid "network error"
-msgstr "Errore generale"
+msgstr "errore di rete"
 
 #: util/errors.c:102
-#, fuzzy
 msgid "not encrypted"
-msgstr "cifra dati"
+msgstr "non cifrato"
 
-#: util/logger.c:218
+#: util/logger.c:178
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... questo � un bug (%s:%d:%s)\n"
 
-#: util/logger.c:224
+#: util/logger.c:184
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Hai trovato un bug... (%s:%d)\n"
 
-#: cipher/random.c:412
-#, fuzzy
+#: cipher/random.c:408
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
-"Attenzione: si sta usando un generatore di numeri casuali non sicuro!!\n"
+"ATTENZIONE: si sta usando un generatore di numeri casuali non sicuro!!\n"
 
-#: cipher/random.c:413
+#: cipher/random.c:409
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -312,7 +263,7 @@ msgstr ""
 "altra cosa per dare all'OS la possibilit� di raccogliere altra entropia!\n"
 "(Servono ancora %d altri byte)\n"
 
-#: g10/g10.c:165
+#: g10/g10.c:163
 msgid ""
 "@Commands:\n"
 " "
@@ -320,131 +271,131 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/g10.c:167
+#: g10/g10.c:165
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/g10.c:168
+#: g10/g10.c:166
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/g10.c:169
+#: g10/g10.c:167
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/g10.c:170
+#: g10/g10.c:168
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/g10.c:171
+#: g10/g10.c:169
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/g10.c:172
+#: g10/g10.c:170
 msgid "store only"
 msgstr "immagazzina soltanto"
 
-#: g10/g10.c:173
+#: g10/g10.c:171
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/g10.c:174
+#: g10/g10.c:172
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:175
+#: g10/g10.c:173
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/g10.c:177
+#: g10/g10.c:175
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/g10.c:178
+#: g10/g10.c:176
 msgid "check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/g10.c:179
+#: g10/g10.c:177
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/g10.c:180
+#: g10/g10.c:178
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/g10.c:181
+#: g10/g10.c:179
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/g10.c:182
+#: g10/g10.c:180
 msgid "remove key from the public keyring"
 msgstr "rimuove una chiave dal portachiavi pubblico"
 
-#: g10/g10.c:183
+#: g10/g10.c:181
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/g10.c:184
+#: g10/g10.c:182
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/g10.c:185
+#: g10/g10.c:183
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/g10.c:186
+#: g10/g10.c:184
 msgid "export keys to a key server"
-msgstr ""
+msgstr "esporta le chiavi a un key server"
 
-#: g10/g10.c:187
+#: g10/g10.c:185
 msgid "import keys from a key server"
-msgstr ""
+msgstr "importa le chiavi da un key server"
 
-#: g10/g10.c:190
+#: g10/g10.c:188
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/g10.c:192
+#: g10/g10.c:190
 msgid "list only the sequence of packets"
 msgstr "elenca solo la sequenza dei pacchetti"
 
-#: g10/g10.c:194
+#: g10/g10.c:192
 msgid "export the ownertrust values"
 msgstr "esporta i valori di fiducia"
 
-#: g10/g10.c:196
+#: g10/g10.c:194
 msgid "import ownertrust values"
 msgstr "importa i valori di fiducia"
 
-#: g10/g10.c:198
+#: g10/g10.c:196
 msgid "|[NAMES]|update the trust database"
-msgstr "|[NAMES]|controlla il database della fiducia"
+msgstr "|[NOMI]|controlla il database della fiducia"
 
-#: g10/g10.c:200
+#: g10/g10.c:198
 msgid "|[NAMES]|check the trust database"
-msgstr "|[NAMES]|controlla il database della fiducia"
+msgstr "|[NOMI]|controlla il database della fiducia"
 
-#: g10/g10.c:201
+#: g10/g10.c:199
 msgid "fix a corrupted trust database"
 msgstr "ripara un database della fiducia rovinato"
 
-#: g10/g10.c:202
+#: g10/g10.c:200
 msgid "De-Armor a file or stdin"
 msgstr "rimuovi l'armatura a un file o a stdin"
 
-#: g10/g10.c:203
+#: g10/g10.c:201
 msgid "En-Armor a file or stdin"
 msgstr "crea l'armatura a un file o a stdin"
 
-#: g10/g10.c:204
+#: g10/g10.c:202
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/g10.c:205
+#: g10/g10.c:203
 msgid "print all message digests"
 msgstr "stampa tutti i message digests"
 
-#: g10/g10.c:211
+#: g10/g10.c:209
 msgid ""
 "@\n"
 "Options:\n"
@@ -454,151 +405,147 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/g10.c:213
+#: g10/g10.c:211
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/g10.c:214
-#, fuzzy
+#: g10/g10.c:212
 msgid "|NAME|encrypt for NAME"
-msgstr "|NAME|usa l'algoritmo di cifratura NOME"
+msgstr "|NOME|cifra per NOME"
 
-#: g10/g10.c:218
+#: g10/g10.c:216
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/g10.c:219
+#: g10/g10.c:217
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disabilita)"
 
-#: g10/g10.c:221
+#: g10/g10.c:219
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/g10.c:222
+#: g10/g10.c:220
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/g10.c:223
+#: g10/g10.c:221
 msgid "verbose"
 msgstr "prolisso"
 
-#: g10/g10.c:224
+#: g10/g10.c:222
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: g10/g10.c:225
+#: g10/g10.c:223
 msgid "force v3 signatures"
 msgstr "forza l'uso di firme v3"
 
-#: g10/g10.c:226
-#, fuzzy
+#: g10/g10.c:224
 msgid "always use a MDC for encryption"
-msgstr "usa questo user-id per cifrare"
+msgstr "usa sempre un MDC per cifrare"
 
-#: g10/g10.c:227
+#: g10/g10.c:225
 msgid "do not make any changes"
-msgstr ""
+msgstr "non fa cambiamenti"
 
-#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:229
+#: g10/g10.c:226
 msgid "batch mode: never ask"
 msgstr "modo batch: non fare domande"
 
-#: g10/g10.c:230
+#: g10/g10.c:227
 msgid "assume yes on most questions"
 msgstr "assumi \"s�\" a quasi tutte le domande"
 
-#: g10/g10.c:231
+#: g10/g10.c:228
 msgid "assume no on most questions"
 msgstr "assumi \"no\" a quasi tutte le domande"
 
-#: g10/g10.c:232
+#: g10/g10.c:229
 msgid "add this keyring to the list of keyrings"
 msgstr "aggiungi questo portachiavi alla lista"
 
-#: g10/g10.c:233
+#: g10/g10.c:230
 msgid "add this secret keyring to the list"
 msgstr "aggiungi questo portachiavi segreto alla lista"
 
-#: g10/g10.c:234
+#: g10/g10.c:231
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|usa NAME come chiave segreta predefinita"
 
-#: g10/g10.c:235
+#: g10/g10.c:232
 msgid "|HOST|use this keyserver to lookup keys"
-msgstr ""
+msgstr "|HOST|cerca le chiavi in questo keyserver"
 
-#: g10/g10.c:236
-#, fuzzy
+#: g10/g10.c:233
 msgid "|NAME|set terminal charset to NAME"
-msgstr "|NAME|usa l'algoritmo di cifratura NOME"
+msgstr "|NAME|imposta il set di caratteri del terminale NOME"
 
-#: g10/g10.c:237
+#: g10/g10.c:234
 msgid "read options from file"
 msgstr "leggi le opzioni dal file"
 
-#: g10/g10.c:239
+#: g10/g10.c:236
 msgid "set debugging flags"
 msgstr "imposta i flag di debugging"
 
-#: g10/g10.c:240
+#: g10/g10.c:237
 msgid "enable full debugging"
 msgstr "abilita il debugging completo"
 
-#: g10/g10.c:241
+#: g10/g10.c:238
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato su questo fd"
 
-#: g10/g10.c:242
+#: g10/g10.c:239
 msgid "do not write comment packets"
 msgstr "non scrivere pacchetti di commento"
 
-#: g10/g10.c:243
+#: g10/g10.c:240
 msgid "(default is 1)"
 msgstr "(predefinito � 1)"
 
-#: g10/g10.c:244
+#: g10/g10.c:241
 msgid "(default is 3)"
 msgstr "(predefinito � 3)"
 
-#: g10/g10.c:246
+#: g10/g10.c:243
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: g10/g10.c:247
+#: g10/g10.c:244
 msgid "emulate the mode described in RFC1991"
-msgstr "emula il modo descritto nel RFC1991"
+msgstr "emula il modo descritto in RFC 1991"
 
-#: g10/g10.c:248
+#: g10/g10.c:245
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa il modo N per la passphrase"
 
-#: g10/g10.c:250
+#: g10/g10.c:247
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|usa l'algoritmo di message digest NOME"
 
-#: g10/g10.c:252
+#: g10/g10.c:249
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|usa l'alg. di cifratura NOME per le passphrase"
 
-#: g10/g10.c:253
+#: g10/g10.c:250
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|usa l'algoritmo di cifratura NOME"
 
-#: g10/g10.c:254
+#: g10/g10.c:251
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|usa l'algoritmo di message digest NOME"
 
-#: g10/g10.c:255
+#: g10/g10.c:252
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritmo di compressione N"
 
-#: g10/g10.c:256
+#: g10/g10.c:253
 msgid "throw keyid field of encrypted packets"
-msgstr "elimina il campo keyid dei pacchetti crittografati"
+msgstr "elimina il campo keyid dei pacchetti cifrati"
 
-#: g10/g10.c:258
+#: g10/g10.c:255
 msgid ""
 "@\n"
 "Examples:\n"
@@ -618,15 +565,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/g10.c:327
+#: g10/g10.c:323
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: g10/g10.c:331
+#: g10/g10.c:327
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [file] (-h per l'aiuto)"
 
-#: g10/g10.c:334
+#: g10/g10.c:330
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -636,7 +583,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/g10.c:339
+#: g10/g10.c:335
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -644,147 +591,145 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/g10.c:413
+#: g10/g10.c:409
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [options] "
 
-#: g10/g10.c:453
+#: g10/g10.c:449
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/g10.c:580
-#, fuzzy, c-format
+#: g10/g10.c:576
+#, c-format
 msgid "NOTE: no default option file `%s'\n"
-msgstr "nota: nessun file con opzioni predefinite `%s'\n"
+msgstr "NOTA: manca il file con le opzioni predefinite `%s'\n"
 
-#: g10/g10.c:584
+#: g10/g10.c:580
 #, c-format
 msgid "option file `%s': %s\n"
-msgstr "file con opzioni predefinite `%s': %s\n"
+msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/g10.c:591
+#: g10/g10.c:587
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/g10.c:737
-#, fuzzy, c-format
+#: g10/g10.c:731
+#, c-format
 msgid "%s is not a valid character set\n"
-msgstr "Carattere non valido nel commento\n"
+msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/g10.c:780 g10/g10.c:792
+#: g10/g10.c:774 g10/g10.c:786
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/g10.c:786 g10/g10.c:798
+#: g10/g10.c:780 g10/g10.c:792
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:801
+#: g10/g10.c:795
 #, 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:803
+#: g10/g10.c:797
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/g10.c:805
+#: g10/g10.c:799
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/g10.c:807
+#: g10/g10.c:801
 msgid "max-cert-depth must be in range 1 to 255\n"
-msgstr ""
+msgstr "max-cert-depth deve essere tra 1 e 255\n"
 
-#: g10/g10.c:810
-#, fuzzy
+#: g10/g10.c:804
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
-msgstr "nota: il modo S2K semplice (0) � fortemente scoraggiato\n"
+msgstr "NOTA: l'uso del modo S2K semplice (0) � fortemente scoraggiato\n"
 
-#: g10/g10.c:814
+#: g10/g10.c:808
 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:891
+#: g10/g10.c:885
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/g10.c:897
+#: g10/g10.c:891
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/g10.c:904
+#: g10/g10.c:898
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:912
+#: g10/g10.c:906
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/g10.c:925
+#: g10/g10.c:919
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/g10.c:938
+#: g10/g10.c:932
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:952
+#: g10/g10.c:946
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/g10.c:964
+#: g10/g10.c:958
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/g10.c:973
-#, fuzzy
+#: g10/g10.c:967
 msgid "--edit-key username [commands]"
-msgstr "--edit-key nomeutente"
+msgstr "--edit-key nomeutente [comandi]"
 
-#: g10/g10.c:987
+#: g10/g10.c:981
 msgid "--delete-secret-key username"
 msgstr "--delete-secret-key nomeutente"
 
-#: g10/g10.c:990
+#: g10/g10.c:984
 msgid "--delete-key username"
 msgstr "--delete-key nomeutente"
 
-#: g10/encode.c:231 g10/g10.c:1013 g10/sign.c:311
+#: g10/encode.c:234 g10/g10.c:1007 g10/sign.c:311
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/g10.c:1024
+#: g10/g10.c:1018
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [userid] [portachiavi]"
 
-#: g10/g10.c:1083
+#: g10/g10.c:1077
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1091
+#: g10/g10.c:1085
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1157
+#: g10/g10.c:1151
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1226
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1230
 msgid "Go ahead and type your message ...\n"
-msgstr ""
+msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1239 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1233 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
@@ -807,71 +752,70 @@ msgid "invalid clearsig header\n"
 msgstr "header della firma in chiaro non valido\n"
 
 #: g10/armor.c:389
-#, fuzzy
 msgid "nested clear text signatures\n"
-msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
+msgstr "firme in chiaro innestate\n"
 
-#: g10/armor.c:500
+#: g10/armor.c:498
 msgid "invalid dash escaped line: "
 msgstr "riga protetta con il trattino non valida: "
 
-#: g10/armor.c:512
-#, fuzzy
+#: g10/armor.c:510
 msgid "unexpected armor:"
-msgstr "Dati inaspettati"
+msgstr "armatura inaspettata:"
 
-#: g10/armor.c:629
+#: g10/armor.c:627
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Carattere radix64 non valido %02x saltato\n"
 
-#: g10/armor.c:672
+#: g10/armor.c:670
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematura (nessun CRC)\n"
 
-#: g10/armor.c:706
+#: g10/armor.c:704
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematura (nel CRC)\n"
 
-#: g10/armor.c:710
+#: g10/armor.c:708
 msgid "malformed CRC\n"
 msgstr "CRC malformato\n"
 
-#: g10/armor.c:714
+#: g10/armor.c:712
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "errore nel CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:731
+#: g10/armor.c:729
 msgid "premature eof (in Trailer)\n"
 msgstr "eof prematura (nella coda)\n"
 
-#: g10/armor.c:735
+#: g10/armor.c:733
 msgid "error in trailer line\n"
 msgstr "errore nella riga della coda\n"
 
-#: g10/armor.c:1001
-#, fuzzy
+#: g10/armor.c:997
 msgid "no valid OpenPGP data found.\n"
-msgstr "Non sono stati trovati dati RFC1991 o OpenPGP validi.\n"
+msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/armor.c:1005
+#: g10/armor.c:1001
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
-msgstr ""
+msgstr "armatura non valida: linea piu` lunga di %d caratteri\n"
 
-#: g10/armor.c:1009
+#: g10/armor.c:1005
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
+"carattere quoted printable nell'armatura - probabilmente � stato usato\n"
+"un MTA buggato\n"
 
 #: g10/pkclist.c:137
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
 "%4u%c/%08lX %s \""
 msgstr ""
-"Nessun valore di fiducia del proprietario definito per %lu:\n"
+"Nessun valore di fiducia assegnato a %lu:\n"
 "%4u%c/%08lX %s \""
 
 #: g10/pkclist.c:147
@@ -898,17 +842,16 @@ msgstr ""
 
 #: g10/pkclist.c:156
 msgid " m = back to the main menu\n"
-msgstr " m = ritorna al men� principale\n"
+msgstr " m = torna al men� principale\n"
 
 #: g10/pkclist.c:158
 msgid " q = quit\n"
-msgstr ""
+msgstr " q = abbandona\n"
 
 # valid user replies (not including 1..4)
 # [Marco, you can change 'm' and 's' to whatever letters you like]
 #. a string with valid answers
 #: g10/pkclist.c:163
-#, fuzzy
 msgid "sSmMqQ"
 msgstr "sSmMqQ"
 
@@ -918,7 +861,7 @@ msgstr "Cosa hai deciso? "
 
 #: g10/pkclist.c:187
 msgid "Certificates leading to an ultimately trusted key:\n"
-msgstr ""
+msgstr "Certificati che portano a chiavi definitivamente affidabili:\n"
 
 #: g10/pkclist.c:254
 msgid ""
@@ -934,51 +877,51 @@ msgstr ""
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
-msgstr ""
+msgstr "Non � stato trovato alcun percorso che porti a una delle nostre chiavi.\n"
 
 #: g10/pkclist.c:262
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
-msgstr ""
+msgstr "Non � stato trovato alcun certificato con fiducia non definita.\n"
 
 #: g10/pkclist.c:264
-#, fuzzy
 msgid ""
 "No trust values changed.\n"
 "\n"
 msgstr ""
-"Nessun valore di fiducia del proprietario modificato.\n"
+"Nessun valore di fiducia modificato.\n"
 "\n"
 
 #: g10/pkclist.c:281
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX: key has been revoked!\n"
-msgstr "chiave %08lX: accettata come chiave segreta\n"
+msgstr "chiave %08lX: la chiave � stata revocata!\n"
 
 #: g10/pkclist.c:287 g10/pkclist.c:297 g10/pkclist.c:403
 msgid "Use this key anyway? "
 msgstr "Uso lo stesso questa chiave? "
 
 #: g10/pkclist.c:291
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX: subkey has been revoked!\n"
-msgstr "chiave %08lX: accettata come chiave segreta\n"
+msgstr "chiave %08lX: la subchiave � stata revocata!\n"
 
 #: g10/pkclist.c:321
-#, fuzzy, c-format
+#, c-format
 msgid "%08lX: key has expired\n"
-msgstr "Nota: questa chiave � scaduta!\n"
+msgstr "%08lX: la chiave � scaduta\n"
 
 #: g10/pkclist.c:327
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr ""
+"%08lX: mancano informazioni su come calcolare una probabilit� di fiducia\n"
 
 #: g10/pkclist.c:341
-#, fuzzy, c-format
+#, c-format
 msgid "%08lX: We do NOT trust this key\n"
-msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n"
+msgstr "%08lX: NON ci fidiamo di questa chiave!\n"
 
 #: g10/pkclist.c:347
 #, c-format
@@ -986,14 +929,16 @@ msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
 "but it is accepted anyway\n"
 msgstr ""
+"%08lX: Non � sicuro che questa chiave appartenga veramente al proprietario\n"
+"ma � accettata comunque\n"
 
 #: g10/pkclist.c:353
 msgid "This key probably belongs to the owner\n"
-msgstr ""
+msgstr "Questa chiave probabilmente appartiene al proprietario\n"
 
 #: g10/pkclist.c:358
 msgid "This key belongs to us\n"
-msgstr ""
+msgstr "Questa chiave ci appartiene\n"
 
 #: g10/pkclist.c:398
 msgid ""
@@ -1007,61 +952,60 @@ msgstr ""
 "prossima domanda.\n"
 "\n"
 
-#: g10/pkclist.c:411 g10/pkclist.c:433
+#: g10/pkclist.c:411
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATTENZIONE: uso di una chiave non fidata!\n"
 
-#: g10/pkclist.c:454
+#: g10/pkclist.c:447
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATTENZIONE: questa chiave � stata revocata dal suo proprietario!\n"
 
-#: g10/pkclist.c:455
+#: g10/pkclist.c:448
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Questo pu� significare che la firma � stata falsificata.\n"
 
-#: g10/pkclist.c:459
-#, fuzzy
+#: g10/pkclist.c:452
 msgid "WARNING: This subkey has been revoked by its owner!\n"
-msgstr "ATTENZIONE: questa chiave � stata revocata dal suo proprietario!\n"
+msgstr "ATTENZIONE: questa subchiave � stata revocata dal proprietario!\n"
 
-#: g10/pkclist.c:480
+#: g10/pkclist.c:473
 msgid "Note: This key has expired!\n"
 msgstr "Nota: questa chiave � scaduta!\n"
 
-#: g10/pkclist.c:487
+#: g10/pkclist.c:480
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "ATTENZIONE: questa chiave non � certificata con una firma fidata!\n"
 
-#: g10/pkclist.c:489
+#: g10/pkclist.c:482
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Non ci sono indicazioni che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:505
+#: g10/pkclist.c:498
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n"
 
-#: g10/pkclist.c:506
+#: g10/pkclist.c:499
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          La firma � probabilmente un FALSO.\n"
 
-#: g10/pkclist.c:513
+#: g10/pkclist.c:506
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATTENZIONE: questa chiave non � certificata con firme abbastanza fidate!\n"
 
-#: g10/pkclist.c:516
+#: g10/pkclist.c:509
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Non � sicuro che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:569 g10/pkclist.c:582 g10/pkclist.c:645 g10/pkclist.c:673
+#: g10/pkclist.c:562 g10/pkclist.c:575 g10/pkclist.c:638 g10/pkclist.c:666
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: saltata: %s\n"
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:584
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1069,20 +1013,20 @@ msgstr ""
 "Non hai specificato un user ID. (puoi usare \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:596
+#: g10/pkclist.c:589
 msgid "Enter the user ID: "
 msgstr "Inserisci l'user ID: "
 
-#: g10/pkclist.c:607
+#: g10/pkclist.c:600
 msgid "No such user ID.\n"
 msgstr "User ID inesistente.\n"
 
-#: g10/pkclist.c:653
+#: g10/pkclist.c:646
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: errore nel controllare la chiave: %s\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:672
 msgid "no valid addressees\n"
 msgstr "nessun indirizzo valido\n"
 
@@ -1111,12 +1055,12 @@ msgstr "   (%d) DSA (firma solo)\n"
 #: g10/keygen.c:391
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (crittografa solo)\n"
+msgstr "   (%d) ElGamal (cifra solo)\n"
 
 #: g10/keygen.c:392
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
-msgstr "   (%d) ElGamal (firma e crittografa)\n"
+msgstr "   (%d) ElGamal (firma e cifra)\n"
 
 #: g10/keygen.c:394
 #, c-format
@@ -1128,9 +1072,8 @@ msgid "Your selection? "
 msgstr "Cosa scegli? "
 
 #: g10/keygen.c:409
-#, fuzzy
 msgid "Do you really want to create a sign and encrypt key? "
-msgstr "Vuoi davvero cancellare le chiavi selezionate? "
+msgstr "Vuoi davvero creare una chiave di firma e cifratura? "
 
 #: g10/keygen.c:430
 msgid "Invalid selection.\n"
@@ -1170,16 +1113,16 @@ msgstr "la chiave � troppo corta; 768 � il minimo valore permesso.\n"
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
 #: g10/keygen.c:466
-#, fuzzy, c-format
+#, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "la chiave � troppo corta; 768 � il minimo valore permesso.\n"
+msgstr "la chiave � troppo lunga; %d � il massimo valore permesso.\n"
 
 #: g10/keygen.c:471
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
 msgstr ""
-"Chiavi pi� lunghe di 2048 non sono consigliate perch� i calcoli sono \n"
+"Chiavi pi� lunghe di 2048 non sono consigliate perch� i calcoli sono\n"
 "VERAMENTE lunghi!\n"
 
 #: g10/keygen.c:474
@@ -1296,7 +1239,7 @@ msgstr "Carattere non valido nel commento\n"
 #: g10/keygen.c:669
 #, c-format
 msgid "You are using the `%s' character set.\n"
-msgstr ""
+msgstr "Stai usando il set di caratteri `%s'.\n"
 
 #: g10/keygen.c:675
 #, c-format
@@ -1342,7 +1285,6 @@ msgstr ""
 "\n"
 
 #: g10/keygen.c:775
-#, fuzzy
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1350,11 +1292,9 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 "Dobbiamo generare un mucchio di byte casuali. � una buona idea eseguire\n"
-"qualche altra azione (lavorare in un'altra finestra, muovere il mouse, "
-"usare\n"
-"la rete e i dischi) durante la generazione dei numeri primi; questo d� al\n"
-"generatore di numeri casuali la possibilit� di raccogliere abbastanza\n"
-"entropia.\n"
+"qualche altra azione (scrivere sulla tastiera, muovere il mouse, usare i\n"
+"dischi) durante la generazione dei numeri primi; questo da al generatore di\n"
+"numeri casuali migliori possibilit� di raccogliere abbastanza entropia.\n"
 
 #: g10/keygen.c:845
 msgid "Key generation can only be used in interactive mode\n"
@@ -1383,41 +1323,39 @@ msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
 #: g10/keygen.c:949
-#, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
 msgstr ""
-"Nota che questa chiave non pu� essere usata per la crittografia. Forse\n"
-"vorrai usare il comando \"--add-key\" per generare una chiave secondaria\n"
-"per questo scopo.\n"
+"Nota che questa chiave non pu� essere usata per cifrare. Forse vorrai usare\n"
+"il comando \"--edit-key\" per generare una chiave secondaria per questo scopo.\n"
 
 #: g10/keygen.c:963 g10/keygen.c:1062
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:52
-#, fuzzy, c-format
+#: g10/keygen.c:1007 g10/sig-check.c:299 g10/sign.c:52
+#, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
-"chiave pubblica creata nel futuro (salto nel tempo o problema con\n"
-"l'orologio)\n"
+"la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
+"con l'orologio)\n"
 
-#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:54
-#, fuzzy, c-format
+#: g10/keygen.c:1009 g10/sig-check.c:301 g10/sign.c:54
+#, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
-"chiave pubblica creata nel futuro (salto nel tempo o problema con\n"
-"l'orologio)\n"
+"la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
+"con l'orologio)\n"
 
 #: g10/keygen.c:1040
 msgid "Really create? "
 msgstr "Crea davvero? "
 
-#: g10/encode.c:91 g10/openfile.c:88 g10/openfile.c:176 g10/tdbio.c:467
+#: g10/encode.c:91 g10/openfile.c:86 g10/openfile.c:174 g10/tdbio.c:467
 #: g10/tdbio.c:528
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1428,48 +1366,52 @@ msgstr "%s: impossibile aprire: %s\n"
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: g10/encode.c:167 g10/encode.c:287
-#, fuzzy, c-format
+#: g10/encode.c:167 g10/encode.c:290
+#, c-format
 msgid "%s: WARNING: empty file\n"
-msgstr "%s: attenzione: file vuoto\n"
+msgstr "%s: ATTENZIONE: file vuoto\n"
 
-#: g10/encode.c:237
+#: g10/encode.c:240
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lettura da `%s'\n"
 
-#: g10/encode.c:417
-#, fuzzy, c-format
+#: g10/encode.c:435 g10/sign.c:346
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "ATTENZIONE: `%s' � un file vuoto\n"
+
+#: g10/encode.c:605
+#, c-format
 msgid "%s/%s encrypted for: %s\n"
-msgstr "%s crittografato per: %s\n"
+msgstr "%s/%s cifrato per: %s\n"
 
 #: g10/export.c:147
-#, fuzzy, c-format
+#, c-format
 msgid "%s: user not found: %s\n"
-msgstr "%s: utente non trovato\n"
+msgstr "%s: utente non trovato: %s\n"
 
 #: g10/export.c:156
 #, c-format
 msgid "certificate read problem: %s\n"
-msgstr ""
+msgstr "problema di lettura del certificato: %s\n"
 
 #: g10/export.c:165
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX: not a rfc2440 key - skipped\n"
-msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
+msgstr "chiave %08lX: chiave non rfc2440 - saltata\n"
 
 #: g10/export.c:203
-#, fuzzy
 msgid "WARNING: nothing exported\n"
-msgstr "ATTENZIONE: uso di una chiave non fidata!\n"
+msgstr "ATTENZIONE: non � stato esportato nulla\n"
 
 #: g10/getkey.c:206
 msgid "too many entries in pk cache - disabled\n"
-msgstr ""
+msgstr "troppe voci nella pk cache - disabilitata\n"
 
 #: g10/getkey.c:345
 msgid "too many entries in unk cache - disabled\n"
-msgstr ""
+msgstr "troppe voci nella unk cache - disabilitata\n"
 
 #: g10/getkey.c:1535 g10/getkey.c:1591
 #, c-format
@@ -1477,9 +1419,9 @@ msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
 
 #: g10/import.c:116
-#, fuzzy, c-format
-msgid "can't open `%s': %s\n"
-msgstr "impossibile aprire `%s': %s\n"
+#, c-format
+msgid "can't open file: %s\n"
+msgstr "impossibile aprire il file: %s\n"
 
 #: g10/import.c:160
 #, c-format
@@ -1492,9 +1434,9 @@ msgid "%lu keys so far processed\n"
 msgstr "Per ora sono state esaminate %lu chiavi\n"
 
 #: g10/import.c:172
-#, fuzzy, c-format
-msgid "error reading `%s': %s\n"
-msgstr "%s: errore nel controllare la chiave: %s\n"
+#, c-format
+msgid "read error: %s\n"
+msgstr "errore di lettura: %s\n"
 
 #: g10/import.c:175
 #, c-format
@@ -1551,7 +1493,7 @@ msgstr "chiavi segrete importate %lu\n"
 msgid " secret keys unchanged: %lu\n"
 msgstr "chiavi segrete non cambiate %lu\n"
 
-#: g10/import.c:342 g10/import.c:529
+#: g10/import.c:342 g10/import.c:534
 #, c-format
 msgid "key %08lX: no user id\n"
 msgstr "chiave %08lX: nessun user id\n"
@@ -1565,7 +1507,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:366 g10/import.c:596
+#: g10/import.c:366 g10/import.c:604
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
@@ -1574,184 +1516,188 @@ msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 msgid "no default public keyring\n"
 msgstr "nessun portachiavi pubblico predefinito\n"
 
-#: g10/import.c:376 g10/openfile.c:117 g10/sign.c:215 g10/sign.c:501
+#: g10/import.c:376 g10/openfile.c:115 g10/sign.c:215 g10/sign.c:501
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: g10/import.c:379 g10/import.c:435
-#, fuzzy
-msgid "can't lock keyring `%': %s\n"
+#: g10/import.c:380 g10/import.c:440 g10/import.c:658
+#, c-format
+msgid "can't lock public keyring: %s\n"
 msgstr "impossibile bloccare il portachiavi pubblico: %s\n"
 
-#: g10/import.c:382
-#, fuzzy
-msgid "error writing keyring `%': %s\n"
-msgstr "%s: errore nel controllare la chiave: %s\n"
+#: g10/import.c:383
+#, c-format
+msgid "can't write to keyring: %s\n"
+msgstr "impossibile scrivere sul portachiavi pubblico: %s\n"
 
 #: g10/import.c:387
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "chiave %08lX: chiave pubblica importata\n"
 
-#: g10/import.c:399
+#: g10/import.c:400
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
 
-#: g10/import.c:411 g10/import.c:604
+#: g10/import.c:413 g10/import.c:613
 #, 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:417 g10/import.c:610
+#: g10/import.c:420 g10/import.c:620
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n"
 
-#: g10/import.c:438 g10/import.c:547 g10/import.c:648
-#, fuzzy, c-format
-msgid "error writing keyring `%s': %s\n"
-msgstr "%s: errore nel controllare la chiave: %s\n"
+#: g10/import.c:437 g10/import.c:549 g10/import.c:655
+msgid "writing keyblock\n"
+msgstr "scrittura del keyblock\n"
 
-#: g10/import.c:444
+#: g10/import.c:443 g10/import.c:661
+#, c-format
+msgid "can't write keyblock: %s\n"
+msgstr "impossibile aprire il keyblock: %s\n"
+
+#: g10/import.c:448
 #, c-format
 msgid "key %08lX: 1 new user-id\n"
 msgstr "chiave %08lX: un nuovo user id\n"
 
-#: g10/import.c:447
+#: g10/import.c:451
 #, c-format
 msgid "key %08lX: %d new user-ids\n"
 msgstr "chiave %08lX: %d nuovi user id\n"
 
-#: g10/import.c:450
+#: g10/import.c:454
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "chiave %08lX: una nuova firma\n"
 
-#: g10/import.c:453
+#: g10/import.c:457
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "chiave %08lX: %d nuove firme\n"
 
-#: g10/import.c:456
+#: g10/import.c:460
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "chiave %08lX: una nuova subchiave\n"
 
-#: g10/import.c:459
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "chiave %08lX: %d nuove subchiavi\n"
 
-#: g10/import.c:469
+#: g10/import.c:473
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "chiave %08lX: non cambiata\n"
 
-#: g10/import.c:544 g10/import.c:645
-#, fuzzy, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "impossibile bloccare il portachiavi pubblico: %s\n"
-
 #: g10/import.c:552
 #, c-format
+msgid "can't lock secret keyring: %s\n"
+msgstr "impossibile bloccare il portachiavi segreto: %s\n"
+
+#: g10/import.c:555
+#, c-format
+msgid "can't write keyring: %s\n"
+msgstr "impossibile scrivere il portachiavi: %s\n"
+
+#: g10/import.c:559
+#, 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:556
+#: g10/import.c:564
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chiave %08lX: gi� nel portachiavi segreto\n"
 
-#: g10/import.c:561
+#: g10/import.c:569
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
 
-#: g10/import.c:590
+#: g10/import.c:598
 #, 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:621
+#: g10/import.c:631
 #, 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:653
+#: g10/import.c:665
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "chiave %08lX: certificato di revoca importato\n"
 
-#: g10/import.c:686
+#: g10/import.c:699
 #, c-format
 msgid "key %08lX: no user-id for signature\n"
 msgstr "chiave %08lX: nessun user id per la firma\n"
 
-#: g10/import.c:693 g10/import.c:717
+#: g10/import.c:706 g10/import.c:731
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
 
-#: g10/import.c:694
+#: g10/import.c:707
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "chiave %08lX: autofirma non valida\n"
 
-#: g10/import.c:709
-#, fuzzy, c-format
+#: g10/import.c:723
+#, c-format
 msgid "key %08lX: no subkey for key binding\n"
-msgstr "chiave %08lX.%lu: Legame con la subchiave corretto\n"
+msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n"
 
-#: g10/import.c:718
-#, fuzzy, c-format
+#: g10/import.c:732
+#, c-format
 msgid "key %08lX: invalid subkey binding\n"
-msgstr "chiave %08lX.%lu: Legame con la subchiave non valido: %s\n"
+msgstr "chiave %08lX: legame con la subchiave non valido:\n"
 
-#: g10/import.c:750
+#: g10/import.c:764
 #, c-format
 msgid "key %08lX: skipped userid '"
 msgstr "chiave %08lX: saltato l'user id '"
 
-#: g10/import.c:773
-#, fuzzy, c-format
+#: g10/import.c:787
+#, c-format
 msgid "key %08lX: skipped subkey\n"
-msgstr "chiave %08lX: una nuova subchiave\n"
+msgstr "chiave %08lX: saltata la subchiave\n"
 
 #. here we violate the rfc a bit by still allowing
 #. * 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:798
-#, fuzzy, c-format
+#: g10/import.c:812
+#, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
-msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltato\n"
+msgstr "chiave %08lX: firma non esportabile (chiave %02x) - saltata\n"
 
-#: g10/import.c:807
+#: g10/import.c:821
 #, 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:815
+#: g10/import.c:829
 #, 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:915
-#, c-format
-msgid "key %08lX: duplicated user ID detected - merged\n"
-msgstr ""
-
-#: g10/import.c:966
+#: g10/import.c:890
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chiave %08lX: certificato di revoca aggiunto\n"
 
-#: g10/import.c:1079 g10/import.c:1134
+#: g10/import.c:1008 g10/import.c:1063
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "chiave %08lX: la nostra copia non ha autofirma\n"
@@ -1763,7 +1709,7 @@ msgstr "%s: utente non trovato\n"
 
 #: g10/keyedit.c:177
 msgid "[revocation]"
-msgstr ""
+msgstr "[revoca]"
 
 #: g10/keyedit.c:178
 msgid "[self-signature]"
@@ -1829,13 +1775,13 @@ msgstr ""
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
-msgstr ""
+msgstr "La firma sar� segnata come non esportabile.\n\n"
 
 #: g10/keyedit.c:321
 msgid "Really sign? "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:347 g10/keyedit.c:1688 g10/keyedit.c:1737 g10/sign.c:75
+#: g10/keyedit.c:347 g10/keyedit.c:1684 g10/keyedit.c:1733 g10/sign.c:75
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
@@ -1873,477 +1819,473 @@ msgstr ""
 msgid "Do you really want to do this? "
 msgstr "Vuoi veramente farlo?"
 
-#: g10/keyedit.c:501
+#: g10/keyedit.c:499
 msgid "moving a key signature to the correct place\n"
-msgstr ""
+msgstr "spostamento della firma di una chiave nel posto corretto\n"
 
-#: g10/keyedit.c:537
+#: g10/keyedit.c:535
 msgid "quit"
 msgstr "quit"
 
-#: g10/keyedit.c:537
+#: g10/keyedit.c:535
 msgid "quit this menu"
 msgstr "abbandona questo men�"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:536
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:537
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:537
 msgid "save and quit"
 msgstr "salva ed esci"
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:538
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:538
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:540
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:540
 msgid "show fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/keyedit.c:543
+#: g10/keyedit.c:541
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:543
+#: g10/keyedit.c:541
 msgid "list key and user ids"
 msgstr "elenca le chiavi e gli user id"
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:542
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:545
+#: g10/keyedit.c:543
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:545
+#: g10/keyedit.c:543
 msgid "select user id N"
 msgstr "scegli l'user id N"
 
-#: g10/keyedit.c:546
+#: g10/keyedit.c:544
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:546
+#: g10/keyedit.c:544
 msgid "select secondary key N"
 msgstr "scegli la chiave secondaria N"
 
-#: g10/keyedit.c:547
+#: g10/keyedit.c:545
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:547
+#: g10/keyedit.c:545
 msgid "list signatures"
 msgstr "elenca le firme"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:546
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:549
+#: g10/keyedit.c:547
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:549
+#: g10/keyedit.c:547
 msgid "sign the key"
 msgstr "firma la chiave"
 
-#: g10/keyedit.c:550
+#: g10/keyedit.c:548
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:551
-#, fuzzy
+#: g10/keyedit.c:549
 msgid "lsign"
-msgstr "sign"
+msgstr "lsign"
 
-#: g10/keyedit.c:551
-#, fuzzy
+#: g10/keyedit.c:549
 msgid "sign the key locally"
-msgstr "firma la chiave"
+msgstr "firma la chiave localmente"
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:550
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:551
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:551
 msgid "add a user id"
 msgstr "aggiungi un user id"
 
-#: g10/keyedit.c:554
+#: g10/keyedit.c:552
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:554
+#: g10/keyedit.c:552
 msgid "delete user id"
 msgstr "cancella un user id"
 
-#: g10/keyedit.c:555
+#: g10/keyedit.c:553
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:555
+#: g10/keyedit.c:553
 msgid "add a secondary key"
 msgstr "aggiungi una chiave secondaria"
 
-#: g10/keyedit.c:556
+#: g10/keyedit.c:554
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:556
+#: g10/keyedit.c:554
 msgid "delete a secondary key"
 msgstr "cancella una chiave secondaria"
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:555
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:555
 msgid "change the expire date"
 msgstr "cambia la data di scadenza"
 
-#: g10/keyedit.c:558
+#: g10/keyedit.c:556
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:558
+#: g10/keyedit.c:556
 msgid "toggle between secret and public key listing"
 msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:558
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:559
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:559
 msgid "list preferences"
 msgstr "elenca le impostazioni"
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:560
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:560
 msgid "change the passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/keyedit.c:563
+#: g10/keyedit.c:561
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:563
+#: g10/keyedit.c:561
 msgid "change the ownertrust"
 msgstr "cambia il valore di fiducia"
 
-#: g10/keyedit.c:564
-#, fuzzy
+#: g10/keyedit.c:562
 msgid "revsig"
-msgstr "sign"
+msgstr "revsig"
 
-#: g10/keyedit.c:564
-#, fuzzy
+#: g10/keyedit.c:562
 msgid "revoke signatures"
-msgstr "forza l'uso di firme v3"
+msgstr "revoca firme"
 
-#: g10/keyedit.c:565
-#, fuzzy
+#: g10/keyedit.c:563
 msgid "revkey"
-msgstr "key"
+msgstr "revkey"
 
-#: g10/keyedit.c:565
-#, fuzzy
+#: g10/keyedit.c:563
 msgid "revoke a secondary key"
-msgstr "cancella una chiave secondaria"
+msgstr "revoca una chiave secondaria"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:582
 msgid "can't do that in batchmode\n"
 msgstr "impossibile fare questo in batch mode\n"
 
 #. check that they match
 #. FIXME: check that they both match
-#: g10/keyedit.c:613
+#: g10/keyedit.c:609
 msgid "Secret key is available.\n"
 msgstr "� disponibile una chiave segreta.\n"
 
-#: g10/keyedit.c:642
+#: g10/keyedit.c:638
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:665
 msgid "Need the secret key to do this.\n"
 msgstr "Per fare questo serve la chiave segreta.\n"
 
-#: g10/keyedit.c:691
+#: g10/keyedit.c:687
 msgid "Save changes? "
 msgstr "Salvo i cambiamenti? "
 
-#: g10/keyedit.c:694
+#: g10/keyedit.c:690
 msgid "Quit without saving? "
 msgstr "Esco senza salvare? "
 
-#: g10/keyedit.c:704
+#: g10/keyedit.c:700
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/keyedit.c:711
+#: g10/keyedit.c:707
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/keyedit.c:718
+#: g10/keyedit.c:714
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:721 g10/keyedit.c:780
-#, fuzzy, c-format
+#: g10/keyedit.c:717 g10/keyedit.c:776
+#, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "aggiornamento del trustdb fallito: %s\n"
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:750
 msgid "Really sign all user ids? "
 msgstr "Firmo davvero tutti gli user id? "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:751
 msgid "Hint: Select the user ids to sign\n"
 msgstr "Suggerimento: seleziona gli user id da firmare\n"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:787
 msgid "You must select at least one user id.\n"
 msgstr "Devi selezionare almeno un user id.\n"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:789
 msgid "You can't delete the last user id!\n"
 msgstr "Non puoi cancellare l'ultimo user id!\n"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:792
 msgid "Really remove all selected user ids? "
 msgstr "Tolgo davvero tutti gli user id selezionati? "
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:793
 msgid "Really remove this user id? "
 msgstr "Tolgo davvero questo user id? "
 
-#: g10/keyedit.c:820 g10/keyedit.c:842
+#: g10/keyedit.c:816 g10/keyedit.c:838
 msgid "You must select at least one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:820
 msgid "Do you really want to delete the selected keys? "
 msgstr "Vuoi davvero cancellare le chiavi selezionate? "
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:821
 msgid "Do you really want to delete this key? "
 msgstr "Vuoi davvero cancellare questa chiave? "
 
-#: g10/keyedit.c:846
-#, fuzzy
+#: g10/keyedit.c:842
 msgid "Do you really want to revoke the selected keys? "
-msgstr "Vuoi davvero cancellare le chiavi selezionate? "
+msgstr "Vuoi davvero revocare le chiavi selezionate? "
 
-#: g10/keyedit.c:847
-#, fuzzy
+#: g10/keyedit.c:843
 msgid "Do you really want to revoke this key? "
-msgstr "Vuoi davvero cancellare questa chiave? "
+msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:901
+#: g10/keyedit.c:897
 msgid "Invalid command  (try \"help\")\n"
-msgstr "Comando non valido (prova \"help\")\n"
+msgstr "Comando non valido  (prova \"help\")\n"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1289
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1295
 msgid "Please select at most one secondary key.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1299
 msgid "Changing exiration time for a secondary key.\n"
 msgstr "Modifico il tempo di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1301
 msgid "Changing exiration time for the primary key.\n"
 msgstr "Modifico il tempo di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1342
 msgid "You can't change the expiration date of a v3 key\n"
-msgstr ""
+msgstr "Non � possibile cambiare la data di scadenza di una chiave v3\n"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1358
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1418
 #, c-format
 msgid "No user id with index %d\n"
 msgstr "Nessun user id con l'indice %d\n"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1464
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nessuna chiave secondaria con l'indice %d\n"
 
-#: g10/keyedit.c:1566
-#, fuzzy
+#: g10/keyedit.c:1562
 msgid "user ID: \""
-msgstr "Inserisci l'user ID: "
+msgstr "user ID: \""
 
-#: g10/keyedit.c:1569
-#, fuzzy, c-format
+#: g10/keyedit.c:1565
+#, c-format
 msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
-msgstr "Niente da firmare con la chiave %08lX\n"
+msgstr ""
+"\"\n"
+"firmata con la tua chiave %08lX a %s\n"
+"\n"
 
-#: g10/keyedit.c:1573
-#, fuzzy
+#: g10/keyedit.c:1569
 msgid "Create a revocation certificate for this signature? (y/N)"
-msgstr "genera un certificato di revoca"
+msgstr "Creare un certificato di revoca per questa firma? (s/N)"
 
-#: g10/keyedit.c:1653
-#, fuzzy
+#: g10/keyedit.c:1649
 msgid "Really create the revocation certificates? (y/N)"
-msgstr "genera un certificato di revoca"
+msgstr "Creare davvero i certificati di revoca? (s/N)"
 
-#: g10/keyedit.c:1676
-#, fuzzy
+#: g10/keyedit.c:1672
 msgid "no secret key\n"
-msgstr "Chiave segreta errata o danneggiata"
+msgstr "manca la chiave segreta\n"
 
-#: g10/mainproc.c:184
-#, fuzzy, c-format
+#: g10/mainproc.c:185
+#, c-format
 msgid "public key is %08lX\n"
-msgstr "Chiave pubblica non trovata"
+msgstr "la chiave pubblica � %08lX\n"
 
-#: g10/mainproc.c:212
-#, fuzzy
+#: g10/mainproc.c:213
 msgid "public key encrypted data: good DEK\n"
-msgstr "Decifratura della chiave pubblica fallita: %s\n"
+msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
 
 #. fixme: defer this message until we have parsed all packets of
 #. * this type - do this by building a list of keys with their stati
 #. * and store it with the context.  do_proc_packets can then use
 #. * this list to display some information
-#: g10/mainproc.c:219
+#: g10/mainproc.c:220
 #, c-format
 msgid "public key decryption failed: %s\n"
-msgstr "Decifratura della chiave pubblica fallita: %s\n"
+msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:247
-#, fuzzy
+#: g10/mainproc.c:249
 msgid "decryption okay\n"
-msgstr "decifratura fallita: %s\n"
+msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:252
-msgid "WARNING: encrypted message has been manipulated!\n"
-msgstr ""
-
-#: g10/mainproc.c:257
+#: g10/mainproc.c:253
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:275
-#, fuzzy
+#: g10/mainproc.c:270
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
-msgstr "nota: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
+msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
 
-#: g10/mainproc.c:277
+#: g10/mainproc.c:272
 #, c-format
 msgid "original file name='%.*s'\n"
-msgstr ""
+msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:876
 msgid "signature verification suppressed\n"
-msgstr ""
+msgstr "verifica della firma soppressa\n"
 
-#: g10/mainproc.c:896
+#: g10/mainproc.c:883
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
-msgstr "Firma fatta %.*s usando %s key ID %08lX\n"
+msgstr "Firma fatta %.*s usando la chiave %s con ID %08lX\n"
+
+#: g10/mainproc.c:895
+msgid "encrypted message is valid\n"
+msgstr "il messaggio cifrato � valido\n"
+
+#: g10/mainproc.c:899
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr "ATTENZIONE: il messaggio cifrato � stato manipolato!\n"
+
+#: g10/mainproc.c:904
+#, c-format
+msgid "Can't check MDC: %s\n"
+msgstr "Impossibile controllare il MDC: %s\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:922 g10/mainproc.c:933
+#: g10/mainproc.c:925 g10/mainproc.c:936
 msgid "BAD signature from \""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:923 g10/mainproc.c:934
+#: g10/mainproc.c:926 g10/mainproc.c:937
 msgid "Good signature from \""
-msgstr "Buona firma da \""
+msgstr "Firma valida da \""
 
-#: g10/mainproc.c:925
-#, fuzzy
+#: g10/mainproc.c:928
 msgid "                aka \""
-msgstr "importate: %lu"
+msgstr "    anche noto come \""
 
-#: g10/mainproc.c:975
+#: g10/mainproc.c:974
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:1056
+#: g10/mainproc.c:1047
 msgid "old style (PGP 2.x) signature\n"
-msgstr ""
+msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/mainproc.c:1061
+#: g10/mainproc.c:1052
 msgid "invalid root packet detected in proc_tree()\n"
-msgstr ""
+msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
-#: g10/misc.c:93
-#, fuzzy, c-format
+#: g10/misc.c:90
+#, c-format
 msgid "can't disable core dumps: %s\n"
-msgstr "impossibile aprire `%s': %s\n"
+msgstr "impossibile disabilitare i core dump: %s\n"
 
-#: g10/misc.c:96
+#: g10/misc.c:93
 msgid "WARNING: program may create a core file!\n"
-msgstr ""
+msgstr "ATTENZIONE: il programma potrebbe creare un file di core!\n"
 
-#: g10/misc.c:203
+#: g10/misc.c:200
 msgid "Experimental algorithms should not be used!\n"
-msgstr ""
+msgstr "Gli algoritmi sperimentali non dovrebbero essere usati!\n"
 
-#: g10/misc.c:217
+#: g10/misc.c:214
 msgid ""
 "RSA keys are deprecated; please consider creating a new key and use this key "
 "in the future\n"
 msgstr ""
-"L'uso di chiavi RSA � deprecato; per favore in futuro considera di creare e\n"
-"usare una nuova chiave.\n"
+"Le chiavi RSA sono deprecate; per favore considera di creare una nuova chiave\n"
+"e usarla in futuro\n"
 
-#: g10/misc.c:239
+#: g10/misc.c:236
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
-msgstr ""
+msgstr "questo algoritmo di cifratura � deprecato; usatene uno pi� standard!\n"
 
-#: g10/parse-packet.c:112
-#, fuzzy, c-format
+#: g10/parse-packet.c:113
+#, c-format
 msgid "can't handle public key algorithm %d\n"
-msgstr "impossibile bloccare il portachiavi pubblico: %s\n"
+msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
 
-#: g10/parse-packet.c:872
+#: g10/parse-packet.c:892
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
-msgstr ""
+msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
 
 #: g10/passphrase.c:157
 msgid ""
@@ -2356,22 +2298,20 @@ msgstr ""
 "dell'utente: \""
 
 #: g10/passphrase.c:166
-#, fuzzy, c-format
+#, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
-msgstr "(chiave %2$s di %1$u-bit, ID %3$08lX, creata il %4$s)\n"
+msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s"
 
 #: g10/passphrase.c:171
 #, c-format
 msgid " (main key ID %08lX)"
-msgstr ""
+msgstr " (key ID principale %08lX)"
 
 #: g10/passphrase.c:190
-#, fuzzy
 msgid "Enter passphrase: "
 msgstr "Inserisci la passphrase: "
 
 #: g10/passphrase.c:194
-#, fuzzy
 msgid "Repeat passphrase: "
 msgstr "Ripeti la passphrase: "
 
@@ -2386,9 +2326,9 @@ msgstr "Inserisci il nome del file di dati: "
 
 #: g10/plaintext.c:229
 msgid "reading stdin ...\n"
-msgstr ""
+msgstr "viene letto stdin...\n"
 
-#: g10/plaintext.c:302
+#: g10/plaintext.c:292
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossibile aprire i dati firmati `%s'\n"
@@ -2396,22 +2336,21 @@ msgstr "impossibile aprire i dati firmati `%s'\n"
 #: g10/pubkey-enc.c:79
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
-msgstr "ricevente anonimo; provo la chiave segreta %08lX ...\n"
+msgstr "destinatario anonimo; provo la chiave segreta %08lX ...\n"
 
 #: g10/pubkey-enc.c:85
-#, fuzzy
 msgid "okay, we are the anonymous recipient.\n"
-msgstr "Bene, siamo il ricevente anonimo.\n"
+msgstr "bene, siamo il destinatario anonimo.\n"
 
 #: g10/pubkey-enc.c:137
-#, fuzzy
 msgid "old encoding of the DEK is not supported\n"
-msgstr "l'algoritmo di protezione %d non � gestito\n"
+msgstr "la vecchia codifica del DEK non � gestita\n"
 
 #: g10/pubkey-enc.c:191
-#, fuzzy, c-format
+#, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
-msgstr "nota: algoritmo di cifratura %d non trovato nelle impostazioni\n"
+msgstr ""
+"NOTA: l'algoritmo di cifratura %d non � stato trovato nelle impostazioni\n"
 
 #: g10/seckey-cert.c:55
 #, c-format
@@ -2423,255 +2362,250 @@ msgid "Invalid passphrase; please try again ...\n"
 msgstr "Passphrase non valida; riprova...\n"
 
 #: g10/seckey-cert.c:227
-#, fuzzy
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
-"Attenzione: individuata una chiave debole - per favore cambia ancora la\n"
+"ATTENZIONE: Individuata una chiave debole - per favore cambia ancora la\n"
 "passphrase.\n"
 
-#: g10/sig-check.c:187
+#: g10/sig-check.c:186
 msgid "assuming bad MDC due to an unknown critical bit\n"
-msgstr ""
+msgstr "si presume un MDC non valido a causa di un bit critico sconosciuto\n"
 
-#: g10/sig-check.c:283
+#: g10/sig-check.c:282
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
-"questa � una chiave ElGamal generata da PGP che NON � sicura per le firme!\n"
+"questa � una chiave ElGamal generata da PGP e NON � sicura per le firme!\n"
 
-#: g10/sig-check.c:291
-#, fuzzy, c-format
+#: g10/sig-check.c:290
+#, c-format
 msgid "public key is %lu second newer than the signature\n"
-msgstr "chiave %08lX: user id senza firma\n"
+msgstr "la chiave pubblica � %lu secondo pi� recente della firma\n"
 
-#: g10/sig-check.c:292
-#, fuzzy, c-format
+#: g10/sig-check.c:291
+#, c-format
 msgid "public key is %lu seconds newer than the signature\n"
-msgstr "chiave %08lX: user id senza firma\n"
+msgstr "la chiave pubblica � %lu secondi pi� recente della firma\n"
 
-#: g10/sig-check.c:308
-#, fuzzy, c-format
+#: g10/sig-check.c:307
+#, c-format
 msgid "NOTE: signature key expired %s\n"
-msgstr "attenzione: firma della chiave scaduta il %s\n"
+msgstr "NOTA: chiave per firmare scaduta il %s\n"
 
-#: g10/sig-check.c:365
+#: g10/sig-check.c:364
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
+"si presume una firma non valida a causa di un bit critico sconosciuto\n"
 
 #: g10/sign.c:79
-#, fuzzy, c-format
+#, c-format
 msgid "%s signature from: %s\n"
-msgstr "Firma NON corretta da \""
+msgstr "Firma %s da: %s\n"
 
 #: g10/sign.c:210 g10/sign.c:496
-#, fuzzy, c-format
+#, c-format
 msgid "can't create %s: %s\n"
-msgstr "%s: impossibile creare: %s\n"
+msgstr "impossibile creare %s: %s\n"
 
 #: g10/sign.c:306
-#, fuzzy
 msgid "signing:"
-msgstr "sign"
-
-#: g10/sign.c:346
-#, fuzzy, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "%s: attenzione: file vuoto\n"
+msgstr "firma:"
 
-#: g10/textfilter.c:128
+#: g10/textfilter.c:122
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
-msgstr ""
+msgstr "impossibile gestire linee di testo pi� lunghe di %d caratteri\n"
 
-#: g10/textfilter.c:197
+#: g10/textfilter.c:189
 #, c-format
 msgid "input line longer than %d characters\n"
-msgstr ""
+msgstr "linea di input pi� lunga di %d caratteri\n"
 
 #: g10/tdbio.c:116 g10/tdbio.c:1505
-#, fuzzy, c-format
+#, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
-msgstr "aggiornamento della chiave segreta fallito: %s\n"
+msgstr "trustdb rec %lu: lseek fallita: %s\n"
 
 #: g10/tdbio.c:122 g10/tdbio.c:1512
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
-msgstr ""
+msgstr "trustdb rec %lu: scrittura fallita (n=%d): %s\n"
 
 #: g10/tdbio.c:232
 msgid "trustdb transaction too large\n"
-msgstr ""
+msgstr "transazione del trustdb troppo grande\n"
 
 #: g10/tdbio.c:424
-#, fuzzy, c-format
+#, c-format
 msgid "%s: can't access: %s\n"
-msgstr "%s: impossibile creare: %s\n"
+msgstr "%s: impossibile acedere a: %s\n"
 
 #: g10/ringedit.c:296 g10/tdbio.c:444
-#, fuzzy, c-format
+#, c-format
 msgid "%s: can't create directory: %s\n"
-msgstr "%s: impossibile creare: %s\n"
+msgstr "%s: impossibile creare la directory: %s\n"
 
 #: g10/ringedit.c:302 g10/tdbio.c:447
-#, fuzzy, c-format
+#, c-format
 msgid "%s: directory created\n"
-msgstr "%s: impossibile creare: %s\n"
+msgstr "%s: directory creata\n"
 
 #: g10/tdbio.c:451
 #, c-format
 msgid "%s: directory does not exist!\n"
-msgstr ""
+msgstr "%s: la directory non esiste!\n"
 
-#: g10/openfile.c:113 g10/openfile.c:183 g10/ringedit.c:1344 g10/tdbio.c:457
+#: g10/openfile.c:111 g10/openfile.c:181 g10/ringedit.c:1344 g10/tdbio.c:457
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: impossibile creare: %s\n"
 
 #: g10/tdbio.c:472 g10/tdbio.c:521
-#, fuzzy, c-format
+#, c-format
 msgid "%s: can't create lock\n"
-msgstr "%s: impossibile creare: %s\n"
+msgstr "%s: impossibile creare il lock\n"
 
 #: g10/tdbio.c:486
 #, c-format
 msgid "%s: failed to create version record: %s"
-msgstr ""
+msgstr "%s: creazione del record della versione fallita: %s"
 
 #: g10/tdbio.c:490
-#, fuzzy, c-format
+#, c-format
 msgid "%s: invalid trustdb created\n"
-msgstr "%s: impossibile creare: %s\n"
+msgstr "%s: � stato creato un trustdb non valido\n"
 
 #: g10/tdbio.c:493
-#, fuzzy, c-format
+#, c-format
 msgid "%s: trustdb created\n"
-msgstr "%s: impossibile creare: %s\n"
+msgstr "%s: creato il trustdb\n"
 
 #: g10/tdbio.c:530
-#, fuzzy, c-format
+#, c-format
 msgid "%s: invalid trustdb\n"
-msgstr "aggiornamento del trustdb fallito: %s\n"
+msgstr "%s: trustdb non valido\n"
 
 #: g10/tdbio.c:563
-#, fuzzy, c-format
+#, c-format
 msgid "%s: failed to create hashtable: %s\n"
-msgstr "%s: impossibile creare: %s\n"
+msgstr "%s: creazione della tabella hash fallita: %s\n"
 
 #: g10/tdbio.c:571
-#, fuzzy, c-format
+#, c-format
 msgid "%s: error updating version record: %s\n"
-msgstr "%s: errore nel controllare la chiave: %s\n"
+msgstr "%s: errore durante l'aggiornamento del record di versione: %s\n"
 
 #: g10/tdbio.c:587 g10/tdbio.c:626 g10/tdbio.c:648 g10/tdbio.c:678
 #: g10/tdbio.c:703 g10/tdbio.c:1438 g10/tdbio.c:1465
-#, fuzzy, c-format
+#, c-format
 msgid "%s: error reading version record: %s\n"
-msgstr "%s: errore nel controllare la chiave: %s\n"
+msgstr "%s: errore durante la lettura del record di versione: %s\n"
 
 #: g10/tdbio.c:600 g10/tdbio.c:659
-#, fuzzy, c-format
+#, c-format
 msgid "%s: error writing version record: %s\n"
-msgstr "%s: errore nel controllare la chiave: %s\n"
+msgstr "%s: errore durante la scrittura del record di versione: %s\n"
 
 #: g10/tdbio.c:1132
-#, fuzzy, c-format
+#, c-format
 msgid "trustdb: lseek failed: %s\n"
-msgstr "aggiornamento della chiave segreta fallito: %s\n"
+msgstr "trustdb: lseek fallita: %s\n"
 
 #: g10/tdbio.c:1140
-#, fuzzy, c-format
+#, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
-msgstr "aggiornamento del trustdb fallito: %s\n"
+msgstr "trustdb: read fallita (n=%d): %s\n"
 
 #: g10/tdbio.c:1161
-#, fuzzy, c-format
+#, c-format
 msgid "%s: not a trustdb file\n"
-msgstr "aggiornamento del trustdb fallito: %s\n"
+msgstr "%s: non � un file di trustdb\n"
 
 #: g10/tdbio.c:1177
 #, c-format
 msgid "%s: version record with recnum %lu\n"
-msgstr ""
+msgstr "%s: record di versione con recnum %lu\n"
 
 #: g10/tdbio.c:1182
-#, fuzzy, c-format
+#, c-format
 msgid "%s: invalid file version %d\n"
-msgstr "header della firma in chiaro non valido\n"
+msgstr "%s: versione %d del file non valida\n"
 
 #: g10/tdbio.c:1471
-#, fuzzy, c-format
+#, c-format
 msgid "%s: error reading free record: %s\n"
-msgstr "%s: errore nel controllare la chiave: %s\n"
+msgstr "%s: errore durante la lettura del record libero: %s\n"
 
 #: g10/tdbio.c:1479
-#, fuzzy, c-format
+#, c-format
 msgid "%s: error writing dir record: %s\n"
-msgstr "%s: errore nel controllare la chiave: %s\n"
+msgstr "%s: errore durante la scrittura del dir record: %s\n"
 
 #: g10/tdbio.c:1489
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
-msgstr ""
+msgstr "%s: azzeramento di un record fallito: %s\n"
 
 #: g10/tdbio.c:1519
 #, c-format
 msgid "%s: failed to append a record: %s\n"
-msgstr ""
+msgstr "%s: accodatura a un record fallita: %s\n"
 
 #: g10/tdbio.c:1630
-#, fuzzy
 msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n"
-msgstr "Il trustdb � rovinato; per favore esegui \"gpgm --fix-trust-db\".\n"
+msgstr "Il trustdb � danneggiato; eseguire \"gpgm --fix-trust-db\".\n"
 
 #: g10/trustdb.c:163
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
-msgstr ""
+msgstr "trust record %lu, req type %d: read fallita: %s\n"
 
 #: g10/trustdb.c:178
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
-msgstr ""
+msgstr "trust record %lu, req type %d: write fallita: %s\n"
 
 #: g10/trustdb.c:192
-#, fuzzy, c-format
+#, c-format
 msgid "trust record %lu: delete failed: %s\n"
-msgstr "aggiornamento della chiave segreta fallito: %s\n"
+msgstr "trust record %lu: delete fallita: %s\n"
 
 #: g10/trustdb.c:206
-#, fuzzy, c-format
+#, c-format
 msgid "trustdb: sync failed: %s\n"
-msgstr "aggiornamento del trustdb fallito: %s\n"
+msgstr "trustdb: sync fallita: %s\n"
 
 #: g10/trustdb.c:386
 #, c-format
 msgid "error reading dir record for LID %lu: %s\n"
-msgstr ""
+msgstr "errore durante la lettura del dir record per il LID %lu: %s\n"
 
 #: g10/trustdb.c:393
 #, c-format
 msgid "lid %lu: expected dir record, got type %d\n"
-msgstr ""
+msgstr "lid %lu: atteso un dir record, trovato uno di tipo %d\n"
 
 #: g10/trustdb.c:398
 #, c-format
 msgid "no primary key for LID %lu\n"
-msgstr ""
+msgstr "manca una chiave primaria per il LID %lu\n"
 
 #: g10/trustdb.c:403
-#, fuzzy, c-format
+#, c-format
 msgid "error reading primary key for LID %lu: %s\n"
-msgstr "errore nella creazione della passhprase: %s\n"
+msgstr ""
+"errore durante la lettura della chiave primaria per il\n"
+"LID %lu: %s\n"
 
 #: g10/trustdb.c:442
-#, fuzzy, c-format
+#, c-format
 msgid "get_dir_record: search_record failed: %s\n"
-msgstr "aggiornamento della chiave segreta fallito: %s\n"
+msgstr "get_dir_record: search_record fallito: %s\n"
 
 #: g10/trustdb.c:510
-#, fuzzy, c-format
+#, c-format
 msgid "NOTE: secret key %08lX is NOT protected.\n"
-msgstr "Questa chiave non � protetta.\n"
+msgstr "NOTA: la chiave segreta %08lX NON � protetta.\n"
 
 #: g10/trustdb.c:518
 #, c-format
@@ -2694,30 +2628,29 @@ msgid "key %08lX: query record failed\n"
 msgstr "chiave %08lX: richiesta del record fallita\n"
 
 #: g10/trustdb.c:550
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX: already in trusted key table\n"
-msgstr "chiave %08lX: gi� nella tabella delle chiavi segrete\n"
+msgstr "chiave %08lX: gi� nella tabella delle chiavi affidabili\n"
 
 #: g10/trustdb.c:553
-#, fuzzy, c-format
+#, c-format
 msgid "key %08lX: accepted as trusted key.\n"
-msgstr "chiave %08lX: accettata come chiave segreta\n"
+msgstr "chiave %08lX: accettata come chiave affidabile\n"
 
 #: g10/trustdb.c:561
-#, fuzzy, c-format
+#, c-format
 msgid "enumerate secret keys failed: %s\n"
-msgstr "enum_secret_keys fallito: %s\n"
+msgstr "enumerate secret keys fallito: %s\n"
 
 #: g10/trustdb.c:851
-#, fuzzy, c-format
+#, c-format
 msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n"
-msgstr ""
-"nota: rec di %lu[%d] nella hintlist di %lu ma marcato come verificato\n"
+msgstr "NOTA: rec di %lu[%d] nella hintlist di %lu ma marcato come verificato\n"
 
 #: g10/trustdb.c:855
-#, fuzzy, c-format
+#, c-format
 msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but not marked\n"
-msgstr "nota: rec di %lu[%d] nella hintlist di %lu ma  non marcato\n"
+msgstr "NOTA: rec di %lu[%d] nella hintlist di %lu ma non marcato\n"
 
 #. we need the dir record
 #: g10/trustdb.c:862
@@ -2773,9 +2706,9 @@ msgid "lid %lu: can't get keyblock: %s\n"
 msgstr "lid %lu: impossibile ottenere il keyblock: %s\n"
 
 #: g10/trustdb.c:1055 g10/trustdb.c:2030
-#, fuzzy, c-format
+#, c-format
 msgid "tdbio_search_dir failed: %s\n"
-msgstr "rimozione dell'armatura fallita: %s\n"
+msgstr "tdbio_search_dir fallita: %s\n"
 
 #: g10/trustdb.c:1210
 #, c-format
@@ -2812,7 +2745,7 @@ msgstr "Autofirma non valida"
 
 #: g10/trustdb.c:1403
 msgid "Valid user ID revocation skipped due to a newer self signature\n"
-msgstr ""
+msgstr "Evitata la revoca dell'user ID valida a causa di una autofirma pi� recente\n"
 
 #: g10/trustdb.c:1410
 msgid "Valid user ID revocation\n"
@@ -2827,23 +2760,20 @@ msgid "Too many preferences"
 msgstr "Troppe preferenze"
 
 #: g10/trustdb.c:1526
-#, fuzzy
 msgid "Too many preference items"
 msgstr "Troppi elementi di preferenza"
 
 #: g10/trustdb.c:1549 g10/trustdb.c:3075 g10/trustdb.c:3105
 msgid "WARNING: can't yet handle long pref records\n"
-msgstr ""
+msgstr "ATTENZIONE: non � ancora possibile gestire record pref lunghi\n"
 
 #: g10/trustdb.c:1654
-#, fuzzy
 msgid "duplicated certificate - deleted"
-msgstr "Certificato doppio - cancellato"
+msgstr "certificato doppio - cancellato"
 
 #: g10/trustdb.c:1692
-#, fuzzy
 msgid "public key not anymore available"
-msgstr "La chiave segreta non � disponibile."
+msgstr "chiave pubblica non pi� disponibile"
 
 #: g10/trustdb.c:1702 g10/trustdb.c:1791
 msgid "Invalid certificate revocation"
@@ -2856,57 +2786,56 @@ msgstr "Certificato non valido"
 #: g10/trustdb.c:1720
 #, c-format
 msgid "uid %08lX.%lu/%02X%02X: has shadow dir %lu but is not yet marked.\n"
-msgstr ""
+msgstr "uid %08lX.%lu/%02X%02X: ha shadow dir %lu ma non � ancora marcato.\n"
 
 #: g10/trustdb.c:1734
-#, fuzzy, c-format
+#, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
-msgstr "Il rec di %lu[%d] nella hintlist di %lu non punta a un record dir\n"
+msgstr "il sig recor di %lu[%d] punta al record sbagliato.\n"
 
 #. that should never happen
 #: g10/trustdb.c:2007
-#, fuzzy, c-format
+#, c-format
 msgid "insert_trust_record: keyblock not found: %s\n"
-msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
+msgstr "insert_trust_record: keyblock non trovato: %s\n"
 
 #: g10/trustdb.c:2408
 msgid "Ooops, no keys\n"
-msgstr ""
+msgstr "Ooops, mancano le chiavi\n"
 
 #: g10/trustdb.c:2412
-#, fuzzy
 msgid "Ooops, no user ids\n"
-msgstr "elenca le chiavi e gli user id"
+msgstr "Ooops, mancano gli user id\n"
 
 #: g10/trustdb.c:2529
-#, fuzzy, c-format
+#, c-format
 msgid "lid ?: insert failed: %s\n"
-msgstr "aggiornamento della chiave segreta fallito: %s\n"
+msgstr "lid ?: inserimento fallito: %s\n"
 
 #: g10/trustdb.c:2534
-#, fuzzy, c-format
+#, c-format
 msgid "lid %lu: insert failed: %s\n"
-msgstr "aggiornamento della chiave segreta fallito: %s\n"
+msgstr "lid %lu: inserimento fallito: %s\n"
 
 #: g10/trustdb.c:2540
-#, fuzzy, c-format
+#, c-format
 msgid "lid %lu: inserted\n"
-msgstr "\\t%lu chiavi inserite\n"
+msgstr "lid %lu: inserito\n"
 
 #: g10/trustdb.c:2545 g10/trustdb.c:2654
-#, fuzzy, c-format
+#, c-format
 msgid "lid %lu: update failed: %s\n"
-msgstr "aggiornamento fallito: %s\n"
+msgstr "lid %lu: aggiornamento fallito: %s\n"
 
 #: g10/trustdb.c:2551 g10/trustdb.c:2660
-#, fuzzy, c-format
+#, c-format
 msgid "lid %lu: updated\n"
-msgstr "\\t%lu chiavi aggiornate\n"
+msgstr "lid %lu: aggiornato\n"
 
 #: g10/trustdb.c:2556 g10/trustdb.c:2664
-#, fuzzy, c-format
+#, c-format
 msgid "lid %lu: okay\n"
-msgstr "lid %lu: manca la chiave primaria\n"
+msgstr "lid %lu: corretto\n"
 
 #: g10/trustdb.c:2562 g10/trustdb.c:2671
 #, c-format
@@ -2916,62 +2845,62 @@ msgstr "%lu chiavi esaminate\n"
 #: g10/trustdb.c:2564 g10/trustdb.c:2675
 #, c-format
 msgid "\t%lu keys with errors\n"
-msgstr "\\t%lu chiavi con errori\n"
+msgstr "\t%lu chiavi con errori\n"
 
 #: g10/trustdb.c:2566 g10/trustdb.c:2677
 #, c-format
 msgid "\t%lu keys updated\n"
-msgstr "\\t%lu chiavi aggiornate\n"
+msgstr "\t%lu chiavi aggiornate\n"
 
 #: g10/trustdb.c:2568
 #, c-format
 msgid "\t%lu keys inserted\n"
-msgstr "\\t%lu chiavi inserite\n"
+msgstr "\t%lu chiavi inserite\n"
 
 #: g10/trustdb.c:2571
-#, fuzzy, c-format
+#, c-format
 msgid "enumerate keyblocks failed: %s\n"
-msgstr "enum_secret_keys fallito: %s\n"
+msgstr "enumerate keyblocks fallito: %s\n"
 
 #: g10/trustdb.c:2598
 #, c-format
 msgid "%s: keyblock read problem: %s\n"
-msgstr ""
+msgstr "%s: il keyblock ha problemi di lettura: %s\n"
 
 #: g10/trustdb.c:2612
-#, fuzzy, c-format
+#, c-format
 msgid "%s: update failed: %s\n"
-msgstr "aggiornamento fallito: %s\n"
+msgstr "%s: aggiornamento fallito: %s\n"
 
 #: g10/trustdb.c:2615
-#, fuzzy, c-format
+#, c-format
 msgid "%s: updated\n"
-msgstr "\\t%lu chiavi aggiornate\n"
+msgstr "%s: aggiornato\n"
 
 #: g10/trustdb.c:2617
 #, c-format
 msgid "%s: okay\n"
-msgstr ""
+msgstr "%s: va bene\n"
 
 #: g10/trustdb.c:2632
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
-msgstr ""
+msgstr "lid %lu: dir record senza chiave - saltato\n"
 
 #: g10/trustdb.c:2645
-#, fuzzy, c-format
+#, c-format
 msgid "lid %lu: keyblock not found: %s\n"
-msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
+msgstr "lid %lu: keyblock non trovato: %s\n"
 
 #: g10/trustdb.c:2673
 #, c-format
 msgid "\t%lu keys skipped\n"
-msgstr "\\t%lu chiavi saltate\n"
+msgstr "\t%lu chiavi saltate\n"
 
 #: g10/trustdb.c:2743
-#, fuzzy, c-format
+#, c-format
 msgid "check_trust: search dir record failed: %s\n"
-msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n"
+msgstr "check_trust: ricerca del dir record fallita: %s\n"
 
 #: g10/trustdb.c:2750
 #, c-format
@@ -3001,110 +2930,110 @@ msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "chiave %08lX.%lu: controllo della fiducia fallito: %s\n"
 
 #: g10/trustdb.c:2881
-#, fuzzy, c-format
+#, c-format
 msgid "user '%s' not found: %s\n"
-msgstr "%s: utente non trovato\n"
+msgstr "utente `%s' non trovato: %s\n"
 
 #: g10/trustdb.c:2883
-#, fuzzy, c-format
+#, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
-msgstr "inizializzazione del trustdb fallita: %s\n"
+msgstr "problema cercando `%s' nel trustdb: %s\n"
 
 #: g10/trustdb.c:2886
-#, fuzzy, c-format
+#, c-format
 msgid "user '%s' not in trustdb - inserting\n"
-msgstr "aggiornamento del trustdb fallito: %s\n"
+msgstr "l'utente `%s' non � nel trustdb - viene inserito\n"
 
 #: g10/trustdb.c:2889
-#, fuzzy, c-format
+#, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
-msgstr "inizializzazione del trustdb fallita: %s\n"
+msgstr "impossibile mettere `%s' nel trustdb: %s\n"
 
 #: g10/ringedit.c:316
-#, fuzzy, c-format
+#, c-format
 msgid "%s: can't create keyring: %s\n"
-msgstr "%s: impossibile creare: %s\n"
+msgstr "%s: impossibile creare il portachiavi: %s\n"
 
 #: g10/ringedit.c:333 g10/ringedit.c:1349
-#, fuzzy, c-format
+#, c-format
 msgid "%s: keyring created\n"
-msgstr "%s: creato un nuovo file delle opzioni\n"
+msgstr "%s: portachiavi creato\n"
 
 #: g10/ringedit.c:1526
 msgid "WARNING: 2 files with confidential information exists.\n"
-msgstr ""
+msgstr "ATTENZIONE: esistono due file con informazioni confidenziali.\n"
 
 #: g10/ringedit.c:1527
-#, fuzzy, c-format
+#, c-format
 msgid "%s is the unchanged one\n"
-msgstr "chiavi segrete non cambiate %lu\n"
+msgstr "%s � quello non modificato\n"
 
 #: g10/ringedit.c:1528
 #, c-format
 msgid "%s is the new one\n"
-msgstr ""
+msgstr "%s � quello nuovo\n"
 
 #: g10/ringedit.c:1529
 msgid "Please fix this possible security flaw\n"
-msgstr ""
+msgstr "Per favore risolvete questo possibile problema di sicurezza\n"
 
 #: g10/skclist.c:88 g10/skclist.c:125
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr ""
+msgstr "la chiave non � indicata come insicura - impossibile usarla con il RNG finto!\n"
 
 #: g10/skclist.c:113
-#, fuzzy, c-format
+#, c-format
 msgid "skipped `%s': %s\n"
-msgstr "%s: saltata: %s\n"
+msgstr "saltata `%s': %s\n"
 
 #: g10/skclist.c:119
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
 "signatures!\n"
 msgstr ""
-"questa � una chiave ElGamal generata da PGP che NON � sicura per le firme!\n"
+"%s: questa � una chiave ElGamal generata da PGP che NON � sicura per\n"
+"le firme!\n"
 
 #. do not overwrite
-#: g10/openfile.c:65
+#: g10/openfile.c:63
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Il file `%s' esiste. "
 
-#: g10/openfile.c:67
+#: g10/openfile.c:65
 msgid "Overwrite (y/N)? "
-msgstr "Sovrascrivo (y/N)? "
+msgstr "Sovrascrivo (s/N)? "
 
-#: g10/openfile.c:92
+#: g10/openfile.c:90
 msgid "writing to stdout\n"
 msgstr "scrivo su stdout\n"
 
-#: g10/openfile.c:149
+#: g10/openfile.c:147
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "presumo che i dati firmati siano in `%s'\n"
 
-#: g10/openfile.c:199
+#: g10/openfile.c:197
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: creato un nuovo file delle opzioni\n"
 
-#: g10/encr-data.c:66
-#, fuzzy, c-format
+#: g10/encr-data.c:60
+#, c-format
 msgid "%s encrypted data\n"
-msgstr "cifra dati"
+msgstr "dati cifrati con %s\n"
 
-#: g10/encr-data.c:68
+#: g10/encr-data.c:62
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
-msgstr ""
+msgstr "cifrato con l'algoritmo sconosciuto %d\n"
 
-#: g10/encr-data.c:85
-#, fuzzy
+#: g10/encr-data.c:77
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
-"Attenzione: il messaggio era stato crittografato usando una chiave debole\n"
+"ATTENZIONE: il messaggio era stato cifrato usando una chiave debole\n"
 "per il cifrario simmetrico\n"
 
 #: g10/seskey.c:52
@@ -3140,9 +3069,8 @@ msgid "keygen.algo"
 msgstr "keygen.algo"
 
 #: g10/helptext.c:82
-#, fuzzy
 msgid "keygen.algo.elg_se"
-msgstr "keygen.algo"
+msgstr "keygen.algo.elg_se"
 
 #: g10/helptext.c:89
 msgid "keygen.size"
@@ -3234,124 +3162,9 @@ msgstr "openfile.overwrite.okay"
 
 #: g10/helptext.c:204
 msgid "No help available"
-msgstr "Nessun aiuto disponibile"
+msgstr "Non � disponibile un aiuto"
 
 #: g10/helptext.c:216
 #, c-format
 msgid "No help available for `%s'"
-msgstr "Nessun aiuto disponibile per `%s'"
-
-#~ msgid "can't open file: %s\n"
-#~ msgstr "impossibile aprire il file: %s\n"
-
-#~ msgid "read error: %s\n"
-#~ msgstr "errore di lettura: %s\n"
-
-#~ msgid "can't write to keyring: %s\n"
-#~ msgstr "impossibile scrivere sul portachiavi pubblico: %s\n"
-
-#~ msgid "writing keyblock\n"
-#~ msgstr "scrittura del keyblock\n"
-
-#~ msgid "can't write keyblock: %s\n"
-#~ msgstr "impossibile aprire il keyblock: %s\n"
-
-#~ msgid "can't lock secret keyring: %s\n"
-#~ msgstr "impossibile bloccare il portachiavi segreto: %s\n"
-
-#~ msgid "can't write keyring: %s\n"
-#~ msgstr "impossibile scrivere il portachiavi: %s\n"
-
-#, fuzzy
-#~ msgid "encrypted message is valid\n"
-#~ msgstr "l'algoritmo di digest selezionato non � valido\n"
-
-#, fuzzy
-#~ msgid "Can't check MDC: %s\n"
-#~ msgstr "Impossibile controllare la firma: %s\n"
-
-#~ msgid "Usage: gpgm [options] [files] (-h for help)"
-#~ msgstr "Uso: gpgm [opzioni] [file] (-h per l'aiuto)"
-
-#~ msgid ""
-#~ "Syntax: gpgm [options] [files]\n"
-#~ "GnuPG maintenance utility\n"
-#~ msgstr ""
-#~ "Sintassi: gpgm [opzioni] [file]\n"
-#~ "Utility di manutenzione di GnuPG\n"
-
-#~ msgid "usage: gpgm [options] "
-#~ msgstr "uso: gpgm [options] "
-
-#~ msgid "chained sigrec %lu has a wrong owner\n"
-#~ msgstr "la chained sigrec %lu ha il proprietario sbagliato\n"
-
-#, fuzzy
-#~ msgid "'%s' is not a valid long keyID\n"
-#~ msgstr "Carattere non valido nel commento\n"
-
-#, fuzzy
-#~ msgid "key %08lX: no public key for trusted key - skipped\n"
-#~ msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
-
-#, fuzzy
-#~ msgid "lid %lu: read dir record failed: %s\n"
-#~ msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n"
-
-#, fuzzy
-#~ msgid "lid %lu: read key record failed: %s\n"
-#~ msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n"
-
-#, fuzzy
-#~ msgid "lid %lu: read uid record failed: %s\n"
-#~ msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n"
-
-#, fuzzy
-#~ msgid "lid %lu: read pref record failed: %s\n"
-#~ msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n"
-
-#, fuzzy
-#~ msgid "lid %lu: read sig record failed: %s\n"
-#~ msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n"
-
-#, fuzzy
-#~ msgid "user '%s' read problem: %s\n"
-#~ msgstr "%s: utente non trovato\n"
-
-#, fuzzy
-#~ msgid "user '%s' list problem: %s\n"
-#~ msgstr "%s: utente non trovato\n"
-
-#, fuzzy
-#~ msgid "user '%s' not in trustdb\n"
-#~ msgstr "%s: utente non trovato\n"
-
-#, fuzzy
-#~ msgid "error: invalid fingerprint\n"
-#~ msgstr "errore nella riga della coda\n"
-
-#, fuzzy
-#~ msgid "error: no ownertrust value\n"
-#~ msgstr "esporta i valori di fiducia"
-
-#, fuzzy
-#~ msgid "key not in ring: %s\n"
-#~ msgstr "impossibile scrivere il portachiavi: %s\n"
-
-#, fuzzy
-#~ msgid "insert trust record failed: %s\n"
-#~ msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n"
-
-#, fuzzy
-#~ msgid "error finding dir record: %s\n"
-#~ msgstr "rimozione dell'armatura fallita: %s\n"
-
-#, fuzzy
-#~ msgid "Hmmm, public key lost?"
-#~ msgstr "chiave pubblica perduta"
-
-#~ msgid "invalid clear text header: "
-#~ msgstr "header del testo in chiaro non valido: "
-
-#~ msgid "You will see a list of signators etc. here\n"
-#~ msgstr "Qui vedrai una lista di firmatari, ecc.\n"
+msgstr "Non � disponibile un aiuto per `%s'"
diff --git a/po/pl.po b/po/pl.po
index 380831b65..75036c618 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,15 +6,21 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-0.9.7\n"
-"POT-Creation-Date: 1999-05-23 15:36+0200\n"
+"POT-Creation-Date: 1999-06-08 21:26+0200\n"
 "PO-Revision-Date: 1999-05-30 19:08+02:00\n"
 "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Xgettext-Options: --default-domain=gnupg --directory=.. --add-comments --keywor\\d=_ --keyword=N_ --files-from=./POTFILES.in\n"
-"Files: util/secmem.c util/argparse.c cipher/random.c cipher/rand-dummy.c cipher\\/rand-unix.c cipher/rand-w32.c g10/g10.c g10/pkclist.c g10/keygen.c g10/decrypt\\.c g10/encode.c g10/import.c g10/keyedit.c g10/keylist.c g10/mainproc.c g10/pas\\sphrase.c g10/plaintext.c g10/pref.c g10/seckey-cert.c g10/sig-check.c g10/sign\\.c g10/trustdb.c g10/verify.c g10/status.c g10/pubkey-enc.c\n"
+"Xgettext-Options: --default-domain=gnupg --directory=.. --add-comments "
+"--keywor\\d=_ --keyword=N_ --files-from=./POTFILES.in\n"
+"Files: util/secmem.c util/argparse.c cipher/random.c cipher/rand-dummy.c "
+"cipher\\/rand-unix.c cipher/rand-w32.c g10/g10.c g10/pkclist.c g10/keygen.c "
+"g10/decrypt\\.c g10/encode.c g10/import.c g10/keyedit.c g10/keylist.c "
+"g10/mainproc.c g10/pas\\sphrase.c g10/plaintext.c g10/pref.c "
+"g10/seckey-cert.c g10/sig-check.c g10/sign\\.c g10/trustdb.c g10/verify.c "
+"g10/status.c g10/pubkey-enc.c\n"
 
 #: util/secmem.c:76
 msgid "Warning: using insecure memory!\n"
@@ -28,14 +34,23 @@ msgstr "operacja niemo�liwa do wykonania bez dost�pnej pami�ci bezpiecznej\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 
-#: util/miscutil.c:156
+#: util/miscutil.c:156 util/miscutil.c:173
 msgid "yes"
 msgstr "tak"
 
-#: util/miscutil.c:157
+#: util/miscutil.c:157 util/miscutil.c:175
 msgid "yY"
 msgstr "tT"
 
+#: g10/keyedit.c:559 util/miscutil.c:174
+msgid "quit"
+msgstr "wyj�cie"
+
+#: util/miscutil.c:176
+#, fuzzy
+msgid "qQ"
+msgstr "w"
+
 #: util/errors.c:54
 msgid "general error"
 msgstr "b��d og�lny"
@@ -258,7 +273,7 @@ msgstr ""
 "JAKIEKOLWIEK DANE GENEROWANE PRZEZ TEN PROGRAM NIE NADAJ� SI� DO \n"
 "NORMALNEGO U�YTKU I NIE ZAPEWNIAJ� BEZPIECZE�STWA!!\n"
 
-#: cipher/rndlinux.c:110
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -270,7 +285,7 @@ msgstr ""
 "Prosz� kontynuowa� inne dzia�ania aby system m�g� zebra� odpowiedni�\n"
 "ilo�� entropii do ich wygenerowania (brakuje %d bajt�w).\n"
 
-#: g10/g10.c:165
+#: g10/g10.c:169
 msgid ""
 "@Commands:\n"
 " "
@@ -278,131 +293,131 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/g10.c:167
+#: g10/g10.c:171
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: g10/g10.c:168
+#: g10/g10.c:172
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu na czytelnym dokumencie"
 
-#: g10/g10.c:169
+#: g10/g10.c:173
 msgid "make a detached signature"
 msgstr "sporz�dzenie podpisu oddzielonego od dokumentu"
 
-#: g10/g10.c:170
+#: g10/g10.c:174
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/g10.c:171
+#: g10/g10.c:175
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/g10.c:172
+#: g10/g10.c:176
 msgid "store only"
 msgstr "tylko zapis"
 
-#: g10/g10.c:173
+#: g10/g10.c:177
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lnie)"
 
-#: g10/g10.c:174
+#: g10/g10.c:178
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/g10.c:175
+#: g10/g10.c:179
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/g10.c:177
+#: g10/g10.c:181
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpis�w"
 
-#: g10/g10.c:178
+#: g10/g10.c:182
 msgid "check key signatures"
 msgstr "sprawdzenie podpis�w kluczy"
 
-#: g10/g10.c:179
+#: g10/g10.c:183
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/g10.c:180
+#: g10/g10.c:184
 msgid "list secret keys"
 msgstr "lista kluczy tajnych"
 
-#: g10/g10.c:181
+#: g10/g10.c:185
 msgid "generate a new key pair"
 msgstr "generacja nowej pary klucza"
 
-#: g10/g10.c:182
+#: g10/g10.c:186
 msgid "remove key from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: g10/g10.c:183
+#: g10/g10.c:187
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/g10.c:184
+#: g10/g10.c:188
 msgid "generate a revocation certificate"
 msgstr "generacja certyfikatu uniewa�nienia klucza"
 
-#: g10/g10.c:185
+#: g10/g10.c:189
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/g10.c:186
+#: g10/g10.c:190
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/g10.c:187
+#: g10/g10.c:191
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/g10.c:190
+#: g10/g10.c:194
 msgid "import/merge keys"
 msgstr "import/do��czenie kluczy"
 
-#: g10/g10.c:192
+#: g10/g10.c:196
 msgid "list only the sequence of packets"
 msgstr "wypisane sekwencji pakiet�w"
 
-#: g10/g10.c:194
+#: g10/g10.c:198
 msgid "export the ownertrust values"
 msgstr "eksport warto�ci zaufania"
 
-#: g10/g10.c:196
+#: g10/g10.c:200
 msgid "import ownertrust values"
 msgstr "wczytanie warto��i zaufania"
 
-#: g10/g10.c:198
+#: g10/g10.c:202
 msgid "|[NAMES]|update the trust database"
 msgstr "|[NAZWY]|naniesienie poprawek do bazy zaufania"
 
-#: g10/g10.c:200
+#: g10/g10.c:204
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAZWY]|sprawdzenie bazy zaufania"
 
-#: g10/g10.c:201
+#: g10/g10.c:205
 msgid "fix a corrupted trust database"
 msgstr "naprawa uszkodzonej Bazy Zaufania"
 
-#: g10/g10.c:202
+#: g10/g10.c:206
 msgid "De-Armor a file or stdin"
 msgstr "zdj�cie opakowania ASCII pliku lub potoku"
 
-#: g10/g10.c:203
+#: g10/g10.c:207
 msgid "En-Armor a file or stdin"
 msgstr "opakowanie ASCII pliku lub potoku"
 
-#: g10/g10.c:204
+#: g10/g10.c:208
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/g10.c:205
+#: g10/g10.c:209
 msgid "print all message digests"
 msgstr "wszystkie skr�ty wiadomo�ci"
 
-#: g10/g10.c:211
+#: g10/g10.c:215
 msgid ""
 "@\n"
 "Options:\n"
@@ -412,148 +427,152 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/g10.c:213
+#: g10/g10.c:217
 msgid "create ascii armored output"
 msgstr "plik wynikowy w opakowaniu ASCII"
 
-#: g10/g10.c:214
+#: g10/g10.c:218
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/g10.c:218
+#: g10/g10.c:222
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/g10.c:219
+#: g10/g10.c:223
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - brak)"
 
-#: g10/g10.c:221
+#: g10/g10.c:225
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/g10.c:222
+#: g10/g10.c:226
 msgid "use as output file"
 msgstr "plik wyj�ciowy"
 
-#: g10/g10.c:223
+#: g10/g10.c:227
 msgid "verbose"
 msgstr "z informacjami dodatkowymi"
 
-#: g10/g10.c:224
+#: g10/g10.c:228
 msgid "be somewhat more quiet"
 msgstr "mniej komunikat�ww"
 
-#: g10/g10.c:225
+#: g10/g10.c:229
 msgid "force v3 signatures"
 msgstr "wymuszenie trzeciej wersji formatu podpis�w"
 
-#: g10/g10.c:226
+#: g10/g10.c:230
 msgid "always use a MDC for encryption"
 msgstr "do szyfrowania b�dzie u�ywany MDC"
 
-#: g10/g10.c:227
+#: g10/g10.c:231
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:229
+#: g10/g10.c:233
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: �adnych pyta�"
 
-#: g10/g10.c:230
+#: g10/g10.c:234
 msgid "assume yes on most questions"
 msgstr "automatyczna odpowied� tak na wi�kszo�� pyta�"
 
-#: g10/g10.c:231
+#: g10/g10.c:235
 msgid "assume no on most questions"
 msgstr "automatyczna odpowied� nie na wi�kszo�� pyta�"
 
-#: g10/g10.c:232
+#: g10/g10.c:236
 msgid "add this keyring to the list of keyrings"
 msgstr "doda� zbi�r kluczy do listy u�ywanych"
 
-#: g10/g10.c:233
+#: g10/g10.c:237
 msgid "add this secret keyring to the list"
 msgstr "doda� zbi�r kluczy tajnych do listy"
 
-#: g10/g10.c:234
+#: g10/g10.c:238
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego klucza tajnego"
 
-#: g10/g10.c:235
+#: g10/g10.c:239
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|serwer kluczy w kt�rym b�d� poszukiwane"
 
-#: g10/g10.c:236
+#: g10/g10.c:240
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAZWA|zestaw znak�w terminala NAZWA"
 
-#: g10/g10.c:237
+#: g10/g10.c:241
 msgid "read options from file"
 msgstr "wczytanie opcji z pliku"
 
-#: g10/g10.c:239
+#: g10/g10.c:243
 msgid "set debugging flags"
 msgstr "ustawienie opcji �ledzenia wykonania programu"
 
-#: g10/g10.c:240
+#: g10/g10.c:244
 msgid "enable full debugging"
 msgstr "umo�liwienie pe�nego �ledzenia programu"
 
-#: g10/g10.c:241
+#: g10/g10.c:245
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapisa� opis stanu do FD"
 
-#: g10/g10.c:242
+#: g10/g10.c:246
 msgid "do not write comment packets"
 msgstr "nie zapisywa� pakiet�w z komentarzem"
 
-#: g10/g10.c:243
+#: g10/g10.c:247
 msgid "(default is 1)"
 msgstr "(domy�lnie 1)"
 
-#: g10/g10.c:244
+#: g10/g10.c:248
 msgid "(default is 3)"
 msgstr "(domy�lnie 3)"
 
-#: g10/g10.c:246
+#: g10/g10.c:250
 msgid "|FILE|load extension module FILE"
 msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
 
-#: g10/g10.c:247
+#: g10/g10.c:251
 msgid "emulate the mode described in RFC1991"
 msgstr "emulacja trybu opisanego w RFC1991"
 
-#: g10/g10.c:248
+#: g10/g10.c:252
 msgid "|N|use passphrase mode N"
 msgstr "|N|N-ty tryb wprowadzania wyra�enia przej�ciowego"
 
-#: g10/g10.c:250
+#: g10/g10.c:254
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|ALG|algorytm obliczania skr�t�w wiadomo�ci ALG"
 
-#: g10/g10.c:252
+#: g10/g10.c:256
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|ALG|algorytmu szyfruj�cy ALG dla has�a"
 
-#: g10/g10.c:253
+#: g10/g10.c:257
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|algorytm szyfruj�cy NAZWA"
 
-#: g10/g10.c:254
+#: g10/g10.c:258
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|algorytm obliczania skr�t�w wiadomo�ci NAZWA"
 
-#: g10/g10.c:255
+#: g10/g10.c:259
 msgid "|N|use compress algorithm N"
 msgstr "|N|algorytm kompresji N"
 
-#: g10/g10.c:256
+#: g10/g10.c:260
 msgid "throw keyid field of encrypted packets"
 msgstr "usuni�cie identyfikator�w kluczy z pakiet�w"
 
-#: g10/g10.c:258
+#: g10/g10.c:261
+msgid "|NAME=VALUE|use this notation data"
+msgstr ""
+
+#: g10/g10.c:263
 msgid ""
 "@\n"
 "Examples:\n"
@@ -574,15 +593,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/g10.c:327
+#: g10/g10.c:337
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: g10/g10.c:331
+#: g10/g10.c:341
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/g10.c:334
+#: g10/g10.c:344
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -592,7 +611,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/g10.c:339
+#: g10/g10.c:349
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -600,149 +619,172 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/g10.c:413
+#: g10/g10.c:423
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/g10.c:453
+#: g10/g10.c:463
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/g10.c:580
+#: g10/g10.c:595
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji '%s'\n"
 
-#: g10/g10.c:584
+#: g10/g10.c:599
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji '%s': %s\n"
 
-#: g10/g10.c:591
+#: g10/g10.c:606
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z '%s'\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:755
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/g10.c:780 g10/g10.c:792
+#: g10/g10.c:799 g10/g10.c:811
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/g10.c:786 g10/g10.c:798
+#: g10/g10.c:805 g10/g10.c:817
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm geenracji skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/g10.c:801
+#: g10/g10.c:821
+msgid "the given policy URL is invalid\n"
+msgstr ""
+
+#: g10/g10.c:824
 #, 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:803
+#: g10/g10.c:826
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/g10.c:805
+#: g10/g10.c:828
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/g10.c:807
+#: g10/g10.c:830
 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:810
+#: g10/g10.c:833
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/g10.c:814
+#: g10/g10.c:837
 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:891
+#: g10/g10.c:914
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/g10.c:897
+#: g10/g10.c:920
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/g10.c:904
+#: g10/g10.c:927
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:912
+#: g10/g10.c:935
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/g10.c:925
+#: g10/g10.c:948
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/g10.c:938
+#: g10/g10.c:961
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:952
+#: g10/g10.c:975
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/g10.c:964
+#: g10/g10.c:987
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/g10.c:973
+#: g10/g10.c:996
 msgid "--edit-key username [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/g10.c:987
+#: g10/g10.c:1010
 msgid "--delete-secret-key username"
 msgstr "--delete-secret-key nazwa u�ytkownika"
 
-#: g10/g10.c:990
+#: g10/g10.c:1013
 msgid "--delete-key username"
 msgstr "--delete-key nazwa u�ytkownika"
 
-#: g10/encode.c:231 g10/g10.c:1013 g10/sign.c:311
+#: g10/encode.c:231 g10/g10.c:1036 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "nie mog� otworzy� %s: %s\n"
 
-#: g10/g10.c:1024
+#: g10/g10.c:1047
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
 
-#: g10/g10.c:1083
+#: g10/g10.c:1106
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "usuni�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1091
+#: g10/g10.c:1114
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1157
+#: g10/g10.c:1180
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu '%s'\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1255
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1259
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1239 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1262 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mog� otworzy� '%s'\n"
 
+#: g10/g10.c:1429
+msgid ""
+"the first character of a notation name must be a letter or an underscore\n"
+msgstr ""
+
+#: g10/g10.c:1435
+msgid ""
+"a notation name must have only letters, digits, dots or underscores and end "
+"with an '='\n"
+msgstr ""
+
+#: g10/g10.c:1441
+msgid "dots in a notation name must be surrounded by other characters\n"
+msgstr ""
+
+#: g10/g10.c:1449
+msgid "a notation value must not use any control characters\n"
+msgstr ""
+
 #: g10/armor.c:296
 #, c-format
 msgid "armor: %s\n"
@@ -1013,12 +1055,17 @@ msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "         Nie ma pewno�ci �e ten podpis zosta� z�o�nony przez w�a�ciciela.\n"
 
-#: g10/pkclist.c:569 g10/pkclist.c:582 g10/pkclist.c:645 g10/pkclist.c:673
+#: g10/pkclist.c:580 g10/pkclist.c:602 g10/pkclist.c:665 g10/pkclist.c:705
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: pomini�ty: %s\n"
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:588 g10/pkclist.c:687
+#, fuzzy, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr "%s: problem przy odczycie bloku klucza: %s\n"
+
+#: g10/pkclist.c:611
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1026,20 +1073,20 @@ msgstr ""
 "Nie poda�e� identyfikatora u�ytkownika (user ID). \n"
 "Mo�na to zrobi� za pomoc� opcji \"-r\".\n"
 
-#: g10/pkclist.c:596
+#: g10/pkclist.c:616
 msgid "Enter the user ID: "
 msgstr "Wprowad� identyfikator u�ytkownika (user ID): "
 
-#: g10/pkclist.c:607
+#: g10/pkclist.c:627
 msgid "No such user ID.\n"
 msgstr "Brak takiego identyfikatora u�ytkownika.\n"
 
-#: g10/pkclist.c:653
+#: g10/pkclist.c:673
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: b��d podczas sprawdzania klucza: %s\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:711
 msgid "no valid addressees\n"
 msgstr "brak poprawnych adres�w\n"
 
@@ -1284,7 +1331,7 @@ msgid ""
 msgstr ""
 "Musisz poda� wyra�enie przej�ciowe (has�o) aby ochroni� sw�j klucz tajny.\n"
 
-#: g10/keyedit.c:433 g10/keygen.c:748
+#: g10/keyedit.c:455 g10/keygen.c:748
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr ""
 "Powt�rzone wyra�enie przej�ciowe nie zgadza si� z podanym w pierwszej "
@@ -1356,7 +1403,7 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:52
+#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:105
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1364,7 +1411,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:54
+#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:107
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1376,7 +1423,7 @@ msgstr ""
 msgid "Really create? "
 msgstr "Na pewno generowa�? "
 
-#: g10/encode.c:91 g10/openfile.c:88 g10/openfile.c:176 g10/tdbio.c:467
+#: g10/encode.c:91 g10/openfile.c:118 g10/openfile.c:208 g10/tdbio.c:467
 #: g10/tdbio.c:528
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1532,18 +1579,20 @@ msgstr "klucz %08lX: brak klucza publicznego: %s\n"
 msgid "no default public keyring\n"
 msgstr "brak domy�lnego zbioru kluczy publicznych\n"
 
-#: g10/import.c:376 g10/openfile.c:117 g10/sign.c:215 g10/sign.c:501
+#: g10/import.c:376 g10/openfile.c:148 g10/sign.c:268 g10/sign.c:559
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
 
-#: g10/import.c:379 g10/import.c:435
-msgid "can't lock keyring `%': %s\n"
-msgstr "nie mo�na zablokowa� zbioru kluczy publicznych: %s\n"
+#: g10/import.c:379 g10/import.c:435 g10/import.c:544 g10/import.c:645
+#, c-format
+msgid "can't lock keyring `%s': %s\n"
+msgstr "nie mo�na zablokowa� zbioru kluczy publicznych '%s': %s\n"
 
-#: g10/import.c:382
-msgid "error writing keyring `%': %s\n"
-msgstr "b��d zapisu zbioru kluczy '%': %s\n"
+#: g10/import.c:382 g10/import.c:438 g10/import.c:547 g10/import.c:648
+#, c-format
+msgid "error writing keyring `%s': %s\n"
+msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
 
 #: g10/import.c:387
 #, c-format
@@ -1565,11 +1614,6 @@ msgstr "klucz %08lX: brak oryginalnego bloku klucza; %s\n"
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "klucz %08lX: nie mo�na odczyta� oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:438 g10/import.c:547 g10/import.c:648
-#, c-format
-msgid "error writing keyring `%s': %s\n"
-msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
-
 #: g10/import.c:444
 #, c-format
 msgid "key %08lX: 1 new user-id\n"
@@ -1605,11 +1649,6 @@ msgstr "klucz %08lX: %d nowych podkluczy\n"
 msgid "key %08lX: not changed\n"
 msgstr "klucz %08lX: bez zmian\n"
 
-#: g10/import.c:544 g10/import.c:645
-#, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "nie mo�na zablokowa� zbioru kluczy publicznych '%s': %s\n"
-
 #: g10/import.c:552
 #, c-format
 msgid "key %08lX: secret key imported\n"
@@ -1717,51 +1756,51 @@ msgstr "klucz %08lX: dodany certyfikat uniewa�nienia\n"
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "klucz %08lX: dost�pna kopia nie jest podpisana ni� sam�\n"
 
-#: g10/keyedit.c:91
+#: g10/keyedit.c:92
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: nie znaleziono u�ytkownika\n"
 
-#: g10/keyedit.c:177
+#: g10/keyedit.c:153
 msgid "[revocation]"
 msgstr "[uniewa�nienie]"
 
-#: g10/keyedit.c:178
+#: g10/keyedit.c:154
 msgid "[self-signature]"
 msgstr "[podpis klucza nim samym]"
 
-#: g10/keyedit.c:196
+#: g10/keyedit.c:218
 msgid "1 bad signature\n"
 msgstr "1 niepoprawny podpis\n"
 
-#: g10/keyedit.c:198
+#: g10/keyedit.c:220
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d niepoprawnych podpis�w\n"
 
-#: g10/keyedit.c:200
+#: g10/keyedit.c:222
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis nie zosta� sprawdzony z powodu braku klucza\n"
 
-#: g10/keyedit.c:202
+#: g10/keyedit.c:224
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d podpis�w nie zosta�o sprawdzonych z powodu braku kluczy\n"
 
-#: g10/keyedit.c:204
+#: g10/keyedit.c:226
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis nie zosta� sprawdzony z powodu b��du\n"
 
-#: g10/keyedit.c:206
+#: g10/keyedit.c:228
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpis�w nie sprawdzonych z powodu b��d�w\n"
 
-#: g10/keyedit.c:208
+#: g10/keyedit.c:230
 msgid "1 user id without valid self-signature detected\n"
 msgstr "wykryto 1 identyfikator u�ytkownika bez podpisu w�a�ciciela klucza\n"
 
-#: g10/keyedit.c:210
+#: g10/keyedit.c:232
 #, c-format
 msgid "%d user ids without valid self-signatures detected\n"
 msgstr ""
@@ -1769,17 +1808,17 @@ msgstr ""
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:290
+#: g10/keyedit.c:312
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Ju� podpisano kluczem %08lX.\n"
 
-#: g10/keyedit.c:298
+#: g10/keyedit.c:320
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nie ma nic do podpisania kluczem %08lX.\n"
 
-#: g10/keyedit.c:307
+#: g10/keyedit.c:329
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -1787,7 +1826,7 @@ msgstr ""
 "Czy jeste� naprawd� pewien �e chcesz podpisa� ten klucz \n"
 "swoim kluczem: \""
 
-#: g10/keyedit.c:316
+#: g10/keyedit.c:338
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -1795,29 +1834,29 @@ msgstr ""
 "Podpis zostanie oznaczony jako nieeksportowalny.\n"
 "\n"
 
-#: g10/keyedit.c:321
+#: g10/keyedit.c:343
 msgid "Really sign? "
 msgstr "Na pewno podpisa�? "
 
-#: g10/keyedit.c:347 g10/keyedit.c:1688 g10/keyedit.c:1737 g10/sign.c:75
+#: g10/keyedit.c:369 g10/keyedit.c:1779 g10/keyedit.c:1828 g10/sign.c:128
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:400
+#: g10/keyedit.c:422
 msgid "This key is not protected.\n"
 msgstr "Ten klucz nie jest chroniony.\n"
 
-#: g10/keyedit.c:403
+#: g10/keyedit.c:425
 msgid "Key is protected.\n"
 msgstr "Klucz jest chroniony.\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:442
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tego klucza nie mo�na edytowa�: %s.\n"
 
-#: g10/keyedit.c:425
+#: g10/keyedit.c:447
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -1825,7 +1864,7 @@ msgstr ""
 "Wprowad� nowe wyra�enie przej�ciowe (has�o) dla tego klucza tajnego.\n"
 "\n"
 
-#: g10/keyedit.c:437
+#: g10/keyedit.c:459
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -1833,339 +1872,373 @@ msgstr ""
 "Nie chcesz poda� wyra�enia przej�ciowego (has�a) - to *z�y* pomys�!\n"
 "\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:462
 msgid "Do you really want to do this? "
 msgstr "Czy na pewno chcesz to zrobi�? "
 
-#: g10/keyedit.c:501
+#: g10/keyedit.c:523
 msgid "moving a key signature to the correct place\n"
 msgstr "przenosz� podpis klucza na w�a�ciwe miejsce\n"
 
-#: g10/keyedit.c:537
-msgid "quit"
-msgstr "wyj�cie"
-
-#: g10/keyedit.c:537
+#: g10/keyedit.c:559
 msgid "quit this menu"
 msgstr "wyj�cie z tego menu"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:560
 msgid "q"
 msgstr "w"
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:561
 msgid "save"
 msgstr "zapis"
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:561
 msgid "save and quit"
 msgstr "zapis zmian i wyj�cie"
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:562
 msgid "help"
 msgstr "pomoc"
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:562
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:564
 msgid "fpr"
 msgstr "odc"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:564
 msgid "show fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/keyedit.c:543
+#: g10/keyedit.c:565
 msgid "list"
 msgstr "lista"
 
-#: g10/keyedit.c:543
+#: g10/keyedit.c:565
 msgid "list key and user ids"
 msgstr "lista kluczy i identyfikator�w u�ytkownik�w"
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:566
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:545
+#: g10/keyedit.c:567
 msgid "uid"
 msgstr "id"
 
-#: g10/keyedit.c:545
+#: g10/keyedit.c:567
 msgid "select user id N"
 msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:546
+#: g10/keyedit.c:568
 msgid "key"
 msgstr "klucz"
 
-#: g10/keyedit.c:546
+#: g10/keyedit.c:568
 msgid "select secondary key N"
 msgstr "wyb�r podklucza N"
 
-#: g10/keyedit.c:547
+#: g10/keyedit.c:569
 msgid "check"
 msgstr "lista"
 
-#: g10/keyedit.c:547
+#: g10/keyedit.c:569
 msgid "list signatures"
 msgstr "lista podpis�w"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:570
 msgid "c"
 msgstr "l"
 
-#: g10/keyedit.c:549
+#: g10/keyedit.c:571
 msgid "sign"
 msgstr "podpis"
 
-#: g10/keyedit.c:549
+#: g10/keyedit.c:571
 msgid "sign the key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/keyedit.c:550
+#: g10/keyedit.c:572
 msgid "s"
 msgstr "p"
 
-#: g10/keyedit.c:551
+#: g10/keyedit.c:573
 msgid "lsign"
 msgstr "lpodpis"
 
-#: g10/keyedit.c:551
+#: g10/keyedit.c:573
 msgid "sign the key locally"
 msgstr "z�o�enie lokalnego podpisu na kluczu"
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:574
 msgid "debug"
 msgstr "�ledzenia"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:575
 msgid "adduid"
 msgstr "dodid"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:575
 msgid "add a user id"
 msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
 
-#: g10/keyedit.c:554
+#: g10/keyedit.c:576
 msgid "deluid"
 msgstr "usid"
 
-#: g10/keyedit.c:554
+#: g10/keyedit.c:576
 msgid "delete user id"
 msgstr "usuni�cie identyfikatora u�ytkownika z klucza"
 
-#: g10/keyedit.c:555
+#: g10/keyedit.c:577
 msgid "addkey"
 msgstr "dodkl"
 
-#: g10/keyedit.c:555
+#: g10/keyedit.c:577
 msgid "add a secondary key"
 msgstr "dodanie podklucza"
 
-#: g10/keyedit.c:556
+#: g10/keyedit.c:578
 msgid "delkey"
 msgstr "uskl"
 
-#: g10/keyedit.c:556
+#: g10/keyedit.c:578
 msgid "delete a secondary key"
 msgstr "usuni�cie podklucza"
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:579
+#, fuzzy
+msgid "delsig"
+msgstr "lpodpis"
+
+#: g10/keyedit.c:579
+#, fuzzy
+msgid "delete signatures"
+msgstr "lista podpis�w"
+
+#: g10/keyedit.c:580
 msgid "expire"
 msgstr "data"
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:580
 msgid "change the expire date"
 msgstr "zmiana daty wa�no�ci klucza"
 
-#: g10/keyedit.c:558
+#: g10/keyedit.c:581
 msgid "toggle"
 msgstr "prze�"
 
-#: g10/keyedit.c:558
+#: g10/keyedit.c:581
 msgid "toggle between secret and public key listing"
 msgstr "prze��czenie pomi�dzy list� kluczy publicznych i tajnych"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:583
 msgid "t"
 msgstr "p"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:584
 msgid "pref"
 msgstr "opcje"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:584
 msgid "list preferences"
 msgstr "lista opcji"
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:585
 msgid "passwd"
 msgstr "has�o"
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:585
 msgid "change the passphrase"
 msgstr "zmiana wyra�enia przej�ciowego (has�a)"
 
-#: g10/keyedit.c:563
+#: g10/keyedit.c:586
 msgid "trust"
 msgstr "zaufanie"
 
-#: g10/keyedit.c:563
+#: g10/keyedit.c:586
 msgid "change the ownertrust"
 msgstr "zmiana zaufania w�a�ciciela"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:587
 msgid "revsig"
 msgstr "unpod"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:587
 msgid "revoke signatures"
 msgstr "uniewa�nienie podpisu"
 
-#: g10/keyedit.c:565
+#: g10/keyedit.c:588
 msgid "revkey"
 msgstr "unpkl"
 
-#: g10/keyedit.c:565
+#: g10/keyedit.c:588
 msgid "revoke a secondary key"
 msgstr "uniewa�nienie podklucza"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:607
 msgid "can't do that in batchmode\n"
 msgstr "nie dzia�a w trybie wsadowym\n"
 
 #. check that they match
 #. FIXME: check that they both match
-#: g10/keyedit.c:613
+#: g10/keyedit.c:636
 msgid "Secret key is available.\n"
 msgstr "Dost�pny jest klucz tajny.\n"
 
-#: g10/keyedit.c:642
+#: g10/keyedit.c:665
 msgid "Command> "
 msgstr "Polecenie> "
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:692
 msgid "Need the secret key to do this.\n"
 msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
 
-#: g10/keyedit.c:691
+#: g10/keyedit.c:714
 msgid "Save changes? "
 msgstr "Zapisa� zmiany? "
 
-#: g10/keyedit.c:694
+#: g10/keyedit.c:717
 msgid "Quit without saving? "
 msgstr "Wyj�� bez zapisania zmian? "
 
-#: g10/keyedit.c:704
+#: g10/keyedit.c:727
 #, c-format
 msgid "update failed: %s\n"
 msgstr "naniesienie poprawek nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:711
+#: g10/keyedit.c:734
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "naniesienie poprawek na kluczu tajnym nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:718
+#: g10/keyedit.c:741
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 "Klucz nie zosta� zmieniony wi�c nanoszenie poprawek nie jest konieczne.\n"
 
-#: g10/keyedit.c:721 g10/keyedit.c:780
+#: g10/keyedit.c:744 g10/keyedit.c:803
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "naniesienie poprawek bazy zaufania nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:777
 msgid "Really sign all user ids? "
 msgstr "Podpisa� wszystkie identyfikatory u�ytkownika na tym kluczu? "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:778
 msgid "Hint: Select the user ids to sign\n"
 msgstr "Podpowied�: wybierz identyfikatory u�ytkownika do podpisania.\n"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:814 g10/keyedit.c:835
 msgid "You must select at least one user id.\n"
 msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:816
 msgid "You can't delete the last user id!\n"
 msgstr "Nie mo�esz usun�� ostatniego identyfikatora u�ytkownika!\n"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:819
 msgid "Really remove all selected user ids? "
 msgstr "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:820
 msgid "Really remove this user id? "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:820 g10/keyedit.c:842
+#: g10/keyedit.c:856 g10/keyedit.c:878
 msgid "You must select at least one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:860
 msgid "Do you really want to delete the selected keys? "
 msgstr "Czy na pewno chcesz usun�� wybrane klucze? "
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:861
 msgid "Do you really want to delete this key? "
 msgstr "Czy na pewno chcesz usun�� ten klucz? "
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:882
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Czy na pewno chcesz uniewa�ni� wybrane klucze? "
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:883
 msgid "Do you really want to revoke this key? "
 msgstr "Czy na pewno chcesz uniewa�ni� ten klucz? "
 
-#: g10/keyedit.c:901
+#: g10/keyedit.c:937
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawna komenda  (spr�buj \"help\")\n"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1289
+msgid "Delete this good signature? (y/N/q)"
+msgstr ""
+
+#: g10/keyedit.c:1292
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr ""
+
+#: g10/keyedit.c:1297
+#, fuzzy
+msgid "Really delete this self-signature? (y/N)"
+msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N)"
+
+#: g10/keyedit.c:1311
+#, fuzzy, c-format
+msgid "Deleted %d signature.\n"
+msgstr "%d niepoprawnych podpis�w\n"
+
+#: g10/keyedit.c:1312
+#, fuzzy, c-format
+msgid "Deleted %d signatures.\n"
+msgstr "%d niepoprawnych podpis�w\n"
+
+#: g10/keyedit.c:1315
+#, fuzzy
+msgid "Nothing deleted.\n"
+msgstr "OSTRZE�ENIE: nic nie zosta�o wyeksportowane!\n"
+
+#: g10/keyedit.c:1384
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Prosz� usun�� znacznik wyboru z kluczy tajnych.\n"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1390
 msgid "Please select at most one secondary key.\n"
 msgstr "Prosz� wybra� najwy�ej jeden podklucz.\n"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1394
 msgid "Changing exiration time for a secondary key.\n"
 msgstr "Zmiana daty wa�no�ci podklucza.\n"
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1396
 msgid "Changing exiration time for the primary key.\n"
 msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1437
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nie mo�na zmieni� daty wa�no�ci klucza w wersji 3.\n"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1453
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy tajnych\n"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1513
 #, c-format
 msgid "No user id with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1559
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Brak podklucza o indeksie %d\n"
 
-#: g10/keyedit.c:1566
+#: g10/keyedit.c:1657
 msgid "user ID: \""
 msgstr "Identyfikator u�ytkownika: "
 
-#: g10/keyedit.c:1569
+#: g10/keyedit.c:1660
 #, c-format
 msgid ""
 "\"\n"
@@ -2174,15 +2247,15 @@ msgstr ""
 "\"\n"
 "podpisano Twoim kluczem %08lX w %s\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1664
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Stworzy� certyfikat uniewa�nienia tego podpisu? (t/N)"
 
-#: g10/keyedit.c:1653
+#: g10/keyedit.c:1744
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N)"
 
-#: g10/keyedit.c:1676
+#: g10/keyedit.c:1767
 msgid "no secret key\n"
 msgstr "brak klucza prywatnego\n"
 
@@ -2226,11 +2299,24 @@ msgstr "UWAGA: nadawca zaznaczy� �e wiadomo�� nie powinna by� zapisywana\n"
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:505 g10/mainproc.c:514
+#, fuzzy
+msgid "WARNING: invalid notation data found\n"
+msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
+
+#: g10/mainproc.c:517
+msgid "Notation: "
+msgstr ""
+
+#: g10/mainproc.c:524
+msgid "Policy: "
+msgstr ""
+
+#: g10/mainproc.c:929
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
 
-#: g10/mainproc.c:896
+#: g10/mainproc.c:935
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
@@ -2238,28 +2324,28 @@ msgstr ""
 "z u�yciem klucza o identyfikatorze %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:922 g10/mainproc.c:933
+#: g10/mainproc.c:961 g10/mainproc.c:972
 msgid "BAD signature from \""
 msgstr "NIEPOPRAWNY podpis z�o�ony przez \""
 
-#: g10/mainproc.c:923 g10/mainproc.c:934
+#: g10/mainproc.c:962 g10/mainproc.c:973
 msgid "Good signature from \""
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:925
+#: g10/mainproc.c:964
 msgid "                aka \""
 msgstr "                        alias \""
 
-#: g10/mainproc.c:975
+#: g10/mainproc.c:1015
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie mog� sprawdzi� podpisu: %s\n"
 
-#: g10/mainproc.c:1056
+#: g10/mainproc.c:1109
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:1061
+#: g10/mainproc.c:1114
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
@@ -2295,7 +2381,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "algorytm klucza publicznego niemo�liwy do obs�u�enia: %d\n"
 
-#: g10/parse-packet.c:872
+#: g10/parse-packet.c:931
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
@@ -2333,15 +2419,15 @@ msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "dane nie zosta�y zapisane; nale�y u�y� opcji \"--output\" aby je zapisa�\n"
 
-#: g10/plaintext.c:208
+#: g10/plaintext.c:266
 msgid "Please enter name of data file: "
 msgstr "Nazwa pliku danych: "
 
-#: g10/plaintext.c:229
+#: g10/plaintext.c:287
 msgid "reading stdin ...\n"
 msgstr "czytam strumie� standardowego wej�cia\n"
 
-#: g10/plaintext.c:302
+#: g10/plaintext.c:360
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nie mo�na otworzy� podpisanego pliku '%s'\n"
@@ -2412,21 +2498,21 @@ msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "przyj�to niewa�no�� podpisu z powonu ustawienia nieznanego bitu krytycznego\n"
 
-#: g10/sign.c:79
+#: g10/sign.c:132
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s podpis z�o�ony przez: %s\n"
 
-#: g10/sign.c:210 g10/sign.c:496
+#: g10/sign.c:263 g10/sign.c:554
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "nie mog� stworzy� %s: %s\n"
 
-#: g10/sign.c:306
+#: g10/sign.c:361
 msgid "signing:"
 msgstr "podpis:"
 
-#: g10/sign.c:346
+#: g10/sign.c:401
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "OSTRZE�ENIE: plik '%s' jest pusty\n"
@@ -2475,7 +2561,7 @@ msgstr "%s: katalog utworzony\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalog nie istnieje!\n"
 
-#: g10/openfile.c:113 g10/openfile.c:183 g10/ringedit.c:1344 g10/tdbio.c:457
+#: g10/openfile.c:144 g10/openfile.c:215 g10/ringedit.c:1344 g10/tdbio.c:457
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: nie mog� utworzy�: %s\n"
@@ -3037,16 +3123,21 @@ msgstr "Plik '%s' ju� istnieje. "
 msgid "Overwrite (y/N)? "
 msgstr "Nadpisa� (t/N)? "
 
-#: g10/openfile.c:92
+#: g10/openfile.c:97
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr ""
+
+#: g10/openfile.c:122
 msgid "writing to stdout\n"
 msgstr "zapisywanie na wyj�cie standardowe\n"
 
-#: g10/openfile.c:149
+#: g10/openfile.c:181
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "przyj�to obecno�� podpisanych danych w '%s'\n"
 
-#: g10/openfile.c:199
+#: g10/openfile.c:231
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: stworzono nowy plik ustawie�\n"
@@ -3220,34 +3311,56 @@ msgstr ""
 msgid "keyedit.remove.subkey.okay"
 msgstr "Odpowiedz \"tak\" je�li na pewno chcesz skasowa� ten podklucz"
 
-#: g10/helptext.c:175
+#: g10/helptext.c:176
+#, fuzzy
+msgid "keyedit.delsig.valid"
+msgstr ""
+"Odpowiedz \"tak\" je�li chcesz podpisa� wszystkie identyfikatory klucza"
+
+#: g10/helptext.c:181
+#, fuzzy
+msgid "keyedit.delsig.invalid"
+msgstr ""
+"Odpowiedz \"tak\" je�li chcesz podpisa� wszystkie identyfikatory klucza"
+
+#: g10/helptext.c:186
+msgid "keyedit.delsig.selfsig"
+msgstr ""
+
+#: g10/helptext.c:195
 msgid "passphrase.enter"
 msgstr ""
 "Prosz� wprowadzi� wyra�enie przej�ciowe (tajne zdanie)\n"
 "  Bla, bla, bla ..."
 
-#: g10/helptext.c:182
+#: g10/helptext.c:202
 msgid "passphrase.repeat"
 msgstr ""
 "Prosz� powt�rzy� podane wyra�enie przej�ciowe dla wyeliminowania pomy�ek."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:206
 msgid "detached_signature.filename"
 msgstr "Nazwa pliku kt�rego dotyczy ten podpis"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:210
 msgid "openfile.overwrite.okay"
 msgstr "Odpowiedz \"tak\" je�li na pewno chcesz nadpisa� ten plik"
 
-#: g10/helptext.c:204
+#: g10/helptext.c:224
 msgid "No help available"
 msgstr "Pomoc niedost�pna"
 
-#: g10/helptext.c:216
+#: g10/helptext.c:236
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Brak pomocy o '%s'"
 
+#~ msgid "can't lock keyring `%': %s\n"
+#~ msgstr "nie mo�na zablokowa� zbioru kluczy publicznych: %s\n"
+
+#~ msgid "error writing keyring `%': %s\n"
+#~ msgstr "b��d zapisu zbioru kluczy '%': %s\n"
+
 #~ msgid "can't open file: %s\n"
 #~ msgstr "nie mo�na otworzy� pliku: %s\n"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 09c8627a6..1109eae8d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-05-23 15:36+0200\n"
+"POT-Creation-Date: 1999-06-08 21:26+0200\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-20 23:46:36-0200\n"
 "From: Thiago Jung Bauermann <[email protected]>\n"
@@ -28,14 +28,23 @@ msgstr ""
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 
-#: util/miscutil.c:156
+#: util/miscutil.c:156 util/miscutil.c:173
 msgid "yes"
 msgstr "sim"
 
-#: util/miscutil.c:157
+#: util/miscutil.c:157 util/miscutil.c:175
 msgid "yY"
 msgstr "sS"
 
+#: g10/keyedit.c:559 util/miscutil.c:174
+msgid "quit"
+msgstr "sair"
+
+#: util/miscutil.c:176
+#, fuzzy
+msgid "qQ"
+msgstr "s"
+
 #: util/errors.c:54
 #, fuzzy
 msgid "general error"
@@ -304,7 +313,7 @@ msgstr ""
 "N�O USE NENHUM DADO GERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:110
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -316,7 +325,7 @@ msgstr ""
 "para que o sistema possa coletar mais entropia!\n"
 "(S�o necess�rios mais %d bytes)\n"
 
-#: g10/g10.c:165
+#: g10/g10.c:169
 msgid ""
 "@Commands:\n"
 " "
@@ -324,131 +333,131 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:167
+#: g10/g10.c:171
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|faz uma assinatura"
 
-#: g10/g10.c:168
+#: g10/g10.c:172
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|faz uma assinatura em texto puro"
 
-#: g10/g10.c:169
+#: g10/g10.c:173
 msgid "make a detached signature"
 msgstr "faz uma assinatura separada"
 
-#: g10/g10.c:170
+#: g10/g10.c:174
 msgid "encrypt data"
 msgstr "codifica dados"
 
-#: g10/g10.c:171
+#: g10/g10.c:175
 msgid "encryption only with symmetric cipher"
 msgstr "codifica apenas com criptografia sim�trica"
 
-#: g10/g10.c:172
+#: g10/g10.c:176
 msgid "store only"
 msgstr "apenas armazena"
 
-#: g10/g10.c:173
+#: g10/g10.c:177
 msgid "decrypt data (default)"
 msgstr "decodifica dados (padr�o)"
 
-#: g10/g10.c:174
+#: g10/g10.c:178
 msgid "verify a signature"
 msgstr "verifica uma assinatura"
 
-#: g10/g10.c:175
+#: g10/g10.c:179
 msgid "list keys"
 msgstr "lista as chaves"
 
-#: g10/g10.c:177
+#: g10/g10.c:181
 msgid "list keys and signatures"
 msgstr "lista as chaves e as assinaturas"
 
-#: g10/g10.c:178
+#: g10/g10.c:182
 msgid "check key signatures"
 msgstr "confere as assinaturas das chaves"
 
-#: g10/g10.c:179
+#: g10/g10.c:183
 msgid "list keys and fingerprints"
 msgstr "lista as chaves e as impress�es digitais"
 
-#: g10/g10.c:180
+#: g10/g10.c:184
 msgid "list secret keys"
 msgstr "lista as chaves secretas"
 
-#: g10/g10.c:181
+#: g10/g10.c:185
 msgid "generate a new key pair"
 msgstr "gera um novo par de chaves"
 
-#: g10/g10.c:182
+#: g10/g10.c:186
 msgid "remove key from the public keyring"
 msgstr "remove a chave do anel de chaves p�blico"
 
-#: g10/g10.c:183
+#: g10/g10.c:187
 msgid "sign or edit a key"
 msgstr "assina ou edita uma chave"
 
-#: g10/g10.c:184
+#: g10/g10.c:188
 msgid "generate a revocation certificate"
 msgstr "gera um certificado de revoga��o"
 
-#: g10/g10.c:185
+#: g10/g10.c:189
 msgid "export keys"
 msgstr "exporta as chaves"
 
-#: g10/g10.c:186
+#: g10/g10.c:190
 msgid "export keys to a key server"
 msgstr ""
 
-#: g10/g10.c:187
+#: g10/g10.c:191
 msgid "import keys from a key server"
 msgstr ""
 
-#: g10/g10.c:190
+#: g10/g10.c:194
 msgid "import/merge keys"
 msgstr "importa/funde as chaves"
 
-#: g10/g10.c:192
+#: g10/g10.c:196
 msgid "list only the sequence of packets"
 msgstr "lista apenas as seq��ncias de pacotes"
 
-#: g10/g10.c:194
+#: g10/g10.c:198
 msgid "export the ownertrust values"
 msgstr "exporta os valores de confian�a"
 
-#: g10/g10.c:196
+#: g10/g10.c:200
 msgid "import ownertrust values"
 msgstr "importa os valores de confian�a"
 
-#: g10/g10.c:198
+#: g10/g10.c:202
 msgid "|[NAMES]|update the trust database"
 msgstr "|[NOMES]|atualiza o banco de dados de confian�a"
 
-#: g10/g10.c:200
+#: g10/g10.c:204
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMES]|confere o banco de dados de confian�a"
 
-#: g10/g10.c:201
+#: g10/g10.c:205
 msgid "fix a corrupted trust database"
 msgstr "conserta um banco de dados de confian�a danificado"
 
-#: g10/g10.c:202
+#: g10/g10.c:206
 msgid "De-Armor a file or stdin"
 msgstr "Retira a armadura de um arquivo ou \"stdin\""
 
-#: g10/g10.c:203
+#: g10/g10.c:207
 msgid "En-Armor a file or stdin"
 msgstr "Cria armadura para um arquivo ou \"stdin\""
 
-#: g10/g10.c:204
+#: g10/g10.c:208
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprime \"digests\" de mensagens"
 
-#: g10/g10.c:205
+#: g10/g10.c:209
 msgid "print all message digests"
 msgstr "imprime todos os \"digests\" de mensagens"
 
-#: g10/g10.c:211
+#: g10/g10.c:215
 msgid ""
 "@\n"
 "Options:\n"
@@ -458,155 +467,159 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/g10.c:213
+#: g10/g10.c:217
 msgid "create ascii armored output"
 msgstr "cria uma sa�da ascii com armadura"
 
-#: g10/g10.c:214
+#: g10/g10.c:218
 #, fuzzy
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME| estabelece mapa de caracteres do terminal para NOME"
 
-#: g10/g10.c:218
+#: g10/g10.c:222
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este identificador de usu�rio para assinar ou decodificar"
 
-#: g10/g10.c:219
+#: g10/g10.c:223
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|estabelece n�vel de compress�o N (0 desabilita)"
 
-#: g10/g10.c:221
+#: g10/g10.c:225
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/g10.c:222
+#: g10/g10.c:226
 msgid "use as output file"
 msgstr "usa como arquivo de sa�da"
 
-#: g10/g10.c:223
+#: g10/g10.c:227
 msgid "verbose"
 msgstr "prolixo"
 
-#: g10/g10.c:224
+#: g10/g10.c:228
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:225
+#: g10/g10.c:229
 msgid "force v3 signatures"
 msgstr "for�a assinaturas v3"
 
-#: g10/g10.c:226
+#: g10/g10.c:230
 #, fuzzy
 msgid "always use a MDC for encryption"
 msgstr "usa este identificador de usu�rio para codificar"
 
-#: g10/g10.c:227
+#: g10/g10.c:231
 msgid "do not make any changes"
 msgstr ""
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:229
+#: g10/g10.c:233
 msgid "batch mode: never ask"
 msgstr "processo de lote: nunca perguntar"
 
-#: g10/g10.c:230
+#: g10/g10.c:234
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:231
+#: g10/g10.c:235
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: g10/g10.c:232
+#: g10/g10.c:236
 msgid "add this keyring to the list of keyrings"
 msgstr "adiciona este anel de chaves � lista de an�is de chaves"
 
-#: g10/g10.c:233
+#: g10/g10.c:237
 msgid "add this secret keyring to the list"
 msgstr "adiciona este anel de chaves secreto � lista"
 
-#: g10/g10.c:234
+#: g10/g10.c:238
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usa NOME como chave secreta padr�o"
 
-#: g10/g10.c:235
+#: g10/g10.c:239
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: g10/g10.c:236
+#: g10/g10.c:240
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOME| estabelece mapa de caracteres do terminal para NOME"
 
-#: g10/g10.c:237
+#: g10/g10.c:241
 msgid "read options from file"
 msgstr "l� op��es do arquivo"
 
-#: g10/g10.c:239
+#: g10/g10.c:243
 msgid "set debugging flags"
 msgstr "estabelece par�metros de depura��o"
 
-#: g10/g10.c:240
+#: g10/g10.c:244
 msgid "enable full debugging"
 msgstr "habilita depura��o completa"
 
-#: g10/g10.c:241
+#: g10/g10.c:245
 msgid "|FD|write status info to this FD"
 msgstr "|DA|escreve informa��es de status para este DA"
 
-#: g10/g10.c:242
+#: g10/g10.c:246
 msgid "do not write comment packets"
 msgstr "n�o escreve pacotes de coment�rio"
 
-#: g10/g10.c:243
+#: g10/g10.c:247
 msgid "(default is 1)"
 msgstr "(o padr�o � 1)"
 
-#: g10/g10.c:244
+#: g10/g10.c:248
 msgid "(default is 3)"
 msgstr "(o padr�o � 3)"
 
-#: g10/g10.c:246
+#: g10/g10.c:250
 msgid "|FILE|load extension module FILE"
 msgstr "|ARQUIVO|carrega m�dulo de extens�o ARQUIVO"
 
-#: g10/g10.c:247
+#: g10/g10.c:251
 msgid "emulate the mode described in RFC1991"
 msgstr "emula o modo descrito no RFC1991"
 
-#: g10/g10.c:248
+#: g10/g10.c:252
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa frase secreta modo N"
 
-#: g10/g10.c:250
+#: g10/g10.c:254
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usa algoritmo de \"digest\" de mensagens NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:252
+#: g10/g10.c:256
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usa algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:253
+#: g10/g10.c:257
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usa algoritmo de criptografia NOME"
 
-#: g10/g10.c:254
+#: g10/g10.c:258
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usa algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:255
+#: g10/g10.c:259
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa algoritmo de compress�o N"
 
-#: g10/g10.c:256
+#: g10/g10.c:260
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina o campo keyid dos pacotes codificados"
 
-#: g10/g10.c:258
+#: g10/g10.c:261
+msgid "|NAME=VALUE|use this notation data"
+msgstr ""
+
+#: g10/g10.c:263
 msgid ""
 "@\n"
 "Examples:\n"
@@ -626,15 +639,15 @@ msgstr ""
 " --list-keys [nomes]        mostra chaves\n"
 " --fingerprint [nomes]      mostra impress�es digitais\n"
 
-#: g10/g10.c:327
+#: g10/g10.c:337
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:331
+#: g10/g10.c:341
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/g10.c:334
+#: g10/g10.c:344
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -644,7 +657,7 @@ msgstr ""
 "assina, verifica, codifica ou decodifica\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/g10.c:339
+#: g10/g10.c:349
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -652,149 +665,172 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:413
+#: g10/g10.c:423
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:453
+#: g10/g10.c:463
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/g10.c:580
+#: g10/g10.c:595
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/g10.c:584
+#: g10/g10.c:599
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: g10/g10.c:591
+#: g10/g10.c:606
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:755
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s n�o � um mapa de caracteres v�lido\n"
 
-#: g10/g10.c:780 g10/g10.c:792
+#: g10/g10.c:799 g10/g10.c:811
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/g10.c:786 g10/g10.c:798
+#: g10/g10.c:805 g10/g10.c:817
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:801
+#: g10/g10.c:821
+msgid "the given policy URL is invalid\n"
+msgstr ""
+
+#: g10/g10.c:824
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "algoritmo de compress�o deve estar na faixa %d..%d\n"
 
-#: g10/g10.c:803
+#: g10/g10.c:826
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:805
+#: g10/g10.c:828
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:807
+#: g10/g10.c:830
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth deve estar na faixa 1 a 255\n"
 
-#: g10/g10.c:810
+#: g10/g10.c:833
 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:814
+#: g10/g10.c:837
 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:891
+#: g10/g10.c:914
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar o banco de dados de confian�a: %s\n"
 
-#: g10/g10.c:897
+#: g10/g10.c:920
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/g10.c:904
+#: g10/g10.c:927
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:912
+#: g10/g10.c:935
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:925
+#: g10/g10.c:948
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/g10.c:938
+#: g10/g10.c:961
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:952
+#: g10/g10.c:975
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/g10.c:964
+#: g10/g10.c:987
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/g10.c:973
+#: g10/g10.c:996
 msgid "--edit-key username [commands]"
 msgstr "--edit-key nome_do_usu�rio [comandos]"
 
-#: g10/g10.c:987
+#: g10/g10.c:1010
 msgid "--delete-secret-key username"
 msgstr "--delete-secret-key nome_do_usu�rio"
 
-#: g10/g10.c:990
+#: g10/g10.c:1013
 msgid "--delete-key username"
 msgstr "--delete-key nome_do_usu�rio"
 
-#: g10/encode.c:231 g10/g10.c:1013 g10/sign.c:311
+#: g10/encode.c:231 g10/g10.c:1036 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/g10.c:1024
+#: g10/g10.c:1047
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [id_do_usu�rio] [anel_de_chaves]"
 
-#: g10/g10.c:1083
+#: g10/g10.c:1106
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1091
+#: g10/g10.c:1114
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/g10.c:1157
+#: g10/g10.c:1180
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribui��o inv�lido `%s'\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1255
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1259
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1239 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1262 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
+#: g10/g10.c:1429
+msgid ""
+"the first character of a notation name must be a letter or an underscore\n"
+msgstr ""
+
+#: g10/g10.c:1435
+msgid ""
+"a notation name must have only letters, digits, dots or underscores and end "
+"with an '='\n"
+msgstr ""
+
+#: g10/g10.c:1441
+msgid "dots in a notation name must be surrounded by other characters\n"
+msgstr ""
+
+#: g10/g10.c:1449
+msgid "a notation value must not use any control characters\n"
+msgstr ""
+
 #: g10/armor.c:296
 #, c-format
 msgid "armor: %s\n"
@@ -1062,12 +1098,17 @@ msgstr "AVISO: Esta chave n�o est� certificada com assinaturas confi�veis!\n"
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         N�o se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:569 g10/pkclist.c:582 g10/pkclist.c:645 g10/pkclist.c:673
+#: g10/pkclist.c:580 g10/pkclist.c:602 g10/pkclist.c:665 g10/pkclist.c:705
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:588 g10/pkclist.c:687
+#, fuzzy, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr "%s: erro de leitura de bloco de chaves: %s\n"
+
+#: g10/pkclist.c:611
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1075,20 +1116,20 @@ msgstr ""
 "Voc� n�o especificou um ID de usu�rio. (pode-se usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:596
+#: g10/pkclist.c:616
 msgid "Enter the user ID: "
 msgstr "Digite o identificador de usu�rio:"
 
-#: g10/pkclist.c:607
+#: g10/pkclist.c:627
 msgid "No such user ID.\n"
 msgstr "Identificador de usu�rio inexistente.\n"
 
-#: g10/pkclist.c:653
+#: g10/pkclist.c:673
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: erro verificando chave: %s\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:711
 msgid "no valid addressees\n"
 msgstr "nenhum endere�o v�lido\n"
 
@@ -1332,7 +1373,7 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keyedit.c:433 g10/keygen.c:748
+#: g10/keyedit.c:455 g10/keygen.c:748
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
@@ -1404,14 +1445,14 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:52
+#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:105
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "chave p�blica criada no futuro (viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:54
+#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:107
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1422,7 +1463,7 @@ msgstr ""
 msgid "Really create? "
 msgstr "Realmente criar? "
 
-#: g10/encode.c:91 g10/openfile.c:88 g10/openfile.c:176 g10/tdbio.c:467
+#: g10/encode.c:91 g10/openfile.c:118 g10/openfile.c:208 g10/tdbio.c:467
 #: g10/tdbio.c:528
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1578,19 +1619,19 @@ msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 msgid "no default public keyring\n"
 msgstr "sem anel de chaves p�blico padr�o\n"
 
-#: g10/import.c:376 g10/openfile.c:117 g10/sign.c:215 g10/sign.c:501
+#: g10/import.c:376 g10/openfile.c:148 g10/sign.c:268 g10/sign.c:559
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: g10/import.c:379 g10/import.c:435
-#, fuzzy
-msgid "can't lock keyring `%': %s\n"
+#: g10/import.c:379 g10/import.c:435 g10/import.c:544 g10/import.c:645
+#, fuzzy, c-format
+msgid "can't lock keyring `%s': %s\n"
 msgstr "imposs�vel bloquear anel de chaves p�blico: %s\n"
 
-#: g10/import.c:382
-#, fuzzy
-msgid "error writing keyring `%': %s\n"
+#: g10/import.c:382 g10/import.c:438 g10/import.c:547 g10/import.c:648
+#, fuzzy, c-format
+msgid "error writing keyring `%s': %s\n"
 msgstr "%s: erro escrevendo registro de vers�o: %s\n"
 
 #: g10/import.c:387
@@ -1613,11 +1654,6 @@ msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
 
-#: g10/import.c:438 g10/import.c:547 g10/import.c:648
-#, fuzzy, c-format
-msgid "error writing keyring `%s': %s\n"
-msgstr "%s: erro escrevendo registro de vers�o: %s\n"
-
 #: g10/import.c:444
 #, c-format
 msgid "key %08lX: 1 new user-id\n"
@@ -1653,11 +1689,6 @@ msgstr "chave %08lX: %d novas subchaves\n"
 msgid "key %08lX: not changed\n"
 msgstr "chave %08lX: n�o modificada\n"
 
-#: g10/import.c:544 g10/import.c:645
-#, fuzzy, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "imposs�vel bloquear anel de chaves p�blico: %s\n"
-
 #: g10/import.c:552
 #, c-format
 msgid "key %08lX: secret key imported\n"
@@ -1760,68 +1791,68 @@ msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "chave %08lX: nossa c�pia n�o tem auto-assinatura\n"
 
-#: g10/keyedit.c:91
+#: g10/keyedit.c:92
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: usu�rio n�o encontrado\n"
 
-#: g10/keyedit.c:177
+#: g10/keyedit.c:153
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:178
+#: g10/keyedit.c:154
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:196
+#: g10/keyedit.c:218
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorreta\n"
 
-#: g10/keyedit.c:198
+#: g10/keyedit.c:220
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorretas\n"
 
-#: g10/keyedit.c:200
+#: g10/keyedit.c:222
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 assinatura n�o verificada por falta de chave\n"
 
-#: g10/keyedit.c:202
+#: g10/keyedit.c:224
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d assinaturas n�o verificadas por falta de chaves\n"
 
-#: g10/keyedit.c:204
+#: g10/keyedit.c:226
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura n�o checada por causa de um erro\n"
 
-#: g10/keyedit.c:206
+#: g10/keyedit.c:228
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas n�o verificadas por causa de erros\n"
 
-#: g10/keyedit.c:208
+#: g10/keyedit.c:230
 msgid "1 user id without valid self-signature detected\n"
 msgstr "1 id de usu�rio sem auto-assinatura v�lida detectado\n"
 
-#: g10/keyedit.c:210
+#: g10/keyedit.c:232
 #, c-format
 msgid "%d user ids without valid self-signatures detected\n"
 msgstr "%d ids de usu�rios sem auto-assinaturas v�lidas detectados\n"
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:290
+#: g10/keyedit.c:312
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:298
+#: g10/keyedit.c:320
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:307
+#: g10/keyedit.c:329
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -1829,35 +1860,35 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "sua chave: \""
 
-#: g10/keyedit.c:316
+#: g10/keyedit.c:338
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:321
+#: g10/keyedit.c:343
 msgid "Really sign? "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:347 g10/keyedit.c:1688 g10/keyedit.c:1737 g10/sign.c:75
+#: g10/keyedit.c:369 g10/keyedit.c:1779 g10/keyedit.c:1828 g10/sign.c:128
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:400
+#: g10/keyedit.c:422
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:403
+#: g10/keyedit.c:425
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:442
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:425
+#: g10/keyedit.c:447
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -1865,7 +1896,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:437
+#: g10/keyedit.c:459
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -1873,365 +1904,399 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:462
 msgid "Do you really want to do this? "
 msgstr "Voc� realmente quer fazer isso? "
 
-#: g10/keyedit.c:501
+#: g10/keyedit.c:523
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a assinatura da chave para o local correto\n"
 
-#: g10/keyedit.c:537
-msgid "quit"
-msgstr "sair"
-
-#: g10/keyedit.c:537
+#: g10/keyedit.c:559
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:560
 msgid "q"
 msgstr "s"
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:561
 msgid "save"
 msgstr "gravar"
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:561
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:562
 msgid "help"
 msgstr "ajuda"
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:562
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:564
 msgid "fpr"
 msgstr ""
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:564
 msgid "show fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:543
+#: g10/keyedit.c:565
 msgid "list"
 msgstr "lista"
 
-#: g10/keyedit.c:543
+#: g10/keyedit.c:565
 msgid "list key and user ids"
 msgstr "lista chave e identificadores de usu�rios"
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:566
 msgid "l"
 msgstr ""
 
-#: g10/keyedit.c:545
+#: g10/keyedit.c:567
 msgid "uid"
 msgstr ""
 
-#: g10/keyedit.c:545
+#: g10/keyedit.c:567
 msgid "select user id N"
 msgstr "seleciona id de usu�rio N"
 
-#: g10/keyedit.c:546
+#: g10/keyedit.c:568
 msgid "key"
 msgstr "chave"
 
-#: g10/keyedit.c:546
+#: g10/keyedit.c:568
 msgid "select secondary key N"
 msgstr "seleciona chave secund�ria N"
 
-#: g10/keyedit.c:547
+#: g10/keyedit.c:569
 msgid "check"
 msgstr "verifica"
 
-#: g10/keyedit.c:547
+#: g10/keyedit.c:569
 msgid "list signatures"
 msgstr "lista assinaturas"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:570
 msgid "c"
 msgstr "v"
 
-#: g10/keyedit.c:549
+#: g10/keyedit.c:571
 msgid "sign"
 msgstr "assina"
 
-#: g10/keyedit.c:549
+#: g10/keyedit.c:571
 msgid "sign the key"
 msgstr "assina a chave"
 
-#: g10/keyedit.c:550
+#: g10/keyedit.c:572
 msgid "s"
 msgstr "a"
 
-#: g10/keyedit.c:551
+#: g10/keyedit.c:573
 #, fuzzy
 msgid "lsign"
 msgstr "assina"
 
-#: g10/keyedit.c:551
+#: g10/keyedit.c:573
 #, fuzzy
 msgid "sign the key locally"
 msgstr "assina a chave"
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:574
 msgid "debug"
 msgstr "depura"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:575
 msgid "adduid"
 msgstr ""
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:575
 msgid "add a user id"
 msgstr "adiciona um novo id de usu�rio"
 
-#: g10/keyedit.c:554
+#: g10/keyedit.c:576
 msgid "deluid"
 msgstr ""
 
-#: g10/keyedit.c:554
+#: g10/keyedit.c:576
 msgid "delete user id"
 msgstr "deleta id de usu�rio"
 
-#: g10/keyedit.c:555
+#: g10/keyedit.c:577
 msgid "addkey"
 msgstr ""
 
-#: g10/keyedit.c:555
+#: g10/keyedit.c:577
 msgid "add a secondary key"
 msgstr "adiciona nova chave secund�ria"
 
-#: g10/keyedit.c:556
+#: g10/keyedit.c:578
 msgid "delkey"
 msgstr ""
 
-#: g10/keyedit.c:556
+#: g10/keyedit.c:578
 msgid "delete a secondary key"
 msgstr "deleta uma chave secund�ria"
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:579
+#, fuzzy
+msgid "delsig"
+msgstr "assina"
+
+#: g10/keyedit.c:579
+#, fuzzy
+msgid "delete signatures"
+msgstr "lista assinaturas"
+
+#: g10/keyedit.c:580
 msgid "expire"
 msgstr "expira"
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:580
 msgid "change the expire date"
 msgstr "muda a data em que a chave expira"
 
-#: g10/keyedit.c:558
+#: g10/keyedit.c:581
 msgid "toggle"
 msgstr "comuta"
 
-#: g10/keyedit.c:558
+#: g10/keyedit.c:581
 msgid "toggle between secret and public key listing"
 msgstr "comuta entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:583
 msgid "t"
 msgstr "c"
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:584
 msgid "pref"
 msgstr ""
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:584
 msgid "list preferences"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:585
 msgid "passwd"
 msgstr "senha"
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:585
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:563
+#: g10/keyedit.c:586
 msgid "trust"
 msgstr "confianca"
 
-#: g10/keyedit.c:563
+#: g10/keyedit.c:586
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:587
 #, fuzzy
 msgid "revsig"
 msgstr "assina"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:587
 #, fuzzy
 msgid "revoke signatures"
 msgstr "for�a assinaturas v3"
 
-#: g10/keyedit.c:565
+#: g10/keyedit.c:588
 #, fuzzy
 msgid "revkey"
 msgstr "chave"
 
-#: g10/keyedit.c:565
+#: g10/keyedit.c:588
 #, fuzzy
 msgid "revoke a secondary key"
 msgstr "deleta uma chave secund�ria"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:607
 msgid "can't do that in batchmode\n"
 msgstr "imposs�vel fazer isso em modo de processo por lotes\n"
 
 #. check that they match
 #. FIXME: check that they both match
-#: g10/keyedit.c:613
+#: g10/keyedit.c:636
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel\n"
 
-#: g10/keyedit.c:642
+#: g10/keyedit.c:665
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:692
 #, fuzzy
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:691
+#: g10/keyedit.c:714
 msgid "Save changes? "
 msgstr "Salvar altera��es? "
 
-#: g10/keyedit.c:694
+#: g10/keyedit.c:717
 msgid "Quit without saving? "
 msgstr "Sair sem salvar? "
 
-#: g10/keyedit.c:704
+#: g10/keyedit.c:727
 #, c-format
 msgid "update failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:711
+#: g10/keyedit.c:734
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:718
+#: g10/keyedit.c:741
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave sem mudan�as, nenhuma atualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:721 g10/keyedit.c:780
+#: g10/keyedit.c:744 g10/keyedit.c:803
 #, fuzzy, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "atualiza��o da confian�a falhou: %s\n"
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:777
 msgid "Really sign all user ids? "
 msgstr "Realmente assinar todos os ids de usu�rio? "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:778
 msgid "Hint: Select the user ids to sign\n"
 msgstr "Sugest�o: Selecione os ids de usu�rio para assinar\n"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:814 g10/keyedit.c:835
 msgid "You must select at least one user id.\n"
 msgstr "Voc� precisa selecionar pelo menos um id de usu�rio.\n"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:816
 msgid "You can't delete the last user id!\n"
 msgstr "Voc� n�o pode deletar o �ltimo id de usu�rio!\n"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:819
 msgid "Really remove all selected user ids? "
 msgstr "Realmente remover todos os ids de usu�rio selecionados? "
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:820
 msgid "Really remove this user id? "
 msgstr "Realmente remover este id de usu�rio? "
 
-#: g10/keyedit.c:820 g10/keyedit.c:842
+#: g10/keyedit.c:856 g10/keyedit.c:878
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:860
 msgid "Do you really want to delete the selected keys? "
 msgstr "Voc� realmente quer deletar as chaves selecionadas? "
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:861
 msgid "Do you really want to delete this key? "
 msgstr "Voc� realmente quer deletar esta chave? "
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:882
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? "
 msgstr "Voc� realmente quer deletar as chaves selecionadas? "
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:883
 #, fuzzy
 msgid "Do you really want to revoke this key? "
 msgstr "Voc� realmente quer deletar esta chave? "
 
-#: g10/keyedit.c:901
+#: g10/keyedit.c:937
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"ajuda\")\n"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1289
+msgid "Delete this good signature? (y/N/q)"
+msgstr ""
+
+#: g10/keyedit.c:1292
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr ""
+
+#: g10/keyedit.c:1297
+#, fuzzy
+msgid "Really delete this self-signature? (y/N)"
+msgstr "gera um certificado de revoga��o"
+
+#: g10/keyedit.c:1311
+#, fuzzy, c-format
+msgid "Deleted %d signature.\n"
+msgstr "%d assinaturas incorretas\n"
+
+#: g10/keyedit.c:1312
+#, fuzzy, c-format
+msgid "Deleted %d signatures.\n"
+msgstr "%d assinaturas incorretas\n"
+
+#: g10/keyedit.c:1315
+#, fuzzy
+msgid "Nothing deleted.\n"
+msgstr "AVISO: nada exportado\n"
+
+#: g10/keyedit.c:1384
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as sele��es das chaves secretas.\n"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1390
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1394
 msgid "Changing exiration time for a secondary key.\n"
 msgstr "Modificando data de expira��o para a chave secund�ria.\n"
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1396
 msgid "Changing exiration time for the primary key.\n"
 msgstr "Modificando data de expira��o para a chave prim�ria.\n"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1437
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Voc� n�o pode modificar a data de expira��o de uma chave v3\n"
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1453
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no anel de chaves secreto\n"
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1513
 #, c-format
 msgid "No user id with index %d\n"
 msgstr "Nenhum id de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1559
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secund�ria com �ndice %d\n"
 
-#: g10/keyedit.c:1566
+#: g10/keyedit.c:1657
 #, fuzzy
 msgid "user ID: \""
 msgstr "Digite o identificador de usu�rio:"
 
-#: g10/keyedit.c:1569
+#: g10/keyedit.c:1660
 #, fuzzy, c-format
 msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1664
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "gera um certificado de revoga��o"
 
-#: g10/keyedit.c:1653
+#: g10/keyedit.c:1744
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "gera um certificado de revoga��o"
 
-#: g10/keyedit.c:1676
+#: g10/keyedit.c:1767
 #, fuzzy
 msgid "no secret key\n"
 msgstr "Chave secreta incorreta"
@@ -2277,39 +2342,52 @@ msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 msgid "original file name='%.*s'\n"
 msgstr "nome de arquivo original='%.*s'\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:505 g10/mainproc.c:514
+#, fuzzy
+msgid "WARNING: invalid notation data found\n"
+msgstr "nenum dado RFC1991 ou OpenPGP v�lido encontrado.\n"
+
+#: g10/mainproc.c:517
+msgid "Notation: "
+msgstr ""
+
+#: g10/mainproc.c:524
+msgid "Policy: "
+msgstr ""
+
+#: g10/mainproc.c:929
 msgid "signature verification suppressed\n"
 msgstr "verifia��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:896
+#: g10/mainproc.c:935
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Assinatura feita %.*s usando %s ID da chave %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:922 g10/mainproc.c:933
+#: g10/mainproc.c:961 g10/mainproc.c:972
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRETA de \""
 
-#: g10/mainproc.c:923 g10/mainproc.c:934
+#: g10/mainproc.c:962 g10/mainproc.c:973
 msgid "Good signature from \""
 msgstr "Assinatura correta de\""
 
-#: g10/mainproc.c:925
+#: g10/mainproc.c:964
 #, fuzzy
 msgid "                aka \""
 msgstr "              importados: %lu"
 
-#: g10/mainproc.c:975
+#: g10/mainproc.c:1015
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1056
+#: g10/mainproc.c:1109
 msgid "old style (PGP 2.x) signature\n"
 msgstr "assinatura antiga (PGP2.x)\n"
 
-#: g10/mainproc.c:1061
+#: g10/mainproc.c:1114
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -2344,7 +2422,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:872
+#: g10/parse-packet.c:931
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -2381,15 +2459,15 @@ msgstr "Repita a frase secreta: "
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "dados n�o salvos; use a op��o \"--output\" para salv�-los\n"
 
-#: g10/plaintext.c:208
+#: g10/plaintext.c:266
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do arquivo de dados: "
 
-#: g10/plaintext.c:229
+#: g10/plaintext.c:287
 msgid "reading stdin ...\n"
 msgstr "lendo \"stdin\" ...\n"
 
-#: g10/plaintext.c:302
+#: g10/plaintext.c:360
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
@@ -2456,21 +2534,21 @@ msgstr "NOTA: chave de assinatura expirou %s\n"
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sign.c:79
+#: g10/sign.c:132
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s assinatura de: %s\n"
 
-#: g10/sign.c:210 g10/sign.c:496
+#: g10/sign.c:263 g10/sign.c:554
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/sign.c:306
+#: g10/sign.c:361
 msgid "signing:"
 msgstr "assinando:"
 
-#: g10/sign.c:346
+#: g10/sign.c:401
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
@@ -2520,7 +2598,7 @@ msgstr "%s: diret�rio criado\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diret�rio inexistente!\n"
 
-#: g10/openfile.c:113 g10/openfile.c:183 g10/ringedit.c:1344 g10/tdbio.c:457
+#: g10/openfile.c:144 g10/openfile.c:215 g10/ringedit.c:1344 g10/tdbio.c:457
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: imposs�vel criar: %s\n"
@@ -3082,16 +3160,21 @@ msgstr "Arquivo `%s' existe. "
 msgid "Overwrite (y/N)? "
 msgstr "Sobrescrever (s/N)? "
 
-#: g10/openfile.c:92
+#: g10/openfile.c:97
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr ""
+
+#: g10/openfile.c:122
 msgid "writing to stdout\n"
 msgstr "escrevendo para \"stdout\"\n"
 
-#: g10/openfile.c:149
+#: g10/openfile.c:181
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "assumindo dados assinados em `%s'\n"
 
-#: g10/openfile.c:199
+#: g10/openfile.c:231
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: novo arquivo de op��es criado\n"
@@ -3222,31 +3305,51 @@ msgstr ""
 msgid "keyedit.remove.subkey.okay"
 msgstr ""
 
-#: g10/helptext.c:175
+#: g10/helptext.c:176
+msgid "keyedit.delsig.valid"
+msgstr ""
+
+#: g10/helptext.c:181
+msgid "keyedit.delsig.invalid"
+msgstr ""
+
+#: g10/helptext.c:186
+msgid "keyedit.delsig.selfsig"
+msgstr ""
+
+#: g10/helptext.c:195
 msgid "passphrase.enter"
 msgstr ""
 
-#: g10/helptext.c:182
+#: g10/helptext.c:202
 msgid "passphrase.repeat"
 msgstr ""
 
-#: g10/helptext.c:186
+#: g10/helptext.c:206
 msgid "detached_signature.filename"
 msgstr ""
 
-#: g10/helptext.c:190
+#: g10/helptext.c:210
 msgid "openfile.overwrite.okay"
 msgstr ""
 
-#: g10/helptext.c:204
+#: g10/helptext.c:224
 msgid "No help available"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/helptext.c:216
+#: g10/helptext.c:236
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
 
+#, fuzzy
+#~ msgid "can't lock keyring `%': %s\n"
+#~ msgstr "imposs�vel bloquear anel de chaves p�blico: %s\n"
+
+#, fuzzy
+#~ msgid "error writing keyring `%': %s\n"
+#~ msgstr "%s: erro escrevendo registro de vers�o: %s\n"
+
 #~ msgid "can't open file: %s\n"
 #~ msgstr "imposs�vel abrir arquivo: %s\n"
 
diff --git a/po/ru.po b/po/ru.po
index be2aa22ff..ab0f2fa3f 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: 1999-05-23 15:36+0200\n"
+"POT-Creation-Date: 1999-06-08 21:26+0200\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-01-26 22:08:36+0100\n"
 "From: Gregory Steuck <[email protected]>\n"
@@ -36,14 +36,22 @@ msgstr ""
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 
-#: util/miscutil.c:156
+#: util/miscutil.c:156 util/miscutil.c:173
 msgid "yes"
 msgstr "��(y)"
 
-#: util/miscutil.c:157
+#: util/miscutil.c:157 util/miscutil.c:175
 msgid "yY"
 msgstr "yY"
 
+#: g10/keyedit.c:559 util/miscutil.c:174
+msgid "quit"
+msgstr "�����"
+
+#: util/miscutil.c:176
+msgid "qQ"
+msgstr ""
+
 #: util/errors.c:54
 #, fuzzy
 msgid "general error"
@@ -311,7 +319,7 @@ msgstr ""
 "�� ����������� ������� ���������� ���� ����������!\n"
 "\n"
 
-#: cipher/rndlinux.c:110
+#: cipher/rndlinux.c:135
 #, c-format
 msgid ""
 "\n"
@@ -322,7 +330,7 @@ msgstr ""
 "������������ ��������� ������. ����������, ��������� ���-������, �����\n"
 "�� ����� ������� �������������� ��������� �����! (����� ��� %d ����)\n"
 
-#: g10/g10.c:165
+#: g10/g10.c:169
 msgid ""
 "@Commands:\n"
 " "
@@ -330,136 +338,136 @@ msgstr ""
 "@�������:\n"
 " "
 
-#: g10/g10.c:167
+#: g10/g10.c:171
 #, fuzzy
 msgid "|[file]|make a signature"
 msgstr "|[����]|������� �������"
 
-#: g10/g10.c:168
+#: g10/g10.c:172
 #, fuzzy
 msgid "|[file]|make a clear text signature"
 msgstr "|[����]|������� ��������� �������"
 
-#: g10/g10.c:169
+#: g10/g10.c:173
 msgid "make a detached signature"
 msgstr "������� ��������� �������"
 
-#: g10/g10.c:170
+#: g10/g10.c:174
 msgid "encrypt data"
 msgstr "����������� ������"
 
-#: g10/g10.c:171
+#: g10/g10.c:175
 msgid "encryption only with symmetric cipher"
 msgstr "����������� ������������ ����������"
 
-#: g10/g10.c:172
+#: g10/g10.c:176
 msgid "store only"
 msgstr "������ ���������"
 
-#: g10/g10.c:173
+#: g10/g10.c:177
 msgid "decrypt data (default)"
 msgstr "������������ ������ (�� ���������)"
 
-#: g10/g10.c:174
+#: g10/g10.c:178
 msgid "verify a signature"
 msgstr "��������� �������"
 
-#: g10/g10.c:175
+#: g10/g10.c:179
 msgid "list keys"
 msgstr "������ ������"
 
-#: g10/g10.c:177
+#: g10/g10.c:181
 msgid "list keys and signatures"
 msgstr "������ ������ � ��������"
 
-#: g10/g10.c:178
+#: g10/g10.c:182
 msgid "check key signatures"
 msgstr "��������� ������� �� �����"
 
-#: g10/g10.c:179
+#: g10/g10.c:183
 msgid "list keys and fingerprints"
 msgstr "������ ������ � �� \"����������� �������\""
 
-#: g10/g10.c:180
+#: g10/g10.c:184
 msgid "list secret keys"
 msgstr "������ ��������� ������"
 
-#: g10/g10.c:181
+#: g10/g10.c:185
 msgid "generate a new key pair"
 msgstr "������������� ����� ���� ������ (�������� � ���������)"
 
-#: g10/g10.c:182
+#: g10/g10.c:186
 msgid "remove key from the public keyring"
 msgstr "������� ���� �� ������"
 
-#: g10/g10.c:183
+#: g10/g10.c:187
 msgid "sign or edit a key"
 msgstr "��������� ��� ������������� ����"
 
-#: g10/g10.c:184
+#: g10/g10.c:188
 msgid "generate a revocation certificate"
 msgstr "������������� ���������� ����������"
 
-#: g10/g10.c:185
+#: g10/g10.c:189
 msgid "export keys"
 msgstr "�������������� �����"
 
-#: g10/g10.c:186
+#: g10/g10.c:190
 msgid "export keys to a key server"
 msgstr ""
 
-#: g10/g10.c:187
+#: g10/g10.c:191
 msgid "import keys from a key server"
 msgstr ""
 
-#: g10/g10.c:190
+#: g10/g10.c:194
 msgid "import/merge keys"
 msgstr "�������������/�������� �����"
 
-#: g10/g10.c:192
+#: g10/g10.c:196
 msgid "list only the sequence of packets"
 msgstr "���������� ������ ������������������ �������"
 
-#: g10/g10.c:194
+#: g10/g10.c:198
 #, fuzzy
 msgid "export the ownertrust values"
 msgstr "�������������� ��������� �������\n"
 
-#: g10/g10.c:196
+#: g10/g10.c:200
 #, fuzzy
 msgid "import ownertrust values"
 msgstr "������������� ��������� �������\n"
 
-#: g10/g10.c:198
+#: g10/g10.c:202
 #, fuzzy
 msgid "|[NAMES]|update the trust database"
 msgstr "|[�����]|��������� ���� ������ �������"
 
-#: g10/g10.c:200
+#: g10/g10.c:204
 msgid "|[NAMES]|check the trust database"
 msgstr "|[�����]|��������� ���� ������ �������"
 
-#: g10/g10.c:201
+#: g10/g10.c:205
 msgid "fix a corrupted trust database"
 msgstr "��������� ����������� ���� ������ �������"
 
-#: g10/g10.c:202
+#: g10/g10.c:206
 msgid "De-Armor a file or stdin"
 msgstr "������������ stdin ��� ���� �� ASCII-�������������"
 
-#: g10/g10.c:203
+#: g10/g10.c:207
 msgid "En-Armor a file or stdin"
 msgstr "������������ stdin ��� ���� � ASCII-�������������"
 
-#: g10/g10.c:204
+#: g10/g10.c:208
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|���������� �������� ���������"
 
-#: g10/g10.c:205
+#: g10/g10.c:209
 msgid "print all message digests"
 msgstr "���������� ��� ��������� ���������"
 
-#: g10/g10.c:211
+#: g10/g10.c:215
 msgid ""
 "@\n"
 "Options:\n"
@@ -469,157 +477,161 @@ msgstr ""
 "���������:\n"
 " "
 
-#: g10/g10.c:213
+#: g10/g10.c:217
 msgid "create ascii armored output"
 msgstr "����� � ASCII-�������������"
 
-#: g10/g10.c:214
+#: g10/g10.c:218
 #, fuzzy
 msgid "|NAME|encrypt for NAME"
 msgstr "|���|������������ ������������ ���������� ���"
 
-#: g10/g10.c:218
+#: g10/g10.c:222
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "������������ ��������� ������������� ������������ ��� ������� ��� �����������"
 
-#: g10/g10.c:219
+#: g10/g10.c:223
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|���������� ������� ������ (0 - �� �������)"
 
-#: g10/g10.c:221
+#: g10/g10.c:225
 msgid "use canonical text mode"
 msgstr "������������ ������������ ��������� �����"
 
-#: g10/g10.c:222
+#: g10/g10.c:226
 msgid "use as output file"
 msgstr "������������ � �������� ��������� �����"
 
-#: g10/g10.c:223
+#: g10/g10.c:227
 msgid "verbose"
 msgstr "������������"
 
-#: g10/g10.c:224
+#: g10/g10.c:228
 msgid "be somewhat more quiet"
 msgstr ""
 
-#: g10/g10.c:225
+#: g10/g10.c:229
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "��������� ������� �� �����"
 
-#: g10/g10.c:226
+#: g10/g10.c:230
 #, fuzzy
 msgid "always use a MDC for encryption"
 msgstr "������������ ��������� ������������� ������������ ��� ����������"
 
-#: g10/g10.c:227
+#: g10/g10.c:231
 msgid "do not make any changes"
 msgstr "Keine wirklichen �nderungen durchf�hren"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:229
+#: g10/g10.c:233
 msgid "batch mode: never ask"
 msgstr "�������� �����: ������ �� ����������"
 
-#: g10/g10.c:230
+#: g10/g10.c:234
 msgid "assume yes on most questions"
 msgstr "�������� \"��\" �� ����������� ��������"
 
-#: g10/g10.c:231
+#: g10/g10.c:235
 msgid "assume no on most questions"
 msgstr "�������� \"���\" �� ����������� ��������"
 
-#: g10/g10.c:232
+#: g10/g10.c:236
 msgid "add this keyring to the list of keyrings"
 msgstr "�������� ��� ������ � ������ ������ ������"
 
-#: g10/g10.c:233
+#: g10/g10.c:237
 msgid "add this secret keyring to the list"
 msgstr "�������� ��� ��������� ������ � ������ ������ ������"
 
-#: g10/g10.c:234
+#: g10/g10.c:238
 msgid "|NAME|use NAME as default secret key"
 msgstr "|���|������������ ��� � �������� ���������� ����� �� ���������"
 
-#: g10/g10.c:235
+#: g10/g10.c:239
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: g10/g10.c:236
+#: g10/g10.c:240
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|���|������������ ������������ ���������� ���"
 
-#: g10/g10.c:237
+#: g10/g10.c:241
 msgid "read options from file"
 msgstr "������ ��������� �� �����"
 
-#: g10/g10.c:239
+#: g10/g10.c:243
 msgid "set debugging flags"
 msgstr "���������� ���������� �����"
 
-#: g10/g10.c:240
+#: g10/g10.c:244
 msgid "enable full debugging"
 msgstr "��������� ��� �������"
 
-#: g10/g10.c:241
+#: g10/g10.c:245
 msgid "|FD|write status info to this FD"
 msgstr "|FD| ���������� ���������� � ��������� � ���������� (FD)"
 
-#: g10/g10.c:242
+#: g10/g10.c:246
 msgid "do not write comment packets"
 msgstr "�� ������ ������ � �������������"
 
-#: g10/g10.c:243
+#: g10/g10.c:247
 msgid "(default is 1)"
 msgstr "(�� ��������� 1)"
 
-#: g10/g10.c:244
+#: g10/g10.c:248
 msgid "(default is 3)"
 msgstr "(�� ��������� 3)"
 
-#: g10/g10.c:246
+#: g10/g10.c:250
 #, fuzzy
 msgid "|FILE|load extension module FILE"
 msgstr "|����|��������� ���� � ������������ ��������"
 
-#: g10/g10.c:247
+#: g10/g10.c:251
 msgid "emulate the mode described in RFC1991"
 msgstr "����������� ����� ��������� � RFC1991"
 
-#: g10/g10.c:248
+#: g10/g10.c:252
 #, fuzzy
 msgid "|N|use passphrase mode N"
 msgstr "|N|������������ �������� ����� ������ N\n"
 
-#: g10/g10.c:250
+#: g10/g10.c:254
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|���|������������ ���-�������� ��� ��� �������� ����"
 
-#: g10/g10.c:252
+#: g10/g10.c:256
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|���|������������ ������������ ���������� ��� ��� �������� ����"
 
-#: g10/g10.c:253
+#: g10/g10.c:257
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|���|������������ ������������ ���������� ���"
 
-#: g10/g10.c:254
+#: g10/g10.c:258
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|���|������������ ���-�������� ���"
 
-#: g10/g10.c:255
+#: g10/g10.c:259
 msgid "|N|use compress algorithm N"
 msgstr "|N|������������ �������� ������ N"
 
-#: g10/g10.c:256
+#: g10/g10.c:260
 msgid "throw keyid field of encrypted packets"
 msgstr "����������� ���� keyid � ������������� �������"
 
-#: g10/g10.c:258
+#: g10/g10.c:261
+msgid "|NAME=VALUE|use this notation data"
+msgstr ""
+
+#: g10/g10.c:263
 #, fuzzy
 msgid ""
 "@\n"
@@ -640,17 +652,17 @@ msgstr ""
 " --list-keys [names]        �������� ������ ������\n"
 " --fingerprint [names]      �������� \"��������� �������\" ������\n"
 
-#: g10/g10.c:327
+#: g10/g10.c:337
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "����������, ����������� ��������� �� ������� �� ������ "
 "<[email protected]>.\n"
 
-#: g10/g10.c:331
+#: g10/g10.c:341
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�������������: gpg [���������] [�����] (-h ��� ������)"
 
-#: g10/g10.c:334
+#: g10/g10.c:344
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -660,7 +672,7 @@ msgstr ""
 "�����������, ��������� �������, ������� ��� ��������������\n"
 "����� ������ ������� �� ������� ������\n"
 
-#: g10/g10.c:339
+#: g10/g10.c:349
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -668,151 +680,174 @@ msgstr ""
 "\n"
 "�������������� ���������:\n"
 
-#: g10/g10.c:413
+#: g10/g10.c:423
 msgid "usage: gpg [options] "
 msgstr "�������������: gpg [���������] "
 
-#: g10/g10.c:453
+#: g10/g10.c:463
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Kommandos\n"
 
-#: g10/g10.c:580
+#: g10/g10.c:595
 #, fuzzy, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "���������: ���� ���������� �� ��������� `%s' �����������\n"
 
-#: g10/g10.c:584
+#: g10/g10.c:599
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���� ���������� `%s': %s\n"
 
-#: g10/g10.c:591
+#: g10/g10.c:606
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� ��������� �� `%s'\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:755
 #, fuzzy, c-format
 msgid "%s is not a valid character set\n"
 msgstr "������������ ������ � �����������.\n"
 
-#: g10/g10.c:780 g10/g10.c:792
+#: g10/g10.c:799 g10/g10.c:811
 msgid "selected cipher algorithm is invalid\n"
 msgstr "������ ������������ �������� ����������\n"
 
-#: g10/g10.c:786 g10/g10.c:798
+#: g10/g10.c:805 g10/g10.c:817
 msgid "selected digest algorithm is invalid\n"
 msgstr "������ ������������ ��������-��������\n"
 
-#: g10/g10.c:801
+#: g10/g10.c:821
+msgid "the given policy URL is invalid\n"
+msgstr ""
+
+#: g10/g10.c:824
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "�������� �������� ����� ����� �������� �� %d �� %d\n"
 
-#: g10/g10.c:803
+#: g10/g10.c:826
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ ���� ������ 0\n"
 
-#: g10/g10.c:805
+#: g10/g10.c:828
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ ���� ������ 1\n"
 
-#: g10/g10.c:807
+#: g10/g10.c:830
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:810
+#: g10/g10.c:833
 #, fuzzy
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "���������: ������� S2K ����� (0) ����� �� �������������\n"
 
-#: g10/g10.c:814
+#: g10/g10.c:837
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "������������ ����� S2K: ������ ���� 0, 1 ��� 3\n"
 
-#: g10/g10.c:891
+#: g10/g10.c:914
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "������ ������������� ���� ������ �������: %s\n"
 
-#: g10/g10.c:897
+#: g10/g10.c:920
 msgid "--store [filename]"
 msgstr "--store [��� �����]"
 
-#: g10/g10.c:904
+#: g10/g10.c:927
 msgid "--symmetric [filename]"
 msgstr "--symmetric [��� �����]"
 
-#: g10/g10.c:912
+#: g10/g10.c:935
 msgid "--encrypt [filename]"
 msgstr "--encrypt [��� �����]"
 
-#: g10/g10.c:925
+#: g10/g10.c:948
 msgid "--sign [filename]"
 msgstr "--sign [��� �����]"
 
-#: g10/g10.c:938
+#: g10/g10.c:961
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [��� �����]"
 
-#: g10/g10.c:952
+#: g10/g10.c:975
 msgid "--clearsign [filename]"
 msgstr "--clearsign [��� �����]"
 
-#: g10/g10.c:964
+#: g10/g10.c:987
 msgid "--decrypt [filename]"
 msgstr "--decrypt [��� �����]"
 
-#: g10/g10.c:973
+#: g10/g10.c:996
 #, fuzzy
 msgid "--edit-key username [commands]"
 msgstr "--edit-key ���-������������"
 
-#: g10/g10.c:987
+#: g10/g10.c:1010
 msgid "--delete-secret-key username"
 msgstr "--delete-secret-key ���-������������"
 
-#: g10/g10.c:990
+#: g10/g10.c:1013
 msgid "--delete-key username"
 msgstr "--delete-key ���-������������"
 
-#: g10/encode.c:231 g10/g10.c:1013 g10/sign.c:311
+#: g10/encode.c:231 g10/g10.c:1036 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "���������� ������� ���� `%s': %s\n"
 
-#: g10/g10.c:1024
+#: g10/g10.c:1047
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [������������� ������������] [������ ������]"
 
-#: g10/g10.c:1083
+#: g10/g10.c:1106
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "������ �������������: %s\n"
 
-#: g10/g10.c:1091
+#: g10/g10.c:1114
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "������ �����������: %s\n"
 
-#: g10/g10.c:1157
+#: g10/g10.c:1180
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "������������ ���-�������� `%s'\n"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1255
 msgid "[filename]"
 msgstr "[��� �����]"
 
-#: g10/g10.c:1236
+#: g10/g10.c:1259
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/decrypt.c:59 g10/g10.c:1239 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1262 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "���������� ������� ���� `%s'\n"
 
+#: g10/g10.c:1429
+msgid ""
+"the first character of a notation name must be a letter or an underscore\n"
+msgstr ""
+
+#: g10/g10.c:1435
+msgid ""
+"a notation name must have only letters, digits, dots or underscores and end "
+"with an '='\n"
+msgstr ""
+
+#: g10/g10.c:1441
+msgid "dots in a notation name must be surrounded by other characters\n"
+msgstr ""
+
+#: g10/g10.c:1449
+msgid "a notation value must not use any control characters\n"
+msgstr ""
+
 #: g10/armor.c:296
 #, fuzzy, c-format
 msgid "armor: %s\n"
@@ -1080,12 +1115,17 @@ msgstr "��������: ���� ���� �� ������� ���������� ����������� ���������!\n"
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "          ��� �����������, ��� ������� ����������� ���������.\n"
 
-#: g10/pkclist.c:569 g10/pkclist.c:582 g10/pkclist.c:645 g10/pkclist.c:673
+#: g10/pkclist.c:580 g10/pkclist.c:602 g10/pkclist.c:665 g10/pkclist.c:705
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ��������: %s\n"
 
-#: g10/pkclist.c:591
+#: g10/pkclist.c:588 g10/pkclist.c:687
+#, c-format
+msgid "%s: skipped: public key already present\n"
+msgstr ""
+
+#: g10/pkclist.c:611
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1094,20 +1134,20 @@ msgstr ""
 "\"-r\").\n"
 "\n"
 
-#: g10/pkclist.c:596
+#: g10/pkclist.c:616
 msgid "Enter the user ID: "
 msgstr "������� ������������� ������������: "
 
-#: g10/pkclist.c:607
+#: g10/pkclist.c:627
 msgid "No such user ID.\n"
 msgstr "��� ������ �������������� ������������.\n"
 
-#: g10/pkclist.c:653
+#: g10/pkclist.c:673
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: ������ ��� �������� �����: %s\n"
 
-#: g10/pkclist.c:679
+#: g10/pkclist.c:711
 msgid "no valid addressees\n"
 msgstr "��� ���������� �������\n"
 
@@ -1353,7 +1393,7 @@ msgstr ""
 "��� ������ ������ ����� ����� �������� �����.\n"
 "\n"
 
-#: g10/keyedit.c:433 g10/keygen.c:748
+#: g10/keyedit.c:455 g10/keygen.c:748
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "�������� ����� �� ���� ��������������, ���������� �����.\n"
 
@@ -1425,7 +1465,7 @@ msgstr ""
 msgid "Key generation failed: %s\n"
 msgstr "��������� ����� �� �������: %s\n"
 
-#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:52
+#: g10/keygen.c:1007 g10/sig-check.c:300 g10/sign.c:105
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1433,7 +1473,7 @@ msgstr ""
 "�������� ���� ������������ � ������� (����������� ������� ��� ����������� "
 "����������� ����)\n"
 
-#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:54
+#: g10/keygen.c:1009 g10/sig-check.c:302 g10/sign.c:107
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1446,7 +1486,7 @@ msgstr ""
 msgid "Really create? "
 msgstr "������������� �������? "
 
-#: g10/encode.c:91 g10/openfile.c:88 g10/openfile.c:176 g10/tdbio.c:467
+#: g10/encode.c:91 g10/openfile.c:118 g10/openfile.c:208 g10/tdbio.c:467
 #: g10/tdbio.c:528
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1603,19 +1643,19 @@ msgstr "���� %08lX: �������� ���� �� ������: %s\n"
 msgid "no default public keyring\n"
 msgstr "��� ������ �������� ������ �� ���������\n"
 
-#: g10/import.c:376 g10/openfile.c:117 g10/sign.c:215 g10/sign.c:501
+#: g10/import.c:376 g10/openfile.c:148 g10/sign.c:268 g10/sign.c:559
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "������������ � `%s'\n"
 
-#: g10/import.c:379 g10/import.c:435
-#, fuzzy
-msgid "can't lock keyring `%': %s\n"
+#: g10/import.c:379 g10/import.c:435 g10/import.c:544 g10/import.c:645
+#, fuzzy, c-format
+msgid "can't lock keyring `%s': %s\n"
 msgstr "���������� ������������� ������ �������� ������: %s\n"
 
-#: g10/import.c:382
-#, fuzzy
-msgid "error writing keyring `%': %s\n"
+#: g10/import.c:382 g10/import.c:438 g10/import.c:547 g10/import.c:648
+#, fuzzy, c-format
+msgid "error writing keyring `%s': %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
 #: g10/import.c:387
@@ -1638,11 +1678,6 @@ msgstr "���� %08lX: ���������� ���������� original keyblock: %s\n"
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "���� %08lX: ���������� ��������� original keyblock: %s\n"
 
-#: g10/import.c:438 g10/import.c:547 g10/import.c:648
-#, fuzzy, c-format
-msgid "error writing keyring `%s': %s\n"
-msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
-
 #: g10/import.c:444
 #, c-format
 msgid "key %08lX: 1 new user-id\n"
@@ -1678,11 +1713,6 @@ msgstr "���� %08lX: %d ����� ���-������\n"
 msgid "key %08lX: not changed\n"
 msgstr "���� %08lX: �� �������\n"
 
-#: g10/import.c:544 g10/import.c:645
-#, fuzzy, c-format
-msgid "can't lock keyring `%s': %s\n"
-msgstr "���������� ������������� ������ �������� ������: %s\n"
-
 #: g10/import.c:552
 #, c-format
 msgid "key %08lX: secret key imported\n"
@@ -1785,56 +1815,56 @@ msgstr "���� %08lX: ���������� ���������� ��������\n"
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "���� %08lX: ���� ����� �� ����� ����-�������\n"
 
-#: g10/keyedit.c:91
+#: g10/keyedit.c:92
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: ������������ �� ������\n"
 
-#: g10/keyedit.c:177
+#: g10/keyedit.c:153
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:178
+#: g10/keyedit.c:154
 #, fuzzy
 msgid "[self-signature]"
 msgstr "[����-�������]\n"
 
-#: g10/keyedit.c:196
+#: g10/keyedit.c:218
 #, fuzzy
 msgid "1 bad signature\n"
 msgstr "1 ������ �������\n"
 
-#: g10/keyedit.c:198
+#: g10/keyedit.c:220
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d ������ ��������\n"
 
-#: g10/keyedit.c:200
+#: g10/keyedit.c:222
 #, fuzzy
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 ������� �� ��������� ��-�� ���������� �����\n"
 
-#: g10/keyedit.c:202
+#: g10/keyedit.c:224
 #, fuzzy, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%s �������� �� ��������� ��-�� ���������� ������\n"
 
-#: g10/keyedit.c:204
+#: g10/keyedit.c:226
 #, fuzzy
 msgid "1 signature not checked due to an error\n"
 msgstr "1 ������� �� ��������� ��-�� ������\n"
 
-#: g10/keyedit.c:206
+#: g10/keyedit.c:228
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%s �������� �� ��������� ��-�� ������\n"
 
-#: g10/keyedit.c:208
+#: g10/keyedit.c:230
 #, fuzzy
 msgid "1 user id without valid self-signature detected\n"
 msgstr "��������� 1 ������������� ������������ ��� ���������� ����-�������\n"
 
-#: g10/keyedit.c:210
+#: g10/keyedit.c:232
 #, c-format
 msgid "%d user ids without valid self-signatures detected\n"
 msgstr ""
@@ -1842,52 +1872,52 @@ msgstr ""
 
 #. Fixme: see whether there is a revocation in which
 #. * case we should allow to sign it again.
-#: g10/keyedit.c:290
+#: g10/keyedit.c:312
 #, fuzzy, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "��� ��������� ������ %08lX.\n"
 
-#: g10/keyedit.c:298
+#: g10/keyedit.c:320
 #, fuzzy, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "������ ����������� ������ %08lX\n"
 
-#: g10/keyedit.c:307
+#: g10/keyedit.c:329
 #, fuzzy
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr "�� ������������� �������, ��� ������ ��������� ���� ���� �����:\n"
 
-#: g10/keyedit.c:316
+#: g10/keyedit.c:338
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:321
+#: g10/keyedit.c:343
 msgid "Really sign? "
 msgstr "������������� ���������? "
 
-#: g10/keyedit.c:347 g10/keyedit.c:1688 g10/keyedit.c:1737 g10/sign.c:75
+#: g10/keyedit.c:369 g10/keyedit.c:1779 g10/keyedit.c:1828 g10/sign.c:128
 #, fuzzy, c-format
 msgid "signing failed: %s\n"
 msgstr "������ ������������: %s\n"
 
-#: g10/keyedit.c:400
+#: g10/keyedit.c:422
 msgid "This key is not protected.\n"
 msgstr "���� ���� �� �������.\n"
 
-#: g10/keyedit.c:403
+#: g10/keyedit.c:425
 msgid "Key is protected.\n"
 msgstr "���� ���� �������.\n"
 
-#: g10/keyedit.c:420
+#: g10/keyedit.c:442
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "���������� ������������� ���� ����: %s\n"
 
-#: g10/keyedit.c:425
+#: g10/keyedit.c:447
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -1895,7 +1925,7 @@ msgstr ""
 "������� ����� �������� ����� ��� ����� ���������� �����.\n"
 "\n"
 
-#: g10/keyedit.c:437
+#: g10/keyedit.c:459
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -1903,382 +1933,416 @@ msgstr ""
 "�� �� ������ �������� ����� - ��� ������ ����� *������* ����!\n"
 "\n"
 
-#: g10/keyedit.c:440
+#: g10/keyedit.c:462
 msgid "Do you really want to do this? "
 msgstr "�� ������������� ����� ������? "
 
-#: g10/keyedit.c:501
+#: g10/keyedit.c:523
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:537
-msgid "quit"
-msgstr "�����"
-
-#: g10/keyedit.c:537
+#: g10/keyedit.c:559
 msgid "quit this menu"
 msgstr "����� �� ����"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:560
 msgid "q"
 msgstr ""
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:561
 msgid "save"
 msgstr "��������"
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:561
 msgid "save and quit"
 msgstr "�������� � �����"
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:562
 msgid "help"
 msgstr "������"
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:562
 msgid "show this help"
 msgstr "�������� ������"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:564
 msgid "fpr"
 msgstr ""
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:564
 #, fuzzy
 msgid "show fingerprint"
 msgstr "�������� \"��������� ������\""
 
-#: g10/keyedit.c:543
+#: g10/keyedit.c:565
 #, fuzzy
 msgid "list"
 msgstr "������"
 
-#: g10/keyedit.c:543
+#: g10/keyedit.c:565
 #, fuzzy
 msgid "list key and user ids"
 msgstr "������ ������ � ��������������� �������������"
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:566
 msgid "l"
 msgstr ""
 
-#: g10/keyedit.c:545
+#: g10/keyedit.c:567
 msgid "uid"
 msgstr ""
 
-#: g10/keyedit.c:545
+#: g10/keyedit.c:567
 msgid "select user id N"
 msgstr "������� ������������� ������������ N"
 
-#: g10/keyedit.c:546
+#: g10/keyedit.c:568
 msgid "key"
 msgstr "����"
 
-#: g10/keyedit.c:546
+#: g10/keyedit.c:568
 msgid "select secondary key N"
 msgstr "������� �������������� ���� N"
 
-#: g10/keyedit.c:547
+#: g10/keyedit.c:569
 msgid "check"
 msgstr "��������"
 
-#: g10/keyedit.c:547
+#: g10/keyedit.c:569
 #, fuzzy
 msgid "list signatures"
 msgstr "������ ������ � �� ��������"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:570
 msgid "c"
 msgstr ""
 
-#: g10/keyedit.c:549
+#: g10/keyedit.c:571
 msgid "sign"
 msgstr "���������"
 
-#: g10/keyedit.c:549
+#: g10/keyedit.c:571
 #, fuzzy
 msgid "sign the key"
 msgstr "��������� ����"
 
-#: g10/keyedit.c:550
+#: g10/keyedit.c:572
 msgid "s"
 msgstr ""
 
-#: g10/keyedit.c:551
+#: g10/keyedit.c:573
 #, fuzzy
 msgid "lsign"
 msgstr "���������"
 
-#: g10/keyedit.c:551
+#: g10/keyedit.c:573
 #, fuzzy
 msgid "sign the key locally"
 msgstr "��������� ����"
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:574
 msgid "debug"
 msgstr "�������"
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:575
 msgid "adduid"
 msgstr ""
 
-#: g10/keyedit.c:553
+#: g10/keyedit.c:575
 msgid "add a user id"
 msgstr "�������� ������������� ������������"
 
-#: g10/keyedit.c:554
+#: g10/keyedit.c:576
 msgid "deluid"
 msgstr ""
 
-#: g10/keyedit.c:554
+#: g10/keyedit.c:576
 #, fuzzy
 msgid "delete user id"
 msgstr "������� ������������� ������������"
 
-#: g10/keyedit.c:555
+#: g10/keyedit.c:577
 msgid "addkey"
 msgstr ""
 
-#: g10/keyedit.c:555
+#: g10/keyedit.c:577
 #, fuzzy
 msgid "add a secondary key"
 msgstr "�������� �������������� ����"
 
-#: g10/keyedit.c:556
+#: g10/keyedit.c:578
 msgid "delkey"
 msgstr ""
 
-#: g10/keyedit.c:556
+#: g10/keyedit.c:578
 msgid "delete a secondary key"
 msgstr "������� �������������� ����"
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:579
+#, fuzzy
+msgid "delsig"
+msgstr "���������"
+
+#: g10/keyedit.c:579
+#, fuzzy
+msgid "delete signatures"
+msgstr "������ ������ � �� ��������"
+
+#: g10/keyedit.c:580
 msgid "expire"
 msgstr ""
 
-#: g10/keyedit.c:557
+#: g10/keyedit.c:580
 #, fuzzy
 msgid "change the expire date"
 msgstr "�������� �������� �����"
 
-#: g10/keyedit.c:558
+#: g10/keyedit.c:581
 msgid "toggle"
 msgstr ""
 
-#: g10/keyedit.c:558
+#: g10/keyedit.c:581
 msgid "toggle between secret and public key listing"
 msgstr "����������� ����� ������� ��������� � �������� ������"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:583
 msgid "t"
 msgstr ""
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:584
 msgid "pref"
 msgstr ""
 
-#: g10/keyedit.c:561
+#: g10/keyedit.c:584
 msgid "list preferences"
 msgstr ""
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:585
 msgid "passwd"
 msgstr ""
 
-#: g10/keyedit.c:562
+#: g10/keyedit.c:585
 #, fuzzy
 msgid "change the passphrase"
 msgstr "�������� �������� �����"
 
-#: g10/keyedit.c:563
+#: g10/keyedit.c:586
 msgid "trust"
 msgstr ""
 
-#: g10/keyedit.c:563
+#: g10/keyedit.c:586
 msgid "change the ownertrust"
 msgstr "�������� ��������� �������"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:587
 #, fuzzy
 msgid "revsig"
 msgstr "���������"
 
-#: g10/keyedit.c:564
+#: g10/keyedit.c:587
 #, fuzzy
 msgid "revoke signatures"
 msgstr "��������� ������� �� �����"
 
-#: g10/keyedit.c:565
+#: g10/keyedit.c:588
 #, fuzzy
 msgid "revkey"
 msgstr "����"
 
-#: g10/keyedit.c:565
+#: g10/keyedit.c:588
 #, fuzzy
 msgid "revoke a secondary key"
 msgstr "������� �������������� ����"
 
-#: g10/keyedit.c:584
+#: g10/keyedit.c:607
 msgid "can't do that in batchmode\n"
 msgstr "���������� ������� ��� � �������� ������.\n"
 
 #. check that they match
 #. FIXME: check that they both match
-#: g10/keyedit.c:613
+#: g10/keyedit.c:636
 #, fuzzy
 msgid "Secret key is available.\n"
 msgstr "������� ��������� ����.\n"
 
-#: g10/keyedit.c:642
+#: g10/keyedit.c:665
 #, fuzzy
 msgid "Command> "
 msgstr "�������> "
 
-#: g10/keyedit.c:669
+#: g10/keyedit.c:692
 #, fuzzy
 msgid "Need the secret key to do this.\n"
 msgstr "����� ��� �������, ����� ��������� ����.\n"
 
-#: g10/keyedit.c:691
+#: g10/keyedit.c:714
 msgid "Save changes? "
 msgstr "��������� ���������? "
 
-#: g10/keyedit.c:694
+#: g10/keyedit.c:717
 msgid "Quit without saving? "
 msgstr "����� ��� ����������? "
 
-#: g10/keyedit.c:704
+#: g10/keyedit.c:727
 #, fuzzy, c-format
 msgid "update failed: %s\n"
 msgstr "���������� �� �������: %s\n"
 
-#: g10/keyedit.c:711
+#: g10/keyedit.c:734
 #, fuzzy, c-format
 msgid "update secret failed: %s\n"
 msgstr "���������� ������� �� �������: %s\n"
 
-#: g10/keyedit.c:718
+#: g10/keyedit.c:741
 msgid "Key not changed so no update needed.\n"
 msgstr "���� �� ���������, ���������� �� �����.\n"
 
-#: g10/keyedit.c:721 g10/keyedit.c:780
+#: g10/keyedit.c:744 g10/keyedit.c:803
 #, fuzzy, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "���������� ���� ������ ������� �� �������: %s\n"
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:777
 msgid "Really sign all user ids? "
 msgstr "������������� ��������� ��� �������������� ������������? "
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:778
 msgid "Hint: Select the user ids to sign\n"
 msgstr ""
 "���������: �������� �������������� ������������ ������� ������ ���������\n"
 
-#: g10/keyedit.c:791
+#: g10/keyedit.c:814 g10/keyedit.c:835
 msgid "You must select at least one user id.\n"
 msgstr "�� ������ ������� ���� �� ���� ������������� ������������.\n"
 
-#: g10/keyedit.c:793
+#: g10/keyedit.c:816
 msgid "You can't delete the last user id!\n"
 msgstr "�� �� ������ ������� ��������� ������������� ������������!\n"
 
-#: g10/keyedit.c:796
+#: g10/keyedit.c:819
 #, fuzzy
 msgid "Really remove all selected user ids? "
 msgstr "������������� ������� ��� ��������� �������������� ������������? "
 
-#: g10/keyedit.c:797
+#: g10/keyedit.c:820
 #, fuzzy
 msgid "Really remove this user id? "
 msgstr "������������� ������� ���� ������������� ������������? "
 
-#: g10/keyedit.c:820 g10/keyedit.c:842
+#: g10/keyedit.c:856 g10/keyedit.c:878
 msgid "You must select at least one key.\n"
 msgstr "�� ������ ������� ���� �� ���� ����.\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:860
 #, fuzzy
 msgid "Do you really want to delete the selected keys? "
 msgstr "�� ������������� ������ ������� ��������� �����? "
 
-#: g10/keyedit.c:825
+#: g10/keyedit.c:861
 #, fuzzy
 msgid "Do you really want to delete this key? "
 msgstr "�� ������������� ������ ������� ���� ����? "
 
-#: g10/keyedit.c:846
+#: g10/keyedit.c:882
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? "
 msgstr "�� ������������� ������ ������� ��������� �����? "
 
-#: g10/keyedit.c:847
+#: g10/keyedit.c:883
 #, fuzzy
 msgid "Do you really want to revoke this key? "
 msgstr "�� ������������� ������ ������� ���� ����? "
 
-#: g10/keyedit.c:901
+#: g10/keyedit.c:937
 msgid "Invalid command  (try \"help\")\n"
 msgstr "������������ ������� (���������� \"help\")\n"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1289
+msgid "Delete this good signature? (y/N/q)"
+msgstr ""
+
+#: g10/keyedit.c:1292
+msgid "Delete this invalid signature? (y/N/q)"
+msgstr ""
+
+#: g10/keyedit.c:1297
+#, fuzzy
+msgid "Really delete this self-signature? (y/N)"
+msgstr "������������� ���������� ����������"
+
+#: g10/keyedit.c:1311
+#, fuzzy, c-format
+msgid "Deleted %d signature.\n"
+msgstr "%d ������ ��������\n"
+
+#: g10/keyedit.c:1312
+#, fuzzy, c-format
+msgid "Deleted %d signatures.\n"
+msgstr "%d ������ ��������\n"
+
+#: g10/keyedit.c:1315
+#, fuzzy
+msgid "Nothing deleted.\n"
+msgstr "��������: ������������ ���� � �������� ��� �������!\n"
+
+#: g10/keyedit.c:1384
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "Please select at most one secondary key.\n"
 msgstr "�� ������ ������� ���� �� ���� ����.\n"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1394
 msgid "Changing exiration time for a secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1396
 msgid "Changing exiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1437
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:1362
+#: g10/keyedit.c:1453
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:1422
+#: g10/keyedit.c:1513
 #, c-format
 msgid "No user id with index %d\n"
 msgstr "��� �������������� ������������ � �������� %d\n"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1559
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "��� ��������������� ����� � �������� %d\n"
 
-#: g10/keyedit.c:1566
+#: g10/keyedit.c:1657
 #, fuzzy
 msgid "user ID: \""
 msgstr "������� ������������� ������������: "
 
-#: g10/keyedit.c:1569
+#: g10/keyedit.c:1660
 #, fuzzy, c-format
 msgid ""
 "\"\n"
 "signed with your key %08lX at %s\n"
 msgstr "������ ����������� ������ %08lX\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1664
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "������������� ���������� ����������"
 
-#: g10/keyedit.c:1653
+#: g10/keyedit.c:1744
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N)"
 msgstr "������������� ���������� ����������"
 
-#: g10/keyedit.c:1676
+#: g10/keyedit.c:1767
 #, fuzzy
 msgid "no secret key\n"
 msgstr "������ ��������� ����"
@@ -2326,38 +2390,51 @@ msgstr "���������: ����������� �������� \"������-���-�����-����\"\n"
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:505 g10/mainproc.c:514
+#, fuzzy
+msgid "WARNING: invalid notation data found\n"
+msgstr "�� ������� ���������� RFC1991 ��� OpenPGP ������.\n"
+
+#: g10/mainproc.c:517
+msgid "Notation: "
+msgstr ""
+
+#: g10/mainproc.c:524
+msgid "Policy: "
+msgstr ""
+
+#: g10/mainproc.c:929
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:896
+#: g10/mainproc.c:935
 #, 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:922 g10/mainproc.c:933
+#: g10/mainproc.c:961 g10/mainproc.c:972
 msgid "BAD signature from \""
 msgstr "������ ������� �� \""
 
-#: g10/mainproc.c:923 g10/mainproc.c:934
+#: g10/mainproc.c:962 g10/mainproc.c:973
 msgid "Good signature from \""
 msgstr "������� ������� �� \""
 
-#: g10/mainproc.c:925
+#: g10/mainproc.c:964
 msgid "                aka \""
 msgstr ""
 
-#: g10/mainproc.c:975
+#: g10/mainproc.c:1015
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "���������� ��������� �������: %s\n"
 
-#: g10/mainproc.c:1056
+#: g10/mainproc.c:1109
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:1061
+#: g10/mainproc.c:1114
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -2391,7 +2468,7 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "���������� ������������� ������ �������� ������: %s\n"
 
-#: g10/parse-packet.c:872
+#: g10/parse-packet.c:931
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -2430,15 +2507,15 @@ msgstr "��������� �������� �����: %s\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "������ �� ���� ���������; �������������� --\"output\" ��� ����������\n"
 
-#: g10/plaintext.c:208
+#: g10/plaintext.c:266
 msgid "Please enter name of data file: "
 msgstr "����������, ������� ��� ����� ������: "
 
-#: g10/plaintext.c:229
+#: g10/plaintext.c:287
 msgid "reading stdin ...\n"
 msgstr ""
 
-#: g10/plaintext.c:302
+#: g10/plaintext.c:360
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "���������� ������� ����������� ������ `%s' .\n"
@@ -2505,22 +2582,22 @@ msgstr "��������������: ���� ������� ������� %s\n"
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sign.c:79
+#: g10/sign.c:132
 #, fuzzy, c-format
 msgid "%s signature from: %s\n"
 msgstr "������ ������� �� \""
 
-#: g10/sign.c:210 g10/sign.c:496
+#: g10/sign.c:263 g10/sign.c:554
 #, fuzzy, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/sign.c:306
+#: g10/sign.c:361
 #, fuzzy
 msgid "signing:"
 msgstr "���������"
 
-#: g10/sign.c:346
+#: g10/sign.c:401
 #, fuzzy, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "%s: ��������������: ������ ����.\n"
@@ -2569,7 +2646,7 @@ msgstr "%s: ���������� �������: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/openfile.c:113 g10/openfile.c:183 g10/ringedit.c:1344 g10/tdbio.c:457
+#: g10/openfile.c:144 g10/openfile.c:215 g10/ringedit.c:1344 g10/tdbio.c:457
 #, fuzzy, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: ���������� �������: %s\n"
@@ -3126,17 +3203,22 @@ msgstr "���� `%s' ����������. "
 msgid "Overwrite (y/N)? "
 msgstr "���������� (y/N)? "
 
-#: g10/openfile.c:92
+#: g10/openfile.c:97
+#, c-format
+msgid "%s: unknown suffix\n"
+msgstr ""
+
+#: g10/openfile.c:122
 #, fuzzy
 msgid "writing to stdout\n"
 msgstr "������������ � `%s'\n"
 
-#: g10/openfile.c:149
+#: g10/openfile.c:181
 #, fuzzy, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "���������� ������� ����������� ������ `%s' .\n"
 
-#: g10/openfile.c:199
+#: g10/openfile.c:231
 #, c-format
 msgid "%s: new options file created\n"
 msgstr ""
@@ -3267,10 +3349,22 @@ msgstr ""
 msgid "keyedit.remove.subkey.okay"
 msgstr ""
 
+#: g10/helptext.c:176
+msgid "keyedit.delsig.valid"
+msgstr ""
+
+#: g10/helptext.c:181
+msgid "keyedit.delsig.invalid"
+msgstr ""
+
+#: g10/helptext.c:186
+msgid "keyedit.delsig.selfsig"
+msgstr ""
+
 # ################################
 # ####### Help msgids ############
 # ################################
-#: g10/helptext.c:175
+#: g10/helptext.c:195
 msgid "passphrase.enter"
 msgstr ""
 "Bitte geben Sie die \"Passhrase\" ein; dies ist ein geheimer Satz der aus\n"
@@ -3285,31 +3379,39 @@ msgstr ""
 "werden,\n"
 "sind i.d.R. eine gute Wahl"
 
-#: g10/helptext.c:182
+#: g10/helptext.c:202
 msgid "passphrase.repeat"
 msgstr ""
 "Um sicher zu gehen, da� Sie sich bei der Eingabe der \"Passphrase\" nicht\n"
 "vertippt haben, geben Sie diese bitte nochmal ein.  Nur wenn beide Eingaben\n"
 "�bereinstimmen, wird die \"Passphrase\" akzeptiert."
 
-#: g10/helptext.c:186
+#: g10/helptext.c:206
 #, fuzzy
 msgid "detached_signature.filename"
 msgstr "��� ����� ��� ��������� �������"
 
-#: g10/helptext.c:190
+#: g10/helptext.c:210
 msgid "openfile.overwrite.okay"
 msgstr "�� ������� ������������ ���� (�������� ������ ������)"
 
-#: g10/helptext.c:204
+#: g10/helptext.c:224
 msgid "No help available"
 msgstr "������ �����������."
 
-#: g10/helptext.c:216
+#: g10/helptext.c:236
 #, c-format
 msgid "No help available for `%s'"
 msgstr "������ ��� `%s' �����������."
 
+#, fuzzy
+#~ msgid "can't lock keyring `%': %s\n"
+#~ msgstr "���������� ������������� ������ �������� ������: %s\n"
+
+#, fuzzy
+#~ msgid "error writing keyring `%': %s\n"
+#~ msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
+
 #~ msgid "can't open file: %s\n"
 #~ msgstr "���������� ������� ����: %s\n"