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

8 files changed, 2496 insertions, 2500 deletions

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  <wk@isil.d.shuttle.de>
+
+
+	* it.po: Updated (Marco).
+
+	* es_ES.po: Updated (Urko).
+
 Wed Jun  2 14:17:19 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
 
 	* 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 <walterk@dip.de>, 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 <walterk@mail.dip.de>\n"
 "Language-Team: German <de@li.org>\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 <gnupg-bugs@gnu.org>.\n"
 msgstr "Berichte über Bugs (Programmfehler) bitte an <gnupg-bugs@gnu.org>.\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
 # <armando@clerval.org> is his PGP 2.3.6i translation.
 # I also got inspiration from it.po by Marco d'Itri <md@linux.it>
+#
+# 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 <ulusa@lacueva.dhis.org>\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 <gqueri@mail.dotcom.fr>\n"
 "Language-Team: French <traduc@Linux.EU.ORG>\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 <gnupg-bugs@gnu.org>.\n"
 msgstr "Rapporter toutes anomalies à <gnupg-bugs@gnu.org>.\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 <md@linux.it>, 1998.
+# GnuPG italian translation
+# Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+# Marco d'Itri <md@linux.it>, 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 <md@linux.it>\n"
 "Language-Team: Italian <it@li.org>\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 <gnupg-bugs@gnu.org>.\n"
 msgstr "Per favore segnala i bug a <gnupg-bugs@gnu.org>.\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 <alex@bofh.net.pl>\n"
 "Language-Team: Polish <pl@li.org>\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 <gnupg-bugs@gnu.org>.\n"
 msgstr "B³êdy prosimy zg³aszaæ na adres <gnupg-bugs@gnu.org>.\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 <jungmann@usa.net>\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 <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\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 <steuck@iname.com>\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 <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "ðÏÖÁÌÕÊÓÔÁ, ÏÔÐÒÁ×ÌÑÊÔÅ ÓÏÏÂÝÅÎÉÑ Ï ÏÛÉÂËÁÈ ÐÏ ÁÄÒÅÓÕ "
 "<gnupg-bugs@gnu.org>.\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"