See ChangeLog: Mon Jan 31 16:37:34 CET 2000 Werner Koch

9 files changed, 3038 insertions, 2940 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index dffdd65b0..8745a43a8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -14,7 +14,7 @@ cipher/rndlinux.c
 
 # main program
 
-g10/g10.c
+g10/gpg.c
 g10/armor.c
 g10/pkclist.c
 g10/keygen.c
diff --git a/po/de.po b/po/de.po
index 8edd12dfb..ae383d38f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,7 +3,7 @@
 # Walter Koch <koch@hsp.de>, 1998.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-10-26 18:57+0200\n"
+"POT-Creation-Date: 2000-01-31 12:09+0100\n"
 "PO-Revision-Date: 1999-09-04 22:36+0200\n"
 "Last-Translator: Walter Koch <koch@hsp.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -11,252 +11,252 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:79
+#: gcrypt/secmem.c:77
 msgid "Warning: using insecure memory!\n"
 msgstr "Warnung: Sensible Daten könnten auf Platte ausgelagert werden.\n"
 
 # "  Um dies zu vermeiden, kann das Programm suid(root) installiert werden.\n"
 # "  Bitte wenden Sie sich hierzu an den Systemadministrator.\n"
-#: util/secmem.c:281
+#: gcrypt/secmem.c:279
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "Vorgang ist ohne sicheren Hauptspeicher nicht möglich\n"
 
-#: util/secmem.c:282
+#: gcrypt/secmem.c:280
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 "(möglicherweise haben Sie das falsche Programm für diese Aufgabe benutzt)\n"
 
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:278 util/miscutil.c:307
 msgid "yes"
 msgstr "ja"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:279 util/miscutil.c:310
 msgid "yY"
 msgstr "jJyY"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:280 util/miscutil.c:308
 msgid "no"
 msgstr "nein"
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:281 util/miscutil.c:311
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:564 util/miscutil.c:308
+#: g10/keyedit.c:564 util/miscutil.c:309
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:312
 msgid "qQ"
 msgstr "qQ"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "Allgemeiner Fehler"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "Unbekannter Pakettyp"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "Unbekannte Version"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "Unbekanntes Public-Key Verfahren"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "Unbekanntes Hashverfahren"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "Falscher öffentlicher Schüssel"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "Falscher geheimer Schlüssel"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "Falsche Unterschrift"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "Prüfsummen-Fehler"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "Falsches Mantra"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "Öffentlicher Schlüssel nicht gefunden"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "Unbekanntes Verschlüsselungsverfahren"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "Der Schlüsselbund kann nicht geöffnet werden"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "Ungültiges Paket"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "Ungültige ASCII-Hülle"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "Keine solche User-ID"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "Geheimer Schlüssel ist nicht vorhanden"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "Falscher geheimer Schlüssel benutzt"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "Wird nicht unterstützt"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "Falscher Schlüssel"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "Dateilesefehler"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "Dateischreibfehler"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "Unbekanntes Komprimierverfahren"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "Fehler beim Öffnen der Datei"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "Fehler beim Erzeugen der Datei"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "Ungültiges Mantra"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "Öffentliches Schlüsselverfahren ist nicht implementiert."
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "Verschlüsselungsverfahren ist nicht implementiert"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "Unbekannte Unterschriftenklasse"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "Fehler in der Trust-DB"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "Falsche MPI"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "festdefinierte Resourcenobergrenze erreicht"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "Ungültiger Schlüsselbund"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "Falsches Zertifikat"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "Ungünstig aufgebaute User-ID"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "Fehler beim Schließen der Datei"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "Fehler beim Umbenennen einer Datei"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "Fehler beim Löschen einer Datei"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "Unerwartete Daten"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "Zeitangaben differieren"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "Unbenutzbares öffentliches Schlüsselverfahren"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "Datei existiert bereits"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "Unsicherer Schlüssel"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "Ungültiges Argument"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "fehlerhafter URI"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "Nicht unterstützter URI"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "Netzwerkfehler"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "nicht verschlüsselt"
 
-#: util/logger.c:218
+#: util/logger.c:219
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... dies ist ein Bug (Programmfehler) (%s:%d:%s)\n"
 
-#: util/logger.c:224
+#: util/logger.c:225
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n"
 
-#: cipher/random.c:452
+#: cipher/random.c:463
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "WARNUNG: Der Zufallsgenerator erzeugt keine echten Zufallszahlen!\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:469
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -270,7 +270,7 @@ msgstr ""
 "BENUTZEN SIE DIE DURCH DIESES PROGRAMM ERZEUGTEN DATEN NICHT!\n"
 "\n"
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:125
 #, c-format
 msgid ""
 "\n"
@@ -282,7 +282,7 @@ msgstr ""
 "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n"
 "(Es werden noch %d Byte benötigt.)\n"
 
-#: g10/g10.c:186
+#: g10/gpg.c:183
 msgid ""
 "@Commands:\n"
 " "
@@ -290,135 +290,140 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: g10/g10.c:188
+#: g10/gpg.c:185
 msgid "|[file]|make a signature"
 msgstr "|[Datei]|Eine Unterschrift erzeugen"
 
-#: g10/g10.c:189
+#: g10/gpg.c:186
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/g10.c:190
+#: g10/gpg.c:187
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/g10.c:191
+#: g10/gpg.c:188
 msgid "encrypt data"
 msgstr "Daten verschlüsseln"
 
-#: g10/g10.c:192
+#: g10/gpg.c:189
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschlüsseln"
 
-#: g10/g10.c:193
+#: g10/gpg.c:190
 msgid "store only"
 msgstr "Nur speichern"
 
-#: g10/g10.c:194
+#: g10/gpg.c:191
 msgid "decrypt data (default)"
 msgstr "Daten entschlüsseln (Voreinstellung)"
 
-#: g10/g10.c:195
+#: g10/gpg.c:192
 msgid "verify a signature"
 msgstr "Signatur prüfen"
 
-#: g10/g10.c:196
+#: g10/gpg.c:193
 msgid "list keys"
 msgstr "Liste der Schlüssel"
 
-#: g10/g10.c:198
+#: g10/gpg.c:195
 msgid "list keys and signatures"
 msgstr "Liste der Schlüssel und ihrer Signaturen"
 
-#: g10/g10.c:199
+#: g10/gpg.c:196
 msgid "check key signatures"
 msgstr "Signaturen der Schlüssel prüfen"
 
-#: g10/g10.c:200
+#: g10/gpg.c:197
 msgid "list keys and fingerprints"
 msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\""
 
-#: g10/g10.c:201
+#: g10/gpg.c:198
 msgid "list secret keys"
 msgstr "Liste der geheimen Schlüssel"
 
-#: g10/g10.c:202
+#: g10/gpg.c:199
 msgid "generate a new key pair"
 msgstr "Ein neues Schlüsselpaar erzeugen"
 
-#: g10/g10.c:203
+#: g10/gpg.c:200
 msgid "remove key from the public keyring"
 msgstr "Schlüssel entfernen"
 
-#: g10/g10.c:204
+#: g10/gpg.c:202
+#, fuzzy
+msgid "remove key from the secret keyring"
+msgstr "Schlüssel entfernen"
+
+#: g10/gpg.c:203
 msgid "sign a key"
 msgstr "Schlüssel signieren"
 
-#: g10/g10.c:205
+#: g10/gpg.c:204
 msgid "sign a key locally"
 msgstr "Schlüssel nur auf diesem Rechner signieren"
 
-#: g10/g10.c:206
+#: g10/gpg.c:205
 msgid "sign or edit a key"
 msgstr "Unterschreiben o. Bearbeiten eines Schlüssels"
 
-#: g10/g10.c:207
+#: g10/gpg.c:206
 msgid "generate a revocation certificate"
 msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen"
 
-#: g10/g10.c:208
+#: g10/gpg.c:207
 msgid "export keys"
 msgstr "Schlüssel exportieren"
 
-#: g10/g10.c:209
+#: g10/gpg.c:208
 msgid "export keys to a key server"
 msgstr "Schlüssel zu einem Schlü.server exportieren"
 
-#: g10/g10.c:210
+#: g10/gpg.c:209
 msgid "import keys from a key server"
 msgstr "Schlüssel von einem Schlü.server importieren"
 
-#: g10/g10.c:213
+#: g10/gpg.c:212
 msgid "import/merge keys"
 msgstr "Schlüssel importieren/kombinieren"
 
-#: g10/g10.c:215
+#: g10/gpg.c:214
 msgid "list only the sequence of packets"
 msgstr "Lediglich Struktur der Datenpakete anzeigen"
 
-#: g10/g10.c:217
+#: g10/gpg.c:216
 msgid "export the ownertrust values"
 msgstr "Exportieren der \"Owner trust\" Werte"
 
-#: g10/g10.c:219
+#: g10/gpg.c:218
 msgid "import ownertrust values"
 msgstr "Importieren der \"Owner trust\" Werte"
 
-#: g10/g10.c:221
+#: g10/gpg.c:220
 msgid "update the trust database"
 msgstr "Ändern der \"Trust\"-Datenbank"
 
-#: g10/g10.c:223
+#: g10/gpg.c:222
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMEN]|Überprüfen der \"Trust\"-Datenbank"
 
-#: g10/g10.c:224
+#: g10/gpg.c:223
 msgid "fix a corrupted trust database"
 msgstr "Reparieren einer beschädigten \"Trust\"-Datenb."
 
-#: g10/g10.c:225
+#: g10/gpg.c:224
 msgid "De-Armor a file or stdin"
 msgstr "Datei oder stdin von der ASCII-Hülle befreien"
 
-#: g10/g10.c:227
+#: g10/gpg.c:226
 msgid "En-Armor a file or stdin"
 msgstr "Datei oder stdin in eine ASCII-Hülle einpacken"
 
-#: g10/g10.c:229
+#: g10/gpg.c:228
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests für die Dateien ausgeben"
 
-#: g10/g10.c:233
+#: g10/gpg.c:232
 msgid ""
 "@\n"
 "Options:\n"
@@ -428,172 +433,172 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/g10.c:235
+#: g10/gpg.c:234
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-Hülle versehen"
 
-#: g10/g10.c:237
+#: g10/gpg.c:236
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschlüsseln für NAME"
 
-#: g10/g10.c:240
+#: g10/gpg.c:239
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|NAME als voreingestellten Empfänger benutzen"
 
-#: g10/g10.c:242
+#: g10/gpg.c:241
 msgid "use the default key as default recipient"
 msgstr ""
 "Den Standardschlüssel als voreingestellten\n"
 "Empfänger benutzen"
 
-#: g10/g10.c:246
+#: g10/gpg.c:245
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/g10.c:247
+#: g10/gpg.c:246
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/g10.c:249
+#: g10/gpg.c:248
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/g10.c:250
+#: g10/gpg.c:249
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/g10.c:251
+#: g10/gpg.c:250
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: g10/g10.c:252
+#: g10/gpg.c:251
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
-#: g10/g10.c:253
+#: g10/gpg.c:252
 msgid "don't use the terminal at all"
 msgstr "das Terminal gar nicht benutzen"
 
-#: g10/g10.c:254
+#: g10/gpg.c:253
 msgid "force v3 signatures"
 msgstr "v3 Signaturen erzwingen"
 
-#: g10/g10.c:255
+#: g10/gpg.c:254
 msgid "always use a MDC for encryption"
 msgstr "Beim Verschlüsseln ein Siegel (MDC) verwenden"
 
-#: g10/g10.c:256
+#: g10/gpg.c:255
 msgid "do not make any changes"
 msgstr "Keine wirklichen Änderungen durchführen"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:258
+#: g10/gpg.c:257
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: g10/g10.c:259
+#: g10/gpg.c:258
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: g10/g10.c:260
+#: g10/gpg.c:259
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: g10/g10.c:261
+#: g10/gpg.c:260
 msgid "add this keyring to the list of keyrings"
 msgstr "Als öffentlichen Schlüsselbund mitbenutzen"
 
-#: g10/g10.c:262
+#: g10/gpg.c:261
 msgid "add this secret keyring to the list"
 msgstr "Als geheimen Schlüsselbund mitbenutzen"
 
-#: g10/g10.c:263
+#: g10/gpg.c:262
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen"
 
-#: g10/g10.c:264
+#: g10/gpg.c:263
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|Schlüssel bei diesem Server nachschlagen"
 
-#: g10/g10.c:265
+#: g10/gpg.c:264
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|Terminalzeichensatz NAME benutzen"
 
-#: g10/g10.c:266
+#: g10/gpg.c:265
 msgid "read options from file"
 msgstr "Optionen aus der Datei lesen"
 
-#: g10/g10.c:268
+#: g10/gpg.c:267
 msgid "set debugging flags"
 msgstr "Debug-Flags einschalten"
 
-#: g10/g10.c:269
+#: g10/gpg.c:268
 msgid "enable full debugging"
 msgstr "Alle Debug-Flags einschalten"
 
-#: g10/g10.c:270
+#: g10/gpg.c:269
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
-#: g10/g10.c:271
+#: g10/gpg.c:270
 msgid "do not write comment packets"
 msgstr "Keine Kommentarpakete schreiben"
 
-#: g10/g10.c:272
+#: g10/gpg.c:271
 msgid "(default is 1)"
 msgstr "Benötigte Vollvertrauen (Voreinstellung 1)"
 
-#: g10/g10.c:273
+#: g10/gpg.c:272
 msgid "(default is 3)"
 msgstr "Benötigte Teilvertrauen (Voreinstellung 3)"
 
-#: g10/g10.c:275
+#: g10/gpg.c:274
 msgid "|FILE|load extension module FILE"
 msgstr "|DATEI|Erweiterungsmodul DATEI laden"
 
-#: g10/g10.c:276
+#: g10/gpg.c:275
 msgid "emulate the mode described in RFC1991"
 msgstr "Den in RFC1991 beschriebenen Modus nachahmen"
 
-#: g10/g10.c:277
+#: g10/gpg.c:276
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "alle Paket-, Verschlüsselungs- und\n"
 "Hashoptionen auf OpenPGP-Verhalten einstellen"
 
-#: g10/g10.c:278
+#: g10/gpg.c:277
 msgid "|N|use passphrase mode N"
 msgstr "|N|Verwenden des Mantra-Modus N"
 
-#: g10/g10.c:280
+#: g10/gpg.c:279
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|Hashverfahren NAME für Mantras benutzen"
 
-#: g10/g10.c:282
+#: g10/gpg.c:281
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|Verschlü.verfahren NAME für Mantras benutzen"
 
-#: g10/g10.c:283
+#: g10/gpg.c:282
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Verschlü.verfahren NAME benutzen"
 
-#: g10/g10.c:284
+#: g10/gpg.c:283
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Hashverfahren NAME benutzen"
 
-#: g10/g10.c:285
+#: g10/gpg.c:284
 msgid "|N|use compress algorithm N"
 msgstr "|N|Komprimierverfahren N benutzen"
 
-#: g10/g10.c:286
+#: g10/gpg.c:285
 msgid "throw keyid field of encrypted packets"
 msgstr "Entferne Empfänger-ID verschlüsselter Pakete"
 
-#: g10/g10.c:287
+#: g10/gpg.c:286
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=WERT|verwende diese \"notation\"-Daten"
 
-#: g10/g10.c:289
+#: g10/gpg.c:288
 msgid ""
 "@\n"
 "Examples:\n"
@@ -613,17 +618,17 @@ msgstr ""
 " --list-keys [Namen]        Schlüssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdrücke\" anzeigen\n"
 
-#: g10/g10.c:376
+#: g10/gpg.c:379
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Berichte über Bugs (Programmfehler) bitte an <gnupg-bugs@gnu.org>.\n"
 "Sinn- oder Schreibfehler in den deutschen Texten bitte an <de@li.org>.\n"
 
-#: g10/g10.c:380
+#: g10/gpg.c:383
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h für Hilfe)"
 
-#: g10/g10.c:383
+#: g10/gpg.c:386
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -633,7 +638,7 @@ msgstr ""
 "Signieren, prüfen, verschlüsseln, entschlüsseln\n"
 "Die voreingestellte Operation ist abhängig von den Eingabedaten\n"
 
-#: g10/g10.c:388
+#: g10/gpg.c:391
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -641,184 +646,189 @@ msgstr ""
 "\n"
 "Unterstützte Verfahren:\n"
 
-#: g10/g10.c:465
+#: g10/gpg.c:469
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/g10.c:518
+#: g10/gpg.c:549
 msgid "conflicting commands\n"
 msgstr "Widersprüchliche Befehle\n"
 
-#: g10/g10.c:653
+#: g10/gpg.c:603
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
+#: g10/gpg.c:693
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/g10.c:657
+#: g10/gpg.c:697
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/g10.c:664
+#: g10/gpg.c:704
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:844
+#: g10/gpg.c:885
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ist kein gültiger Zeichensatz.\n"
 
-#: g10/g10.c:911 g10/g10.c:920
+#: g10/gpg.c:955 g10/gpg.c:964
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Hinweis: %s ist nicht für den üblichen Gebrauch gedacht!\n"
 
-#: g10/g10.c:913
+#: g10/gpg.c:957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/g10.c:916
+#: g10/gpg.c:960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/g10.c:935 g10/g10.c:947
+#: g10/gpg.c:980 g10/gpg.c:992
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgewählte Verschlüsslungsverfahren ist ungültig\n"
 
-#: g10/g10.c:941 g10/g10.c:953
+#: g10/gpg.c:986 g10/gpg.c:998
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/g10.c:957
+#: g10/gpg.c:1002
 msgid "the given policy URL is invalid\n"
 msgstr "Die angegebene URL für Richtlinien ist ungültig\n"
 
-#: g10/g10.c:960
+#: g10/gpg.c:1005
 #, 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:962
+#: g10/gpg.c:1007
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed müssen größer als 0 sein\n"
 
-#: g10/g10.c:964
+#: g10/gpg.c:1009
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed müssen größer als 1 sein\n"
 
-#: g10/g10.c:966
+#: g10/gpg.c:1011
 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:969
+#: g10/gpg.c:1014
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:973
+#: g10/gpg.c:1018
 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:1050
+#: g10/gpg.c:1095
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:1056
+#: g10/gpg.c:1101
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:1063
+#: g10/gpg.c:1108
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:1071
+#: g10/gpg.c:1116
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:1084
+#: g10/gpg.c:1129
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:1097
+#: g10/gpg.c:1142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:1111
+#: g10/gpg.c:1156
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:1123
+#: g10/gpg.c:1168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:1131
+#: g10/gpg.c:1176
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/g10.c:1139
+#: g10/gpg.c:1184
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/g10.c:1147
+#: g10/gpg.c:1192
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/g10.c:1163
+#: g10/gpg.c:1208
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key User-ID"
 
-#: g10/g10.c:1166
+#: g10/gpg.c:1211
 msgid "--delete-key user-id"
 msgstr "--delete-key User-ID"
 
-#: g10/encode.c:260 g10/g10.c:1190 g10/sign.c:368
+#: g10/encode.c:306 g10/gpg.c:1236 g10/sign.c:424
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
 
-#: g10/g10.c:1201
+#: g10/gpg.c:1247
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schlüsselbund]"
 
-#: g10/g10.c:1262
+#: g10/gpg.c:1308
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1270
+#: g10/gpg.c:1316
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1338
+#: g10/gpg.c:1386
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ungültiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:1419
+#: g10/gpg.c:1467
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:1423
+#: g10/gpg.c:1471
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1426 g10/verify.c:66
+#: g10/decrypt.c:59 g10/gpg.c:1474 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht geöffnet werden\n"
 
-#: g10/g10.c:1594
+#: g10/gpg.c:1642
 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:1600
+#: g10/gpg.c:1648
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -826,12 +836,12 @@ msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und muß mit einem '=' enden\n"
 
-#: g10/g10.c:1606
+#: g10/gpg.c:1654
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "Punkte in einem \"notation\"-Namen müssen von anderen Zeichen umgeben sein\n"
 
-#: g10/g10.c:1614
+#: g10/gpg.c:1662
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
@@ -840,70 +850,74 @@ msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 msgid "armor: %s\n"
 msgstr "ASCII-Hülle: %s\n"
 
-#: g10/armor.c:319
+#: g10/armor.c:325
 msgid "invalid armor header: "
 msgstr "Ungültige ASCII-Hülle"
 
-#: g10/armor.c:326
+#: g10/armor.c:332
 msgid "armor header: "
 msgstr "ASCII-Hülle: "
 
-#: g10/armor.c:337
+#: g10/armor.c:343
 msgid "invalid clearsig header\n"
 msgstr "Ungültige Klartextsignatur-Einleitung\n"
 
-#: g10/armor.c:389
+#: g10/armor.c:395
 msgid "nested clear text signatures\n"
 msgstr "verschachtelte Klartextunterschriften\n"
 
-#: g10/armor.c:500
+#: g10/armor.c:506
 msgid "invalid dash escaped line: "
 msgstr "Ungültige mit Bindestrich \"escapte\" Zeile: "
 
-#: g10/armor.c:512
+#: g10/armor.c:518
 msgid "unexpected armor:"
 msgstr "Unerwartete ASCII-Hülle:"
 
-#: g10/armor.c:629
+#: g10/armor.c:635
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Ungültiges \"radix64\" Zeichen %02x ignoriert\n"
 
-#: g10/armor.c:672
+#: g10/armor.c:678
 msgid "premature eof (no CRC)\n"
 msgstr "vorzeitiges Dateiende (keine Prüfsumme)\n"
 
-#: g10/armor.c:706
+#: g10/armor.c:712
 msgid "premature eof (in CRC)\n"
 msgstr "vorzeitiges Dateiende (innerhalb der Prüfsumme)\n"
 
-#: g10/armor.c:710
+#: g10/armor.c:716
 msgid "malformed CRC\n"
 msgstr "Falsch aufgebaute Prüfsumme\n"
 
-#: g10/armor.c:714
+#: g10/armor.c:720
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "Prüfsummenfehler; %06lx - %06lx\n"
 
-#: g10/armor.c:731
+#: g10/armor.c:737
 msgid "premature eof (in Trailer)\n"
 msgstr "vorzeitiges Dateiende (im Nachsatz)\n"
 
-#: g10/armor.c:735
+#: g10/armor.c:741
 msgid "error in trailer line\n"
 msgstr "Fehler in der Nachsatzzeile\n"
 
-#: g10/armor.c:1001
+#: g10/armor.c:892
+msgid "For info see http://www.gnupg.org"
+msgstr ""
+
+#: g10/armor.c:1007
 msgid "no valid OpenPGP data found.\n"
 msgstr "Keine gültigen OpenPGP-Daten gefunden.\n"
 
-#: g10/armor.c:1005
+#: g10/armor.c:1011
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ungültige ASCII-Hülle: Zeile ist länger als %d Zeichen\n"
 
-#: g10/armor.c:1009
+#: g10/armor.c:1015
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1182,58 +1196,58 @@ msgstr "%s: übersprungen: öffentlicher Schlüssel ist abgeschaltet\n"
 msgid "no valid addressees\n"
 msgstr "Keine gültigen Adressaten\n"
 
-#: g10/keygen.c:122
+#: g10/keygen.c:123
 msgid "writing self signature\n"
 msgstr "Die Eigenbeglaubigung wird geschrieben\n"
 
-#: g10/keygen.c:160
+#: g10/keygen.c:161
 msgid "writing key binding signature\n"
 msgstr "Schreiben der \"key-binding\" Signatur\n"
 
-#: g10/keygen.c:386
+#: g10/keygen.c:511
 msgid "Please select what kind of key you want:\n"
 msgstr "Bitte wählen Sie, welche Art von Schlüssel Sie möchten:\n"
 
-#: g10/keygen.c:388
+#: g10/keygen.c:513
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA und ElGamal (voreingestellt)\n"
 
-#: g10/keygen.c:389
+#: g10/keygen.c:514
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:391
+#: g10/keygen.c:516
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur verschlüsseln)\n"
 
-#: g10/keygen.c:392
+#: g10/keygen.c:517
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signieren/beglaubigen und verschlüsseln)\n"
 
-#: g10/keygen.c:394
+#: g10/keygen.c:519
 #, c-format
 msgid "   (%d) ElGamal in a v3 packet\n"
 msgstr "   (%d) ElGamal in einem v3-Paket\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
-#: g10/keygen.c:409
+#: g10/keygen.c:534
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr ""
 "Möchten Sie wirklich einen Unterschriften-/Verschlüsselungschlüssel "
 "erzeugen? "
 
-#: g10/keygen.c:430
+#: g10/keygen.c:555
 msgid "Invalid selection.\n"
 msgstr "Ungültige Auswahl.\n"
 
-#: g10/keygen.c:442
+#: g10/keygen.c:567
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1246,15 +1260,15 @@ msgstr ""
 "              standard Schlüssellänge ist 1024 Bit\n"
 "      größte sinnvolle Schlüssellänge ist 2048 Bit\n"
 
-#: g10/keygen.c:449
+#: g10/keygen.c:574
 msgid "What keysize do you want? (1024) "
 msgstr "Welche Schlüssellänge wünschen Sie? (1024) "
 
-#: g10/keygen.c:454
+#: g10/keygen.c:579
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA erlaubt nur Schlüssellängen von 512 bis 1024\n"
 
-#: g10/keygen.c:456
+#: g10/keygen.c:581
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "zu kurz; 768 ist die kleinste mögliche Schlüssellänge.\n"
 
@@ -1266,12 +1280,12 @@ msgstr "zu kurz; 768 ist die kleinste mögliche Schlüssellänge.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:466
+#: g10/keygen.c:591
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "Schüsselgröße zu hoch; %d ist der Maximalwert.\n"
 
-#: g10/keygen.c:471
+#: g10/keygen.c:596
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1279,11 +1293,11 @@ msgstr ""
 "Schlüssellängen größer als 2048 werden nicht empfohlen, da die\n"
 "Berechnungen dann WIRKLICH lange brauchen!\n"
 
-#: g10/keygen.c:474
+#: g10/keygen.c:599
 msgid "Are you sure that you want this keysize? "
 msgstr "Sind Sie sicher, daß Sie diese Schlüssellänge wünschen? "
 
-#: g10/keygen.c:475
+#: g10/keygen.c:600
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1291,21 +1305,21 @@ msgstr ""
 "Gut, aber bitte denken Sie auch daran, daß Monitor und Tastatur Daten "
 "abstrahlen und diese leicht mitgelesen werden können.\n"
 
-#: g10/keygen.c:483
+#: g10/keygen.c:608
 msgid "Do you really need such a large keysize? "
 msgstr "Brauchen Sie wirklich einen derartig langen Schlüssel? "
 
-#: g10/keygen.c:489
+#: g10/keygen.c:614
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Die verlangte Schlüssellänge beträgt %u Bit\n"
 
-#: g10/keygen.c:492 g10/keygen.c:496
+#: g10/keygen.c:617 g10/keygen.c:621
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "aufgerundet auf %u Bit\n"
 
-#: g10/keygen.c:509
+#: g10/keygen.c:634
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1321,29 +1335,29 @@ msgstr ""
 "      <n>m = Schlüssel verfällt nach n Monaten\n"
 "      <n>y = Schlüssel verfällt nach n Jahren\n"
 
-#: g10/keygen.c:526
+#: g10/keygen.c:651
 msgid "Key is valid for? (0) "
 msgstr "Der Schlüssel bleibt wie lange gültig? (0) "
 
-#: g10/keygen.c:547
+#: g10/keygen.c:672
 msgid "invalid value\n"
 msgstr "Ungültiger Wert.\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:677
 msgid "Key does not expire at all\n"
 msgstr "Der Schlüssel verfällt nie.\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:558
+#: g10/keygen.c:683
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Der Schlüssel verfällt am %s\n"
 
-#: g10/keygen.c:563
+#: g10/keygen.c:688
 msgid "Is this correct (y/n)? "
 msgstr "Ist dies richtig? (j/n) "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:731
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1359,44 +1373,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:617
+#: g10/keygen.c:742
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:621
+#: g10/keygen.c:746
 msgid "Invalid character in name\n"
 msgstr "Ungültiges Zeichen im Namen\n"
 
-#: g10/keygen.c:623
+#: g10/keygen.c:748
 msgid "Name may not start with a digit\n"
 msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
-#: g10/keygen.c:625
+#: g10/keygen.c:750
 msgid "Name must be at least 5 characters long\n"
 msgstr "Der Name muß min. 5 Zeichen lang sein.\n"
 
-#: g10/keygen.c:633
+#: g10/keygen.c:758
 msgid "Email address: "
 msgstr "E-Mail-Adresse: "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:769
 msgid "Not a valid email address\n"
 msgstr "Diese E-Mail-Adresse ist ungültig\n"
 
-#: g10/keygen.c:652
+#: g10/keygen.c:777
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:658
+#: g10/keygen.c:783
 msgid "Invalid character in comment\n"
 msgstr "Ungültiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:680
+#: g10/keygen.c:808
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Sie benutzen den Zeichensatz `%s'\n"
 
-#: g10/keygen.c:686
+#: g10/keygen.c:814
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1407,15 +1421,15 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:689
+#: g10/keygen.c:817
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfBb"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ändern: (N)ame, (K)ommentar, (E)-Mail oder (F)ertig/(B)eenden? "
 
-#: g10/keygen.c:751
+#: g10/keygen.c:879
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1423,11 +1437,11 @@ msgstr ""
 "Sie benötigen ein Mantra, um den geheimen Schlüssel zu schützen.\n"
 "\n"
 
-#: g10/keyedit.c:456 g10/keygen.c:759
+#: g10/keyedit.c:456 g10/keygen.c:887
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "Mantra wurde nicht richtig wiederholt; noch einmal versuchen.\n"
 
-#: g10/keygen.c:765
+#: g10/keygen.c:893
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1440,7 +1454,7 @@ msgstr ""
 "aufrufen.\n"
 "\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:914
 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"
@@ -1451,34 +1465,34 @@ msgstr ""
 "unterstützen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n"
 "tippen, die Maus verwenden oder irgendwelche anderen Programme benutzen.\n"
 
-#: g10/keygen.c:856
+#: g10/keygen.c:984
 msgid "Key generation can only be used in interactive mode\n"
 msgstr ""
 "Die Schlüsselerzeugung kann nur im interaktiven Modus benutzt werden.\n"
 
-#: g10/keygen.c:864
+#: g10/keygen.c:992
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Der DSA Schlüssel wird 1024 Bits haben.\n"
 
-#: g10/keygen.c:870
+#: g10/keygen.c:998
 msgid "Key generation canceled.\n"
 msgstr "Schlüsselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:880
+#: g10/keygen.c:1008
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "schreiben des öffentlichen Zertifikats nach '%s'\n"
 
-#: g10/keygen.c:881
+#: g10/keygen.c:1009
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "schreiben des geheimen Zertifikats nach '%s'\n"
 
-#: g10/keygen.c:958
+#: g10/keygen.c:1086
 msgid "public and secret key created and signed.\n"
 msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:960
+#: g10/keygen.c:1088
 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"
@@ -1487,12 +1501,12 @@ msgstr ""
 "werden kann.  Sie können aber mit dem Befehl \"--edit-key\" einen\n"
 "Zweitschlüssel für diesem Zweck erzeugen.\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1073
+#: g10/keygen.c:1102 g10/keygen.c:1201
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:1018 g10/sig-check.c:314 g10/sign.c:106
+#: g10/keygen.c:1146 g10/sig-check.c:394 g10/sign.c:162
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1500,7 +1514,7 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht überein)\n"
 
-#: g10/keygen.c:1020 g10/sig-check.c:316 g10/sign.c:108
+#: g10/keygen.c:1148 g10/sig-check.c:396 g10/sign.c:164
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1508,32 +1522,32 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht überein)\n"
 
-#: g10/keygen.c:1051
+#: g10/keygen.c:1179
 msgid "Really create? "
 msgstr "Wirklich erzeugen? "
 
-#: g10/encode.c:91 g10/openfile.c:163 g10/openfile.c:272 g10/tdbio.c:468
+#: g10/encode.c:137 g10/openfile.c:163 g10/openfile.c:272 g10/tdbio.c:468
 #: g10/tdbio.c:529
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: kann nicht geöffnet werden: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:159
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Fehler beim Erzeugen des Mantras: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:217 g10/encode.c:365
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: WARNUNG: Leere Datei\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:312
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Lesen von '%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:529
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s verschlüsselt für: %s\n"
@@ -1593,7 +1607,7 @@ msgstr "'%s' kann nicht geöffnet werden: %s\n"
 msgid "skipping block of type %d\n"
 msgstr "überspringe den Block vom Typ %d\n"
 
-#: g10/import.c:169 g10/trustdb.c:1658 g10/trustdb.c:1697
+#: g10/import.c:169 g10/trustdb.c:1659 g10/trustdb.c:1698
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu Schlüssel bislang bearbeitet\n"
@@ -1681,7 +1695,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:399 g10/openfile.c:215 g10/sign.c:269 g10/sign.c:582
+#: g10/import.c:399 g10/openfile.c:215 g10/sign.c:325 g10/sign.c:638
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
@@ -1942,7 +1956,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "Wirklich unterschreiben? "
 
-#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:129
+#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:185
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
@@ -2407,68 +2421,68 @@ msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
 msgid "no secret key\n"
 msgstr "Kein geheimer Schlüssel\n"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:212
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "Öffentlicher Schlüssel ist %08lX\n"
 
-#: g10/mainproc.c:244
+#: g10/mainproc.c:243
 msgid "public key encrypted data: good DEK\n"
 msgstr "Mit öffentlichem Schüssel verschlüsselte Daten: Korrekte DEK\n"
 
-#: g10/mainproc.c:275
+#: g10/mainproc.c:274
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "verschlüsselt mit %u-Bit %s Schlüssel, ID %08lX, erzeugt %s\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:285
+#: g10/mainproc.c:284
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "verschlüsselt mit %s Schlüssel, ID %08lX\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 msgid "no secret key for decryption available\n"
 msgstr "kein geheimer Schlüssel zur Entschlüsselung vorhanden\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:299
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Entschlüsselung mit öffentlichem Schlüssel fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:332
+#: g10/mainproc.c:331
 msgid "decryption okay\n"
 msgstr "Enschlüsselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:337
+#: g10/mainproc.c:336
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Warnung: Verschlüsselte Botschaft ist manipuliert worden!\n"
 
-#: g10/mainproc.c:342
+#: g10/mainproc.c:341
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Enschlüsselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:360
+#: g10/mainproc.c:359
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 "Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:361
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Ursprünglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:596 g10/mainproc.c:605
+#: g10/mainproc.c:595 g10/mainproc.c:604
 msgid "WARNING: invalid notation data found\n"
 msgstr "WARNUNG: Ungültige \"Notation\"-Daten gefunden\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:607
 msgid "Notation: "
 msgstr "\"Notation\": "
 
-#: g10/mainproc.c:615
+#: g10/mainproc.c:614
 msgid "Policy: "
 msgstr "Richtlinie: "
 
@@ -2508,20 +2522,20 @@ msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ungültiges root-Paket in proc_tree() entdeckt\n"
 
-#: g10/misc.c:95
+#: g10/misc.c:83
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "core-dump-Dateierzeugung kann nicht abgeschaltet werden: %s\n"
 
-#: g10/misc.c:98
+#: g10/misc.c:86
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:312
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Experimentiermethoden sollten nicht benutzt werden!\n"
 
-#: g10/misc.c:220
+#: g10/misc.c:326
 msgid ""
 "RSA keys are deprecated; please consider creating a new key and use this key "
 "in the future\n"
@@ -2529,18 +2543,18 @@ msgstr ""
 "RSA Schlüssel sind nicht erwünscht; bitte denken Sie darüber nach, einen\n"
 "neuen Schlüssel zu erzeugen und diesen in Zukunft zu benutzen\n"
 
-#: g10/misc.c:242
+#: g10/misc.c:348
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "Diese Verschlüsselungsmethode taugt nicht mehr viel; verwenden Sie eine "
 "stärker standardisierte Methode!\n"
 
-#: g10/parse-packet.c:113
+#: g10/parse-packet.c:112
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
 
-#: g10/parse-packet.c:939
+#: g10/parse-packet.c:938
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
@@ -2600,99 +2614,99 @@ msgstr "lese stdin ...\n"
 msgid "can't open signed data `%s'\n"
 msgstr "kann signierte Datei '%s' nicht öffnen.\n"
 
-#: g10/pubkey-enc.c:80
+#: g10/pubkey-enc.c:147
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "Ungenannter Empfänger: Versuch mit geheimen Schlüssel %08lX ...\n"
 
-#: g10/pubkey-enc.c:86
+#: g10/pubkey-enc.c:153
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "Alles klar, wir sind der ungenannte Empfänger.\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:209
 msgid "old encoding of the DEK is not supported\n"
 msgstr "alte Kodierung des DEK wird nicht unterstützt\n"
 
-#: g10/pubkey-enc.c:192
+#: g10/pubkey-enc.c:263
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "Hinweis: Verfahren %d ist kein bevorzugtes Verschlüsselungsverfahren\n"
 
-#: g10/seckey-cert.c:56
+#: g10/seckey-cert.c:101
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "Schutzverfahren %d wird nicht unterstützt\n"
 
-#: g10/seckey-cert.c:181
+#: g10/seckey-cert.c:242
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Ungültiges Mantra; versuchen Sie's doch noch einmal ...\n"
 
-#: g10/seckey-cert.c:246
+#: g10/seckey-cert.c:307
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "WARNUNG: Unsicherer Schlüssel entdeckt -\n"
 "         bitte Mantra nochmals wechseln.\n"
 
-#: g10/sig-check.c:201
+#: g10/sig-check.c:281
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr ""
 "Vermutlich ist das Siegel (MDC) BESCHÄDIGT (wegen unbekanntem \"critical "
 "bit\")\n"
 
-#: g10/sig-check.c:297
+#: g10/sig-check.c:377
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "Dieser durch PGP erzeugte ElGamal-Schlüssel ist für Signaturen NICHT sicher "
 "genug!\n"
 
-#: g10/sig-check.c:305
+#: g10/sig-check.c:385
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr ""
 "Öffentlicher Schlüssel ist um %lu Sekunde jünger als die Unterschrift\n"
 
-#: g10/sig-check.c:306
+#: g10/sig-check.c:386
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr ""
 "Öffentlicher Schlüssel ist um %lu Sekunden jünger als die Unterschrift\n"
 
-#: g10/sig-check.c:322
+#: g10/sig-check.c:402
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "Hinweis: Schlüssel der Signatur ist verfallen am %s.\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:459
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "Vermutlich eine FALSCHE Unterschrift, wegen unbekanntem \"critical bit\"\n"
 
-#: g10/sign.c:133
+#: g10/sign.c:189
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s Unterschrift von: %s\n"
 
-#: g10/sign.c:264 g10/sign.c:577
+#: g10/sign.c:320 g10/sign.c:633
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s kann nicht erzeugt werden: %s\n"
 
-#: g10/sign.c:363
+#: g10/sign.c:419
 msgid "signing:"
 msgstr "unterschreibe:"
 
-#: g10/sign.c:406
+#: g10/sign.c:462
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
 
-#: g10/textfilter.c:129
+#: g10/textfilter.c:128
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "Textzeilen länger als %d Zeichen können nicht benutzt werden\n"
 
-#: g10/textfilter.c:198
+#: g10/textfilter.c:197
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "Eingabezeile ist länger als %d Zeichen\n"
@@ -2716,12 +2730,12 @@ msgstr "trustdb Transaktion zu groß\n"
 msgid "%s: can't access: %s\n"
 msgstr "%s: kann nicht zugegriffen werden: %s\n"
 
-#: g10/ringedit.c:298 g10/tdbio.c:445
+#: g10/ringedit.c:297 g10/tdbio.c:445
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: Verzeichnis kann nicht erzeugt werden: %s\n"
 
-#: g10/ringedit.c:304 g10/tdbio.c:448
+#: g10/ringedit.c:303 g10/tdbio.c:448
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: Verzeichnis erzeugt\n"
@@ -2731,7 +2745,7 @@ msgstr "%s: Verzeichnis erzeugt\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: Verzeichnis existiert nicht!\n"
 
-#: g10/openfile.c:211 g10/openfile.c:279 g10/ringedit.c:1350 g10/tdbio.c:458
+#: g10/openfile.c:211 g10/openfile.c:279 g10/ringedit.c:1349 g10/tdbio.c:458
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: kann nicht erzeugt werden: %s\n"
@@ -2921,242 +2935,236 @@ msgstr "Schlüssel %08lX: Akzeptiert als vertrauenswürdiger Schlüssel.\n"
 msgid "enumerate secret keys failed: %s\n"
 msgstr "enum_secret_keys fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:877
+#: g10/trustdb.c:878
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "Schlüssel %08lX.%lu: Korrekte Unterschlüssel-Anbindung\n"
 
-#: g10/trustdb.c:883 g10/trustdb.c:918
+#: g10/trustdb.c:884 g10/trustdb.c:919
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "Schlüssel %08lX.%lu: Ungültige Unterschlüssel-Anbindung\n"
 
-#: g10/trustdb.c:895
+#: g10/trustdb.c:896
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "Schlüssel %08lX.%lu: Gültiger Schlüsselwiderruf\n"
 
-#: g10/trustdb.c:901
+#: g10/trustdb.c:902
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "Schlüssel %08lX.%lu: Ungültiger Schlüsselwiderruf: %s\n"
 
-#: g10/trustdb.c:912
+#: g10/trustdb.c:913
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "Schlüssel %08lX.%lu: Gültiger Unterschlüsselwiderruf\n"
 
-#: g10/trustdb.c:1023
+#: g10/trustdb.c:1024
 msgid "Good self-signature"
 msgstr "Korrekte Eigenbeglaubigung"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1034
 msgid "Invalid self-signature"
 msgstr "Ungültige Eigenbeglaubigung"
 
-#: g10/trustdb.c:1060
+#: g10/trustdb.c:1061
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Gültiger User-ID-Widerruf ignoriert, da eine neuere Eigenbeglaubigung "
 "vorliegt"
 
-#: g10/trustdb.c:1066
+#: g10/trustdb.c:1067
 msgid "Valid user ID revocation"
 msgstr "Gültiger User-ID-Widerruf"
 
-#: g10/trustdb.c:1071
+#: g10/trustdb.c:1072
 msgid "Invalid user ID revocation"
 msgstr "Ungültiger User-ID-Widerruf"
 
-#: g10/trustdb.c:1112
+#: g10/trustdb.c:1113
 msgid "Valid certificate revocation"
 msgstr "Gültiger Zerifikat-Widerruf"
 
-#: g10/trustdb.c:1113
+#: g10/trustdb.c:1114
 msgid "Good certificate"
 msgstr "Korrektes Zertifikat"
 
-#: g10/trustdb.c:1134
+#: g10/trustdb.c:1135
 msgid "Invalid certificate revocation"
 msgstr "Ungültiger Zertifikatswiderruf"
 
-#: g10/trustdb.c:1135
+#: g10/trustdb.c:1136
 msgid "Invalid certificate"
 msgstr "Ungültiges Zertifikat"
 
-#: g10/trustdb.c:1152 g10/trustdb.c:1156
+#: g10/trustdb.c:1153 g10/trustdb.c:1157
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "Signatursatz %lu[%d] zeigt auf falschen Satz.\n"
 
-#: g10/trustdb.c:1208
+#: g10/trustdb.c:1209
 msgid "duplicated certificate - deleted"
 msgstr "Doppelte Zertifikate - entfernt"
 
-#: g10/trustdb.c:1514
+#: g10/trustdb.c:1515
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1636
+#: g10/trustdb.c:1637
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: Einfügen fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1641
+#: g10/trustdb.c:1642
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: Einfügen fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1647
+#: g10/trustdb.c:1648
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: eingefügt\n"
 
-#: g10/trustdb.c:1652
+#: g10/trustdb.c:1653
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "Fehler beim Lesen des Verz.Satzes: %s\n"
 
-#: g10/trustdb.c:1660 g10/trustdb.c:1714
+#: g10/trustdb.c:1661 g10/trustdb.c:1715
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu Schlüssel bearbeitet\n"
 
-#: g10/trustdb.c:1662 g10/trustdb.c:1718
+#: g10/trustdb.c:1663 g10/trustdb.c:1719
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu Schlüssel mit Fehlern\n"
 
-#: g10/trustdb.c:1664
+#: g10/trustdb.c:1665
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu Schlüssel eingefügt\n"
 
-#: g10/trustdb.c:1667
+#: g10/trustdb.c:1668
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enumerate Schlüsselblock fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:1705
+#: g10/trustdb.c:1706
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: Dir-Satz ohne Schlüssel - übergangen\n"
 
-#: g10/trustdb.c:1716
+#: g10/trustdb.c:1717
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu Schlüssel übersprungen\n"
 
-#: g10/trustdb.c:1720
+#: g10/trustdb.c:1721
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu Schlüssel geändert\n"
 
-#: g10/trustdb.c:2057
+#: g10/trustdb.c:2058
 msgid "Ooops, no keys\n"
 msgstr "Huch, keine Schlüssel\n"
 
-#: g10/trustdb.c:2061
+#: g10/trustdb.c:2062
 msgid "Ooops, no user IDs\n"
 msgstr "Huch, keine User-IDs\n"
 
-#: g10/trustdb.c:2218
+#: g10/trustdb.c:2219
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: Suche nach Dir-Satz fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:2227
+#: g10/trustdb.c:2228
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "Schlüssel %08lX: 'trust record' einfügen fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:2231
+#: g10/trustdb.c:2232
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "Schlüssel %08lX.%lu: in \"trustdb\" eingefügt\n"
 
-#: g10/trustdb.c:2239
+#: g10/trustdb.c:2240
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "Schlüssel %08lX.%lu: wurde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht überein)\n"
 
-#: g10/trustdb.c:2248
+#: g10/trustdb.c:2249
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "Schlüssel %08lX.%lu: verfallen am %s\n"
 
-#: g10/trustdb.c:2256
+#: g10/trustdb.c:2257
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "Schlüssel %08lX.%lu: Vertrauensprüfung fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:2362
+#: g10/trustdb.c:2363
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "Benutzer '%s' nicht gefunden: %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2365
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "Problem, '%s' in der Trust-DB zu finden: %s\n"
 
-#: g10/trustdb.c:2367
+#: g10/trustdb.c:2368
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "User '%s' ist nicht in der 'Trust'-Datenbank - wird eingefügt\n"
 
-#: g10/trustdb.c:2370
+#: g10/trustdb.c:2371
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "konnte '%s' nicht in die 'Trust'-Datenbank hineintun: %s\n"
 
-#: g10/trustdb.c:2556 g10/trustdb.c:2586
+#: g10/trustdb.c:2557 g10/trustdb.c:2587
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "WARNUNG: Lange 'Pref'-Records können noch nicht benutzt werden\n"
 
-#: g10/ringedit.c:318
+#: g10/ringedit.c:317
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: Schlüsselbund kann nicht erzeugt werden: %s\n"
 
-#: g10/ringedit.c:335 g10/ringedit.c:1355
+#: g10/ringedit.c:334 g10/ringedit.c:1354
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: Schlüsselbund erstellt\n"
 
-#: g10/ringedit.c:1532
+#: g10/ringedit.c:1531
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "Warnung: Zwei Dateien mit vertraulichem Inhalt vorhanden.\n"
 
-#: g10/ringedit.c:1533
+#: g10/ringedit.c:1532
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ist der Unveränderte\n"
 
-#: g10/ringedit.c:1534
+#: g10/ringedit.c:1533
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s ist der Neue\n"
 
-#: g10/ringedit.c:1535
+#: g10/ringedit.c:1534
 msgid "Please fix this possible security flaw\n"
 msgstr "Bitte diesen potentiellen Sicherheitsmangel beseitigen\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
-msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr ""
-"Schlüssel ist nicht als unsicher gekennzeichnet - er ist nur mit einem\n"
-"echten Zufallsgenerator verwendbar\n"
-
-#: g10/skclist.c:113
+#: g10/skclist.c:97
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "übersprungen '%s': %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:103
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3198,27 +3206,27 @@ msgstr "die unterzeichneten Daten sind wohl in '%s'\n"
 msgid "%s: new options file created\n"
 msgstr "%s: neue Optionendatei erstellt\n"
 
-#: g10/encr-data.c:66
+#: g10/encr-data.c:64
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Mit unbekanntem Verfahren verschlüsselt %d\n"
 
-#: g10/encr-data.c:71
+#: g10/encr-data.c:69
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s verschlüsselte Daten\n"
 
-#: g10/encr-data.c:101
+#: g10/encr-data.c:99
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "Warnung: Botschaft wurde mit einem unsicheren Schlüssel verschlüsselt.\n"
 
-#: g10/seskey.c:63
+#: g10/seskey.c:62
 msgid "weak key created - retrying\n"
 msgstr "Unsicherer Schlüssel erzeugt - neuer Versuch\n"
 
-#: g10/seskey.c:68
+#: g10/seskey.c:67
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
@@ -3502,6 +3510,11 @@ msgstr "Keine Hilfe vorhanden."
 msgid "No help available for `%s'"
 msgstr "Keine Hilfe für '%s' vorhanden."
 
+#~ msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
+#~ msgstr ""
+#~ "Schlüssel ist nicht als unsicher gekennzeichnet - er ist nur mit einem\n"
+#~ "echten Zufallsgenerator verwendbar\n"
+
 # "It's up to you to assign a value here; this value will never be exported\n"
 # "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
 # "to do with the (implicitly created) web-of-certificates."
diff --git a/po/es_ES.po b/po/es_ES.po
index 637f7ab67..d515686c8 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@
 # GPG version: 0.9.7
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-10-26 18:57+0200\n"
+"POT-Creation-Date: 2000-01-31 12:09+0100\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"
@@ -22,250 +22,250 @@ msgstr ""
 "g10/mainproc.c g10/passphrase.c g10/plaintext.c g10/pref.c g10/seckey-cert.c "
 "g10/sig-check.c g10/sign.c g10/trustdb.c g10/verify.c\n"
 
-#: util/secmem.c:79
+#: gcrypt/secmem.c:77
 msgid "Warning: using insecure memory!\n"
 msgstr "ATENCIÓN: ¡se está usando memoria insegura!\n"
 
-#: util/secmem.c:281
+#: gcrypt/secmem.c:279
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operación imposible sin memoria segura inicializada\n"
 
-#: util/secmem.c:282
+#: gcrypt/secmem.c:280
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:278 util/miscutil.c:307
 msgid "yes"
 msgstr "sí"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:279 util/miscutil.c:310
 msgid "yY"
 msgstr "sS"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:280 util/miscutil.c:308
 msgid "no"
 msgstr ""
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:281 util/miscutil.c:311
 msgid "nN"
 msgstr ""
 
-#: g10/keyedit.c:564 util/miscutil.c:308
+#: g10/keyedit.c:564 util/miscutil.c:309
 msgid "quit"
 msgstr ""
 
-#: util/miscutil.c:311
+#: util/miscutil.c:312
 msgid "qQ"
 msgstr ""
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "Error general"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "Formato desconocido"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "Versión desconocida"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "Algoritmo de clave pública desconocido"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "Algoritmo desconocido de resumen de mensaje"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "Clave pública incorrecta"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "Clave secreta incorrecta"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "Firma incorrecta"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "Error en suma de comprobación"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "Contraseña incorrecta"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "Clave pública no encontrada"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "Algoritmo de cifrado desconocido"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "No se puede abrir el anillo"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "Valor no válido"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "Armadura no válida"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "No existe el identificativo de usuario"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "Clave secreta no disponible"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "Clave secreta incorrecta"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "No soportado"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "Clave incorrecta"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "Error de lectura"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "error de escritura"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "Algoritmo de compresión desconocido"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "Error al abrir fichero"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "Error al crear fichero"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "Contraseña incorrecta"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "Algoritmo de clave pública no implementado"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "Algoritmo de cifrado no implementado"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "Clase de firma desconocida"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "Error en la base de datos de confianza"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "MPI incorrecto"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "Límite de recurso"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "Anillo no válido"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "Certificado incorrecto"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "Identificativo de usuario mal formado"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "Error al cerrar fichero"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "Error al renombrar fichero"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "Error al borrar fichero"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "Datos inesperados"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "Conflicto con sello de fecha"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "Algoritmo de clave pública no utilizable"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "El fichero existe. "
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "Clave débil"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "argumento no válido"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "URI incorrecto"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "URI no soportado"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "error de red"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "no cifrado"
 
-#: util/logger.c:218
+#: util/logger.c:219
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... esto es un bug (%s:%d:%s)\n"
 
-#: util/logger.c:224
+#: util/logger.c:225
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Ha encontrado Vd. un bug... (%s:%d)\n"
 
-#: cipher/random.c:452
+#: cipher/random.c:463
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ATENCIÓN: ¡se está usando un generador de números aleatorios inseguro!\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:469
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -279,7 +279,7 @@ msgstr ""
 "¡NO USE NINGÚN DATO GENERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:125
 #, c-format
 msgid ""
 "\n"
@@ -291,7 +291,7 @@ msgstr ""
 "otro trabajo para que el sistema pueda recolectar más entropía\n"
 "(se necesitan %d bytes más).\n"
 
-#: g10/g10.c:186
+#: g10/gpg.c:183
 msgid ""
 "@Commands:\n"
 " "
@@ -299,138 +299,143 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:188
+#: g10/gpg.c:185
 msgid "|[file]|make a signature"
 msgstr "|[file]|hace una firma"
 
-#: g10/g10.c:189
+#: g10/gpg.c:186
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|hace una firma en texto claro"
 
-#: g10/g10.c:190
+#: g10/gpg.c:187
 msgid "make a detached signature"
 msgstr "hace una firma separada"
 
-#: g10/g10.c:191
+#: g10/gpg.c:188
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/g10.c:192
+#: g10/gpg.c:189
 msgid "encryption only with symmetric cipher"
 msgstr "cifra sólo con un cifrado simétrico"
 
-#: g10/g10.c:193
+#: g10/gpg.c:190
 msgid "store only"
 msgstr "sólo almacenar"
 
-#: g10/g10.c:194
+#: g10/gpg.c:191
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/g10.c:195
+#: g10/gpg.c:192
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:196
+#: g10/gpg.c:193
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/g10.c:198
+#: g10/gpg.c:195
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/g10.c:199
+#: g10/gpg.c:196
 msgid "check key signatures"
 msgstr "comprueba las firmas de las claves"
 
-#: g10/g10.c:200
+#: g10/gpg.c:197
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/g10.c:201
+#: g10/gpg.c:198
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/g10.c:202
+#: g10/gpg.c:199
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/g10.c:203
+#: g10/gpg.c:200
 msgid "remove key from the public keyring"
 msgstr "elimina la clave del anillo público"
 
-#: g10/g10.c:204
+#: g10/gpg.c:202
+#, fuzzy
+msgid "remove key from the secret keyring"
+msgstr "elimina la clave del anillo público"
+
+#: g10/gpg.c:203
 #, fuzzy
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/g10.c:205
+#: g10/gpg.c:204
 #, fuzzy
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/g10.c:206
+#: g10/gpg.c:205
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/g10.c:207
+#: g10/gpg.c:206
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocación"
 
-#: g10/g10.c:208
+#: g10/gpg.c:207
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/g10.c:209
+#: g10/gpg.c:208
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/g10.c:210
+#: g10/gpg.c:209
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/g10.c:213
+#: g10/gpg.c:212
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/g10.c:215
+#: g10/gpg.c:214
 msgid "list only the sequence of packets"
 msgstr "lista sólo la secuencia de paquetes"
 
-#: g10/g10.c:217
+#: g10/gpg.c:216
 msgid "export the ownertrust values"
 msgstr "exporta los valores de confianza"
 
-#: g10/g10.c:219
+#: g10/gpg.c:218
 msgid "import ownertrust values"
 msgstr "importa los valores de confianza"
 
-#: g10/g10.c:221
+#: g10/gpg.c:220
 #, fuzzy
 msgid "update the trust database"
 msgstr "|[NOMBRES]|actualiza la base de datos de confianza"
 
-#: g10/g10.c:223
+#: g10/gpg.c:222
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMBRES]|comprueba la base de datos de confianza"
 
-#: g10/g10.c:224
+#: g10/gpg.c:223
 msgid "fix a corrupted trust database"
 msgstr "arregla una base de datos de confianza dañada"
 
-#: g10/g10.c:225
+#: g10/gpg.c:224
 msgid "De-Armor a file or stdin"
 msgstr "quita la armadura de un fichero o stdin"
 
-#: g10/g10.c:227
+#: g10/gpg.c:226
 msgid "En-Armor a file or stdin"
 msgstr "crea la armadura a un fichero o stdin"
 
-#: g10/g10.c:229
+#: g10/gpg.c:228
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime resúmenes de mensaje"
 
-#: g10/g10.c:233
+#: g10/gpg.c:232
 msgid ""
 "@\n"
 "Options:\n"
@@ -440,173 +445,173 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/g10.c:235
+#: g10/gpg.c:234
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/g10.c:237
+#: g10/gpg.c:236
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/g10.c:240
+#: g10/gpg.c:239
 #, fuzzy
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
-#: g10/g10.c:242
+#: g10/gpg.c:241
 msgid "use the default key as default recipient"
 msgstr ""
 
-#: g10/g10.c:246
+#: g10/gpg.c:245
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/g10.c:247
+#: g10/gpg.c:246
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|establece nivel de compresión N (0 no comprime)"
 
-#: g10/g10.c:249
+#: g10/gpg.c:248
 msgid "use canonical text mode"
 msgstr "usa modo de texto canónico"
 
-#: g10/g10.c:250
+#: g10/gpg.c:249
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/g10.c:251
+#: g10/gpg.c:250
 msgid "verbose"
 msgstr "prolijo"
 
-#: g10/g10.c:252
+#: g10/gpg.c:251
 msgid "be somewhat more quiet"
 msgstr "algo más discreto"
 
-#: g10/g10.c:253
+#: g10/gpg.c:252
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: g10/g10.c:254
+#: g10/gpg.c:253
 msgid "force v3 signatures"
 msgstr "fuerza firmas v3"
 
-#: g10/g10.c:255
+#: g10/gpg.c:254
 msgid "always use a MDC for encryption"
 msgstr "siempre usa un MCD para cifrar"
 
-#: g10/g10.c:256
+#: g10/gpg.c:255
 msgid "do not make any changes"
 msgstr "no hace ningún cambio"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:258
+#: g10/gpg.c:257
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
-#: g10/g10.c:259
+#: g10/gpg.c:258
 msgid "assume yes on most questions"
 msgstr "asume \"sí\" en casi todas las preguntas"
 
-#: g10/g10.c:260
+#: g10/gpg.c:259
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: g10/g10.c:261
+#: g10/gpg.c:260
 msgid "add this keyring to the list of keyrings"
 msgstr "añade este anillo a la lista de anillos"
 
-#: g10/g10.c:262
+#: g10/gpg.c:261
 msgid "add this secret keyring to the list"
 msgstr "añade este anillo secreto a la lista"
 
-#: g10/g10.c:263
+#: g10/gpg.c:262
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
-#: g10/g10.c:264
+#: g10/gpg.c:263
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVIDOR|usa este servidor de claves"
 
-#: g10/g10.c:265
+#: g10/gpg.c:264
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
 
-#: g10/g10.c:266
+#: g10/gpg.c:265
 msgid "read options from file"
 msgstr "lee opciones del fichero"
 
-#: g10/g10.c:268
+#: g10/gpg.c:267
 msgid "set debugging flags"
 msgstr "establece los parámetros de depuración"
 
-#: g10/g10.c:269
+#: g10/gpg.c:268
 msgid "enable full debugging"
 msgstr "habilita depuración completa"
 
-#: g10/g10.c:270
+#: g10/gpg.c:269
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe información de estado en descriptor DF"
 
-#: g10/g10.c:271
+#: g10/gpg.c:270
 msgid "do not write comment packets"
 msgstr "no escribe paquetes de comentario"
 
-#: g10/g10.c:272
+#: g10/gpg.c:271
 msgid "(default is 1)"
 msgstr "(por defecto es 1)"
 
-#: g10/g10.c:273
+#: g10/gpg.c:272
 msgid "(default is 3)"
 msgstr "(por defecto es 3)"
 
-#: g10/g10.c:275
+#: g10/gpg.c:274
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHERO|carga módulo de extensiones FICHERO"
 
-#: g10/g10.c:276
+#: g10/gpg.c:275
 msgid "emulate the mode described in RFC1991"
 msgstr "emula el modo descrito en la RFC1991"
 
-#: g10/g10.c:277
+#: g10/gpg.c:276
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:278
+#: g10/gpg.c:277
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa modo de contraseña N"
 
-#: g10/g10.c:280
+#: g10/gpg.c:279
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE\n"
 "para las contraseñas"
 
-#: g10/g10.c:282
+#: g10/gpg.c:281
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las\n"
 "contraseñas"
 
-#: g10/g10.c:283
+#: g10/gpg.c:282
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
 
-#: g10/g10.c:284
+#: g10/gpg.c:283
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: g10/g10.c:285
+#: g10/gpg.c:284
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa el algoritmo de compresión N"
 
-#: g10/g10.c:286
+#: g10/gpg.c:285
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina el campo keyid de los paquetes cifrados"
 
-#: g10/g10.c:287
+#: g10/gpg.c:286
 msgid "|NAME=VALUE|use this notation data"
 msgstr ""
 
-#: g10/g10.c:289
+#: g10/gpg.c:288
 msgid ""
 "@\n"
 "Examples:\n"
@@ -626,15 +631,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/g10.c:376
+#: g10/gpg.c:379
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:380
+#: g10/gpg.c:383
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/g10.c:383
+#: g10/gpg.c:386
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -644,7 +649,7 @@ msgstr ""
 "Firma, comprueba, cifra o descifra.\n"
 "La operación por defecto depende del tipo de datos de entrada.\n"
 
-#: g10/g10.c:388
+#: g10/gpg.c:391
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -652,197 +657,202 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/g10.c:465
+#: g10/gpg.c:469
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/g10.c:518
+#: g10/gpg.c:549
 msgid "conflicting commands\n"
 msgstr "comandos incompatibles\n"
 
-#: g10/g10.c:653
+#: g10/gpg.c:603
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
+#: g10/gpg.c:693
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/g10.c:657
+#: g10/gpg.c:697
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/g10.c:664
+#: g10/gpg.c:704
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/g10.c:844
+#: g10/gpg.c:885
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s no es un juego de caracteres válido\n"
 
-#: g10/g10.c:911 g10/g10.c:920
+#: g10/gpg.c:955 g10/gpg.c:964
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/g10.c:913
+#: g10/gpg.c:957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr ""
 
-#: g10/g10.c:916
+#: g10/gpg.c:960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr ""
 
-#: g10/g10.c:935 g10/g10.c:947
+#: g10/gpg.c:980 g10/gpg.c:992
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado no es válido\n"
 
-#: g10/g10.c:941 g10/g10.c:953
+#: g10/gpg.c:986 g10/gpg.c:998
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no es válido\n"
 
-#: g10/g10.c:957
+#: g10/gpg.c:1002
 msgid "the given policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:960
+#: g10/gpg.c:1005
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "el algoritmo de compresión debe estar en el rango %d-%d\n"
 
-#: g10/g10.c:962
+#: g10/gpg.c:1007
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/g10.c:964
+#: g10/gpg.c:1009
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/g10.c:966
+#: g10/gpg.c:1011
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth debe estar en el rango 1-255\n"
 
-#: g10/g10.c:969
+#: g10/gpg.c:1014
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
 
-#: g10/g10.c:973
+#: g10/gpg.c:1018
 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:1050
+#: g10/gpg.c:1095
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicialización de la base de datos de confianza fallida: %s\n"
 
-#: g10/g10.c:1056
+#: g10/gpg.c:1101
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/g10.c:1063
+#: g10/gpg.c:1108
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:1071
+#: g10/gpg.c:1116
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/g10.c:1084
+#: g10/gpg.c:1129
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/g10.c:1097
+#: g10/gpg.c:1142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:1111
+#: g10/gpg.c:1156
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/g10.c:1123
+#: g10/gpg.c:1168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/g10.c:1131
+#: g10/gpg.c:1176
 msgid "--sign-key user-id"
 msgstr ""
 
-#: g10/g10.c:1139
+#: g10/gpg.c:1184
 #, fuzzy
 msgid "--lsign-key user-id"
 msgstr "--delete-key nombre_usuario"
 
-#: g10/g10.c:1147
+#: g10/gpg.c:1192
 #, fuzzy
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nombre_usuario [comandos]"
 
-#: g10/g10.c:1163
+#: g10/gpg.c:1208
 #, fuzzy
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key nombre_usuario"
 
-#: g10/g10.c:1166
+#: g10/gpg.c:1211
 #, fuzzy
 msgid "--delete-key user-id"
 msgstr "--delete-key nombre_usuario"
 
-#: g10/encode.c:260 g10/g10.c:1190 g10/sign.c:368
+#: g10/encode.c:306 g10/gpg.c:1236 g10/sign.c:424
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: g10/g10.c:1201
+#: g10/gpg.c:1247
 #, fuzzy
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id_usuario] [anillo]"
 
-#: g10/g10.c:1262
+#: g10/gpg.c:1308
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminación de armadura fallida: %s\n"
 
-#: g10/g10.c:1270
+#: g10/gpg.c:1316
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creación de armadura fallida: %s\n"
 
-#: g10/g10.c:1338
+#: g10/gpg.c:1386
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribución no válido `%s'\n"
 
-#: g10/g10.c:1419
+#: g10/gpg.c:1467
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
-#: g10/g10.c:1423
+#: g10/gpg.c:1471
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1426 g10/verify.c:66
+#: g10/decrypt.c:59 g10/gpg.c:1474 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no puede abrirse `%s'\n"
 
-#: g10/g10.c:1594
+#: g10/gpg.c:1642
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 
-#: g10/g10.c:1600
+#: g10/gpg.c:1648
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1606
+#: g10/gpg.c:1654
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1614
+#: g10/gpg.c:1662
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
@@ -851,70 +861,74 @@ msgstr ""
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:319
+#: g10/armor.c:325
 msgid "invalid armor header: "
 msgstr "cabecera de armadura no válida: "
 
-#: g10/armor.c:326
+#: g10/armor.c:332
 msgid "armor header: "
 msgstr "cabecera de armadura: "
 
-#: g10/armor.c:337
+#: g10/armor.c:343
 msgid "invalid clearsig header\n"
 msgstr "cabecera de firma clara no válida\n"
 
-#: g10/armor.c:389
+#: g10/armor.c:395
 msgid "nested clear text signatures\n"
 msgstr "firmas en texto claro anidadas\n"
 
-#: g10/armor.c:500
+#: g10/armor.c:506
 msgid "invalid dash escaped line: "
 msgstr "Línea con guiones no válida: "
 
-#: g10/armor.c:512
+#: g10/armor.c:518
 msgid "unexpected armor:"
 msgstr "armadura inesperada"
 
-#: g10/armor.c:629
+#: g10/armor.c:635
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracteres no válidos radix64 %02x ignorados\n"
 
-#: g10/armor.c:672
+#: g10/armor.c:678
 msgid "premature eof (no CRC)\n"
 msgstr "Fin de fichero prematuro\n"
 
-#: g10/armor.c:706
+#: g10/armor.c:712
 msgid "premature eof (in CRC)\n"
 msgstr "Fin de suma de comprobación prematuro\n"
 
-#: g10/armor.c:710
+#: g10/armor.c:716
 msgid "malformed CRC\n"
 msgstr "Suma de comprobación mal creada\n"
 
-#: g10/armor.c:714
+#: g10/armor.c:720
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "Error en suma de comprobación: %06lx - %06lx\n"
 
-#: g10/armor.c:731
+#: g10/armor.c:737
 msgid "premature eof (in Trailer)\n"
 msgstr "fin de fichero prematuro (en el cierre)\n"
 
-#: g10/armor.c:735
+#: g10/armor.c:741
 msgid "error in trailer line\n"
 msgstr "error en la línea de cierre\n"
 
-#: g10/armor.c:1001
+#: g10/armor.c:892
+msgid "For info see http://www.gnupg.org"
+msgstr ""
+
+#: g10/armor.c:1007
 msgid "no valid OpenPGP data found.\n"
 msgstr "no se han encontrados datos OpenPGP válidos\n"
 
-#: g10/armor.c:1005
+#: g10/armor.c:1011
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura incorrecta: línea más larga de %d caracteres\n"
 
-#: g10/armor.c:1009
+#: g10/armor.c:1015
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1187,56 +1201,56 @@ msgstr "%s: problema lectura del bloque de clave: %s\n"
 msgid "no valid addressees\n"
 msgstr "no hay direcciones válidas\n"
 
-#: g10/keygen.c:122
+#: g10/keygen.c:123
 msgid "writing self signature\n"
 msgstr "escribiendo autofirma\n"
 
-#: g10/keygen.c:160
+#: g10/keygen.c:161
 msgid "writing key binding signature\n"
 msgstr "escribiendo la firma de comprobación de clave\n"
 
-#: g10/keygen.c:386
+#: g10/keygen.c:511
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor seleccione tipo de clave deseado:\n"
 
-#: g10/keygen.c:388
+#: g10/keygen.c:513
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA y ElGamal (por defecto)\n"
 
-#: g10/keygen.c:389
+#: g10/keygen.c:514
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (sólo firma)\n"
 
-#: g10/keygen.c:391
+#: g10/keygen.c:516
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (sólo cifrado)\n"
 
-#: g10/keygen.c:392
+#: g10/keygen.c:517
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firma y cifrado)\n"
 
-#: g10/keygen.c:394
+#: g10/keygen.c:519
 #, c-format
 msgid "   (%d) ElGamal in a v3 packet\n"
 msgstr "   (%d) ElGamal en un paquete v3\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
 msgid "Your selection? "
 msgstr "Su elección: "
 
-#: g10/keygen.c:409
+#: g10/keygen.c:534
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "¿De verdad quiere crear una clave de firma y cifrado? "
 
-#: g10/keygen.c:430
+#: g10/keygen.c:555
 msgid "Invalid selection.\n"
 msgstr "Elección no válida.\n"
 
-#: g10/keygen.c:442
+#: g10/keygen.c:567
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1249,15 +1263,15 @@ msgstr ""
 "        el tamaño por defecto es 1024 bits\n"
 " el tamaño máximo recomendado es 2048 bits\n"
 
-#: g10/keygen.c:449
+#: g10/keygen.c:574
 msgid "What keysize do you want? (1024) "
 msgstr "¿De qué tamaño quiere la clave (1024)? "
 
-#: g10/keygen.c:454
+#: g10/keygen.c:579
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA sólo permite tamaños desde 512 a 1024\n"
 
-#: g10/keygen.c:456
+#: g10/keygen.c:581
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamaño insuficiente; 768 es el valor mínimo permitido\n"
 
@@ -1269,12 +1283,12 @@ msgstr "tamaño insuficiente; 768 es el valor mínimo permitido\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:466
+#: g10/keygen.c:591
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "tamaño excesivo; %d es el máximo valor permitido.\n"
 
-#: g10/keygen.c:471
+#: g10/keygen.c:596
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1282,11 +1296,11 @@ msgstr ""
 "No se recomiendan claves de más de 2048 bits porque\n"
 "el tiempo de computación es REALMENTE largo.\n"
 
-#: g10/keygen.c:474
+#: g10/keygen.c:599
 msgid "Are you sure that you want this keysize? "
 msgstr "¿Seguro que quiere una clave de este tamaño? "
 
-#: g10/keygen.c:475
+#: g10/keygen.c:600
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1295,21 +1309,21 @@ msgstr ""
 "teclado\n"
 "también son vulnerables a un ataque!\n"
 
-#: g10/keygen.c:483
+#: g10/keygen.c:608
 msgid "Do you really need such a large keysize? "
 msgstr "¿De verdad necesita una clave tan grande? "
 
-#: g10/keygen.c:489
+#: g10/keygen.c:614
 #, 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
+#: g10/keygen.c:617 g10/keygen.c:621
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:509
+#: g10/keygen.c:634
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1325,29 +1339,29 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n años\n"
 
-#: g10/keygen.c:526
+#: g10/keygen.c:651
 msgid "Key is valid for? (0) "
 msgstr "¿Validez de la clave (0)? "
 
-#: g10/keygen.c:547
+#: g10/keygen.c:672
 msgid "invalid value\n"
 msgstr "valor no válido\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:677
 msgid "Key does not expire at all\n"
 msgstr "La clave nunca caduca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:558
+#: g10/keygen.c:683
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clave caduca el %s\n"
 
-#: g10/keygen.c:563
+#: g10/keygen.c:688
 msgid "Is this correct (y/n)? "
 msgstr "¿Es correcto (s/n)? "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:731
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1365,44 +1379,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:617
+#: g10/keygen.c:742
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:621
+#: g10/keygen.c:746
 msgid "Invalid character in name\n"
 msgstr "Caracter no válido en el nombre\n"
 
-#: g10/keygen.c:623
+#: g10/keygen.c:748
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un número\n"
 
-#: g10/keygen.c:625
+#: g10/keygen.c:750
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:633
+#: g10/keygen.c:758
 msgid "Email address: "
 msgstr "Dirección de correo electrónico: "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:769
 msgid "Not a valid email address\n"
 msgstr "Dirección no válida\n"
 
-#: g10/keygen.c:652
+#: g10/keygen.c:777
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:658
+#: g10/keygen.c:783
 msgid "Invalid character in comment\n"
 msgstr "Caracter no válido en el comentario\n"
 
-#: g10/keygen.c:680
+#: g10/keygen.c:808
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Está usando el juego de caracteres `%s'.\n"
 
-#: g10/keygen.c:686
+#: g10/keygen.c:814
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1413,15 +1427,15 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:689
+#: g10/keygen.c:817
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "¿Cambia (N)ombre, (C)omentario, (D)irección o (V)ale/(S)alir? "
 
-#: g10/keygen.c:751
+#: g10/keygen.c:879
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1429,11 +1443,11 @@ msgstr ""
 "Necesita una contraseña para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:456 g10/keygen.c:759
+#: g10/keyedit.c:456 g10/keygen.c:887
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "contraseña repetida incorrecta, inténtelo de nuevo.\n"
 
-#: g10/keygen.c:765
+#: g10/keygen.c:893
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1445,7 +1459,7 @@ msgstr ""
 "la opción \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:914
 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"
@@ -1458,34 +1472,34 @@ msgstr ""
 "generador de números aleatorios mayor oportunidad de recoger suficiente\n"
 "entropía.\n"
 
-#: g10/keygen.c:856
+#: g10/keygen.c:984
 msgid "Key generation can only be used in interactive mode\n"
 msgstr "La creación de claves sólo es posible en modo interactivo\n"
 
-#: g10/keygen.c:864
+#: g10/keygen.c:992
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "El par de claves DSA tendrá 1024 bits.\n"
 
-#: g10/keygen.c:870
+#: g10/keygen.c:998
 #, fuzzy
 msgid "Key generation canceled.\n"
 msgstr "Creación de claves cancelada.\n"
 
-#: g10/keygen.c:880
+#: g10/keygen.c:1008
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "escribiendo certificado público en `%s'\n"
 
-#: g10/keygen.c:881
+#: g10/keygen.c:1009
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "escribiendo certificado privado en `%s'\n"
 
-#: g10/keygen.c:958
+#: g10/keygen.c:1086
 msgid "public and secret key created and signed.\n"
 msgstr "Claves pública y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:960
+#: g10/keygen.c:1088
 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"
@@ -1494,12 +1508,12 @@ msgstr ""
 "el comando \"--edit-key\" para crear una clave secundaria con este "
 "propósito.\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1073
+#: g10/keygen.c:1102 g10/keygen.c:1201
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creación de la clave fallida: %s\n"
 
-#: g10/keygen.c:1018 g10/sig-check.c:314 g10/sign.c:106
+#: g10/keygen.c:1146 g10/sig-check.c:394 g10/sign.c:162
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1507,7 +1521,7 @@ msgstr ""
 "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:1020 g10/sig-check.c:316 g10/sign.c:108
+#: g10/keygen.c:1148 g10/sig-check.c:396 g10/sign.c:164
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1515,32 +1529,32 @@ msgstr ""
 "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:1051
+#: g10/keygen.c:1179
 msgid "Really create? "
 msgstr "¿Crear de verdad? "
 
-#: g10/encode.c:91 g10/openfile.c:163 g10/openfile.c:272 g10/tdbio.c:468
+#: g10/encode.c:137 g10/openfile.c:163 g10/openfile.c:272 g10/tdbio.c:468
 #: g10/tdbio.c:529
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: no puede abrirse: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:159
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creando contraseña: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:217 g10/encode.c:365
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATENCIÓN: fichero vacío\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:312
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "leyendo desde `%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:529
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s cifrado para: %s\n"
@@ -1601,7 +1615,7 @@ msgstr "no puede abrirse `%s': %s\n"
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloque de tipo %d\n"
 
-#: g10/import.c:169 g10/trustdb.c:1658 g10/trustdb.c:1697
+#: g10/import.c:169 g10/trustdb.c:1659 g10/trustdb.c:1698
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "hasta ahora se han procesado %lu claves\n"
@@ -1689,7 +1703,7 @@ msgstr "clave %08lX: clave pública no encontrada: %s\n"
 msgid "no default public keyring\n"
 msgstr "no hay anillo público por defecto\n"
 
-#: g10/import.c:399 g10/openfile.c:215 g10/sign.c:269 g10/sign.c:582
+#: g10/import.c:399 g10/openfile.c:215 g10/sign.c:325 g10/sign.c:638
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
@@ -1949,7 +1963,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "¿Firmar de verdad? "
 
-#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:129
+#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:185
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
@@ -2434,67 +2448,67 @@ msgstr "¿Crear los certificados de revocación realmente? (s/N)"
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:212
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la clave pública es %08lX\n"
 
-#: g10/mainproc.c:244
+#: g10/mainproc.c:243
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados de la clave pública: DEK bueno\n"
 
-#: g10/mainproc.c:275
+#: g10/mainproc.c:274
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s"
 
-#: g10/mainproc.c:285
+#: g10/mainproc.c:284
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "Firma creada %.*s usando identificativo de clave %s %08lX\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 #, fuzzy
 msgid "no secret key for decryption available\n"
 msgstr "Clave secreta no disponible"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:299
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave pública fallido: %s\n"
 
-#: g10/mainproc.c:332
+#: g10/mainproc.c:331
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:337
+#: g10/mainproc.c:336
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCIÓN: ¡el mensaje cifrado ha sido manipulado!\n"
 
-#: g10/mainproc.c:342
+#: g10/mainproc.c:341
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:360
+#: g10/mainproc.c:359
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitente solicitó \"sólo-para-tus-ojos\"\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:361
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:596 g10/mainproc.c:605
+#: g10/mainproc.c:595 g10/mainproc.c:604
 #, fuzzy
 msgid "WARNING: invalid notation data found\n"
 msgstr "no se han encontrados datos OpenPGP válidos\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:607
 msgid "Notation: "
 msgstr ""
 
-#: g10/mainproc.c:615
+#: g10/mainproc.c:614
 msgid "Policy: "
 msgstr ""
 
@@ -2533,20 +2547,20 @@ msgstr "firma viejo estilo (PGP 2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete raíz no válido detectado en proc_tree()\n"
 
-#: g10/misc.c:95
+#: g10/misc.c:83
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "no se pueden desactivar los core dumps: %s\n"
 
-#: g10/misc.c:98
+#: g10/misc.c:86
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCIÓN: ¡el programa podría crear un fichero core dump!\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:312
 msgid "Experimental algorithms should not be used!\n"
 msgstr "¡No se deberían usar algoritmos experimentales!\n"
 
-#: g10/misc.c:220
+#: g10/misc.c:326
 msgid ""
 "RSA keys are deprecated; please consider creating a new key and use this key "
 "in the future\n"
@@ -2554,18 +2568,18 @@ msgstr ""
 "Las claves RSA están en desuso, considere la creación de una nueva clave "
 "para futuros usos\n"
 
-#: g10/misc.c:242
+#: g10/misc.c:348
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "este algoritmo de cifrado está en desuso, considere el uso de uno más "
 "estándar.\n"
 
-#: g10/parse-packet.c:113
+#: 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:939
+#: g10/parse-packet.c:938
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquete de tipo %d tiene el bit crítico activado\n"
@@ -2625,92 +2639,92 @@ msgstr "leyendo stdin...\n"
 msgid "can't open signed data `%s'\n"
 msgstr "imposible abrir datos firmados `%s'\n"
 
-#: g10/pubkey-enc.c:80
+#: g10/pubkey-enc.c:147
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "destinatario anónimo, probando clave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:86
+#: g10/pubkey-enc.c:153
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "de acuerdo, somos el destinatario anónimo.\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:209
 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:192
+#: g10/pubkey-enc.c:263
 #, 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:56
+#: g10/seckey-cert.c:101
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "el algoritmo de protección %d no está soportado\n"
 
-#: g10/seckey-cert.c:181
+#: g10/seckey-cert.c:242
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Contraseña incorrecta, inténtelo de nuevo...\n"
 
-#: g10/seckey-cert.c:246
+#: g10/seckey-cert.c:307
 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:201
+#: g10/sig-check.c:281
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr "asumiendo firma mala debido a un bit crítico desconocido\n"
 
-#: g10/sig-check.c:297
+#: g10/sig-check.c:377
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "¡esto es una clave ElGamal generada por PGP que NO es segura para las "
 "firmas!\n"
 
-#: g10/sig-check.c:305
+#: g10/sig-check.c:385
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "la clave pública es %lu segundos más nueva que la firma\n"
 
-#: g10/sig-check.c:306
+#: g10/sig-check.c:386
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "la clave pública es %lu segundos más nueva que la firma\n"
 
-#: g10/sig-check.c:322
+#: g10/sig-check.c:402
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTA: clave de la firma caducada el %s\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:459
 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:133
+#: g10/sign.c:189
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "firma %s de %s\n"
 
-#: g10/sign.c:264 g10/sign.c:577
+#: g10/sign.c:320 g10/sign.c:633
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "no puede crearse %s: %s\n"
 
-#: g10/sign.c:363
+#: g10/sign.c:419
 msgid "signing:"
 msgstr "firmando:"
 
-#: g10/sign.c:406
+#: g10/sign.c:462
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATENCIÓN `%s' es un fichero vacío\n"
 
-#: g10/textfilter.c:129
+#: g10/textfilter.c:128
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "no se pueden manejar líneas de texto de más de %d caracteres\n"
 
-#: g10/textfilter.c:198
+#: g10/textfilter.c:197
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "línea de longitud superior a %d caracteres\n"
@@ -2735,12 +2749,12 @@ msgstr "transacción en la base de datos de confianza demasiado grande\n"
 msgid "%s: can't access: %s\n"
 msgstr "%s: no puede abrirse: %s\n"
 
-#: g10/ringedit.c:298 g10/tdbio.c:445
+#: g10/ringedit.c:297 g10/tdbio.c:445
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: no puede crearse el directorio: %s\n"
 
-#: g10/ringedit.c:304 g10/tdbio.c:448
+#: g10/ringedit.c:303 g10/tdbio.c:448
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: directorio creado\n"
@@ -2750,7 +2764,7 @@ msgstr "%s: directorio creado\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: ¡el directorio no existe!\n"
 
-#: g10/openfile.c:211 g10/openfile.c:279 g10/ringedit.c:1350 g10/tdbio.c:458
+#: g10/openfile.c:211 g10/openfile.c:279 g10/ringedit.c:1349 g10/tdbio.c:458
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: no puede crearse: %s\n"
@@ -2938,243 +2952,239 @@ msgstr "clave %08lX: aceptada como clave de confianza.\n"
 msgid "enumerate secret keys failed: %s\n"
 msgstr "enum_secret_keys fallido: %s\n"
 
-#: g10/trustdb.c:877
+#: g10/trustdb.c:878
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "clave %08lX.%lu: buena unión de subclave\n"
 
-#: g10/trustdb.c:883 g10/trustdb.c:918
+#: g10/trustdb.c:884 g10/trustdb.c:919
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "clave %08lX.%lu: unión de subclave no válida\n"
 
-#: g10/trustdb.c:895
+#: g10/trustdb.c:896
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "clave %08lX.%lu: revocación de clave válida\n"
 
-#: g10/trustdb.c:901
+#: g10/trustdb.c:902
 #, 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:912
+#: g10/trustdb.c:913
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "clave %08lX.%lu: revocación de subclave válida\n"
 
-#: g10/trustdb.c:1023
+#: g10/trustdb.c:1024
 msgid "Good self-signature"
 msgstr "Autofirma buena"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1034
 msgid "Invalid self-signature"
 msgstr "Autofirma no válida"
 
-#: g10/trustdb.c:1060
+#: g10/trustdb.c:1061
 #, fuzzy
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Revocación válida de identificativo de usuario ignorada debido a una "
 "autofirma más reciente\n"
 
-#: g10/trustdb.c:1066
+#: g10/trustdb.c:1067
 #, fuzzy
 msgid "Valid user ID revocation"
 msgstr "Revocación identificativo de usuario válida.\n"
 
-#: g10/trustdb.c:1071
+#: g10/trustdb.c:1072
 msgid "Invalid user ID revocation"
 msgstr "Revocación identificativo de usuario no válida."
 
-#: g10/trustdb.c:1112
+#: g10/trustdb.c:1113
 msgid "Valid certificate revocation"
 msgstr "Revocación de certificado válida"
 
-#: g10/trustdb.c:1113
+#: g10/trustdb.c:1114
 msgid "Good certificate"
 msgstr "Certificado bueno"
 
-#: g10/trustdb.c:1134
+#: g10/trustdb.c:1135
 msgid "Invalid certificate revocation"
 msgstr "Certificado de revocación incorrecto"
 
-#: g10/trustdb.c:1135
+#: g10/trustdb.c:1136
 msgid "Invalid certificate"
 msgstr "Certificado incorrecto"
 
-#: g10/trustdb.c:1152 g10/trustdb.c:1156
+#: g10/trustdb.c:1153 g10/trustdb.c:1157
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "registro de firma %lu[%d] apunta al registro equivocado.\n"
 
-#: g10/trustdb.c:1208
+#: g10/trustdb.c:1209
 msgid "duplicated certificate - deleted"
 msgstr "certificado duplicado - eliminado"
 
-#: g10/trustdb.c:1514
+#: g10/trustdb.c:1515
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir fallida: %s\n"
 
-#: g10/trustdb.c:1636
+#: g10/trustdb.c:1637
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: inserción fallida: %s\n"
 
-#: g10/trustdb.c:1641
+#: g10/trustdb.c:1642
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: inserción fallida: %s\n"
 
-#: g10/trustdb.c:1647
+#: g10/trustdb.c:1648
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: insertada\n"
 
-#: g10/trustdb.c:1652
+#: g10/trustdb.c:1653
 #, fuzzy, c-format
 msgid "error reading dir record: %s\n"
 msgstr "error buscando registro de directorio: %s\n"
 
-#: g10/trustdb.c:1660 g10/trustdb.c:1714
+#: g10/trustdb.c:1661 g10/trustdb.c:1715
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "se han procesado %lu claves\n"
 
-#: g10/trustdb.c:1662 g10/trustdb.c:1718
+#: g10/trustdb.c:1663 g10/trustdb.c:1719
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu claves con errores\n"
 
-#: g10/trustdb.c:1664
+#: g10/trustdb.c:1665
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu claves insertadas\n"
 
-#: g10/trustdb.c:1667
+#: g10/trustdb.c:1668
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enumeración bloques de clave fallido: %s\n"
 
-#: g10/trustdb.c:1705
+#: g10/trustdb.c:1706
 #, 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:1716
+#: g10/trustdb.c:1717
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu claves ignoradas\n"
 
-#: g10/trustdb.c:1720
+#: g10/trustdb.c:1721
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu claves actualizadas\n"
 
-#: g10/trustdb.c:2057
+#: g10/trustdb.c:2058
 msgid "Ooops, no keys\n"
 msgstr "Oh oh, no hay claves\n"
 
-#: g10/trustdb.c:2061
+#: g10/trustdb.c:2062
 #, fuzzy
 msgid "Ooops, no user IDs\n"
 msgstr "Oh oh, no hay identificativos de usuario\n"
 
-#: g10/trustdb.c:2218
+#: g10/trustdb.c:2219
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: búsqueda registro directorio fallida: %s\n"
 
-#: g10/trustdb.c:2227
+#: g10/trustdb.c:2228
 #, 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:2231
+#: g10/trustdb.c:2232
 #, 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:2239
+#: g10/trustdb.c:2240
 #, 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:2248
+#: g10/trustdb.c:2249
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "clave %08lX.%lu: caducada el %s\n"
 
-#: g10/trustdb.c:2256
+#: g10/trustdb.c:2257
 #, 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:2362
+#: g10/trustdb.c:2363
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "usuario '%s' no encontrado: %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2365
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problema buscando '%s' en la tabla de confianza: %s\n"
 
-#: g10/trustdb.c:2367
+#: g10/trustdb.c:2368
 #, 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:2370
+#: g10/trustdb.c:2371
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "fallo al poner '%s' en la tabla de confianza: %s\n"
 
-#: g10/trustdb.c:2556 g10/trustdb.c:2586
+#: g10/trustdb.c:2557 g10/trustdb.c:2587
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "ATENCÍON: todavía no puedo tratar registros de preferencias largos\n"
 
-#: g10/ringedit.c:318
+#: g10/ringedit.c:317
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: no se puede crear el anillo: %s\n"
 
-#: g10/ringedit.c:335 g10/ringedit.c:1355
+#: g10/ringedit.c:334 g10/ringedit.c:1354
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anillo creado\n"
 
-#: g10/ringedit.c:1532
+#: g10/ringedit.c:1531
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATENCIÓN: existen 2 ficheros con información confidencial.\n"
 
-#: g10/ringedit.c:1533
+#: g10/ringedit.c:1532
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s es el que no se ha modificado\n"
 
-#: g10/ringedit.c:1534
+#: g10/ringedit.c:1533
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s es el nuevo\n"
 
-#: g10/ringedit.c:1535
+#: g10/ringedit.c:1534
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor arregle este posible fallo de seguridad\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
-msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr ""
-
-#: g10/skclist.c:113
+#: g10/skclist.c:97
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s' ignorado: %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:103
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3217,27 +3227,27 @@ msgstr "asumiendo que hay datos firmados en `%s'\n"
 msgid "%s: new options file created\n"
 msgstr "%s: se ha creado un nuevo fichero de opciones\n"
 
-#: g10/encr-data.c:66
+#: g10/encr-data.c:64
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado con algoritmo desconocido %d\n"
 
-#: g10/encr-data.c:71
+#: g10/encr-data.c:69
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados %s\n"
 
-#: g10/encr-data.c:101
+#: g10/encr-data.c:99
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATENCIÓN: mensaje cifrado con una clave débil en el cifrado simétrico.\n"
 
-#: g10/seskey.c:63
+#: g10/seskey.c:62
 msgid "weak key created - retrying\n"
 msgstr "creada clave débil - reintentando\n"
 
-#: g10/seskey.c:68
+#: g10/seskey.c:67
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 3618281a7..d5151a61c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.1\n"
-"POT-Creation-Date: 1999-10-26 18:57+0200\n"
+"POT-Creation-Date: 2000-01-31 12:09+0100\n"
 "PO-Revision-Date: 1999-10-06 21:43+0200\n"
 "Last-Translator: Gaël Quéri <gqueri@mail.dotcom.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -16,252 +16,252 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: util/secmem.c:79
+#: gcrypt/secmem.c:77
 msgid "Warning: using insecure memory!\n"
 msgstr "Attention : utilisation de la mémoire non sûre !\n"
 
-#: util/secmem.c:281
+#: gcrypt/secmem.c:279
 msgid "operation is not possible without initialized secure memory\n"
 msgstr ""
 "l'opération n'est pas possible tant que la mémoire sûre n'est pas\n"
 "initialisée\n"
 
-#: util/secmem.c:282
+#: gcrypt/secmem.c:280
 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:277 util/miscutil.c:306
+#: util/miscutil.c:278 util/miscutil.c:307
 msgid "yes"
 msgstr "oui"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:279 util/miscutil.c:310
 msgid "yY"
 msgstr "oO"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:280 util/miscutil.c:308
 msgid "no"
 msgstr "non"
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:281 util/miscutil.c:311
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:564 util/miscutil.c:308
+#: g10/keyedit.c:564 util/miscutil.c:309
 msgid "quit"
 msgstr "quitter"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:312
 msgid "qQ"
 msgstr "qQ"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "erreur générale"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "type de paquet inconnu"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "version inconnue"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "algorithme à clé publique inconnu"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "algorithme de hachage inconnu"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "mauvaise clé publique"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "mauvaise clé secrète"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "mauvaise signature"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "erreur de checksum"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "mauvais mot de passe"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "clé publique non trouvée"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "algorithme de chiffrement inconnu"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "impossible d'ouvrir le porte-clés"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "paquet invalide"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "armure invalide"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "pas de tel utilisateur"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "la clé secrète n'est pas disponible"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "mauvaise clé secrète utilisée"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "non supporté"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "mauvaise clé"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "erreur de lecture"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "erreur d'écriture"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "algorithme de compression inconnu"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "erreur d'ouverture de fichier"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "erreur de création de fichier"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "mot de passe invalide"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "algorithme à clé publique non implanté"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "algorithme de chiffrement non implanté"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "classe de signature inconnue"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "erreur dans la base de confiance"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "mauvais entier en précision multiple (MPI)"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "limite de ressources atteinte"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "porte-clés invalide"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "mauvais certificat"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "nom d'utilisateur malformé"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "erreur de fermeture de fichier"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "erreur pendant le changement de nom du fichier"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "erreur pendant la suppression du fichier"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "données inattendues"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "conflit de dates"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "algorithme de clés publiques inutilisable"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "le fichier existe"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "clé faible"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "argument invalide"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "mauvaise adresse (URI)"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "URI non supportée"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "erreur de réseau"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "non chiffré"
 
-#: util/logger.c:218
+#: util/logger.c:219
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... c'est un bug (%s:%d:%s)\n"
 
-#: util/logger.c:224
+#: util/logger.c:225
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vous avez trouvé un bug ... (%s:%d)\n"
 
-#: cipher/random.c:452
+#: cipher/random.c:463
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ATTENTION : utilisation d'un générateur de nombres aléatoires peu sûr !!\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:469
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -275,7 +275,7 @@ msgstr ""
 "N'UTILISEZ PAS LES DONNÉES GÉNÉRÉES PAR CE PROGRAMME !!\n"
 "\n"
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:125
 #, c-format
 msgid ""
 "\n"
@@ -286,7 +286,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:186
+#: g10/gpg.c:183
 msgid ""
 "@Commands:\n"
 " "
@@ -294,136 +294,141 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: g10/g10.c:188
+#: g10/gpg.c:185
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/g10.c:189
+#: g10/gpg.c:186
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/g10.c:190
+#: g10/gpg.c:187
 msgid "make a detached signature"
 msgstr "faire une signature détachée"
 
-#: g10/g10.c:191
+#: g10/gpg.c:188
 msgid "encrypt data"
 msgstr "chiffrer les données"
 
-#: g10/g10.c:192
+#: g10/gpg.c:189
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement symétrique seulement"
 
-#: g10/g10.c:193
+#: g10/gpg.c:190
 msgid "store only"
 msgstr "pas d'action"
 
-#: g10/g10.c:194
+#: g10/gpg.c:191
 msgid "decrypt data (default)"
 msgstr "déchiffrer les données (défaut)"
 
-#: g10/g10.c:195
+#: g10/gpg.c:192
 msgid "verify a signature"
 msgstr "vérifier une signature"
 
-#: g10/g10.c:196
+#: g10/gpg.c:193
 msgid "list keys"
 msgstr "lister les clés"
 
-#: g10/g10.c:198
+#: g10/gpg.c:195
 msgid "list keys and signatures"
 msgstr "lister les clés et les signatures"
 
-#: g10/g10.c:199
+#: g10/gpg.c:196
 msgid "check key signatures"
 msgstr "vérifier les signatures des clés"
 
-#: g10/g10.c:200
+#: g10/gpg.c:197
 msgid "list keys and fingerprints"
 msgstr "lister les clés et les empreintes"
 
-#: g10/g10.c:201
+#: g10/gpg.c:198
 msgid "list secret keys"
 msgstr "lister les clés secrètes"
 
-#: g10/g10.c:202
+#: g10/gpg.c:199
 msgid "generate a new key pair"
 msgstr "générer une nouvelle paire de clés"
 
-#: g10/g10.c:203
+#: g10/gpg.c:200
 msgid "remove key from the public keyring"
 msgstr "enlever la clé du porte-clés public"
 
-#: g10/g10.c:204
+#: g10/gpg.c:202
+#, fuzzy
+msgid "remove key from the secret keyring"
+msgstr "enlever la clé du porte-clés public"
+
+#: g10/gpg.c:203
 msgid "sign a key"
 msgstr "signer une clé"
 
-#: g10/g10.c:205
+#: g10/gpg.c:204
 msgid "sign a key locally"
 msgstr "signer une clé localement"
 
-#: g10/g10.c:206
+#: g10/gpg.c:205
 msgid "sign or edit a key"
 msgstr "signer ou éditer une clé"
 
-#: g10/g10.c:207
+#: g10/gpg.c:206
 msgid "generate a revocation certificate"
 msgstr "générer un certificat de révocation"
 
-#: g10/g10.c:208
+#: g10/gpg.c:207
 msgid "export keys"
 msgstr "exporter les clés"
 
-#: g10/g10.c:209
+#: g10/gpg.c:208
 msgid "export keys to a key server"
 msgstr "exporter les clés vers un serveur de clés"
 
-#: g10/g10.c:210
+#: g10/gpg.c:209
 msgid "import keys from a key server"
 msgstr "importer les clés d'un serveur de clés"
 
-#: g10/g10.c:213
+#: g10/gpg.c:212
 msgid "import/merge keys"
 msgstr "importer/fusionner les clés"
 
-#: g10/g10.c:215
+#: g10/gpg.c:214
 msgid "list only the sequence of packets"
 msgstr "ne lister que les paquets"
 
-#: g10/g10.c:217
+#: g10/gpg.c:216
 msgid "export the ownertrust values"
 msgstr "exporter les indices de confiance"
 
-#: g10/g10.c:219
+#: g10/gpg.c:218
 msgid "import ownertrust values"
 msgstr "importer les indices de confiance"
 
 #
-#: g10/g10.c:221
+#: g10/gpg.c:220
 msgid "update the trust database"
 msgstr "mettre la base de confiance à jour"
 
-#: g10/g10.c:223
+#: g10/gpg.c:222
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMS]|vérifier la base de confiance"
 
-#: g10/g10.c:224
+#: g10/gpg.c:223
 msgid "fix a corrupted trust database"
 msgstr "réparer une base de confiance corrompue"
 
-#: g10/g10.c:225
+#: g10/gpg.c:224
 msgid "De-Armor a file or stdin"
 msgstr "Enlever l'armure d'un fichier ou de stdin"
 
-#: g10/g10.c:227
+#: g10/gpg.c:226
 msgid "En-Armor a file or stdin"
 msgstr "Mettre une armure à un fichier ou à stdin"
 
-#: g10/g10.c:229
+#: g10/gpg.c:228
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/g10.c:233
+#: g10/gpg.c:232
 msgid ""
 "@\n"
 "Options:\n"
@@ -433,169 +438,169 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/g10.c:235
+#: g10/gpg.c:234
 msgid "create ascii armored output"
 msgstr "créer une sortie ascii avec armure"
 
-#: g10/g10.c:237
+#: g10/gpg.c:236
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/g10.c:240
+#: g10/gpg.c:239
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOM|utiliser NOM comme récipient par défaut"
 
-#: g10/g10.c:242
+#: g10/gpg.c:241
 msgid "use the default key as default recipient"
 msgstr "utiliser la clé par déf. comme récipient"
 
-#: g10/g10.c:246
+#: g10/gpg.c:245
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou déchiffrer"
 
-#: g10/g10.c:247
+#: g10/gpg.c:246
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 désactive)"
 
-#: g10/g10.c:249
+#: g10/gpg.c:248
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/g10.c:250
+#: g10/gpg.c:249
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/g10.c:251
+#: g10/gpg.c:250
 msgid "verbose"
 msgstr "bavard"
 
-#: g10/g10.c:252
+#: g10/gpg.c:251
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: g10/g10.c:253
+#: g10/gpg.c:252
 msgid "don't use the terminal at all"
 msgstr "ne pas utiliser du tout le terminal"
 
 #
-#: g10/g10.c:254
+#: g10/gpg.c:253
 msgid "force v3 signatures"
 msgstr "forcer les signatures en v3"
 
-#: g10/g10.c:255
+#: g10/gpg.c:254
 msgid "always use a MDC for encryption"
 msgstr "toujours utiliser un sceau pour le chiffrement"
 
-#: g10/g10.c:256
+#: g10/gpg.c:255
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:258
+#: g10/gpg.c:257
 msgid "batch mode: never ask"
 msgstr "mode automatique : ne jamais rien demander"
 
-#: g10/g10.c:259
+#: g10/gpg.c:258
 msgid "assume yes on most questions"
 msgstr "répondre oui à la plupart des questions"
 
-#: g10/g10.c:260
+#: g10/gpg.c:259
 msgid "assume no on most questions"
 msgstr "répondre non à la plupart des questions"
 
-#: g10/g10.c:261
+#: g10/gpg.c:260
 msgid "add this keyring to the list of keyrings"
 msgstr "ajouter ce porte-clés à la liste"
 
-#: g10/g10.c:262
+#: g10/gpg.c:261
 msgid "add this secret keyring to the list"
 msgstr "ajouter ce porte-clés secret à la liste"
 
-#: g10/g10.c:263
+#: g10/gpg.c:262
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|utiliser NOM comme clé secrète par défaut"
 
-#: g10/g10.c:264
+#: g10/gpg.c:263
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HÔTE|utiliser ce serveur pour chercher des clés"
 
-#: g10/g10.c:265
+#: g10/gpg.c:264
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|le terminal utilise la table de caractères NOM"
 
-#: g10/g10.c:266
+#: g10/gpg.c:265
 msgid "read options from file"
 msgstr "lire les options du fichier"
 
-#: g10/g10.c:268
+#: g10/gpg.c:267
 msgid "set debugging flags"
 msgstr "choisir les attributs de déboguage"
 
-#: g10/g10.c:269
+#: g10/gpg.c:268
 msgid "enable full debugging"
 msgstr "permettre un déboguage complet"
 
-#: g10/g10.c:270
+#: g10/gpg.c:269
 msgid "|FD|write status info to this FD"
 msgstr "|FD|écrire l'état sur ce descripteur"
 
-#: g10/g10.c:271
+#: g10/gpg.c:270
 msgid "do not write comment packets"
 msgstr "ne pas écrire de paquets de commentaire"
 
-#: g10/g10.c:272
+#: g10/gpg.c:271
 msgid "(default is 1)"
 msgstr "nombre de signatures complètes requises (1)"
 
-#: g10/g10.c:273
+#: g10/gpg.c:272
 msgid "(default is 3)"
 msgstr "nombre de signatures marginales requises (3)"
 
-#: g10/g10.c:275
+#: g10/gpg.c:274
 msgid "|FILE|load extension module FILE"
 msgstr "|FICH|charger le module d'extension FICH"
 
-#: g10/g10.c:276
+#: g10/gpg.c:275
 msgid "emulate the mode described in RFC1991"
 msgstr "imiter le mode décrit dans la RFC1991"
 
-#: g10/g10.c:277
+#: g10/gpg.c:276
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "utiliser le comportement défini par OpenPGP"
 
-#: g10/g10.c:278
+#: g10/gpg.c:277
 msgid "|N|use passphrase mode N"
 msgstr "|N|coder les mots de passe suivant le mode N"
 
-#: g10/g10.c:280
+#: g10/gpg.c:279
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le hachage NOM pour les mots de passe"
 
-#: g10/g10.c:282
+#: g10/gpg.c:281
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe"
 
-#: g10/g10.c:283
+#: g10/gpg.c:282
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
 
-#: g10/g10.c:284
+#: g10/gpg.c:283
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|utiliser la fonction de hachage NOM"
 
-#: g10/g10.c:285
+#: g10/gpg.c:284
 msgid "|N|use compress algorithm N"
 msgstr "|N|utiliser l'algorithme de compression N"
 
-#: g10/g10.c:286
+#: g10/gpg.c:285
 msgid "throw keyid field of encrypted packets"
 msgstr "supprimer l'ident. des paquets chiffrés"
 
-#: g10/g10.c:287
+#: g10/gpg.c:286
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOM=VALEUR|utiliser ces données de notation"
 
-#: g10/g10.c:289
+#: g10/gpg.c:288
 msgid ""
 "@\n"
 "Examples:\n"
@@ -615,15 +620,15 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les clés\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/g10.c:376
+#: g10/gpg.c:379
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Rapporter toutes anomalies à <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:380
+#: g10/gpg.c:383
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/g10.c:383
+#: g10/gpg.c:386
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -633,7 +638,7 @@ msgstr ""
 "signer, vérifier, chiffrer ou déchiffrer\n"
 "l'opération par défaut dépend des données entrées\n"
 
-#: g10/g10.c:388
+#: g10/gpg.c:391
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -641,184 +646,189 @@ msgstr ""
 "\n"
 "Algorithmes supportés :\n"
 
-#: g10/g10.c:465
+#: g10/gpg.c:469
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/g10.c:518
+#: g10/gpg.c:549
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/g10.c:653
+#: g10/gpg.c:603
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
+#: g10/gpg.c:693
 #, 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:657
+#: g10/gpg.c:697
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s' : %s\n"
 
-#: g10/g10.c:664
+#: g10/gpg.c:704
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/g10.c:844
+#: g10/gpg.c:885
 #, 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:911 g10/g10.c:920
+#: g10/gpg.c:955 g10/gpg.c:964
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE : %s n'est pas pour une utilisation normale !\n"
 
-#: g10/g10.c:913
+#: g10/gpg.c:957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/g10.c:916
+#: g10/gpg.c:960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/g10.c:935 g10/g10.c:947
+#: g10/gpg.c:980 g10/gpg.c:992
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement sélectionné est invalide\n"
 
-#: g10/g10.c:941 g10/g10.c:953
+#: g10/gpg.c:986 g10/gpg.c:998
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage sélectionnée est invalide\n"
 
-#: g10/g10.c:957
+#: g10/gpg.c:1002
 msgid "the given policy URL is invalid\n"
 msgstr "l'URL de politique donnée est invalide\n"
 
-#: g10/g10.c:960
+#: g10/gpg.c:1005
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "l'algorithme de compression doit faire partie de l'intervalle %d..%d\n"
 
-#: g10/g10.c:962
+#: g10/gpg.c:1007
 msgid "completes-needed must be greater than 0\n"
 msgstr "« completes-needed » doit être supérieur à 0\n"
 
-#: g10/g10.c:964
+#: g10/gpg.c:1009
 msgid "marginals-needed must be greater than 1\n"
 msgstr "« marginals-needed » doit être supérieur à 1\n"
 
-#: g10/g10.c:966
+#: g10/gpg.c:1011
 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:969
+#: g10/gpg.c:1014
 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:973
+#: g10/gpg.c:1018
 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:1050
+#: g10/gpg.c:1095
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance : %s\n"
 
-#: g10/g10.c:1056
+#: g10/gpg.c:1101
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/g10.c:1063
+#: g10/gpg.c:1108
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/g10.c:1071
+#: g10/gpg.c:1116
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/g10.c:1084
+#: g10/gpg.c:1129
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/g10.c:1097
+#: g10/gpg.c:1142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:1111
+#: g10/gpg.c:1156
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/g10.c:1123
+#: g10/gpg.c:1168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/g10.c:1131
+#: g10/gpg.c:1176
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/g10.c:1139
+#: g10/gpg.c:1184
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/g10.c:1147
+#: g10/gpg.c:1192
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/g10.c:1163
+#: g10/gpg.c:1208
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key utilisateur"
 
-#: g10/g10.c:1166
+#: g10/gpg.c:1211
 msgid "--delete-key user-id"
 msgstr "--delete-key utilisateur"
 
-#: g10/encode.c:260 g10/g10.c:1190 g10/sign.c:368
+#: g10/encode.c:306 g10/gpg.c:1236 g10/sign.c:424
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossible d'ouvrir %s: %s\n"
 
-#: g10/g10.c:1201
+#: g10/gpg.c:1247
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-clés]"
 
-#: g10/g10.c:1262
+#: g10/gpg.c:1308
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "suppression d'armure non réussie : %s\n"
 
-#: g10/g10.c:1270
+#: g10/gpg.c:1316
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "construction d'armure non réussie : %s \n"
 
-#: g10/g10.c:1338
+#: g10/gpg.c:1386
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/g10.c:1419
+#: g10/gpg.c:1467
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/g10.c:1423
+#: g10/gpg.c:1471
 msgid "Go ahead and type your message ...\n"
 msgstr "Continuez et tapez votre message...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1426 g10/verify.c:66
+#: g10/decrypt.c:59 g10/gpg.c:1474 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir `%s'\n"
 
-#: g10/g10.c:1594
+#: g10/gpg.c:1642
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "le premier caractère du nom d'une notation doit être un lettre ou un trait\n"
 "de soulignement\n"
 
-#: g10/g10.c:1600
+#: g10/gpg.c:1648
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -827,13 +837,13 @@ msgstr ""
 "des points ou des traits de soulignement et doit se terminer par un signe "
 "égal\n"
 
-#: g10/g10.c:1606
+#: g10/gpg.c:1654
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "les points dans le nom d'une notation doivent être entourés d'autes "
 "caractères\n"
 
-#: g10/g10.c:1614
+#: g10/gpg.c:1662
 msgid "a notation value must not use any control characters\n"
 msgstr "une valeur de notation ne doit utiliser aucun caractère de contrôle\n"
 
@@ -842,70 +852,74 @@ msgstr "une valeur de notation ne doit utiliser aucun caractère de contrôle\n"
 msgid "armor: %s\n"
 msgstr "armure : %s\n"
 
-#: g10/armor.c:319
+#: g10/armor.c:325
 msgid "invalid armor header: "
 msgstr "en-tête d'armure invalide : "
 
-#: g10/armor.c:326
+#: g10/armor.c:332
 msgid "armor header: "
 msgstr "en-tête d'armure : "
 
-#: g10/armor.c:337
+#: g10/armor.c:343
 msgid "invalid clearsig header\n"
 msgstr "en-tête de signature claire invalide\n"
 
-#: g10/armor.c:389
+#: g10/armor.c:395
 msgid "nested clear text signatures\n"
 msgstr "signatures en texte clair imbriquées\n"
 
-#: g10/armor.c:500
+#: g10/armor.c:506
 msgid "invalid dash escaped line: "
 msgstr "ligne de traits d'échappement invalide : "
 
-#: g10/armor.c:512
+#: g10/armor.c:518
 msgid "unexpected armor:"
 msgstr "armure inattendue :"
 
-#: g10/armor.c:629
+#: g10/armor.c:635
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caractère %02x invalide en base 64 ignoré\n"
 
-#: g10/armor.c:672
+#: g10/armor.c:678
 msgid "premature eof (no CRC)\n"
 msgstr "fin de fichier prématurée (pas de CRC)\n"
 
-#: g10/armor.c:706
+#: g10/armor.c:712
 msgid "premature eof (in CRC)\n"
 msgstr "fin de fichier prématurée (dans le CRC)\n"
 
-#: g10/armor.c:710
+#: g10/armor.c:716
 msgid "malformed CRC\n"
 msgstr "CRC malformé\n"
 
-#: g10/armor.c:714
+#: g10/armor.c:720
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "Erreur de CRC ; %06lx - %06lx\n"
 
-#: g10/armor.c:731
+#: g10/armor.c:737
 msgid "premature eof (in Trailer)\n"
 msgstr "fin de fichier prématurée (dans la remorque)\n"
 
-#: g10/armor.c:735
+#: g10/armor.c:741
 msgid "error in trailer line\n"
 msgstr "erreur dans la ligne de remorque\n"
 
-#: g10/armor.c:1001
+#: g10/armor.c:892
+msgid "For info see http://www.gnupg.org"
+msgstr ""
+
+#: g10/armor.c:1007
 msgid "no valid OpenPGP data found.\n"
 msgstr "aucune donnée OpenPGP valide n'a été trouvée.\n"
 
-#: g10/armor.c:1005
+#: g10/armor.c:1011
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armure invalide : ligne plus longue que %d caractères\n"
 
-#: g10/armor.c:1009
+#: g10/armor.c:1015
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1176,57 +1190,57 @@ msgid "no valid addressees\n"
 msgstr "pas de destinataire valide\n"
 
 # g10/keygen.c:123 ???
-#: g10/keygen.c:122
+#: g10/keygen.c:123
 msgid "writing self signature\n"
 msgstr "écriture de l'auto-signature\n"
 
 # g10/keygen.c:161 ???
-#: g10/keygen.c:160
+#: g10/keygen.c:161
 msgid "writing key binding signature\n"
 msgstr "écriture de la signature de liaison\n"
 
-#: g10/keygen.c:386
+#: g10/keygen.c:511
 msgid "Please select what kind of key you want:\n"
 msgstr "Sélectionnez le type de clé désiré :\n"
 
-#: g10/keygen.c:388
+#: g10/keygen.c:513
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA et ElGamal (défaut)\n"
 
-#: g10/keygen.c:389
+#: g10/keygen.c:514
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (signature seule)\n"
 
-#: g10/keygen.c:391
+#: g10/keygen.c:516
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (chiffrement seul)\n"
 
-#: g10/keygen.c:392
+#: g10/keygen.c:517
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signature et chiffrement)\n"
 
-#: g10/keygen.c:394
+#: g10/keygen.c:519
 #, c-format
 msgid "   (%d) ElGamal in a v3 packet\n"
 msgstr "   (%d) ElGamal dans un paquet v3\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
 msgid "Your selection? "
 msgstr "Votre choix ? "
 
-#: g10/keygen.c:409
+#: g10/keygen.c:534
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Voulez-vous vraiment créer une clé de signature et de chiffrement ? "
 
-#: g10/keygen.c:430
+#: g10/keygen.c:555
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
-#: g10/keygen.c:442
+#: g10/keygen.c:567
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1239,15 +1253,15 @@ msgstr ""
 "          la taille par défaut est 1024 bits\n"
 " la taille maximale conseillée est 2048 bits\n"
 
-#: g10/keygen.c:449
+#: g10/keygen.c:574
 msgid "What keysize do you want? (1024) "
 msgstr "Quelle taille de clé désirez-vous ? (1024) "
 
-#: g10/keygen.c:454
+#: g10/keygen.c:579
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permet seulement des tailles comprises entre 512 et 1024\n"
 
-#: g10/keygen.c:456
+#: g10/keygen.c:581
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "taille trop petite ; 768 est la plus petite valeur permise.\n"
 
@@ -1259,12 +1273,12 @@ msgstr "taille trop petite ; 768 est la plus petite valeur permise.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:466
+#: g10/keygen.c:591
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "taille trop importante ; %d est la plus grande valeur permise.\n"
 
-#: g10/keygen.c:471
+#: g10/keygen.c:596
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1272,11 +1286,11 @@ msgstr ""
 "Les tailles supérieures à 2048 ne sont pas conseillées car\n"
 "les calculs prennent VRAIMENT beaucoup de temps !\n"
 
-#: g10/keygen.c:474
+#: g10/keygen.c:599
 msgid "Are you sure that you want this keysize? "
 msgstr "Etes-vous sûr de vouloir cette taille ? "
 
-#: g10/keygen.c:475
+#: g10/keygen.c:600
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1284,21 +1298,21 @@ msgstr ""
 "D'accord, mais n'oubliez pas que les radiations de votre écran et de votre\n"
 "clavier sont aussi très vulnérables aux attaques !\n"
 
-#: g10/keygen.c:483
+#: g10/keygen.c:608
 msgid "Do you really need such a large keysize? "
 msgstr "Avez-vous réellement besoin d'une taille aussi grande ? "
 
-#: g10/keygen.c:489
+#: g10/keygen.c:614
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La taille demandée est %u bits\n"
 
-#: g10/keygen.c:492 g10/keygen.c:496
+#: g10/keygen.c:617 g10/keygen.c:621
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrondie à %u bits\n"
 
-#: g10/keygen.c:509
+#: g10/keygen.c:634
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1314,29 +1328,29 @@ msgstr ""
 "      <n>m = la clé expire dans n mois\n"
 "      <n>y = la clé expire dans n ans\n"
 
-#: g10/keygen.c:526
+#: g10/keygen.c:651
 msgid "Key is valid for? (0) "
 msgstr "La clé est valide pour ? (0) "
 
-#: g10/keygen.c:547
+#: g10/keygen.c:672
 msgid "invalid value\n"
 msgstr "valeur invalide\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:677
 msgid "Key does not expire at all\n"
 msgstr "La clé n'expire pas du tout\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:558
+#: g10/keygen.c:683
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clé expire le %s\n"
 
-#: g10/keygen.c:563
+#: g10/keygen.c:688
 msgid "Is this correct (y/n)? "
 msgstr "Est-ce correct (o/n) ? "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:731
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1352,44 +1366,44 @@ msgstr ""
 "   « Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de> »\n"
 "\n"
 
-#: g10/keygen.c:617
+#: g10/keygen.c:742
 msgid "Real name: "
 msgstr "Nom réel : "
 
-#: g10/keygen.c:621
+#: g10/keygen.c:746
 msgid "Invalid character in name\n"
 msgstr "Caractère invalide dans le nom\n"
 
-#: g10/keygen.c:623
+#: g10/keygen.c:748
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
-#: g10/keygen.c:625
+#: g10/keygen.c:750
 msgid "Name must be at least 5 characters long\n"
 msgstr "Le nom doit faire au moins 5 caractères de long\n"
 
-#: g10/keygen.c:633
+#: g10/keygen.c:758
 msgid "Email address: "
 msgstr "Adresse e-mail : "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:769
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse e-mail valide\n"
 
-#: g10/keygen.c:652
+#: g10/keygen.c:777
 msgid "Comment: "
 msgstr "Commentaire : "
 
-#: g10/keygen.c:658
+#: g10/keygen.c:783
 msgid "Invalid character in comment\n"
 msgstr "Caractère invalide dans le commentaire\n"
 
-#: g10/keygen.c:680
+#: g10/keygen.c:808
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vous utilisez le jeu de caractères '%s'.\n"
 
-#: g10/keygen.c:686
+#: g10/keygen.c:814
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1400,15 +1414,15 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:689
+#: g10/keygen.c:817
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (O)K/(Q)uitter? "
 
-#: g10/keygen.c:751
+#: g10/keygen.c:879
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1416,11 +1430,11 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour protéger votre clé secrète.\n"
 "\n"
 
-#: g10/keyedit.c:456 g10/keygen.c:759
+#: g10/keyedit.c:456 g10/keygen.c:887
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "le mot de passe n'a pas été répété à l'identique ; recommencez.\n"
 
-#: g10/keygen.c:765
+#: g10/keygen.c:893
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1432,7 +1446,7 @@ msgstr ""
 "le désirez, en utilisant ce programme avec l'option « --edit-key ».\n"
 "\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:914
 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"
@@ -1444,33 +1458,33 @@ msgstr ""
 "pendant la génération de nombres premiers ; cela donne au générateur de\n"
 "nombres aléatoires une meilleure chance d'avoir assez d'entropie.\n"
 
-#: g10/keygen.c:856
+#: g10/keygen.c:984
 msgid "Key generation can only be used in interactive mode\n"
 msgstr "La génération de clé ne peut être faite qu'en mode interactif\n"
 
-#: g10/keygen.c:864
+#: g10/keygen.c:992
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La paire de clés DSA fera 1024 bits.\n"
 
-#: g10/keygen.c:870
+#: g10/keygen.c:998
 msgid "Key generation canceled.\n"
 msgstr "La génération de clé a été annulée.\n"
 
-#: g10/keygen.c:880
+#: g10/keygen.c:1008
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "écriture d'un certificat public à `%s'\n"
 
-#: g10/keygen.c:881
+#: g10/keygen.c:1009
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "écriture d'un certificat secret à `%s'\n"
 
-#: g10/keygen.c:958
+#: g10/keygen.c:1086
 msgid "public and secret key created and signed.\n"
 msgstr "les clés publique et secrète ont été créées et signées.\n"
 
-#: g10/keygen.c:960
+#: g10/keygen.c:1088
 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"
@@ -1479,13 +1493,13 @@ msgstr ""
 "utiliser la commande « --edit-key » pour générer une clé secondaire à\n"
 "cette fin.\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1073
+#: g10/keygen.c:1102 g10/keygen.c:1201
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "La génération de clé a échoué : %s\n"
 
 # on s'amuse comme on peut...
-#: g10/keygen.c:1018 g10/sig-check.c:314 g10/sign.c:106
+#: g10/keygen.c:1146 g10/sig-check.c:394 g10/sign.c:162
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1493,7 +1507,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:1020 g10/sig-check.c:316 g10/sign.c:108
+#: g10/keygen.c:1148 g10/sig-check.c:396 g10/sign.c:164
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1501,32 +1515,32 @@ msgstr ""
 "la clé a été créée %lu secondes dans le futur (discontinuité temporelle ou\n"
 "problème d'horloge\n"
 
-#: g10/keygen.c:1051
+#: g10/keygen.c:1179
 msgid "Really create? "
 msgstr "Créer vraiment ? "
 
-#: g10/encode.c:91 g10/openfile.c:163 g10/openfile.c:272 g10/tdbio.c:468
+#: g10/encode.c:137 g10/openfile.c:163 g10/openfile.c:272 g10/tdbio.c:468
 #: g10/tdbio.c:529
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s : impossible d'ouvrir : %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:159
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erreur pendant la création du mot de passe : %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:217 g10/encode.c:365
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s : ATTENTION : fichier vide\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:312
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lecture de `%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:529
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s chiffré pour : %s\n"
@@ -1587,7 +1601,7 @@ msgstr "impossible d'ouvrir `%s': %s\n"
 msgid "skipping block of type %d\n"
 msgstr "ne prend pas en compte le bloc de type %d\n"
 
-#: g10/import.c:169 g10/trustdb.c:1658 g10/trustdb.c:1697
+#: g10/import.c:169 g10/trustdb.c:1659 g10/trustdb.c:1698
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu clés traitées jusqu'ici\n"
@@ -1675,7 +1689,7 @@ 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:399 g10/openfile.c:215 g10/sign.c:269 g10/sign.c:582
+#: g10/import.c:399 g10/openfile.c:215 g10/sign.c:325 g10/sign.c:638
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "écriture de `%s'\n"
@@ -1933,7 +1947,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "Signer réellement ? "
 
-#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:129
+#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:185
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a échoué : %s\n"
@@ -2394,65 +2408,65 @@ msgstr "Faut-il vraiment générer les certificats de révocation ? (o/N)"
 msgid "no secret key\n"
 msgstr "pas de clé secrète\n"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:212
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la clé publique est %08lX\n"
 
-#: g10/mainproc.c:244
+#: g10/mainproc.c:243
 msgid "public key encrypted data: good DEK\n"
 msgstr "données chiffrées avec la clé publique : bonne clé de chiffrement\n"
 
-#: g10/mainproc.c:275
+#: g10/mainproc.c:274
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "chiffré avec une clé de %u bits %s, ID %08lX, créée le %s\n"
 
-#: g10/mainproc.c:285
+#: g10/mainproc.c:284
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "chiffré avec une clé %s, %08lX\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 msgid "no secret key for decryption available\n"
 msgstr "aucune clé secrète n'est disponible pour le déchiffrement\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:299
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "le déchiffrement de la clé publique a échoué : %s\n"
 
-#: g10/mainproc.c:332
+#: g10/mainproc.c:331
 msgid "decryption okay\n"
 msgstr "le déchiffrement a réussi\n"
 
-#: g10/mainproc.c:337
+#: g10/mainproc.c:336
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENTION: le message chiffré a été manipulé !\n"
 
-#: g10/mainproc.c:342
+#: g10/mainproc.c:341
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "le déchiffrement a échoué : %s\n"
 
-#: g10/mainproc.c:360
+#: g10/mainproc.c:359
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTE : l'expéditeur a demandé « pour vos yeux seulement »\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:361
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original : '%.*s'\n"
 
-#: g10/mainproc.c:596 g10/mainproc.c:605
+#: g10/mainproc.c:595 g10/mainproc.c:604
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENTION : des données de notation invalides ont été détectées\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:607
 msgid "Notation: "
 msgstr "Notation : "
 
-#: g10/mainproc.c:615
+#: g10/mainproc.c:614
 msgid "Policy: "
 msgstr "Politique : "
 
@@ -2491,20 +2505,20 @@ msgstr "signature d'un ancien style (PGP 2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide détecté dans proc_tree()\n"
 
-#: g10/misc.c:95
+#: g10/misc.c:83
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossible d'empêcher la génération de fichiers core : %s\n"
 
-#: g10/misc.c:98
+#: g10/misc.c:86
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION : Le programme peut créer un fichier « core » !\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:312
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Les algorithmes expérimentaux ne devraient pas être utilisés !\n"
 
-#: g10/misc.c:220
+#: g10/misc.c:326
 msgid ""
 "RSA keys are deprecated; please consider creating a new key and use this key "
 "in the future\n"
@@ -2512,18 +2526,18 @@ msgstr ""
 "Les clés RSA sont déconseillées : considérez créer une nouvelle clé\n"
 "et l'utiliser dans l'avenir\n"
 
-#: g10/misc.c:242
+#: g10/misc.c:348
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "Cet algorithme de chiffrement est déconseillé ; utilisez-en un\n"
 "plus standard !\n"
 
-#: g10/parse-packet.c:113
+#: g10/parse-packet.c:112
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossible de gérer l'algorithme à clé publique %d\n"
 
-#: g10/parse-packet.c:939
+#: g10/parse-packet.c:938
 #, 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"
@@ -2584,96 +2598,96 @@ msgstr "lecture de l'entrée standard...\n"
 msgid "can't open signed data `%s'\n"
 msgstr "impossible d'ouvir les données signées `%s'\n"
 
-#: g10/pubkey-enc.c:80
+#: g10/pubkey-enc.c:147
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "destinataire anonyme ; essai de la clé secrète %08lX ...\n"
 
-#: g10/pubkey-enc.c:86
+#: g10/pubkey-enc.c:153
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "d'accord, nous sommes le récipient anonyme.\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:209
 msgid "old encoding of the DEK is not supported\n"
 msgstr "l'ancien codage de la clé de chiffrement (DEK) n'est pas supporté\n"
 
-#: g10/pubkey-enc.c:192
+#: g10/pubkey-enc.c:263
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr ""
 "NOTE : l'algorithme de chiffrement %d n'a pas été trouvé dans les "
 "préférences\n"
 
-#: g10/seckey-cert.c:56
+#: g10/seckey-cert.c:101
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "l'algorithme de protection %d n'est pas supporté\n"
 
-#: g10/seckey-cert.c:181
+#: g10/seckey-cert.c:242
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Mot de passe invalide ; réessayez...\n"
 
-#: g10/seckey-cert.c:246
+#: g10/seckey-cert.c:307
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "ATTENTION : Clé faible détectée - changez encore le mot de passe.\n"
 
-#: g10/sig-check.c:201
+#: g10/sig-check.c:281
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr "le sceau (MDC) est supposé être faux car un bit critique est inconnu\n"
 
-#: g10/sig-check.c:297
+#: g10/sig-check.c:377
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "Ceci est une clé ElGamal générée par PGP qui n'est PAS sûre pour les\n"
 "signatures !\n"
 
-#: g10/sig-check.c:305
+#: g10/sig-check.c:385
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "la clé publique est plus récente de %lu seconde que la signature\n"
 
-#: g10/sig-check.c:306
+#: g10/sig-check.c:386
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "la clé publique est plus récente de %lu secondes que la signature\n"
 
-#: g10/sig-check.c:322
+#: g10/sig-check.c:402
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTE : la clé de signature a expiré le %s\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:459
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "la signature est supposée être fausse car un bit critique est\n"
 "inconnu\n"
 
-#: g10/sign.c:133
+#: g10/sign.c:189
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "Signature %s de : %s\n"
 
-#: g10/sign.c:264 g10/sign.c:577
+#: g10/sign.c:320 g10/sign.c:633
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossible de créer %s : %s\n"
 
-#: g10/sign.c:363
+#: g10/sign.c:419
 msgid "signing:"
 msgstr "signature :"
 
-#: g10/sign.c:406
+#: g10/sign.c:462
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATTENTION : `%s' est un fichier vide\n"
 
-#: g10/textfilter.c:129
+#: g10/textfilter.c:128
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "impossible de traiter les lignes plus longues que %d caractères\n"
 
-#: g10/textfilter.c:198
+#: g10/textfilter.c:197
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "la ligne d'entrée est plus longue que %d caractères\n"
@@ -2699,12 +2713,12 @@ msgstr "transaction de base de confiance trop volumineuse\n"
 msgid "%s: can't access: %s\n"
 msgstr "%s : impossible d'accéder : %s\n"
 
-#: g10/ringedit.c:298 g10/tdbio.c:445
+#: g10/ringedit.c:297 g10/tdbio.c:445
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s : impossible de créer le répertoire : %s\n"
 
-#: g10/ringedit.c:304 g10/tdbio.c:448
+#: g10/ringedit.c:303 g10/tdbio.c:448
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s : répertoire créé\n"
@@ -2714,7 +2728,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:211 g10/openfile.c:279 g10/ringedit.c:1350 g10/tdbio.c:458
+#: g10/openfile.c:211 g10/openfile.c:279 g10/ringedit.c:1349 g10/tdbio.c:458
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s : impossible de créer : %s\n"
@@ -2906,248 +2920,242 @@ msgstr "clé %08lX : acceptée comme clé certifiée.\n"
 msgid "enumerate secret keys failed: %s\n"
 msgstr "l'énumération des clés secrètes a échoué : %s\n"
 
-#: g10/trustdb.c:877
+#: g10/trustdb.c:878
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "clé %08lX.%lu : bonne liaison avec la sous-clé\n"
 
-#: g10/trustdb.c:883 g10/trustdb.c:918
+#: g10/trustdb.c:884 g10/trustdb.c:919
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "clé %08lX.%lu : liaison avec la sous-clé invalide : %s\n"
 
-#: g10/trustdb.c:895
+#: g10/trustdb.c:896
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "clé %08lX.%lu : révocation de clé valide\n"
 
-#: g10/trustdb.c:901
+#: g10/trustdb.c:902
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "clé %08lX.%lu : révocation de sous-clé invalide : %s\n"
 
-#: g10/trustdb.c:912
+#: g10/trustdb.c:913
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "clé %08lX.%lu : révocation de sous-clé valide\n"
 
-#: g10/trustdb.c:1023
+#: g10/trustdb.c:1024
 msgid "Good self-signature"
 msgstr "Bonne auto-signature"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1034
 msgid "Invalid self-signature"
 msgstr "Auto-signature invalide"
 
-#: g10/trustdb.c:1060
+#: g10/trustdb.c:1061
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "La révocation valide de nom d'utilisateur a été ignorée car l'auto-\n"
 "signature est plus récente"
 
-#: g10/trustdb.c:1066
+#: g10/trustdb.c:1067
 msgid "Valid user ID revocation"
 msgstr "Révocation de nom d'utilisateur valide"
 
-#: g10/trustdb.c:1071
+#: g10/trustdb.c:1072
 msgid "Invalid user ID revocation"
 msgstr "Révocation de nom d'utilisateur invalide"
 
-#: g10/trustdb.c:1112
+#: g10/trustdb.c:1113
 msgid "Valid certificate revocation"
 msgstr "Certificat de révocation valide"
 
-#: g10/trustdb.c:1113
+#: g10/trustdb.c:1114
 msgid "Good certificate"
 msgstr "Bon certificat"
 
-#: g10/trustdb.c:1134
+#: g10/trustdb.c:1135
 msgid "Invalid certificate revocation"
 msgstr "Révocation de certificat invalide"
 
-#: g10/trustdb.c:1135
+#: g10/trustdb.c:1136
 msgid "Invalid certificate"
 msgstr "Certificat invalide"
 
-#: g10/trustdb.c:1152 g10/trustdb.c:1156
+#: g10/trustdb.c:1153 g10/trustdb.c:1157
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr ""
 "l'enregistrement de signature %lu[%d] pointe vers le mauvais\n"
 "enregistrement de répertoire\n"
 
-#: g10/trustdb.c:1208
+#: g10/trustdb.c:1209
 msgid "duplicated certificate - deleted"
 msgstr "certificat dupliqué - supprimé"
 
-#: g10/trustdb.c:1514
+#: g10/trustdb.c:1515
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir a échoué : %s\n"
 
-#: g10/trustdb.c:1636
+#: g10/trustdb.c:1637
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ? : l'insertion a échoué : %s\n"
 
-#: g10/trustdb.c:1641
+#: g10/trustdb.c:1642
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu : l'insertion a échoué : %s\n"
 
-#: g10/trustdb.c:1647
+#: g10/trustdb.c:1648
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu : inséré\n"
 
-#: g10/trustdb.c:1652
+#: g10/trustdb.c:1653
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "erreur pendant la lecture de l'enregistrement de répertoire : %s\n"
 
-#: g10/trustdb.c:1660 g10/trustdb.c:1714
+#: g10/trustdb.c:1661 g10/trustdb.c:1715
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu clés traitées\n"
 
-#: g10/trustdb.c:1662 g10/trustdb.c:1718
+#: g10/trustdb.c:1663 g10/trustdb.c:1719
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu clés avec erreurs\n"
 
-#: g10/trustdb.c:1664
+#: g10/trustdb.c:1665
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu clés insérées\n"
 
-#: g10/trustdb.c:1667
+#: g10/trustdb.c:1668
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "l'énumération des blocs de clés a échoué : %s\n"
 
-#: g10/trustdb.c:1705
+#: g10/trustdb.c:1706
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu : enregistrement de répertoire sans clé - ignoré\n"
 
-#: g10/trustdb.c:1716
+#: g10/trustdb.c:1717
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu clés ignorées\n"
 
-#: g10/trustdb.c:1720
+#: g10/trustdb.c:1721
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu clés mises à jour\n"
 
-#: g10/trustdb.c:2057
+#: g10/trustdb.c:2058
 msgid "Ooops, no keys\n"
 msgstr "Ooops, pas de clé\n"
 
-#: g10/trustdb.c:2061
+#: g10/trustdb.c:2062
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, pas de nom d'utilisateur\n"
 
-#: g10/trustdb.c:2218
+#: g10/trustdb.c:2219
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr ""
 "check_trust : la recherche d'enregistrement de répertoire a échoué : %s\n"
 
-#: g10/trustdb.c:2227
+#: g10/trustdb.c:2228
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "clé %08lX : l'insertion d'enregistrement de confiance a échoué : %s\n"
 
-#: g10/trustdb.c:2231
+#: g10/trustdb.c:2232
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "clé %08lX.%lu : insérée dans la base de confiance\n"
 
-#: g10/trustdb.c:2239
+#: g10/trustdb.c:2240
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "clé %08lX.%lu : créée dans le futur (voyage temporel ou\n"
 "problème d'horloge)\n"
 
-#: g10/trustdb.c:2248
+#: g10/trustdb.c:2249
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "clé %08lX.%lu : a expiré le %s\n"
 
-#: g10/trustdb.c:2256
+#: g10/trustdb.c:2257
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "clé %08lX.%lu : la vérification de confiance a échoué: %s\n"
 
-#: g10/trustdb.c:2362
+#: g10/trustdb.c:2363
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "l'utilisateur '%s' n'a pas été trouvé : %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2365
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problème de recherche de '%s' dans la base de confiance : %s\n"
 
-#: g10/trustdb.c:2367
+#: g10/trustdb.c:2368
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "l'utilisateur '%s' n'est pas dans la base de confiance - insertion\n"
 
-#: g10/trustdb.c:2370
+#: g10/trustdb.c:2371
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "impossible d'insérer '%s' dans la base de confiance : %s\n"
 
-#: g10/trustdb.c:2556 g10/trustdb.c:2586
+#: g10/trustdb.c:2557 g10/trustdb.c:2587
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr ""
 "ATTENTION : les enregistrements de préférences longs ne sont pas encore\n"
 "supportés\n"
 
-#: g10/ringedit.c:318
+#: g10/ringedit.c:317
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s : impossible de créer le porte-clés : %s\n"
 
-#: g10/ringedit.c:335 g10/ringedit.c:1355
+#: g10/ringedit.c:334 g10/ringedit.c:1354
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s : porte-clés créé\n"
 
-#: g10/ringedit.c:1532
+#: g10/ringedit.c:1531
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 "ATTENTION : 2 fichiers avec des informations confidentielles existent.\n"
 
-#: g10/ringedit.c:1533
+#: g10/ringedit.c:1532
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s est le fichier original\n"
 
-#: g10/ringedit.c:1534
+#: g10/ringedit.c:1533
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s est le nouveau\n"
 
-#: g10/ringedit.c:1535
+#: g10/ringedit.c:1534
 msgid "Please fix this possible security flaw\n"
 msgstr "Réparez ce problème de sécurité possible\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
-msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr ""
-"la clé n'est pas marquée comme non-sûre ; on ne peut pas l'utiliser avec le\n"
-"pseudo-générateur de nombres aléatiores !\n"
-
-#: g10/skclist.c:113
+#: g10/skclist.c:97
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "`%s' a été ignoré : %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:103
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3189,28 +3197,28 @@ msgstr "les données signées sont supposées être dans `%s'\n"
 msgid "%s: new options file created\n"
 msgstr "%s : nouveau fichier d'options créé\n"
 
-#: g10/encr-data.c:66
+#: g10/encr-data.c:64
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "chiffré avec l'algorithme inconnu %d\n"
 
-#: g10/encr-data.c:71
+#: g10/encr-data.c:69
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "données chiffrées avec %s\n"
 
-#: g10/encr-data.c:101
+#: g10/encr-data.c:99
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATTENTION : Le message a été chiffré avec une clé faible pendant le\n"
 "chiffrement symétrique.\n"
 
-#: g10/seskey.c:63
+#: g10/seskey.c:62
 msgid "weak key created - retrying\n"
 msgstr "clé faible générée - nouvel essai\n"
 
-#: g10/seskey.c:68
+#: g10/seskey.c:67
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
@@ -3463,6 +3471,11 @@ msgstr "Pas d'aide disponible"
 msgid "No help available for `%s'"
 msgstr "Pas d'aide disponible pour `%s'"
 
+#~ msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
+#~ msgstr ""
+#~ "la clé n'est pas marquée comme non-sûre ; on ne peut pas l'utiliser avec le\n"
+#~ "pseudo-générateur de nombres aléatiores !\n"
+
 #~ msgid "not processed"
 #~ msgstr "non traité"
 
diff --git a/po/it.po b/po/it.po
index 542ea01d9..76c63775a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.0\n"
-"POT-Creation-Date: 1999-10-26 18:57+0200\n"
+"POT-Creation-Date: 2000-01-31 12:09+0100\n"
 "PO-Revision-Date: 1999-09-09 15:51+02:00\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -13,250 +13,250 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: util/secmem.c:79
+#: gcrypt/secmem.c:77
 msgid "Warning: using insecure memory!\n"
 msgstr "Attenzione: si sta usando memoria insicura!\n"
 
-#: util/secmem.c:281
+#: gcrypt/secmem.c:279
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "l'operazione non è possibile senza memoria sicura inizializzata\n"
 
-#: util/secmem.c:282
+#: gcrypt/secmem.c:280
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:278 util/miscutil.c:307
 msgid "yes"
 msgstr "sì"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:279 util/miscutil.c:310
 msgid "yY"
 msgstr "sS"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:280 util/miscutil.c:308
 msgid "no"
 msgstr "no"
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:281 util/miscutil.c:311
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:564 util/miscutil.c:308
+#: g10/keyedit.c:564 util/miscutil.c:309
 msgid "quit"
 msgstr "quit"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:312
 msgid "qQ"
 msgstr "qQ"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "errore generale"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "pacchetto di tipo sconosciuto"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "versione sconosciuta"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "algoritmo della chiave pubblica sconosciuto"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "algoritmo del digest sconosciuto"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "chiave pubblica errata"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "chiave segreta errata"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "firma errata"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "codice di controllo errato"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "passphrase errata"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "chiave pubblica non trovata"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "algoritmo di cifratura sconosciuto"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "impossibile aprire il portachiavi"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "pacchetto non valido"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "armatura non valida"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "l'user id non esiste"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "la chiave segreta non è disponibile"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "è stata usata la chiave segreta sbagliata"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "non gestito"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "chiave sbagliata"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "errore durante la lettura del file"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "errore durante la scrittura del file"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "algoritmo di compressione sconosciuto"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "errore durante l'apertura del file"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "errore durante la creazione del file"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "passphrase non valida"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "algoritmo della chiave pubblica non implementato"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "algoritmo di cifratura non implementato"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "classe della firma sconosciuta"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "errore nel database della fiducia"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "MPI danneggiato"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "limite della risorsa"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "portachiavi non valido"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "certificato danneggiato"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "user id malformato"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "errore durante la chiusura del file"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "errore durante la rinominazione del file"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "errore durante la cancellazione del file"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "dati inattesi"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "date in conflitto"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "algoritmo della chiave pubblica non utilizzabile"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "il file esiste"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "chiave debole"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "argomento non valido"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "URI non valida"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "URI non gestito"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "errore di rete"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "non cifrato"
 
-#: util/logger.c:218
+#: util/logger.c:219
 #, 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:225
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Hai trovato un bug... (%s:%d)\n"
 
-#: cipher/random.c:452
+#: cipher/random.c:463
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ATTENZIONE: si sta usando un generatore di numeri casuali non sicuro!!\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:469
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -270,7 +270,7 @@ msgstr ""
 "NON USARE ALCUN DATO GENERATO DA QUESTO PROGRAMMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:125
 #, c-format
 msgid ""
 "\n"
@@ -282,7 +282,7 @@ msgstr ""
 "altra cosa per dare all'OS la possibilità di raccogliere altra entropia!\n"
 "(Servono altri %d byte)\n"
 
-#: g10/g10.c:186
+#: g10/gpg.c:183
 msgid ""
 "@Commands:\n"
 " "
@@ -290,135 +290,140 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/g10.c:188
+#: g10/gpg.c:185
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/g10.c:189
+#: g10/gpg.c:186
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/g10.c:190
+#: g10/gpg.c:187
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/g10.c:191
+#: g10/gpg.c:188
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/g10.c:192
+#: g10/gpg.c:189
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/g10.c:193
+#: g10/gpg.c:190
 msgid "store only"
 msgstr "immagazzina soltanto"
 
-#: g10/g10.c:194
+#: g10/gpg.c:191
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/g10.c:195
+#: g10/gpg.c:192
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:196
+#: g10/gpg.c:193
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/g10.c:198
+#: g10/gpg.c:195
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/g10.c:199
+#: g10/gpg.c:196
 msgid "check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/g10.c:200
+#: g10/gpg.c:197
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/g10.c:201
+#: g10/gpg.c:198
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/g10.c:202
+#: g10/gpg.c:199
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/g10.c:203
+#: g10/gpg.c:200
 msgid "remove key from the public keyring"
 msgstr "rimuove una chiave dal portachiavi pubblico"
 
-#: g10/g10.c:204
+#: g10/gpg.c:202
+#, fuzzy
+msgid "remove key from the secret keyring"
+msgstr "rimuove una chiave dal portachiavi pubblico"
+
+#: g10/gpg.c:203
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/g10.c:205
+#: g10/gpg.c:204
 msgid "sign a key locally"
 msgstr "firma localmente una chiave"
 
-#: g10/g10.c:206
+#: g10/gpg.c:205
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/g10.c:207
+#: g10/gpg.c:206
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/g10.c:208
+#: g10/gpg.c:207
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/g10.c:209
+#: g10/gpg.c:208
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/g10.c:210
+#: g10/gpg.c:209
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/g10.c:213
+#: g10/gpg.c:212
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/g10.c:215
+#: g10/gpg.c:214
 msgid "list only the sequence of packets"
 msgstr "elenca solo la sequenza dei pacchetti"
 
-#: g10/g10.c:217
+#: g10/gpg.c:216
 msgid "export the ownertrust values"
 msgstr "esporta i valori di fiducia"
 
-#: g10/g10.c:219
+#: g10/gpg.c:218
 msgid "import ownertrust values"
 msgstr "importa i valori di fiducia"
 
-#: g10/g10.c:221
+#: g10/gpg.c:220
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/g10.c:223
+#: g10/gpg.c:222
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMI]|controlla il database della fiducia"
 
-#: g10/g10.c:224
+#: g10/gpg.c:223
 msgid "fix a corrupted trust database"
 msgstr "ripara un database della fiducia rovinato"
 
-#: g10/g10.c:225
+#: g10/gpg.c:224
 msgid "De-Armor a file or stdin"
 msgstr "rimuovi l'armatura a un file o a stdin"
 
-#: g10/g10.c:227
+#: g10/gpg.c:226
 msgid "En-Armor a file or stdin"
 msgstr "crea l'armatura a un file o a stdin"
 
-#: g10/g10.c:229
+#: g10/gpg.c:228
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/g10.c:233
+#: g10/gpg.c:232
 msgid ""
 "@\n"
 "Options:\n"
@@ -428,170 +433,170 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/g10.c:235
+#: g10/gpg.c:234
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/g10.c:237
+#: g10/gpg.c:236
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/g10.c:240
+#: g10/gpg.c:239
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: g10/g10.c:242
+#: g10/gpg.c:241
 msgid "use the default key as default recipient"
 msgstr "usa la chiave predefinita come destinatario predefinito"
 
-#: g10/g10.c:246
+#: g10/gpg.c:245
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/g10.c:247
+#: g10/gpg.c:246
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/g10.c:249
+#: g10/gpg.c:248
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/g10.c:250
+#: g10/gpg.c:249
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/g10.c:251
+#: g10/gpg.c:250
 msgid "verbose"
 msgstr "prolisso"
 
-#: g10/g10.c:252
+#: g10/gpg.c:251
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: g10/g10.c:253
+#: g10/gpg.c:252
 msgid "don't use the terminal at all"
 msgstr "non usa per niente il terminale"
 
-#: g10/g10.c:254
+#: g10/gpg.c:253
 msgid "force v3 signatures"
 msgstr "forza l'uso di firme v3"
 
-#: g10/g10.c:255
+#: g10/gpg.c:254
 msgid "always use a MDC for encryption"
 msgstr "usa sempre un MDC per cifrare"
 
-#: g10/g10.c:256
+#: g10/gpg.c:255
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:258
+#: g10/gpg.c:257
 msgid "batch mode: never ask"
 msgstr "modo batch: non fa domande"
 
-#: g10/g10.c:259
+#: g10/gpg.c:258
 msgid "assume yes on most questions"
 msgstr "assumi \"sì\" per quasi tutte le domande"
 
-#: g10/g10.c:260
+#: g10/gpg.c:259
 msgid "assume no on most questions"
 msgstr "assumi \"no\" per quasi tutte le domande"
 
-#: g10/g10.c:261
+#: g10/gpg.c:260
 msgid "add this keyring to the list of keyrings"
 msgstr "aggiungi questo portachiavi alla lista"
 
-#: g10/g10.c:262
+#: g10/gpg.c:261
 msgid "add this secret keyring to the list"
 msgstr "aggiungi questo portachiavi segreto alla lista"
 
-#: g10/g10.c:263
+#: g10/gpg.c:262
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usa NOME come chiave segreta predefinita"
 
-#: g10/g10.c:264
+#: g10/gpg.c:263
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|cerca le chiavi in questo keyserver"
 
-#: g10/g10.c:265
+#: g10/gpg.c:264
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOME|imposta il set di caratteri del terminale NOME"
 
-#: g10/g10.c:266
+#: g10/gpg.c:265
 msgid "read options from file"
 msgstr "leggi le opzioni dal file"
 
-#: g10/g10.c:268
+#: g10/gpg.c:267
 msgid "set debugging flags"
 msgstr "imposta i flag di debugging"
 
-#: g10/g10.c:269
+#: g10/gpg.c:268
 msgid "enable full debugging"
 msgstr "abilita il debugging completo"
 
-#: g10/g10.c:270
+#: g10/gpg.c:269
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato su questo FD"
 
-#: g10/g10.c:271
+#: g10/gpg.c:270
 msgid "do not write comment packets"
 msgstr "non scrivere pacchetti di commento"
 
-#: g10/g10.c:272
+#: g10/gpg.c:271
 msgid "(default is 1)"
 msgstr "(predefinito è 1)"
 
-#: g10/g10.c:273
+#: g10/gpg.c:272
 msgid "(default is 3)"
 msgstr "(predefinito è 3)"
 
-#: g10/g10.c:275
+#: g10/gpg.c:274
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: g10/g10.c:276
+#: g10/gpg.c:275
 msgid "emulate the mode described in RFC1991"
 msgstr "emula il modo descritto in RFC 1991"
 
-#: g10/g10.c:277
+#: g10/gpg.c:276
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "imposta tutte le opzioni di pacchetto,\n"
 "cifrario e digest per OpenPGP"
 
-#: g10/g10.c:278
+#: g10/gpg.c:277
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa il modo N per la passphrase"
 
-#: g10/g10.c:280
+#: g10/gpg.c:279
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOME|usa l'algoritmo di message digest NOME per le passphrase"
 
-#: g10/g10.c:282
+#: g10/gpg.c:281
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
 
-#: g10/g10.c:283
+#: g10/gpg.c:282
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di cifratura NOME"
 
-#: g10/g10.c:284
+#: g10/gpg.c:283
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di message digest NOME"
 
-#: g10/g10.c:285
+#: g10/gpg.c:284
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritmo di compressione N"
 
-#: g10/g10.c:286
+#: g10/gpg.c:285
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina il campo keyid dei pacchetti cifrati"
 
-#: g10/g10.c:287
+#: g10/gpg.c:286
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALORE|usa questi dati per una nota"
 
-#: g10/g10.c:289
+#: g10/gpg.c:288
 msgid ""
 "@\n"
 "Examples:\n"
@@ -611,15 +616,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/g10.c:376
+#: g10/gpg.c:379
 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:380
+#: g10/gpg.c:383
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/g10.c:383
+#: g10/gpg.c:386
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -629,7 +634,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/g10.c:388
+#: g10/gpg.c:391
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -637,184 +642,189 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/g10.c:465
+#: g10/gpg.c:469
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/g10.c:518
+#: g10/gpg.c:549
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/g10.c:653
+#: g10/gpg.c:603
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
+#: g10/gpg.c:693
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/g10.c:657
+#: g10/gpg.c:697
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/g10.c:664
+#: g10/gpg.c:704
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/g10.c:844
+#: g10/gpg.c:885
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s non è un set di caratteri valido\n"
 
-#: g10/g10.c:911 g10/g10.c:920
+#: g10/gpg.c:955 g10/gpg.c:964
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/g10.c:913
+#: g10/gpg.c:957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non è permesso usare %s con %s!\n"
 
-#: g10/g10.c:916
+#: g10/gpg.c:960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/g10.c:935 g10/g10.c:947
+#: g10/gpg.c:980 g10/gpg.c:992
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non è valido\n"
 
-#: g10/g10.c:941 g10/g10.c:953
+#: g10/gpg.c:986 g10/gpg.c:998
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non è valido\n"
 
-#: g10/g10.c:957
+#: g10/gpg.c:1002
 msgid "the given policy URL is invalid\n"
 msgstr "L'URL della policy indicato non è valido\n"
 
-#: g10/g10.c:960
+#: g10/gpg.c:1005
 #, 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:962
+#: g10/gpg.c:1007
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/g10.c:964
+#: g10/gpg.c:1009
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/g10.c:966
+#: g10/gpg.c:1011
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth deve essere tra 1 e 255\n"
 
-#: g10/g10.c:969
+#: g10/gpg.c:1014
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: l'uso del modo S2K semplice (0) è fortemente scoraggiato\n"
 
-#: g10/g10.c:973
+#: g10/gpg.c:1018
 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:1050
+#: g10/gpg.c:1095
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/g10.c:1056
+#: g10/gpg.c:1101
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/g10.c:1063
+#: g10/gpg.c:1108
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:1071
+#: g10/gpg.c:1116
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/g10.c:1084
+#: g10/gpg.c:1129
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/g10.c:1097
+#: g10/gpg.c:1142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:1111
+#: g10/gpg.c:1156
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/g10.c:1123
+#: g10/gpg.c:1168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/g10.c:1131
+#: g10/gpg.c:1176
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:1139
+#: g10/gpg.c:1184
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:1147
+#: g10/gpg.c:1192
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/g10.c:1163
+#: g10/gpg.c:1208
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key user-id"
 
-#: g10/g10.c:1166
+#: g10/gpg.c:1211
 msgid "--delete-key user-id"
 msgstr "--delete-key user-id"
 
-#: g10/encode.c:260 g10/g10.c:1190 g10/sign.c:368
+#: g10/encode.c:306 g10/gpg.c:1236 g10/sign.c:424
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/g10.c:1201
+#: g10/gpg.c:1247
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/g10.c:1262
+#: g10/gpg.c:1308
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1270
+#: g10/gpg.c:1316
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1338
+#: g10/gpg.c:1386
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/g10.c:1419
+#: g10/gpg.c:1467
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/g10.c:1423
+#: g10/gpg.c:1471
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1426 g10/verify.c:66
+#: g10/decrypt.c:59 g10/gpg.c:1474 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/g10.c:1594
+#: g10/gpg.c:1642
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "il primo carattere del nome di una nota deve essere una lettera o un\n"
 "underscore\n"
 
-#: g10/g10.c:1600
+#: g10/gpg.c:1648
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -822,11 +832,11 @@ msgstr ""
 "il nome di una nota deve essere formato solo da lettere, numeri, punti o\n"
 "underscore e deve finire con `='\n"
 
-#: g10/g10.c:1606
+#: g10/gpg.c:1654
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "nel nome di una nota i punti devono avere altri caratteri intorno\n"
 
-#: g10/g10.c:1614
+#: g10/gpg.c:1662
 msgid "a notation value must not use any control characters\n"
 msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 
@@ -835,70 +845,74 @@ msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 msgid "armor: %s\n"
 msgstr "armatura: %s\n"
 
-#: g10/armor.c:319
+#: g10/armor.c:325
 msgid "invalid armor header: "
 msgstr "header dell'armatura non valido: "
 
-#: g10/armor.c:326
+#: g10/armor.c:332
 msgid "armor header: "
 msgstr "header dell'armatura: "
 
-#: g10/armor.c:337
+#: g10/armor.c:343
 msgid "invalid clearsig header\n"
 msgstr "header della firma in chiaro non valido\n"
 
-#: g10/armor.c:389
+#: g10/armor.c:395
 msgid "nested clear text signatures\n"
 msgstr "firme in chiaro annidate\n"
 
-#: g10/armor.c:500
+#: g10/armor.c:506
 msgid "invalid dash escaped line: "
 msgstr "riga protetta con il trattino non valida: "
 
-#: g10/armor.c:512
+#: g10/armor.c:518
 msgid "unexpected armor:"
 msgstr "armatura inaspettata:"
 
-#: g10/armor.c:629
+#: g10/armor.c:635
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Carattere radix64 non valido %02x saltato\n"
 
-#: g10/armor.c:672
+#: g10/armor.c:678
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematura (nessun CRC)\n"
 
-#: g10/armor.c:706
+#: g10/armor.c:712
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematura (nel CRC)\n"
 
-#: g10/armor.c:710
+#: g10/armor.c:716
 msgid "malformed CRC\n"
 msgstr "CRC malformato\n"
 
-#: g10/armor.c:714
+#: g10/armor.c:720
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "errore nel CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:731
+#: g10/armor.c:737
 msgid "premature eof (in Trailer)\n"
 msgstr "eof prematura (nella coda)\n"
 
-#: g10/armor.c:735
+#: g10/armor.c:741
 msgid "error in trailer line\n"
 msgstr "errore nella riga della coda\n"
 
-#: g10/armor.c:1001
+#: g10/armor.c:892
+msgid "For info see http://www.gnupg.org"
+msgstr ""
+
+#: g10/armor.c:1007
 msgid "no valid OpenPGP data found.\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/armor.c:1005
+#: g10/armor.c:1011
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armatura non valida: linea più lunga di %d caratteri\n"
 
-#: g10/armor.c:1009
+#: g10/armor.c:1015
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1163,56 +1177,56 @@ msgstr "%s: saltato: chiave pubblica disabilitata\n"
 msgid "no valid addressees\n"
 msgstr "nessun indirizzo valido\n"
 
-#: g10/keygen.c:122
+#: g10/keygen.c:123
 msgid "writing self signature\n"
 msgstr "scrittura della autofirma\n"
 
-#: g10/keygen.c:160
+#: g10/keygen.c:161
 msgid "writing key binding signature\n"
 msgstr "scrittura della firma di collegamento alla chiave\n"
 
-#: g10/keygen.c:386
+#: g10/keygen.c:511
 msgid "Please select what kind of key you want:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/keygen.c:388
+#: g10/keygen.c:513
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (default)\n"
 
-#: g10/keygen.c:389
+#: g10/keygen.c:514
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (firma solo)\n"
 
-#: g10/keygen.c:391
+#: g10/keygen.c:516
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:392
+#: g10/keygen.c:517
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firma e cifra)\n"
 
-#: g10/keygen.c:394
+#: g10/keygen.c:519
 #, c-format
 msgid "   (%d) ElGamal in a v3 packet\n"
 msgstr "   (%d) ElGamal in un pacchetto v3\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
-#: g10/keygen.c:409
+#: g10/keygen.c:534
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Vuoi davvero creare una chiave di firma e cifratura? "
 
-#: g10/keygen.c:430
+#: g10/keygen.c:555
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
-#: g10/keygen.c:442
+#: g10/keygen.c:567
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1225,15 +1239,15 @@ msgstr ""
 "          la dimensione predefinita è 1024 bit\n"
 "  la dimensione massima consigliata è 2048 bit\n"
 
-#: g10/keygen.c:449
+#: g10/keygen.c:574
 msgid "What keysize do you want? (1024) "
 msgstr "Di che dimensioni vuoi la chiave? (1024) "
 
-#: g10/keygen.c:454
+#: g10/keygen.c:579
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permette solo chiavi di dimensioni tra 512 e 1024\n"
 
-#: g10/keygen.c:456
+#: g10/keygen.c:581
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "la chiave è troppo corta; 768 è il minimo valore permesso.\n"
 
@@ -1245,12 +1259,12 @@ msgstr "la chiave è troppo corta; 768 è il minimo valore permesso.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:466
+#: g10/keygen.c:591
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "la chiave è troppo lunga; %d è il massimo valore permesso.\n"
 
-#: g10/keygen.c:471
+#: g10/keygen.c:596
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1258,11 +1272,11 @@ msgstr ""
 "Chiavi più lunghe di 2048 non sono consigliate perchè i calcoli sono\n"
 "VERAMENTE lunghi!\n"
 
-#: g10/keygen.c:474
+#: g10/keygen.c:599
 msgid "Are you sure that you want this keysize? "
 msgstr "Sei sicuro di volere una chiave di queste dimensioni? "
 
-#: g10/keygen.c:475
+#: g10/keygen.c:600
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1270,21 +1284,21 @@ msgstr ""
 "Va bene, ma ricordati che anche le radiazioni emesse dal tuo monitor e dalla "
 "tua tastiera sono molto vulnerabili ad attacchi!\n"
 
-#: g10/keygen.c:483
+#: g10/keygen.c:608
 msgid "Do you really need such a large keysize? "
 msgstr "Ti serve davvero una chiave così lunga? "
 
-#: g10/keygen.c:489
+#: g10/keygen.c:614
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La dimensione richiesta della chiave è %u bit\n"
 
-#: g10/keygen.c:492 g10/keygen.c:496
+#: g10/keygen.c:617 g10/keygen.c:621
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:509
+#: g10/keygen.c:634
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1300,29 +1314,29 @@ msgstr ""
 "      <n>m = la chiave scadrà dopo n mesi\n"
 "      <n>y = la chiave scadrà dopo n anni\n"
 
-#: g10/keygen.c:526
+#: g10/keygen.c:651
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:547
+#: g10/keygen.c:672
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:677
 msgid "Key does not expire at all\n"
 msgstr "La chiave non scade\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:558
+#: g10/keygen.c:683
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La chiave scadrà il %s\n"
 
-#: g10/keygen.c:563
+#: g10/keygen.c:688
 msgid "Is this correct (y/n)? "
 msgstr "È giusto (s/n)? "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:731
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1338,44 +1352,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:617
+#: g10/keygen.c:742
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:621
+#: g10/keygen.c:746
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:623
+#: g10/keygen.c:748
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non può iniziare con una cifra\n"
 
-#: g10/keygen.c:625
+#: g10/keygen.c:750
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:633
+#: g10/keygen.c:758
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:769
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non è valido\n"
 
-#: g10/keygen.c:652
+#: g10/keygen.c:777
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:658
+#: g10/keygen.c:783
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:680
+#: g10/keygen.c:808
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Stai usando il set di caratteri `%s'.\n"
 
-#: g10/keygen.c:686
+#: g10/keygen.c:814
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1386,15 +1400,15 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:689
+#: g10/keygen.c:817
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
 
-#: g10/keygen.c:751
+#: g10/keygen.c:879
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1402,11 +1416,11 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:456 g10/keygen.c:759
+#: g10/keyedit.c:456 g10/keygen.c:887
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "passphrase non ripetuta correttamente; riprova.\n"
 
-#: g10/keygen.c:765
+#: g10/keygen.c:893
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1418,7 +1432,7 @@ msgstr ""
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:914
 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"
@@ -1430,33 +1444,33 @@ msgstr ""
 "dischi) durante la generazione dei numeri primi; questo da al generatore di\n"
 "numeri casuali migliori possibilità di raccogliere abbastanza entropia.\n"
 
-#: g10/keygen.c:856
+#: g10/keygen.c:984
 msgid "Key generation can only be used in interactive mode\n"
 msgstr "Una chiave può essere generata solo in modo interattivo\n"
 
-#: g10/keygen.c:864
+#: g10/keygen.c:992
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La coppia DSA avrà 1024 bit.\n"
 
-#: g10/keygen.c:870
+#: g10/keygen.c:998
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:880
+#: g10/keygen.c:1008
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "scrittura del certificato pubblico in `%s'\n"
 
-#: g10/keygen.c:881
+#: g10/keygen.c:1009
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "scrittura del certificato segreto in `%s'\n"
 
-#: g10/keygen.c:958
+#: g10/keygen.c:1086
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:960
+#: g10/keygen.c:1088
 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"
@@ -1465,12 +1479,12 @@ msgstr ""
 "il comando \"--edit-key\" per generare una chiave secondaria per questo "
 "scopo.\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1073
+#: g10/keygen.c:1102 g10/keygen.c:1201
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:1018 g10/sig-check.c:314 g10/sign.c:106
+#: g10/keygen.c:1146 g10/sig-check.c:394 g10/sign.c:162
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1478,7 +1492,7 @@ msgstr ""
 "la chiave è stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:1020 g10/sig-check.c:316 g10/sign.c:108
+#: g10/keygen.c:1148 g10/sig-check.c:396 g10/sign.c:164
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1486,32 +1500,32 @@ msgstr ""
 "la chiave è stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:1051
+#: g10/keygen.c:1179
 msgid "Really create? "
 msgstr "Crea davvero? "
 
-#: g10/encode.c:91 g10/openfile.c:163 g10/openfile.c:272 g10/tdbio.c:468
+#: g10/encode.c:137 g10/openfile.c:163 g10/openfile.c:272 g10/tdbio.c:468
 #: g10/tdbio.c:529
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: impossibile aprire: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:159
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:217 g10/encode.c:365
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ATTENZIONE: file vuoto\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:312
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lettura da `%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:529
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s cifrato per: %s\n"
@@ -1570,7 +1584,7 @@ msgstr "impossibile aprire `%s': %s\n"
 msgid "skipping block of type %d\n"
 msgstr "salto un blocco di tipo %d\n"
 
-#: g10/import.c:169 g10/trustdb.c:1658 g10/trustdb.c:1697
+#: g10/import.c:169 g10/trustdb.c:1659 g10/trustdb.c:1698
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "Per ora sono state esaminate %lu chiavi\n"
@@ -1658,7 +1672,7 @@ msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 msgid "no default public keyring\n"
 msgstr "nessun portachiavi pubblico predefinito\n"
 
-#: g10/import.c:399 g10/openfile.c:215 g10/sign.c:269 g10/sign.c:582
+#: g10/import.c:399 g10/openfile.c:215 g10/sign.c:325 g10/sign.c:638
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
@@ -1916,7 +1930,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:129
+#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:185
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
@@ -2376,65 +2390,65 @@ msgstr "Creare davvero i certificati di revoca? (s/N)"
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:212
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la chiave pubblica è %08lX\n"
 
-#: g10/mainproc.c:244
+#: g10/mainproc.c:243
 msgid "public key encrypted data: good DEK\n"
 msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
 
-#: g10/mainproc.c:275
+#: g10/mainproc.c:274
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "cifrato con la chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s\n"
 
-#: g10/mainproc.c:285
+#: g10/mainproc.c:284
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "Cifrato con la chiave %s con ID %08lX\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 msgid "no secret key for decryption available\n"
 msgstr "nessuna chiave disponibile per decifrare\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:299
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:332
+#: g10/mainproc.c:331
 msgid "decryption okay\n"
 msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:337
+#: g10/mainproc.c:336
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato è stato manipolato!\n"
 
-#: g10/mainproc.c:342
+#: g10/mainproc.c:341
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:360
+#: g10/mainproc.c:359
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:361
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:596 g10/mainproc.c:605
+#: g10/mainproc.c:595 g10/mainproc.c:604
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:607
 msgid "Notation: "
 msgstr "Nota: "
 
-#: g10/mainproc.c:615
+#: g10/mainproc.c:614
 msgid "Policy: "
 msgstr "Policy: "
 
@@ -2473,20 +2487,20 @@ msgstr "firma vecchio stile (PGP 2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
-#: g10/misc.c:95
+#: g10/misc.c:83
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossibile disabilitare i core dump: %s\n"
 
-#: g10/misc.c:98
+#: g10/misc.c:86
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:312
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Gli algoritmi sperimentali non dovrebbero essere usati!\n"
 
-#: g10/misc.c:220
+#: g10/misc.c:326
 msgid ""
 "RSA keys are deprecated; please consider creating a new key and use this key "
 "in the future\n"
@@ -2495,16 +2509,16 @@ msgstr ""
 "chiave\n"
 "e usarla in futuro\n"
 
-#: g10/misc.c:242
+#: g10/misc.c:348
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr "questo algoritmo di cifratura è deprecato; usane uno più standard!\n"
 
-#: g10/parse-packet.c:113
+#: g10/parse-packet.c:112
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
 
-#: g10/parse-packet.c:939
+#: g10/parse-packet.c:938
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
@@ -2564,95 +2578,95 @@ msgstr "viene letto stdin...\n"
 msgid "can't open signed data `%s'\n"
 msgstr "impossibile aprire i dati firmati `%s'\n"
 
-#: g10/pubkey-enc.c:80
+#: g10/pubkey-enc.c:147
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "destinatario anonimo; provo la chiave segreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:86
+#: g10/pubkey-enc.c:153
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "bene, siamo il destinatario anonimo.\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:209
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la vecchia codifica del DEK non è gestita\n"
 
-#: g10/pubkey-enc.c:192
+#: g10/pubkey-enc.c:263
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr ""
 "NOTA: l'algoritmo di cifratura %d non è stato trovato nelle impostazioni\n"
 
-#: g10/seckey-cert.c:56
+#: g10/seckey-cert.c:101
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "l'algoritmo di protezione %d non è gestito\n"
 
-#: g10/seckey-cert.c:181
+#: g10/seckey-cert.c:242
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Passphrase non valida; riprova...\n"
 
-#: g10/seckey-cert.c:246
+#: g10/seckey-cert.c:307
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "ATTENZIONE: Individuata una chiave debole - per favore cambia ancora la\n"
 "passphrase.\n"
 
-#: g10/sig-check.c:201
+#: g10/sig-check.c:281
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr "si suppone un MDC non valido a causa di un bit critico sconosciuto\n"
 
-#: g10/sig-check.c:297
+#: g10/sig-check.c:377
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "questa è una chiave ElGamal generata da PGP e NON è sicura per le firme!\n"
 
-#: g10/sig-check.c:305
+#: g10/sig-check.c:385
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "la chiave pubblica è %lu secondo più recente della firma\n"
 
-#: g10/sig-check.c:306
+#: g10/sig-check.c:386
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "la chiave pubblica è %lu secondi più recente della firma\n"
 
-#: g10/sig-check.c:322
+#: g10/sig-check.c:402
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTA: chiave per firmare scaduta il %s\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:459
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "si suppone una firma non valida a causa di un bit critico sconosciuto\n"
 
-#: g10/sign.c:133
+#: g10/sign.c:189
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "Firma %s da: %s\n"
 
-#: g10/sign.c:264 g10/sign.c:577
+#: g10/sign.c:320 g10/sign.c:633
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: g10/sign.c:363
+#: g10/sign.c:419
 msgid "signing:"
 msgstr "firma:"
 
-#: g10/sign.c:406
+#: g10/sign.c:462
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATTENZIONE: `%s' è un file vuoto\n"
 
-#: g10/textfilter.c:129
+#: g10/textfilter.c:128
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "impossibile gestire linee di testo più lunghe di %d caratteri\n"
 
-#: g10/textfilter.c:198
+#: g10/textfilter.c:197
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linea di input più lunga di %d caratteri\n"
@@ -2676,12 +2690,12 @@ msgstr "transazione del trustdb troppo grande\n"
 msgid "%s: can't access: %s\n"
 msgstr "%s: impossibile acedere a: %s\n"
 
-#: g10/ringedit.c:298 g10/tdbio.c:445
+#: g10/ringedit.c:297 g10/tdbio.c:445
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: impossibile creare la directory: %s\n"
 
-#: g10/ringedit.c:304 g10/tdbio.c:448
+#: g10/ringedit.c:303 g10/tdbio.c:448
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: directory creata\n"
@@ -2691,7 +2705,7 @@ msgstr "%s: directory creata\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: la directory non esiste!\n"
 
-#: g10/openfile.c:211 g10/openfile.c:279 g10/ringedit.c:1350 g10/tdbio.c:458
+#: g10/openfile.c:211 g10/openfile.c:279 g10/ringedit.c:1349 g10/tdbio.c:458
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: impossibile creare: %s\n"
@@ -2878,241 +2892,235 @@ msgstr "chiave %08lX: accettata come chiave affidabile\n"
 msgid "enumerate secret keys failed: %s\n"
 msgstr "enumerate secret keys fallito: %s\n"
 
-#: g10/trustdb.c:877
+#: g10/trustdb.c:878
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "chiave %08lX.%lu: Legame con la subchiave corretto\n"
 
-#: g10/trustdb.c:883 g10/trustdb.c:918
+#: g10/trustdb.c:884 g10/trustdb.c:919
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "chiave %08lX.%lu: Legame con la subchiave non valido: %s\n"
 
-#: g10/trustdb.c:895
+#: g10/trustdb.c:896
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "chiave %08lX.%lu: Revoca della chiave valida\n"
 
-#: g10/trustdb.c:901
+#: g10/trustdb.c:902
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "chiave %08lX.%lu: Revoca della chiave non valida: %s\n"
 
-#: g10/trustdb.c:912
+#: g10/trustdb.c:913
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "chiave %08lX.%lu: Revoca della subchiave valida\n"
 
-#: g10/trustdb.c:1023
+#: g10/trustdb.c:1024
 msgid "Good self-signature"
 msgstr "Autofirma corretta"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1034
 msgid "Invalid self-signature"
 msgstr "Autofirma non valida"
 
-#: g10/trustdb.c:1060
+#: g10/trustdb.c:1061
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Saltata una revoca dell'user ID valida a causa di una autofirma più recente"
 
-#: g10/trustdb.c:1066
+#: g10/trustdb.c:1067
 msgid "Valid user ID revocation"
 msgstr "Revoca dell'user ID valida"
 
-#: g10/trustdb.c:1071
+#: g10/trustdb.c:1072
 msgid "Invalid user ID revocation"
 msgstr "Revoca dell'user ID non valida"
 
-#: g10/trustdb.c:1112
+#: g10/trustdb.c:1113
 msgid "Valid certificate revocation"
 msgstr "Revoca del certificato valida"
 
-#: g10/trustdb.c:1113
+#: g10/trustdb.c:1114
 msgid "Good certificate"
 msgstr "Certificato corretto"
 
-#: g10/trustdb.c:1134
+#: g10/trustdb.c:1135
 msgid "Invalid certificate revocation"
 msgstr "Certificato di revoca non valido"
 
-#: g10/trustdb.c:1135
+#: g10/trustdb.c:1136
 msgid "Invalid certificate"
 msgstr "Certificato non valido"
 
-#: g10/trustdb.c:1152 g10/trustdb.c:1156
+#: g10/trustdb.c:1153 g10/trustdb.c:1157
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "il sig recor di %lu[%d] punta al record sbagliato.\n"
 
-#: g10/trustdb.c:1208
+#: g10/trustdb.c:1209
 msgid "duplicated certificate - deleted"
 msgstr "certificato doppio - cancellato"
 
-#: g10/trustdb.c:1514
+#: g10/trustdb.c:1515
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir fallita: %s\n"
 
-#: g10/trustdb.c:1636
+#: g10/trustdb.c:1637
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: inserimento fallito: %s\n"
 
-#: g10/trustdb.c:1641
+#: g10/trustdb.c:1642
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: inserimento fallito: %s\n"
 
-#: g10/trustdb.c:1647
+#: g10/trustdb.c:1648
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: inserito\n"
 
-#: g10/trustdb.c:1652
+#: g10/trustdb.c:1653
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "errore durante la lettura del dir record: %s\n"
 
-#: g10/trustdb.c:1660 g10/trustdb.c:1714
+#: g10/trustdb.c:1661 g10/trustdb.c:1715
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu chiavi esaminate\n"
 
-#: g10/trustdb.c:1662 g10/trustdb.c:1718
+#: g10/trustdb.c:1663 g10/trustdb.c:1719
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu chiavi con errori\n"
 
-#: g10/trustdb.c:1664
+#: g10/trustdb.c:1665
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu chiavi inserite\n"
 
-#: g10/trustdb.c:1667
+#: g10/trustdb.c:1668
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enumerate keyblocks fallito: %s\n"
 
-#: g10/trustdb.c:1705
+#: g10/trustdb.c:1706
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: dir record senza chiave - saltato\n"
 
-#: g10/trustdb.c:1716
+#: g10/trustdb.c:1717
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu chiavi saltate\n"
 
-#: g10/trustdb.c:1720
+#: g10/trustdb.c:1721
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu chiavi aggiornate\n"
 
-#: g10/trustdb.c:2057
+#: g10/trustdb.c:2058
 msgid "Ooops, no keys\n"
 msgstr "Ooops, mancano le chiavi\n"
 
-#: g10/trustdb.c:2061
+#: g10/trustdb.c:2062
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, mancano gli user ID\n"
 
-#: g10/trustdb.c:2218
+#: g10/trustdb.c:2219
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: ricerca del dir record fallita: %s\n"
 
-#: g10/trustdb.c:2227
+#: g10/trustdb.c:2228
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "chiave %08lX: inserimento del record della fiducia fallito: %s\n"
 
-#: g10/trustdb.c:2231
+#: g10/trustdb.c:2232
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "chiave %08lX.%lu: inserita nel trustdb\n"
 
-#: g10/trustdb.c:2239
+#: g10/trustdb.c:2240
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "chiave %08lX.%lu: creata nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/trustdb.c:2248
+#: g10/trustdb.c:2249
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "chiave %08lX.%lu: scaduta il %s\n"
 
-#: g10/trustdb.c:2256
+#: g10/trustdb.c:2257
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "chiave %08lX.%lu: controllo della fiducia fallito: %s\n"
 
-#: g10/trustdb.c:2362
+#: g10/trustdb.c:2363
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "utente `%s' non trovato: %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2365
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problema cercando `%s' nel trustdb: %s\n"
 
-#: g10/trustdb.c:2367
+#: g10/trustdb.c:2368
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "l'utente `%s' non è nel trustdb - viene inserito\n"
 
-#: g10/trustdb.c:2370
+#: g10/trustdb.c:2371
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "impossibile mettere `%s' nel trustdb: %s\n"
 
-#: g10/trustdb.c:2556 g10/trustdb.c:2586
+#: g10/trustdb.c:2557 g10/trustdb.c:2587
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "ATTENZIONE: non è ancora possibile gestire record pref lunghi\n"
 
-#: g10/ringedit.c:318
+#: g10/ringedit.c:317
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: impossibile creare il portachiavi: %s\n"
 
-#: g10/ringedit.c:335 g10/ringedit.c:1355
+#: g10/ringedit.c:334 g10/ringedit.c:1354
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: portachiavi creato\n"
 
-#: g10/ringedit.c:1532
+#: g10/ringedit.c:1531
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATTENZIONE: esistono due file con informazioni confidenziali.\n"
 
-#: g10/ringedit.c:1533
+#: g10/ringedit.c:1532
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s è quello non modificato\n"
 
-#: g10/ringedit.c:1534
+#: g10/ringedit.c:1533
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s è quello nuovo\n"
 
-#: g10/ringedit.c:1535
+#: g10/ringedit.c:1534
 msgid "Please fix this possible security flaw\n"
 msgstr "Per favore risolvete questo possibile problema di sicurezza\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
-msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr ""
-"la chiave non è indicata come insicura - impossibile usarla con il RNG "
-"finto!\n"
-
-#: g10/skclist.c:113
+#: g10/skclist.c:97
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "saltata `%s': %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:103
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3154,28 +3162,28 @@ msgstr "suppongo che i dati firmati siano in `%s'\n"
 msgid "%s: new options file created\n"
 msgstr "%s: creato un nuovo file delle opzioni\n"
 
-#: g10/encr-data.c:66
+#: g10/encr-data.c:64
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrato con l'algoritmo sconosciuto %d\n"
 
-#: g10/encr-data.c:71
+#: g10/encr-data.c:69
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dati cifrati con %s\n"
 
-#: g10/encr-data.c:101
+#: g10/encr-data.c:99
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATTENZIONE: il messaggio era stato cifrato usando una chiave debole\n"
 "per il cifrario simmetrico\n"
 
-#: g10/seskey.c:63
+#: g10/seskey.c:62
 msgid "weak key created - retrying\n"
 msgstr "creata una chiave debole - riprovo\n"
 
-#: g10/seskey.c:68
+#: g10/seskey.c:67
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
@@ -3425,3 +3433,8 @@ msgstr "Non è disponibile un aiuto"
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Non è disponibile un aiuto per `%s'"
+
+#~ msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
+#~ msgstr ""
+#~ "la chiave non è indicata come insicura - impossibile usarla con il RNG "
+#~ "finto!\n"
diff --git a/po/pl.po b/po/pl.po
index 42228cd55..66baa51b0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-0.9.11\n"
-"POT-Creation-Date: 1999-10-26 18:57+0200\n"
+"POT-Creation-Date: 2000-01-31 12:09+0100\n"
 "PO-Revision-Date: 1999-09-07 10:59+02:00\n"
 "Last-Translator: Janusz A. Urbanowicz <alex@bofh.net.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -23,251 +23,251 @@ msgstr ""
 "g10/sig-check.c g10/sign.c g10/trustdb.c g10/verify.c g10/status.c "
 "g10/pubkey-enc.c\n"
 
-#: util/secmem.c:79
+#: gcrypt/secmem.c:77
 msgid "Warning: using insecure memory!\n"
 msgstr "Ostrze¿enie: u¿ywana pamiêæ nie jest pamiêci± bezpieczn±!\n"
 
-#: util/secmem.c:281
+#: gcrypt/secmem.c:279
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operacja niemo¿liwa do wykonania bez dostêpnej pamiêci bezpiecznej\n"
 
-#: util/secmem.c:282
+#: gcrypt/secmem.c:280
 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:277 util/miscutil.c:306
+#: util/miscutil.c:278 util/miscutil.c:307
 msgid "yes"
 msgstr "tak"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:279 util/miscutil.c:310
 msgid "yY"
 msgstr "tT"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:280 util/miscutil.c:308
 msgid "no"
 msgstr "nie"
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:281 util/miscutil.c:311
 msgid "nN"
 msgstr "nN"
 
-#: g10/keyedit.c:564 util/miscutil.c:308
+#: g10/keyedit.c:564 util/miscutil.c:309
 msgid "quit"
 msgstr "wyj¶cie"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:312
 msgid "qQ"
 msgstr "wW"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "b³±d ogólny"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "nieznany rodzaj pakietu"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "nieznana wersja"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "nieznany algorytm klucza publicznego"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "nieznany algorytm skrótu"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "niepoprawny klucz publiczny"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "niepoprawny klucz prywatny"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "niepoprawny podpis"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "b³±d sumy kontrolnej"
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "niepoprawne wyra¿enie przej¶ciowe"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "klucz publiczny nie odnaleziony"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "nieznany algorytm szyfruj±cy"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "otwarcie zbioru kluczy jest niemo¿liwe"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "niepoprawny pakiet"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "b³±d w opakowaniu ASCII"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "brak takiego identyfikatora u¿ytkownika."
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "klucz tajny jest niedostêpny"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "zosta³ u¿yty niew³a¶ciwy klucz tajny"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "nie jet obs³ugiwany"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "klucz niepoprawny"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "b³±d przy odczycie pliku"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "b³±d przy zapisie pliku"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "nieznany algorytm kompresji"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "b³±d przy otwieraniu pliku"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "b³±d przy tworzeniu pliku"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "niepoprawne wyra¿enie przej¶ciowe"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "algorytm szyfrowania z kluczem publicznym nie jest zaimplementowany"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "algorytm szyfruj±cy nie jest zaimplementowany"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "nieznana klasa podpisu"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "b³±d w bazie zaufania"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "b³±d MPI"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "ograniczenie zasobów"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "b³±d w zbiorze kluczy"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "niepoprawny certyfikat"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "b³±d formatu indentyfikatora u¿ytkownika"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "b³±d przy zamykaniu pliku"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "b³±d przy zmianie nazwy pliku"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "b³±d przy usuwaniu pliku"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "nieoczekiowane dane"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "konflikt znaczników czasu"
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "nieu¿yteczny algorytm z kluczem publicznym"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "plik ju¿ istnieje"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "klucz s³aby"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "b³êdny argument"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "niepoprawny URI"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "URI typu nie obs³ugiwanego"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "b³±d sieci"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "nie zaszyfrowany"
 
-#: util/logger.c:218
+#: util/logger.c:219
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... to jest b³±d w programie (%s:%d:%s)\n"
 
-#: util/logger.c:224
+#: util/logger.c:225
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "znalaz³e¶(a¶) b³±d w programie ... (%s:%d)\n"
 
-#: cipher/random.c:452
+#: cipher/random.c:463
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "OSTRZE¯ENIE: u¿ywany generator liczb losowych\n"
 "nie jest kryptograficznie bezpieczny!!\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:469
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -281,7 +281,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:135
+#: cipher/rndlinux.c:125
 #, c-format
 msgid ""
 "\n"
@@ -293,7 +293,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:186
+#: g10/gpg.c:183
 msgid ""
 "@Commands:\n"
 " "
@@ -301,135 +301,140 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/g10.c:188
+#: g10/gpg.c:185
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z³o¿enie podpisu"
 
-#: g10/g10.c:189
+#: g10/gpg.c:186
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z³o¿enie podpisu na czytelnym dokumencie"
 
-#: g10/g10.c:190
+#: g10/gpg.c:187
 msgid "make a detached signature"
 msgstr "sporz±dzenie podpisu oddzielonego od dokumentu"
 
-#: g10/g10.c:191
+#: g10/gpg.c:188
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/g10.c:192
+#: g10/gpg.c:189
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/g10.c:193
+#: g10/gpg.c:190
 msgid "store only"
 msgstr "tylko zapis"
 
-#: g10/g10.c:194
+#: g10/gpg.c:191
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy¶lnie)"
 
-#: g10/g10.c:195
+#: g10/gpg.c:192
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/g10.c:196
+#: g10/gpg.c:193
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/g10.c:198
+#: g10/gpg.c:195
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpisów"
 
-#: g10/g10.c:199
+#: g10/gpg.c:196
 msgid "check key signatures"
 msgstr "sprawdzenie podpisów kluczy"
 
-#: g10/g10.c:200
+#: g10/gpg.c:197
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisków"
 
-#: g10/g10.c:201
+#: g10/gpg.c:198
 msgid "list secret keys"
 msgstr "lista kluczy tajnych"
 
-#: g10/g10.c:202
+#: g10/gpg.c:199
 msgid "generate a new key pair"
 msgstr "generacja nowej pary klucza"
 
-#: g10/g10.c:203
+#: g10/gpg.c:200
 msgid "remove key from the public keyring"
 msgstr "usuniêcie klucza ze zbioru kluczy publicznych"
 
-#: g10/g10.c:204
+#: g10/gpg.c:202
+#, fuzzy
+msgid "remove key from the secret keyring"
+msgstr "usuniêcie klucza ze zbioru kluczy publicznych"
+
+#: g10/gpg.c:203
 msgid "sign a key"
 msgstr "z³o¿enie podpisu na kluczu"
 
-#: g10/g10.c:205
+#: g10/gpg.c:204
 msgid "sign a key locally"
 msgstr "z³o¿enie lokalnego podpisu na kluczu"
 
-#: g10/g10.c:206
+#: g10/gpg.c:205
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/g10.c:207
+#: g10/gpg.c:206
 msgid "generate a revocation certificate"
 msgstr "generacja certyfikatu uniewa¿nienia klucza"
 
-#: g10/g10.c:208
+#: g10/gpg.c:207
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/g10.c:209
+#: g10/gpg.c:208
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/g10.c:210
+#: g10/gpg.c:209
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/g10.c:213
+#: g10/gpg.c:212
 msgid "import/merge keys"
 msgstr "import/do³±czenie kluczy"
 
-#: g10/g10.c:215
+#: g10/gpg.c:214
 msgid "list only the sequence of packets"
 msgstr "wypisane sekwencji pakietów"
 
-#: g10/g10.c:217
+#: g10/gpg.c:216
 msgid "export the ownertrust values"
 msgstr "eksport warto¶ci zaufania"
 
-#: g10/g10.c:219
+#: g10/gpg.c:218
 msgid "import ownertrust values"
 msgstr "wczytanie warto¶æi zaufania"
 
-#: g10/g10.c:221
+#: g10/gpg.c:220
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/g10.c:223
+#: g10/gpg.c:222
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAZWY]|sprawdzenie bazy zaufania"
 
-#: g10/g10.c:224
+#: g10/gpg.c:223
 msgid "fix a corrupted trust database"
 msgstr "naprawa uszkodzonej Bazy Zaufania"
 
-#: g10/g10.c:225
+#: g10/gpg.c:224
 msgid "De-Armor a file or stdin"
 msgstr "zdjêcie opakowania ASCII pliku lub potoku"
 
-#: g10/g10.c:227
+#: g10/gpg.c:226
 msgid "En-Armor a file or stdin"
 msgstr "opakowanie ASCII pliku lub potoku"
 
-#: g10/g10.c:229
+#: g10/gpg.c:228
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skróty wiadomo¶ci"
 
-#: g10/g10.c:233
+#: g10/gpg.c:232
 msgid ""
 "@\n"
 "Options:\n"
@@ -439,168 +444,168 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/g10.c:235
+#: g10/gpg.c:234
 msgid "create ascii armored output"
 msgstr "plik wynikowy w opakowaniu ASCII"
 
-#: g10/g10.c:237
+#: g10/gpg.c:236
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/g10.c:240
+#: g10/gpg.c:239
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAZWA|u¿ycie NAZWA jako domy¶lnego adresata"
 
-#: g10/g10.c:242
+#: g10/gpg.c:241
 msgid "use the default key as default recipient"
 msgstr "domy¶lny klucz jest domy¶lnym adresatem"
 
-#: g10/g10.c:246
+#: g10/gpg.c:245
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/g10.c:247
+#: g10/gpg.c:246
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - brak)"
 
-#: g10/g10.c:249
+#: g10/gpg.c:248
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/g10.c:250
+#: g10/gpg.c:249
 msgid "use as output file"
 msgstr "plik wyj¶ciowy"
 
-#: g10/g10.c:251
+#: g10/gpg.c:250
 msgid "verbose"
 msgstr "z informacjami dodatkowymi"
 
-#: g10/g10.c:252
+#: g10/gpg.c:251
 msgid "be somewhat more quiet"
 msgstr "mniej komunikatóww"
 
-#: g10/g10.c:253
+#: g10/gpg.c:252
 msgid "don't use the terminal at all"
 msgstr "bez odwo³añ do terminala"
 
-#: g10/g10.c:254
+#: g10/gpg.c:253
 msgid "force v3 signatures"
 msgstr "wymuszenie trzeciej wersji formatu podpisów"
 
-#: g10/g10.c:255
+#: g10/gpg.c:254
 msgid "always use a MDC for encryption"
 msgstr "do szyfrowania bêdzie u¿ywany MDC"
 
-#: g10/g10.c:256
+#: g10/gpg.c:255
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:258
+#: g10/gpg.c:257
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: ¿adnych pytañ"
 
-#: g10/g10.c:259
+#: g10/gpg.c:258
 msgid "assume yes on most questions"
 msgstr "automatyczna odpowied¼ tak na wiêkszo¶æ pytañ"
 
-#: g10/g10.c:260
+#: g10/gpg.c:259
 msgid "assume no on most questions"
 msgstr "automatyczna odpowied¼ nie na wiêkszo¶æ pytañ"
 
-#: g10/g10.c:261
+#: g10/gpg.c:260
 msgid "add this keyring to the list of keyrings"
 msgstr "dodaæ zbiór kluczy do listy u¿ywanych"
 
-#: g10/g10.c:262
+#: g10/gpg.c:261
 msgid "add this secret keyring to the list"
 msgstr "dodaæ zbiór kluczy tajnych do listy"
 
-#: g10/g10.c:263
+#: g10/gpg.c:262
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|u¿ycie NAZWA jako domy¶lnego klucza tajnego"
 
-#: g10/g10.c:264
+#: g10/gpg.c:263
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|serwer kluczy w którym bêd± poszukiwane"
 
-#: g10/g10.c:265
+#: g10/gpg.c:264
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAZWA|zestaw znaków terminala NAZWA"
 
-#: g10/g10.c:266
+#: g10/gpg.c:265
 msgid "read options from file"
 msgstr "wczytanie opcji z pliku"
 
-#: g10/g10.c:268
+#: g10/gpg.c:267
 msgid "set debugging flags"
 msgstr "ustawienie opcji ¶ledzenia wykonania programu"
 
-#: g10/g10.c:269
+#: g10/gpg.c:268
 msgid "enable full debugging"
 msgstr "umo¿liwienie pe³nego ¶ledzenia programu"
 
-#: g10/g10.c:270
+#: g10/gpg.c:269
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapisaæ opis stanu do FD"
 
-#: g10/g10.c:271
+#: g10/gpg.c:270
 msgid "do not write comment packets"
 msgstr "nie zapisywaæ pakietów z komentarzem"
 
-#: g10/g10.c:272
+#: g10/gpg.c:271
 msgid "(default is 1)"
 msgstr "(domy¶lnie 1)"
 
-#: g10/g10.c:273
+#: g10/gpg.c:272
 msgid "(default is 3)"
 msgstr "(domy¶lnie 3)"
 
-#: g10/g10.c:275
+#: g10/gpg.c:274
 msgid "|FILE|load extension module FILE"
 msgstr "|PLIK|³adowanie modu³u rozszerzenia z PLIK"
 
-#: g10/g10.c:276
+#: g10/gpg.c:275
 msgid "emulate the mode described in RFC1991"
 msgstr "emulacja trybu opisanego w RFC1991"
 
-#: g10/g10.c:277
+#: g10/gpg.c:276
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "zgodno¶æ ustawieñ pakietów, szyfrów i skrótów z OpenPGP"
 
-#: g10/g10.c:278
+#: g10/gpg.c:277
 msgid "|N|use passphrase mode N"
 msgstr "|N|N-ty tryb wprowadzania wyra¿enia przej¶ciowego"
 
-#: g10/g10.c:280
+#: g10/gpg.c:279
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|ALG|algorytm obliczania skrótów wiadomo¶ci ALG"
 
-#: g10/g10.c:282
+#: g10/gpg.c:281
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|ALG|algorytmu szyfruj±cy ALG dla has³a"
 
-#: g10/g10.c:283
+#: g10/gpg.c:282
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|algorytm szyfruj±cy NAZWA"
 
-#: g10/g10.c:284
+#: g10/gpg.c:283
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|algorytm obliczania skrótów wiadomo¶ci NAZWA"
 
-#: g10/g10.c:285
+#: g10/gpg.c:284
 msgid "|N|use compress algorithm N"
 msgstr "|N|algorytm kompresji N"
 
-#: g10/g10.c:286
+#: g10/gpg.c:285
 msgid "throw keyid field of encrypted packets"
 msgstr "usuniêcie identyfikatorów kluczy z pakietów"
 
-#: g10/g10.c:287
+#: g10/gpg.c:286
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAZWA=TRE¦Æ|adnotacje"
 
-#: g10/g10.c:289
+#: g10/gpg.c:288
 msgid ""
 "@\n"
 "Examples:\n"
@@ -621,15 +626,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/g10.c:376
+#: g10/gpg.c:379
 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:380
+#: g10/gpg.c:383
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo³anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/g10.c:383
+#: g10/gpg.c:386
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -639,7 +644,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpisów, szyfrowanie, deszyfrowanie\n"
 "domy¶lnie wykonywana operacja zale¿y od danych wej¶ciowych\n"
 
-#: g10/g10.c:388
+#: g10/gpg.c:391
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -647,182 +652,187 @@ msgstr ""
 "\n"
 "Obs³ugiwane algorytmy:\n"
 
-#: g10/g10.c:465
+#: g10/gpg.c:469
 msgid "usage: gpg [options] "
 msgstr "wywo³anie: gpg [opcje]"
 
-#: g10/g10.c:518
+#: g10/gpg.c:549
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/g10.c:653
+#: g10/gpg.c:603
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
+#: g10/gpg.c:693
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy¶lnego pliku opcji '%s'\n"
 
-#: g10/g10.c:657
+#: g10/gpg.c:697
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji '%s': %s\n"
 
-#: g10/g10.c:664
+#: g10/gpg.c:704
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z '%s'\n"
 
-#: g10/g10.c:844
+#: g10/gpg.c:885
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nie jest poprawn± nazw± zestawu znaków\n"
 
-#: g10/g10.c:911 g10/g10.c:920
+#: g10/gpg.c:955 g10/gpg.c:964
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u¿ytku!\n"
 
-#: g10/g10.c:913
+#: g10/gpg.c:957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s jest niedozwolony z %s!\n"
 
-#: g10/g10.c:916
+#: g10/gpg.c:960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu z %s!\n"
 
-#: g10/g10.c:935 g10/g10.c:947
+#: g10/gpg.c:980 g10/gpg.c:992
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj±cy jest niepoprawny\n"
 
-#: g10/g10.c:941 g10/g10.c:953
+#: g10/gpg.c:986 g10/gpg.c:998
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm geenracji skrótów wiadomo¶ci jest niepoprawny\n"
 
-#: g10/g10.c:957
+#: g10/gpg.c:1002
 msgid "the given policy URL is invalid\n"
 msgstr "podany URL regulaminu jest niepoprawny\n"
 
-#: g10/g10.c:960
+#: g10/gpg.c:1005
 #, 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:962
+#: g10/gpg.c:1007
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto¶æ completes-needed musi byæ wiêksza od 0\n"
 
-#: g10/g10.c:964
+#: g10/gpg.c:1009
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto¶æ marginals-needed musi byæ wiêksza od 1\n"
 
-#: g10/g10.c:966
+#: g10/gpg.c:1011
 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:969
+#: g10/gpg.c:1014
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/g10.c:973
+#: g10/gpg.c:1018
 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:1050
+#: g10/gpg.c:1095
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod³o siê: %s\n"
 
-#: g10/g10.c:1056
+#: g10/gpg.c:1101
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/g10.c:1063
+#: g10/gpg.c:1108
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:1071
+#: g10/gpg.c:1116
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/g10.c:1084
+#: g10/gpg.c:1129
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/g10.c:1097
+#: g10/gpg.c:1142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:1111
+#: g10/gpg.c:1156
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/g10.c:1123
+#: g10/gpg.c:1168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/g10.c:1131
+#: g10/gpg.c:1176
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u¿ytkownika"
 
-#: g10/g10.c:1139
+#: g10/gpg.c:1184
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u¿ytkownika"
 
-#: g10/g10.c:1147
+#: g10/gpg.c:1192
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u¿ytkownika [polecenia]"
 
-#: g10/g10.c:1163
+#: g10/gpg.c:1208
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key nazwa u¿ytkownika"
 
-#: g10/g10.c:1166
+#: g10/gpg.c:1211
 msgid "--delete-key user-id"
 msgstr "--delete-key nazwa u¿ytkownika"
 
-#: g10/encode.c:260 g10/g10.c:1190 g10/sign.c:368
+#: g10/encode.c:306 g10/gpg.c:1236 g10/sign.c:424
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "nie mo¿na otworzyæ %s: %s\n"
 
-#: g10/g10.c:1201
+#: g10/gpg.c:1247
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbiór kluczy]"
 
-#: g10/g10.c:1262
+#: g10/gpg.c:1308
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "usuniêcie opakowania ASCII nie powiod³o siê: %s\n"
 
-#: g10/g10.c:1270
+#: g10/gpg.c:1316
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod³o siê: %s\n"
 
-#: g10/g10.c:1338
+#: g10/gpg.c:1386
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew³a¶ciwy algorytm skrótu '%s'\n"
 
-#: g10/g10.c:1419
+#: g10/gpg.c:1467
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/g10.c:1423
+#: g10/gpg.c:1471
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj± wiadomo¶æ ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1426 g10/verify.c:66
+#: g10/decrypt.c:59 g10/gpg.c:1474 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mo¿na otworzyæ '%s'\n"
 
-#: g10/g10.c:1594
+#: g10/gpg.c:1642
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "adnotacja musi zaczynaæ siê od podkre¶lenia lub litery\n"
 
-#: g10/g10.c:1600
+#: g10/gpg.c:1648
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -830,11 +840,11 @@ msgstr ""
 "nazwa adnotacji mo¿e zawieraæ tylko litery, cyfry, kropki,\n"
 "podkre¶lenia, i musi koñczyæ siê '='\n"
 
-#: g10/g10.c:1606
+#: g10/gpg.c:1654
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "kropki w adnotacji musz± znajdowaæ siê pomiêdzy innymi znakami\n"
 
-#: g10/g10.c:1614
+#: g10/gpg.c:1662
 msgid "a notation value must not use any control characters\n"
 msgstr "warto¶æ adnotacji nie mo¿e zawieraæ znaków steruj±cych\n"
 
@@ -843,70 +853,74 @@ msgstr "warto¶æ adnotacji nie mo¿e zawieraæ znaków steruj±cych\n"
 msgid "armor: %s\n"
 msgstr "opakowanie: %s\n"
 
-#: g10/armor.c:319
+#: g10/armor.c:325
 msgid "invalid armor header: "
 msgstr "niepoprawny nag³ówek opakowania: "
 
-#: g10/armor.c:326
+#: g10/armor.c:332
 msgid "armor header: "
 msgstr "nag³ówek opakowania: "
 
-#: g10/armor.c:337
+#: g10/armor.c:343
 msgid "invalid clearsig header\n"
 msgstr "niew³a¶ciwy nag³ówek czytelnego podpisanego dokumentu\n"
 
-#: g10/armor.c:389
+#: g10/armor.c:395
 msgid "nested clear text signatures\n"
 msgstr "zagnie¿d¿one podpisy na czytelnym dokumencie\n"
 
-#: g10/armor.c:500
+#: g10/armor.c:506
 msgid "invalid dash escaped line: "
 msgstr "niepoprawne oznaczenie linii minusami: "
 
-#: g10/armor.c:512
+#: g10/armor.c:518
 msgid "unexpected armor:"
 msgstr "nieoczekiwane opakowanie:"
 
-#: g10/armor.c:629
+#: g10/armor.c:635
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "niew³a¶ciwy znak formatu radix64 %02x zosta³ pominiêty\n"
 
-#: g10/armor.c:672
+#: g10/armor.c:678
 msgid "premature eof (no CRC)\n"
 msgstr "przewczesny koniec pliku (brak CRC)\n"
 
-#: g10/armor.c:706
+#: g10/armor.c:712
 msgid "premature eof (in CRC)\n"
 msgstr "przedwczesny koniec pliku (w CRC)\n"
 
-#: g10/armor.c:710
+#: g10/armor.c:716
 msgid "malformed CRC\n"
 msgstr "b³±d formatu CRC\n"
 
-#: g10/armor.c:714
+#: g10/armor.c:720
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "B³±d sumy CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:731
+#: g10/armor.c:737
 msgid "premature eof (in Trailer)\n"
 msgstr "przedwczesny koniec pliku (w linii koñcz±cej)\n"
 
-#: g10/armor.c:735
+#: g10/armor.c:741
 msgid "error in trailer line\n"
 msgstr "b³±d w linii koñcz±cej\n"
 
-#: g10/armor.c:1001
+#: g10/armor.c:892
+msgid "For info see http://www.gnupg.org"
+msgstr ""
+
+#: g10/armor.c:1007
 msgid "no valid OpenPGP data found.\n"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: g10/armor.c:1005
+#: g10/armor.c:1011
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "b³±d opakowania: linia d³u¿sza ni¿ %d znaków\n"
 
-#: g10/armor.c:1009
+#: g10/armor.c:1015
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1175,57 +1189,57 @@ msgstr "%s: pominiêty: klucz publiczny wy³±czony z u¿ycia\n"
 msgid "no valid addressees\n"
 msgstr "brak poprawnych adresów\n"
 
-#: g10/keygen.c:122
+#: g10/keygen.c:123
 msgid "writing self signature\n"
 msgstr "zapis podpisu klucza nim samym\n"
 
-#: g10/keygen.c:160
+#: g10/keygen.c:161
 msgid "writing key binding signature\n"
 msgstr "zapis podpisu wi±¿±cego klucz\n"
 
-#: g10/keygen.c:386
+#: g10/keygen.c:511
 msgid "Please select what kind of key you want:\n"
 msgstr "Proszê wybraæ rodzaj klucza:\n"
 
-#: g10/keygen.c:388
+#: g10/keygen.c:513
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) Para kluczy dla algorytmów DSA i ElGamala (domy¶lne)\n"
 
-#: g10/keygen.c:389
+#: g10/keygen.c:514
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:391
+#: g10/keygen.c:516
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowanie)\n"
 
-#: g10/keygen.c:392
+#: g10/keygen.c:517
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (do szyfrowania i podpisywania)\n"
 
-#: g10/keygen.c:394
+#: g10/keygen.c:519
 #, c-format
 msgid "   (%d) ElGamal in a v3 packet\n"
 msgstr ""
 "   (%d) Klucz dla algorytmu ElGamala w pakiecie w trzeciej wersji formatu\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
 msgid "Your selection? "
 msgstr "Twój wybór? "
 
-#: g10/keygen.c:409
+#: g10/keygen.c:534
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Czy na pewno chcesz stworzyæ klucz do szyfrowania i podpisywania? "
 
-#: g10/keygen.c:430
+#: g10/keygen.c:555
 msgid "Invalid selection.\n"
 msgstr "Niew³a¶ciwy wybór.\n"
 
-#: g10/keygen.c:442
+#: g10/keygen.c:567
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1238,15 +1252,15 @@ msgstr ""
 "               domy¶lny rozmiar klucza wynosi 1024 bity\n"
 "  najwiêkszy sugerowany rozmiar klucza wynosi 2048 bitów\n"
 
-#: g10/keygen.c:449
+#: g10/keygen.c:574
 msgid "What keysize do you want? (1024) "
 msgstr "Jakiej d³ugo¶ci klucz wygenerowaæ? (1024) "
 
-#: g10/keygen.c:454
+#: g10/keygen.c:579
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "Klucz dla DSA musi mieæ d³ugo¶æ pomiêdzy 512 i 1024 bitow.\n"
 
-#: g10/keygen.c:456
+#: g10/keygen.c:581
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "D³ugo¶æ klucza zbyt ma³a; minimalna dopuszczona wynosi 768 bitów.\n"
 
@@ -1258,12 +1272,12 @@ msgstr "D³ugo¶æ klucza zbyt ma³a; minimalna dopuszczona wynosi 768 bitów.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:466
+#: g10/keygen.c:591
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "zbyt du¿y rozmiar klucza, ograniczenie wynosi %d.\n"
 
-#: g10/keygen.c:471
+#: g10/keygen.c:596
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1271,11 +1285,11 @@ msgstr ""
 "Klucze d³u¿sze ni¿ 2048 bitów s± odradzane, poniewa¿ obliczenia\n"
 "trwaj± wtedy BARDZO d³ugo!\n"
 
-#: g10/keygen.c:474
+#: g10/keygen.c:599
 msgid "Are you sure that you want this keysize? "
 msgstr "Na pewno wygenerowaæ klucz takiej d³ugo¶ci? "
 
-#: g10/keygen.c:475
+#: g10/keygen.c:600
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1283,21 +1297,21 @@ msgstr ""
 "Nale¿y tak¿e pamiêtaæ o tym, ¿e informacje mog± byæ te¿ wykradzione z\n"
 "komputera przez pods³uch emisji elektromagnetycznej klawiatury i monitora!\n"
 
-#: g10/keygen.c:483
+#: g10/keygen.c:608
 msgid "Do you really need such a large keysize? "
 msgstr "Czy naprawdê potrzebujesz takiego d³ugiego klucza? "
 
-#: g10/keygen.c:489
+#: g10/keygen.c:614
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "¯±dana d³ugo¶æ klucza to %u bity.\n"
 
-#: g10/keygen.c:492 g10/keygen.c:496
+#: g10/keygen.c:617 g10/keygen.c:621
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr±glono do %u bitów\n"
 
-#: g10/keygen.c:509
+#: g10/keygen.c:634
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1313,29 +1327,29 @@ msgstr ""
 "      <n>m = termin wa¿no¶ci klucza up³ywa za n miesiêcy\n"
 "      <n>y = termin wa¿no¶ci klucza up³ywa za n lat\n"
 
-#: g10/keygen.c:526
+#: g10/keygen.c:651
 msgid "Key is valid for? (0) "
 msgstr "Okres wa¿no¶ci klucza ? (0) "
 
-#: g10/keygen.c:547
+#: g10/keygen.c:672
 msgid "invalid value\n"
 msgstr "niepoprawna warto¶æ\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:677
 msgid "Key does not expire at all\n"
 msgstr "Klucz nie ma daty wa¿no¶ci (nie traci wa¿no¶ci z up³ywem czasu).\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:558
+#: g10/keygen.c:683
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Data wa¿no¶ci klucza: %s\n"
 
-#: g10/keygen.c:563
+#: g10/keygen.c:688
 msgid "Is this correct (y/n)? "
 msgstr "Dane poprawne (t/n)? "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:731
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1351,44 +1365,44 @@ msgstr ""
 "    \"Tadeusz ¯eleñski (Boy) <tzb@provider.com.pl>\"\n"
 "\n"
 
-#: g10/keygen.c:617
+#: g10/keygen.c:742
 msgid "Real name: "
 msgstr "Imiê i nazwisko: "
 
-#: g10/keygen.c:621
+#: g10/keygen.c:746
 msgid "Invalid character in name\n"
 msgstr "Niew³a¶ciwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:623
+#: g10/keygen.c:748
 msgid "Name may not start with a digit\n"
 msgstr "Imiê lub nazwisko nie mo¿e zaczynaæ siê od cyfry\n"
 
-#: g10/keygen.c:625
+#: g10/keygen.c:750
 msgid "Name must be at least 5 characters long\n"
 msgstr "Imiê i nazwisko musz± mieæ conajmniej 5 znaków d³ugo¶ci.\n"
 
-#: g10/keygen.c:633
+#: g10/keygen.c:758
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:769
 msgid "Not a valid email address\n"
 msgstr "To nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:652
+#: g10/keygen.c:777
 msgid "Comment: "
 msgstr "Komentarz: "
 
-#: g10/keygen.c:658
+#: g10/keygen.c:783
 msgid "Invalid character in comment\n"
 msgstr "Niew³a¶ciwy znak w komentarzu\n"
 
-#: g10/keygen.c:680
+#: g10/keygen.c:808
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "U¿ywasz zestawu znaków %s.\n"
 
-#: g10/keygen.c:686
+#: g10/keygen.c:814
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1399,31 +1413,31 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:689
+#: g10/keygen.c:817
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Zmieniæ (I)miê/nazwisko, (K)omentarz, adres (E)mail, \n"
 "przej¶æ (D)alej czy (W)yj¶æ z programu ? "
 
-#: g10/keygen.c:751
+#: g10/keygen.c:879
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 "Musisz podaæ wyra¿enie przej¶ciowe (has³o) aby ochroniæ swój klucz tajny.\n"
 
-#: g10/keyedit.c:456 g10/keygen.c:759
+#: g10/keyedit.c:456 g10/keygen.c:887
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr ""
 "Powtórzone wyra¿enie przej¶ciowe nie zgadza siê z podanym w pierwszej "
 "próbie;\n"
 "spróbuj jeszcze raz.\n"
 
-#: g10/keygen.c:765
+#: g10/keygen.c:893
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1435,7 +1449,7 @@ msgstr ""
 "i opcji \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:914
 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"
@@ -1449,33 +1463,33 @@ msgstr ""
 "generator liczb losowych ma mo¿liwo¶æ zebrania odpowiedniej ilo¶ci "
 "entropii.\n"
 
-#: g10/keygen.c:856
+#: g10/keygen.c:984
 msgid "Key generation can only be used in interactive mode\n"
 msgstr "Generacjê klucza mo¿na wykonywaæ tylko w trybie interaktywnym\n"
 
-#: g10/keygen.c:864
+#: g10/keygen.c:992
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Para kluczy dla DSA bêdzie mia³a 1024 bity d³ugo¶ci.\n"
 
-#: g10/keygen.c:870
+#: g10/keygen.c:998
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza zosta³a anulowana.\n"
 
-#: g10/keygen.c:880
+#: g10/keygen.c:1008
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "zapisujê certyfikat publiczny w '%s'\n"
 
-#: g10/keygen.c:881
+#: g10/keygen.c:1009
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "zapisujê certyfikat prywatny w '%s'\n"
 
-#: g10/keygen.c:958
+#: g10/keygen.c:1086
 msgid "public and secret key created and signed.\n"
 msgstr "Prywatny i publiczny klucz zosta³ stworzony i podpisany.\n"
 
-#: g10/keygen.c:960
+#: g10/keygen.c:1088
 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"
@@ -1483,12 +1497,12 @@ msgstr ""
 "Ten klucz nie mo¿e byæ wykorzystany do szyfrowania. Komend± \"--edit-key\" \n"
 "mo¿na dodaæ do niego podklucz u¿ywany do szyfrowania.\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1073
+#: g10/keygen.c:1102 g10/keygen.c:1201
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod³a siê: %s\n"
 
-#: g10/keygen.c:1018 g10/sig-check.c:314 g10/sign.c:106
+#: g10/keygen.c:1146 g10/sig-check.c:394 g10/sign.c:162
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1496,7 +1510,7 @@ msgstr ""
 "klucz zosta³ stworzony %lu sekundê w przysz³o¶ci (zaburzenia\n"
 "czasoprzestrzeni, lub ¼le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:1020 g10/sig-check.c:316 g10/sign.c:108
+#: g10/keygen.c:1148 g10/sig-check.c:396 g10/sign.c:164
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1504,32 +1518,32 @@ msgstr ""
 "klucz zosta³ stworzony %lu sekund w przysz³o¶ci (zaburzenia\n"
 "czasoprzestrzeni, lub ¼le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:1051
+#: g10/keygen.c:1179
 msgid "Really create? "
 msgstr "Na pewno generowaæ? "
 
-#: g10/encode.c:91 g10/openfile.c:163 g10/openfile.c:272 g10/tdbio.c:468
+#: g10/encode.c:137 g10/openfile.c:163 g10/openfile.c:272 g10/tdbio.c:468
 #: g10/tdbio.c:529
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: nie mo¿na otworzyæ: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:159
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "b³±d podczs tworzenia wyra¿enia przej¶ciowego (has³a): %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:217 g10/encode.c:365
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: OSTRZE¯ENIE: plik jest pusty\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:312
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "odczyt z '%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:529
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s zaszyfrowany dla: %s\n"
@@ -1588,7 +1602,7 @@ msgstr "nie mo¿na otworzyæ %s: %s\n"
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d zostaje pominiêty\n"
 
-#: g10/import.c:169 g10/trustdb.c:1658 g10/trustdb.c:1697
+#: g10/import.c:169 g10/trustdb.c:1659 g10/trustdb.c:1698
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu kluczy przetworzonych do tej chwili\n"
@@ -1676,7 +1690,7 @@ msgstr "klucz %08lX: brak klucza publicznego: %s\n"
 msgid "no default public keyring\n"
 msgstr "brak domy¶lnego zbioru kluczy publicznych\n"
 
-#: g10/import.c:399 g10/openfile.c:215 g10/sign.c:269 g10/sign.c:582
+#: g10/import.c:399 g10/openfile.c:215 g10/sign.c:325 g10/sign.c:638
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
@@ -1940,7 +1954,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "Na pewno podpisaæ? "
 
-#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:129
+#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:185
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "z³o¿enie podpisu nie powiod³o siê: %s\n"
@@ -2406,65 +2420,65 @@ msgstr "Na pewno utworzyæ certyfikaty uniewa¿nienia ? (t/N)"
 msgid "no secret key\n"
 msgstr "brak klucza prywatnego\n"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:212
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "klucz publiczny %08lX\n"
 
-#: g10/mainproc.c:244
+#: g10/mainproc.c:243
 msgid "public key encrypted data: good DEK\n"
 msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
 
-#: g10/mainproc.c:275
+#: g10/mainproc.c:274
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "d³ugo¶æ %u bitów, typ %s, klucz %08lX, stworzony %s\n"
 
-#: g10/mainproc.c:285
+#: g10/mainproc.c:284
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "zaszyfrowane kluczem %s, o identyfikatorze %08lX\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 msgid "no secret key for decryption available\n"
 msgstr "odszyfrowuj±cy klucz tajny do jest niedostêpny\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:299
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "b³±d odszyfrowywania kluczem publicznym: %s\n"
 
-#: g10/mainproc.c:332
+#: g10/mainproc.c:331
 msgid "decryption okay\n"
 msgstr "odszyfrowane poprawnie\n"
 
-#: g10/mainproc.c:337
+#: g10/mainproc.c:336
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "OSTRZE¯ENIE: zaszyfrowana wiadomo¶æ by³a manipulowana!\n"
 
-#: g10/mainproc.c:342
+#: g10/mainproc.c:341
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "b³±d odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:360
+#: g10/mainproc.c:359
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "UWAGA: nadawca zaznaczy³ ¿e wiadomo¶æ nie powinna byæ zapisywana\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:361
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:596 g10/mainproc.c:605
+#: g10/mainproc.c:595 g10/mainproc.c:604
 msgid "WARNING: invalid notation data found\n"
 msgstr "OSTRZE¯ENIE: niepoprawne dane w adnotacji\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:607
 msgid "Notation: "
 msgstr "Adnotacja:"
 
-#: g10/mainproc.c:615
+#: g10/mainproc.c:614
 msgid "Policy: "
 msgstr "Regulamin:"
 
@@ -2505,20 +2519,20 @@ msgstr "podpis starego typu (PGP 2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
-#: g10/misc.c:95
+#: g10/misc.c:83
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nie mo¿na wy³±czyæ zrzutów pamiêci: %s\n"
 
-#: g10/misc.c:98
+#: g10/misc.c:86
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE¯ENIE: program mo¿e stworzyæ plik zrzutu pamiêci!\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:312
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Nie nale¿y u¿ywaæ algorytmów do¶wiadczalnych!\n"
 
-#: g10/misc.c:220
+#: g10/misc.c:326
 msgid ""
 "RSA keys are deprecated; please consider creating a new key and use this key "
 "in the future\n"
@@ -2526,18 +2540,18 @@ msgstr ""
 "Klucze RSA s± odradzane; proszê rozwa¿yæ przej¶cie na inne algorytmy po\n"
 "wygenerowaniu odpowiednich kluczy.\n"
 
-#: g10/misc.c:242
+#: g10/misc.c:348
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "ten algorytm szyfruj±cy jest odradzany; proszê u¿ywaæ bardziej "
 "standardowych!\n"
 
-#: g10/parse-packet.c:113
+#: g10/parse-packet.c:112
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "algorytm klucza publicznego niemo¿liwy do obs³u¿enia: %d\n"
 
-#: g10/parse-packet.c:939
+#: g10/parse-packet.c:938
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
@@ -2597,97 +2611,97 @@ msgstr "czytam strumieñ standardowego wej¶cia\n"
 msgid "can't open signed data `%s'\n"
 msgstr "nie mo¿na otworzyæ podpisanego pliku '%s'\n"
 
-#: g10/pubkey-enc.c:80
+#: g10/pubkey-enc.c:147
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "adresat anonimowy; próbujê klucz tajny %08lX ...\n"
 
-#: g10/pubkey-enc.c:86
+#: g10/pubkey-enc.c:153
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "OK, to my jeste¶my adresatem anonimowym.\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:209
 msgid "old encoding of the DEK is not supported\n"
 msgstr "stary, nie obs³ugiwany algorytm szyfrowania klucza sesyjnego\n"
 
-#: g10/pubkey-enc.c:192
+#: g10/pubkey-enc.c:263
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "UWAGA: brak algorytmu szyfruj±cego %d w ustawieniach\n"
 
-#: g10/seckey-cert.c:56
+#: g10/seckey-cert.c:101
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "%d - algorytm ochrony nie obs³ugiwany\n"
 
-#: g10/seckey-cert.c:181
+#: g10/seckey-cert.c:242
 msgid "Invalid passphrase; please try again ...\n"
 msgstr ""
 "Niepoprawne wyra¿enie przej¶ciowe (has³o); proszê spróbowaæ ponownie ...\n"
 
-#: g10/seckey-cert.c:246
+#: g10/seckey-cert.c:307
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "Ostrze¿enie: Wykryto klucz s³aby algorytmu - nale¿y ponownie zmieniæ \n"
 "wyra¿enie przej¶ciowe (has³o).\n"
 
-#: g10/sig-check.c:201
+#: g10/sig-check.c:281
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr ""
 "przyjêto niepoprawno¶æ MDC z powonu ustawienia nieznanego bitu krytycznego\n"
 
-#: g10/sig-check.c:297
+#: g10/sig-check.c:377
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "Klucz algorytmu ElGamala wygenerowany przez PGP - podpisy nim sk³adane\n"
 "nie zapewniaj± bezpieczeñstwa!\n"
 
-#: g10/sig-check.c:305
+#: g10/sig-check.c:385
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "klucz publiczny jest o %lu sekund m³odszy od podpisu\n"
 
-#: g10/sig-check.c:306
+#: g10/sig-check.c:386
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "klucz publiczny jest o %lu sekund m³odszy od podpisu\n"
 
-#: g10/sig-check.c:322
+#: g10/sig-check.c:402
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "UWAGA: klucz podpisuj±cy przekroczy³ datê wa¿no¶ci %s\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:459
 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:133
+#: g10/sign.c:189
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "%s podpis z³o¿ony przez: %s\n"
 
-#: g10/sign.c:264 g10/sign.c:577
+#: g10/sign.c:320 g10/sign.c:633
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "nie mogê stworzyæ %s: %s\n"
 
-#: g10/sign.c:363
+#: g10/sign.c:419
 msgid "signing:"
 msgstr "podpis:"
 
-#: g10/sign.c:406
+#: g10/sign.c:462
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "OSTRZE¯ENIE: plik '%s' jest pusty\n"
 
-#: g10/textfilter.c:129
+#: g10/textfilter.c:128
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "nie mogê obs³u¿yæ linii tekstu d³u¿szej ni¿ %d znaków\n"
 
-#: g10/textfilter.c:198
+#: g10/textfilter.c:197
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linia d³u¿sza ni¿ %d znaków\n"
@@ -2711,12 +2725,12 @@ msgstr "zbyt du¿e zlecenie dla bazy zaufania\n"
 msgid "%s: can't access: %s\n"
 msgstr "%s: dostêp niemo¿liwy: %s\n"
 
-#: g10/ringedit.c:298 g10/tdbio.c:445
+#: g10/ringedit.c:297 g10/tdbio.c:445
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: nie mogê utworzyæ katalogu: %s\n"
 
-#: g10/ringedit.c:304 g10/tdbio.c:448
+#: g10/ringedit.c:303 g10/tdbio.c:448
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: katalog utworzony\n"
@@ -2726,7 +2740,7 @@ msgstr "%s: katalog utworzony\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalog nie istnieje!\n"
 
-#: g10/openfile.c:211 g10/openfile.c:279 g10/ringedit.c:1350 g10/tdbio.c:458
+#: g10/openfile.c:211 g10/openfile.c:279 g10/ringedit.c:1349 g10/tdbio.c:458
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: nie mogê utworzyæ: %s\n"
@@ -2912,242 +2926,236 @@ msgstr "Klucz %08lX: zaakceptowany jako klucz zaufany.\n"
 msgid "enumerate secret keys failed: %s\n"
 msgstr "wyliczenie kluczy tajnych nie powiod³o siê %s\n"
 
-#: g10/trustdb.c:877
+#: g10/trustdb.c:878
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "klucz %08lX.%lu Dobre dowi±zanie podklucza\n"
 
-#: g10/trustdb.c:883 g10/trustdb.c:918
+#: g10/trustdb.c:884 g10/trustdb.c:919
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "klucz %08lX.%lu: Niepoprawne dowi±zanie podklucza %s\n"
 
-#: g10/trustdb.c:895
+#: g10/trustdb.c:896
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "klucz %08lX.%lu: Poprawne uniewa¿nienie klucza\n"
 
-#: g10/trustdb.c:901
+#: g10/trustdb.c:902
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "klucz %08lX.%lu: Niew³a¶ciwe uniewa¿nienie klucza: %s\n"
 
-#: g10/trustdb.c:912
+#: g10/trustdb.c:913
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "klucz %08lX.%lu: Poprawne uniewa¿nienie podklucza\n"
 
-#: g10/trustdb.c:1023
+#: g10/trustdb.c:1024
 msgid "Good self-signature"
 msgstr "Poprawny podpis klucza nim samym"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1034
 msgid "Invalid self-signature"
 msgstr "Niepoprawny podpis klucza nim samym"
 
-#: g10/trustdb.c:1060
+#: g10/trustdb.c:1061
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Poprawne uniewa¿nienie identyfikatora u¿ytkownika pominiête z powodu\n"
 "nowszego podpisu tym samym kluczem"
 
-#: g10/trustdb.c:1066
+#: g10/trustdb.c:1067
 msgid "Valid user ID revocation"
 msgstr "Poprawne uniewa¿nienie identyfikatora u¿ytkownika"
 
-#: g10/trustdb.c:1071
+#: g10/trustdb.c:1072
 msgid "Invalid user ID revocation"
 msgstr "Niepoprawne uniewa¿nienie identyfikatora u¿ytkownika"
 
-#: g10/trustdb.c:1112
+#: g10/trustdb.c:1113
 msgid "Valid certificate revocation"
 msgstr "Poprawne uniewa¿nienie certyfikatu"
 
-#: g10/trustdb.c:1113
+#: g10/trustdb.c:1114
 msgid "Good certificate"
 msgstr "Poprawny certyfikat"
 
-#: g10/trustdb.c:1134
+#: g10/trustdb.c:1135
 msgid "Invalid certificate revocation"
 msgstr "Niepoprawne uniewa¿nienie certyfikatu"
 
-#: g10/trustdb.c:1135
+#: g10/trustdb.c:1136
 msgid "Invalid certificate"
 msgstr "Niepoprawny certyfikat"
 
-#: g10/trustdb.c:1152 g10/trustdb.c:1156
+#: g10/trustdb.c:1153 g10/trustdb.c:1157
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "zapis o podpisach %lu[%d] wskazuje na z³y wpis.\n"
 
-#: g10/trustdb.c:1208
+#: g10/trustdb.c:1209
 msgid "duplicated certificate - deleted"
 msgstr "podwójny certyfikat - usuniêty"
 
-#: g10/trustdb.c:1514
+#: g10/trustdb.c:1515
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "Procedura tdbio_search_dir nie powiod³a siê: %s\n"
 
-#: g10/trustdb.c:1636
+#: g10/trustdb.c:1637
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: wpisanie nie powiod³o siê: %s\n"
 
-#: g10/trustdb.c:1641
+#: g10/trustdb.c:1642
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: wpisanie nie powiod³o siê: %s\n"
 
-#: g10/trustdb.c:1647
+#: g10/trustdb.c:1648
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: wpisany\n"
 
-#: g10/trustdb.c:1652
+#: g10/trustdb.c:1653
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "b³±d podczas odczytu wpisu katalogowego: %s\n"
 
-#: g10/trustdb.c:1660 g10/trustdb.c:1714
+#: g10/trustdb.c:1661 g10/trustdb.c:1715
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu kluczy przetworzonych\n"
 
-#: g10/trustdb.c:1662 g10/trustdb.c:1718
+#: g10/trustdb.c:1663 g10/trustdb.c:1719
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu kluczy z b³êdami\n"
 
-#: g10/trustdb.c:1664
+#: g10/trustdb.c:1665
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu kluczy wpisanych\n"
 
-#: g10/trustdb.c:1667
+#: g10/trustdb.c:1668
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "wyliczenie bloków kluczy nie powiod³o siê: %s\n"
 
-#: g10/trustdb.c:1705
+#: g10/trustdb.c:1706
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: wpis katalogowy bez bloku klucza - pominiêty\n"
 
-#: g10/trustdb.c:1716
+#: g10/trustdb.c:1717
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu kluczy pominiêtych\n"
 
-#: g10/trustdb.c:1720
+#: g10/trustdb.c:1721
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu kluczy uaktualnionych\n"
 
-#: g10/trustdb.c:2057
+#: g10/trustdb.c:2058
 msgid "Ooops, no keys\n"
 msgstr "Oops, brak kluczy\n"
 
-#: g10/trustdb.c:2061
+#: g10/trustdb.c:2062
 msgid "Ooops, no user IDs\n"
 msgstr "Oops, brak identyfikatorów u¿ytkowników\n"
 
-#: g10/trustdb.c:2218
+#: g10/trustdb.c:2219
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: poszukiwanie wpisu katalogowego nie powiod³o siê: %s\n"
 
-#: g10/trustdb.c:2227
+#: g10/trustdb.c:2228
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "klucz %08lX: wprowadzenie wpisu zaufania nie powiod³o siê: %s\n"
 
-#: g10/trustdb.c:2231
+#: g10/trustdb.c:2232
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "Klucz %08lX.%lu: wprowadzony do bazy zaufania\n"
 
-#: g10/trustdb.c:2239
+#: g10/trustdb.c:2240
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "Klucz %08lX.%lu: stworzony w przysz³o¶ci (zaburzenia czasoprzestrzeni,\n"
 "lub ¼le ustawiony zegar systemowy)\n"
 
-#: g10/trustdb.c:2248
+#: g10/trustdb.c:2249
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "klucz %08lX.%lu: okres wa¿no¶ci up³yn±³ %s\n"
 
-#: g10/trustdb.c:2256
+#: g10/trustdb.c:2257
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "klucz %08lX.%lu: b³±d przy sprawdzaniu zaufania: %s\n"
 
-#: g10/trustdb.c:2362
+#: g10/trustdb.c:2363
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "u¿ytkownik '%s' nie odnaleziony: %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2365
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problem podczas szukania '%s' w bazie zaufania: %s\n"
 
-#: g10/trustdb.c:2367
+#: g10/trustdb.c:2368
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "brak u¿ytkownika '%s' w bazie zaufania - dodano\n"
 
-#: g10/trustdb.c:2370
+#: g10/trustdb.c:2371
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "umieszczenie '%s' w Bazie Zaufania nie powiod³o siê: %s\n"
 
-#: g10/trustdb.c:2556 g10/trustdb.c:2586
+#: g10/trustdb.c:2557 g10/trustdb.c:2587
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "OSTRZE¯ENIE: d³ugie wpisy ustawieñ jeszcze nie s± obs³ugiwane.\n"
 
-#: g10/ringedit.c:318
+#: g10/ringedit.c:317
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: stworzenie zbioru kluczy jest niemo¿liwe: %s\n"
 
-#: g10/ringedit.c:335 g10/ringedit.c:1355
+#: g10/ringedit.c:334 g10/ringedit.c:1354
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: zbiór kluczy utworzony\n"
 
-#: g10/ringedit.c:1532
+#: g10/ringedit.c:1531
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "OSTRZE¯ENIE: Istniej± dwa pliki z poufnymi informacjami.\n"
 
-#: g10/ringedit.c:1533
+#: g10/ringedit.c:1532
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s pozosta³ bez zmian\n"
 
-#: g10/ringedit.c:1534
+#: g10/ringedit.c:1533
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s zosta³ utworzony\n"
 
-#: g10/ringedit.c:1535
+#: g10/ringedit.c:1534
 msgid "Please fix this possible security flaw\n"
 msgstr "Proszê usun±æ to naruszenie zasad bezpieczeñstwa\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
-msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr ""
-"klucz nie jest oznaczony jako niepewny - nie mo¿na go u¿yæ z atrap± \n"
-"generatora liczb losowych!\n"
-
-#: g10/skclist.c:113
+#: g10/skclist.c:97
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "pominiêty '%s': %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:103
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3189,27 +3197,27 @@ msgstr "przyjêto obecno¶æ podpisanych danych w '%s'\n"
 msgid "%s: new options file created\n"
 msgstr "%s: stworzono nowy plik ustawieñ\n"
 
-#: g10/encr-data.c:66
+#: g10/encr-data.c:64
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "zaszyfrowane nieznanym algorytmem %d\n"
 
-#: g10/encr-data.c:71
+#: g10/encr-data.c:69
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s zaszyfrowane dane\n"
 
-#: g10/encr-data.c:101
+#: g10/encr-data.c:99
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "OSTRZE¯ENIE: wiadomo¶æ by³a szyfrowana s³abym kluczem szyfru symetrycznego.\n"
 
-#: g10/seskey.c:63
+#: g10/seskey.c:62
 msgid "weak key created - retrying\n"
 msgstr "wygenerowano s³aby klucz - operacja zostaje powtórzona\n"
 
-#: g10/seskey.c:68
+#: g10/seskey.c:67
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
@@ -3465,6 +3473,11 @@ msgstr "Pomoc niedostêpna"
 msgid "No help available for `%s'"
 msgstr "Brak pomocy o '%s'"
 
+#~ msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
+#~ msgstr ""
+#~ "klucz nie jest oznaczony jako niepewny - nie mo¿na go u¿yæ z atrap± \n"
+#~ "generatora liczb losowych!\n"
+
 #~ msgid "print all message digests"
 #~ msgstr "wszystkie skróty wiadomo¶ci"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 70dd44aac..f1a15bc6e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-10-26 18:57+0200\n"
+"POT-Creation-Date: 2000-01-31 12:09+0100\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-20 23:46:36-0200\n"
 "From: Thiago Jung Bauermann <jungmann@usa.net>\n"
@@ -17,253 +17,253 @@ msgstr ""
 "g10/mainproc.c g10/passphrase.c g10/plaintext.c g10/pref.c g10/seckey-cert.c "
 "g10/sig-check.c g10/sign.c g10/trustdb.c g10/verify.c\n"
 
-#: util/secmem.c:79
+#: gcrypt/secmem.c:77
 msgid "Warning: using insecure memory!\n"
 msgstr "Aviso: usando memória insegura!\n"
 
-#: util/secmem.c:281
+#: gcrypt/secmem.c:279
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "a operação não é possível sem memória segura inicializada\n"
 
-#: util/secmem.c:282
+#: gcrypt/secmem.c:280
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(você pode ter usado o programa errado para esta tarefa)\n"
 
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:278 util/miscutil.c:307
 msgid "yes"
 msgstr "sim"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:279 util/miscutil.c:310
 msgid "yY"
 msgstr "sS"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:280 util/miscutil.c:308
 msgid "no"
 msgstr "não"
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:281 util/miscutil.c:311
 msgid "nN"
 msgstr "nN"
 
 # INICIO MENU
-#: g10/keyedit.c:564 util/miscutil.c:308
+#: g10/keyedit.c:564 util/miscutil.c:309
 msgid "quit"
 msgstr "sair"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:312
 msgid "qQ"
 msgstr ""
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "erro geral"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "formato de pacote desconhecido"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "versão desconhecida"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "algoritmo de chave pública desconhecido"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "algoritmo de \"digest\" desconhecido"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "chave pública incorreta"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "chave secreta incorreta"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "assinatura incorreta"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "erro de \"checksum\""
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "frase secreta incorreta"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "chave pública não encontrada"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "algoritmo de criptografia desconhecido"
 
 # keyring == molho ???
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "não é possível abrir o chaveiro"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "pacote inválido"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "armadura inválida"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "identificador de usuário inexistente"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "chave secreta não disponível"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "chave secreta incorreta"
 
 # suportado ???
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "não suportado"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "chave incorreta"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "erro de leitura"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "erro de escrita"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "algoritmo de compressão desconhecido"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "erro na abertura de arquivo"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "erro na criação de arquivo"
 
 # frase secreta ???
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "frase secreta inválida"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "algoritmo de chave pública não implementado"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "algoritmo de criptografia não implementado"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "classe de assinatura desconhecida"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "erro no banco de dados de confiabilidade"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "MPI incorreto"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "limite de recurso"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "chaveiro inválido"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "certificado incorreto"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "identificador de usuário malformado"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "erro no fechamento de arquivo"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "erro na renomeação de arquivo"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "erro na remoção de arquivo"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "dados inesperados"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "conflito de \"timestamp\""
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "algoritmo de chave pública inutilizável"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "o arquivo já existe"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "chave fraca"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "argumento inválido"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "URI incorreto"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "URI não suportado"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "erro na rede"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "não criptografado"
 
-#: util/logger.c:218
+#: util/logger.c:219
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... isto é um bug (%s:%d:%s)\n"
 
-#: util/logger.c:224
+#: util/logger.c:225
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "você encontrou um bug ... (%s:%d)\n"
 
-#: cipher/random.c:452
+#: cipher/random.c:463
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: usando gerador de números aleatórios inseguro!\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:469
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -277,7 +277,7 @@ msgstr ""
 "NÃO USE NENHUM DADO GERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:125
 #, c-format
 msgid ""
 "\n"
@@ -289,7 +289,7 @@ msgstr ""
 "para que o sistema possa coletar mais entropia!\n"
 "(São necessários mais %d bytes)\n"
 
-#: g10/g10.c:186
+#: g10/gpg.c:183
 msgid ""
 "@Commands:\n"
 " "
@@ -297,140 +297,145 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:188
+#: g10/gpg.c:185
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: g10/g10.c:189
+#: g10/gpg.c:186
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:190
+#: g10/gpg.c:187
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:191
+#: g10/gpg.c:188
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/g10.c:192
+#: g10/gpg.c:189
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "simétrica"
 
-#: g10/g10.c:193
+#: g10/gpg.c:190
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/g10.c:194
+#: g10/gpg.c:191
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padrão)"
 
-#: g10/g10.c:195
+#: g10/gpg.c:192
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:196
+#: g10/gpg.c:193
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:198
+#: g10/gpg.c:195
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:199
+#: g10/gpg.c:196
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:200
+#: g10/gpg.c:197
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impressões digitais"
 
-#: g10/g10.c:201
+#: g10/gpg.c:198
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:202
+#: g10/gpg.c:199
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:203
+#: g10/gpg.c:200
 msgid "remove key from the public keyring"
 msgstr "remover a chave do chaveiro público"
 
-#: g10/g10.c:204
+#: g10/gpg.c:202
+#, fuzzy
+msgid "remove key from the secret keyring"
+msgstr "remover a chave do chaveiro público"
+
+#: g10/gpg.c:203
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:205
+#: g10/gpg.c:204
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:206
+#: g10/gpg.c:205
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:207
+#: g10/gpg.c:206
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revogação"
 
-#: g10/g10.c:208
+#: g10/gpg.c:207
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:209
+#: g10/gpg.c:208
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:210
+#: g10/gpg.c:209
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:213
+#: g10/gpg.c:212
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:215
+#: g10/gpg.c:214
 msgid "list only the sequence of packets"
 msgstr "listar apenas as seqüências de pacotes"
 
 # ownertrust ???
-#: g10/g10.c:217
+#: g10/gpg.c:216
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confiança"
 
-#: g10/g10.c:219
+#: g10/gpg.c:218
 msgid "import ownertrust values"
 msgstr "importar os valores de confiança"
 
-#: g10/g10.c:221
+#: g10/gpg.c:220
 msgid "update the trust database"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/g10.c:223
+#: g10/gpg.c:222
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMES]|verificar o banco de dados de confiabilidade"
 
-#: g10/g10.c:224
+#: g10/gpg.c:223
 msgid "fix a corrupted trust database"
 msgstr ""
 "consertar um banco de dados de confiabilidade\n"
 "danificado"
 
-#: g10/g10.c:225
+#: g10/gpg.c:224
 msgid "De-Armor a file or stdin"
 msgstr "retirar a armadura de um arquivo ou de \"stdin\""
 
-#: g10/g10.c:227
+#: g10/gpg.c:226
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um arquivo ou \"stdin\""
 
-#: g10/g10.c:229
+#: g10/gpg.c:228
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:233
+#: g10/gpg.c:232
 msgid ""
 "@\n"
 "Options:\n"
@@ -440,185 +445,185 @@ msgstr ""
 "Opções:\n"
 " "
 
-#: g10/g10.c:235
+#: g10/gpg.c:234
 msgid "create ascii armored output"
 msgstr "criar saída com armadura ascii"
 
-#: g10/g10.c:237
+#: g10/gpg.c:236
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/g10.c:240
+#: g10/gpg.c:239
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinatário padrão"
 
-#: g10/g10.c:242
+#: g10/gpg.c:241
 msgid "use the default key as default recipient"
 msgstr "usar a chave padrão como destinatário padrão"
 
-#: g10/g10.c:246
+#: g10/gpg.c:245
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usuário para\n"
 "assinar ou descriptografar"
 
-#: g10/g10.c:247
+#: g10/gpg.c:246
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer nível de compressão N\n"
 "(0 desabilita)"
 
-#: g10/g10.c:249
+#: g10/gpg.c:248
 msgid "use canonical text mode"
 msgstr "usar modo de texto canônico"
 
-#: g10/g10.c:250
+#: g10/gpg.c:249
 msgid "use as output file"
 msgstr "usar como arquivo de saída"
 
-#: g10/g10.c:251
+#: g10/gpg.c:250
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:252
+#: g10/gpg.c:251
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:253
+#: g10/gpg.c:252
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/g10.c:254
+#: g10/gpg.c:253
 msgid "force v3 signatures"
 msgstr "forçar assinaturas v3"
 
-#: g10/g10.c:255
+#: g10/gpg.c:254
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para criptografar"
 
-#: g10/g10.c:256
+#: g10/gpg.c:255
 msgid "do not make any changes"
 msgstr "não fazer alterações"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:258
+#: g10/gpg.c:257
 msgid "batch mode: never ask"
 msgstr "modo não-interativo: nunca perguntar"
 
-#: g10/g10.c:259
+#: g10/gpg.c:258
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:260
+#: g10/gpg.c:259
 msgid "assume no on most questions"
 msgstr "assumir não para a maioria das perguntas"
 
-#: g10/g10.c:261
+#: g10/gpg.c:260
 msgid "add this keyring to the list of keyrings"
 msgstr "adicionar este chaveiro à lista de chaveiros"
 
-#: g10/g10.c:262
+#: g10/gpg.c:261
 msgid "add this secret keyring to the list"
 msgstr "adicionar este chaveiro secreto à lista"
 
-#: g10/g10.c:263
+#: g10/gpg.c:262
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta padrão"
 
-#: g10/g10.c:264
+#: g10/gpg.c:263
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDEREÇO|usar este servidor para buscar chaves"
 
-#: g10/g10.c:265
+#: g10/gpg.c:264
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/g10.c:266
+#: g10/gpg.c:265
 msgid "read options from file"
 msgstr "ler opções do arquivo"
 
-#: g10/g10.c:268
+#: g10/gpg.c:267
 msgid "set debugging flags"
 msgstr "definir parâmetros de depuração"
 
-#: g10/g10.c:269
+#: g10/gpg.c:268
 msgid "enable full debugging"
 msgstr "habilitar depuração completa"
 
-#: g10/g10.c:270
+#: g10/gpg.c:269
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DA|escrever informações de estado para o\n"
 "descritor de arquivo DA"
 
-#: g10/g10.c:271
+#: g10/gpg.c:270
 msgid "do not write comment packets"
 msgstr "não escrever pacotes de comentário"
 
-#: g10/g10.c:272
+#: g10/gpg.c:271
 msgid "(default is 1)"
 msgstr "(o padrão é 1)"
 
-#: g10/g10.c:273
+#: g10/gpg.c:272
 msgid "(default is 3)"
 msgstr "(o padrão é 3)"
 
-#: g10/g10.c:275
+#: g10/gpg.c:274
 msgid "|FILE|load extension module FILE"
 msgstr "|ARQUIVO|carregar módulo de extensão ARQUIVO"
 
-#: g10/g10.c:276
+#: g10/gpg.c:275
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/g10.c:277
+#: g10/gpg.c:276
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "configurar todas as opções de pacote,\n"
 "criptografia e \"digest\" para comportamento\n"
 "OpenPGP"
 
-#: g10/g10.c:278
+#: g10/gpg.c:277
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar frase secreta modo N"
 
-#: g10/g10.c:280
+#: g10/gpg.c:279
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de \"digest\" de mensagens NOME\n"
 "para frases secretas"
 
-#: g10/g10.c:282
+#: g10/gpg.c:281
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:283
+#: g10/gpg.c:282
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:284
+#: g10/gpg.c:283
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:285
+#: g10/gpg.c:284
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compressão N"
 
-#: g10/g10.c:286
+#: g10/gpg.c:285
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "eliminar o campo keyid dos pacotes\n"
 "criptografados"
 
-#: g10/g10.c:287
+#: g10/gpg.c:286
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALOR|usar estes dados de notação"
 
-#: g10/g10.c:289
+#: g10/gpg.c:288
 msgid ""
 "@\n"
 "Examples:\n"
@@ -638,15 +643,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impressões digitais\n"
 
-#: g10/g10.c:376
+#: g10/gpg.c:379
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:380
+#: g10/gpg.c:383
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opções] [arquivos] (-h para ajuda)"
 
-#: g10/g10.c:383
+#: g10/gpg.c:386
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -656,7 +661,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a operação padrão depende dos dados de entrada\n"
 
-#: g10/g10.c:388
+#: g10/gpg.c:391
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -664,185 +669,190 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:465
+#: g10/gpg.c:469
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opções] "
 
-#: g10/g10.c:518
+#: g10/gpg.c:549
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/g10.c:653
+#: g10/gpg.c:603
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
+#: g10/gpg.c:693
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de opções padrão `%s' inexistente\n"
 
-#: g10/g10.c:657
+#: g10/gpg.c:697
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de opções `%s': %s\n"
 
-#: g10/g10.c:664
+#: g10/gpg.c:704
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo opções de `%s'\n"
 
-#: g10/g10.c:844
+#: g10/gpg.c:885
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s não é um conjunto de caracteres válido\n"
 
-#: g10/g10.c:911 g10/g10.c:920
+#: g10/gpg.c:955 g10/gpg.c:964
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s não é para uso normal!\n"
 
-#: g10/g10.c:913
+#: g10/gpg.c:957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s não é permitido com %s!\n"
 
-#: g10/g10.c:916
+#: g10/gpg.c:960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s não faz sentido com %s!\n"
 
-#: g10/g10.c:935 g10/g10.c:947
+#: g10/gpg.c:980 g10/gpg.c:992
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado não é válido\n"
 
-#: g10/g10.c:941 g10/g10.c:953
+#: g10/gpg.c:986 g10/gpg.c:998
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado não é válido\n"
 
-#: g10/g10.c:957
+#: g10/gpg.c:1002
 msgid "the given policy URL is invalid\n"
 msgstr "a URL de política dada é inválida\n"
 
-#: g10/g10.c:960
+#: g10/gpg.c:1005
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "o algoritmo de compressão deve estar na faixa %d..%d\n"
 
-#: g10/g10.c:962
+#: g10/gpg.c:1007
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:964
+#: g10/gpg.c:1009
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:966
+#: g10/gpg.c:1011
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/g10.c:969
+#: g10/gpg.c:1014
 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:973
+#: g10/gpg.c:1018
 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:1050
+#: g10/gpg.c:1095
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/g10.c:1056
+#: g10/gpg.c:1101
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/g10.c:1063
+#: g10/gpg.c:1108
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:1071
+#: g10/gpg.c:1116
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1084
+#: g10/gpg.c:1129
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/g10.c:1097
+#: g10/gpg.c:1142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1111
+#: g10/gpg.c:1156
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/g10.c:1123
+#: g10/gpg.c:1168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1131
+#: g10/gpg.c:1176
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuário"
 
-#: g10/g10.c:1139
+#: g10/gpg.c:1184
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuário"
 
-#: g10/g10.c:1147
+#: g10/gpg.c:1192
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuário [comandos]"
 
-#: g10/g10.c:1163
+#: g10/gpg.c:1208
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-usuário"
 
-#: g10/g10.c:1166
+#: g10/gpg.c:1211
 msgid "--delete-key user-id"
 msgstr "--delete-key id-usuário"
 
-#: g10/encode.c:260 g10/g10.c:1190 g10/sign.c:368
+#: g10/encode.c:306 g10/gpg.c:1236 g10/sign.c:424
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossível abrir %s: %s\n"
 
-#: g10/g10.c:1201
+#: g10/gpg.c:1247
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuário] [chaveiro]"
 
-#: g10/g10.c:1262
+#: g10/gpg.c:1308
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1270
+#: g10/gpg.c:1316
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
 # "hash" poderia ser "espalhamento", mas não fica claro
-#: g10/g10.c:1338
+#: g10/gpg.c:1386
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inválido `%s'\n"
 
-#: g10/g10.c:1419
+#: g10/gpg.c:1467
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/g10.c:1423
+#: g10/gpg.c:1471
 msgid "Go ahead and type your message ...\n"
 msgstr "Vá em frente e digite sua mensagem ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1426 g10/verify.c:66
+#: g10/decrypt.c:59 g10/gpg.c:1474 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossível abrir `%s'\n"
 
-#: g10/g10.c:1594
+#: g10/gpg.c:1642
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "o primeiro caractere de um nome de notação deve ser uma letra ou um "
 "sublinhado\n"
 
-#: g10/g10.c:1600
+#: g10/gpg.c:1648
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -850,12 +860,12 @@ msgstr ""
 "um nome de notação deve ter apenas letras, dígitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:1606
+#: g10/gpg.c:1654
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "pontos em um nome de notação devem estar cercados por outros caracteres\n"
 
-#: g10/g10.c:1614
+#: g10/gpg.c:1662
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de notação não deve usar caracteres de controle\n"
 
@@ -864,70 +874,74 @@ msgstr "um valor de notação não deve usar caracteres de controle\n"
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:319
+#: g10/armor.c:325
 msgid "invalid armor header: "
 msgstr "cabeçalho de armadura inválido: "
 
-#: g10/armor.c:326
+#: g10/armor.c:332
 msgid "armor header: "
 msgstr "cabeçalho de armadura: "
 
-#: g10/armor.c:337
+#: g10/armor.c:343
 msgid "invalid clearsig header\n"
 msgstr "cabeçalho de assinatura em texto puro inválido\n"
 
-#: g10/armor.c:389
+#: g10/armor.c:395
 msgid "nested clear text signatures\n"
 msgstr "assinaturas em texto puro aninhadas\n"
 
-#: g10/armor.c:500
+#: g10/armor.c:506
 msgid "invalid dash escaped line: "
 msgstr "linha com hífen inválida: "
 
-#: g10/armor.c:512
+#: g10/armor.c:518
 msgid "unexpected armor:"
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:629
+#: g10/armor.c:635
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caractere radix64 inválido %02x ignorado\n"
 
-#: g10/armor.c:672
+#: g10/armor.c:678
 msgid "premature eof (no CRC)\n"
 msgstr "fim de arquivo prematuro (sem CRC)\n"
 
-#: g10/armor.c:706
+#: g10/armor.c:712
 msgid "premature eof (in CRC)\n"
 msgstr "fim de arquivo prematuro (no CRC)\n"
 
-#: g10/armor.c:710
+#: g10/armor.c:716
 msgid "malformed CRC\n"
 msgstr "CRC malformado\n"
 
-#: g10/armor.c:714
+#: g10/armor.c:720
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:731
+#: g10/armor.c:737
 msgid "premature eof (in Trailer)\n"
 msgstr "fim de arquivo prematuro (no \"Trailer\")\n"
 
-#: g10/armor.c:735
+#: g10/armor.c:741
 msgid "error in trailer line\n"
 msgstr "erro na linha \"trailer\"\n"
 
-#: g10/armor.c:1001
+#: g10/armor.c:892
+msgid "For info see http://www.gnupg.org"
+msgstr ""
+
+#: g10/armor.c:1007
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP válido encontrado.\n"
 
-#: g10/armor.c:1005
+#: g10/armor.c:1011
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inválida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1009
+#: g10/armor.c:1015
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1195,57 +1209,57 @@ msgstr "%s: ignorado: a chave pública está desativada\n"
 msgid "no valid addressees\n"
 msgstr "nenhum endereço válido\n"
 
-#: g10/keygen.c:122
+#: g10/keygen.c:123
 msgid "writing self signature\n"
 msgstr "escrevendo auto-assinatura\n"
 
 # key binding ???
-#: g10/keygen.c:160
+#: g10/keygen.c:161
 msgid "writing key binding signature\n"
 msgstr "escrevendo assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:386
+#: g10/keygen.c:511
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:388
+#: g10/keygen.c:513
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (padrão)\n"
 
-#: g10/keygen.c:389
+#: g10/keygen.c:514
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:391
+#: g10/keygen.c:516
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:392
+#: g10/keygen.c:517
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e criptografia)\n"
 
-#: g10/keygen.c:394
+#: g10/keygen.c:519
 #, c-format
 msgid "   (%d) ElGamal in a v3 packet\n"
 msgstr "   (%d) ElGamal em um pacote v3\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
 msgid "Your selection? "
 msgstr "Sua opção? "
 
-#: g10/keygen.c:409
+#: g10/keygen.c:534
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Você realmente quer criar uma chave para assinatura e criptografia? "
 
-#: g10/keygen.c:430
+#: g10/keygen.c:555
 msgid "Invalid selection.\n"
 msgstr "Opção inválida.\n"
 
-#: g10/keygen.c:442
+#: g10/keygen.c:567
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1258,15 +1272,15 @@ msgstr ""
 "              tamanho padrão é 1024 bits\n"
 "     tamanho máximo sugerido é 2048 bits\n"
 
-#: g10/keygen.c:449
+#: g10/keygen.c:574
 msgid "What keysize do you want? (1024) "
 msgstr "Que tamanho de chave você quer? (1024) "
 
-#: g10/keygen.c:454
+#: g10/keygen.c:579
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
 
-#: g10/keygen.c:456
+#: g10/keygen.c:581
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n"
 
@@ -1278,12 +1292,12 @@ msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:466
+#: g10/keygen.c:591
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "tamanho muito grande; %d é o valor máximo permitido.\n"
 
-#: g10/keygen.c:471
+#: g10/keygen.c:596
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1291,11 +1305,11 @@ msgstr ""
 "Tamanhos de chave maiores que 2048 não são recomendados\n"
 "porque o tempo de computação é REALMENTE longo!\n"
 
-#: g10/keygen.c:474
+#: g10/keygen.c:599
 msgid "Are you sure that you want this keysize? "
 msgstr "Você tem certeza de que quer este tamanho de chave? "
 
-#: g10/keygen.c:475
+#: g10/keygen.c:600
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1303,21 +1317,21 @@ msgstr ""
 "Tudo bem, mas tenha em mente que a radiação de seu monitor e teclado também "
 "é vulnerável a ataques!\n"
 
-#: g10/keygen.c:483
+#: g10/keygen.c:608
 msgid "Do you really need such a large keysize? "
 msgstr "Você realmente precisa de uma chave tão grande? "
 
-#: g10/keygen.c:489
+#: g10/keygen.c:614
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido é %u bits\n"
 
-#: g10/keygen.c:492 g10/keygen.c:496
+#: g10/keygen.c:617 g10/keygen.c:621
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:509
+#: g10/keygen.c:634
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1333,29 +1347,29 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:526
+#: g10/keygen.c:651
 msgid "Key is valid for? (0) "
 msgstr "A chave é valida por? (0) "
 
-#: g10/keygen.c:547
+#: g10/keygen.c:672
 msgid "invalid value\n"
 msgstr "valor inválido\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:677
 msgid "Key does not expire at all\n"
 msgstr "A chave não expira nunca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:558
+#: g10/keygen.c:683
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:563
+#: g10/keygen.c:688
 msgid "Is this correct (y/n)? "
 msgstr "Está correto (s/n)? "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:731
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1371,44 +1385,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:617
+#: g10/keygen.c:742
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:621
+#: g10/keygen.c:746
 msgid "Invalid character in name\n"
 msgstr "Caractere inválido no nome\n"
 
-#: g10/keygen.c:623
+#: g10/keygen.c:748
 msgid "Name may not start with a digit\n"
 msgstr "O nome não pode começar com um dígito\n"
 
-#: g10/keygen.c:625
+#: g10/keygen.c:750
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:633
+#: g10/keygen.c:758
 msgid "Email address: "
 msgstr "Endereço de correio eletrônico: "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:769
 msgid "Not a valid email address\n"
 msgstr "Endereço eletrônico inválido\n"
 
-#: g10/keygen.c:652
+#: g10/keygen.c:777
 msgid "Comment: "
 msgstr "Comentário: "
 
-#: g10/keygen.c:658
+#: g10/keygen.c:783
 msgid "Invalid character in comment\n"
 msgstr "Caractere inválido no comentário\n"
 
-#: g10/keygen.c:680
+#: g10/keygen.c:808
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Você está usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:686
+#: g10/keygen.c:814
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1419,15 +1433,15 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:689
+#: g10/keygen.c:817
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muda (N)ome, (C)omentário, (E)ndereço ou (O)k/(S)air? "
 
-#: g10/keygen.c:751
+#: g10/keygen.c:879
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1435,11 +1449,11 @@ msgstr ""
 "Você precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keyedit.c:456 g10/keygen.c:759
+#: g10/keyedit.c:456 g10/keygen.c:887
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "A frase secreta não foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keygen.c:765
+#: g10/keygen.c:893
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1451,7 +1465,7 @@ msgstr ""
 "qualquer hora, usando este programa com a opção \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:914
 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"
@@ -1463,33 +1477,33 @@ msgstr ""
 "geração dos números primos; isso dá ao gerador de números aleatórios\n"
 "uma chance melhor de conseguir entropia suficiente.\n"
 
-#: g10/keygen.c:856
+#: g10/keygen.c:984
 msgid "Key generation can only be used in interactive mode\n"
 msgstr "A geração de chaves só pode ser feita em modo interativo\n"
 
-#: g10/keygen.c:864
+#: g10/keygen.c:992
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA terá 1024 bits.\n"
 
-#: g10/keygen.c:870
+#: g10/keygen.c:998
 msgid "Key generation canceled.\n"
 msgstr "Geração de chave cancelada.\n"
 
-#: g10/keygen.c:880
+#: g10/keygen.c:1008
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "escrevendo certificado público para `%s'\n"
 
-#: g10/keygen.c:881
+#: g10/keygen.c:1009
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:958
+#: g10/keygen.c:1086
 msgid "public and secret key created and signed.\n"
 msgstr "chaves pública e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:960
+#: g10/keygen.c:1088
 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"
@@ -1497,12 +1511,12 @@ msgstr ""
 "Note que esta chave não pode ser usada para criptografia. Você pode usar\n"
 "o comando \"--edit-key\" para gerar uma chave secundária para esse fim.\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1073
+#: g10/keygen.c:1102 g10/keygen.c:1201
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/keygen.c:1018 g10/sig-check.c:314 g10/sign.c:106
+#: g10/keygen.c:1146 g10/sig-check.c:394 g10/sign.c:162
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1510,7 +1524,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:1020 g10/sig-check.c:316 g10/sign.c:108
+#: g10/keygen.c:1148 g10/sig-check.c:396 g10/sign.c:164
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1518,32 +1532,32 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:1051
+#: g10/keygen.c:1179
 msgid "Really create? "
 msgstr "Realmente criar? "
 
-#: g10/encode.c:91 g10/openfile.c:163 g10/openfile.c:272 g10/tdbio.c:468
+#: g10/encode.c:137 g10/openfile.c:163 g10/openfile.c:272 g10/tdbio.c:468
 #: g10/tdbio.c:529
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: impossível abrir: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:159
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:217 g10/encode.c:365
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVISO: arquivo vazio\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:312
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:529
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s criptografado para: %s\n"
@@ -1602,7 +1616,7 @@ msgstr "impossível abrir `%s': %s\n"
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:169 g10/trustdb.c:1658 g10/trustdb.c:1697
+#: g10/import.c:169 g10/trustdb.c:1659 g10/trustdb.c:1698
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu chaves processadas até agora\n"
@@ -1690,7 +1704,7 @@ msgstr "chave %08lX: chave pública não encontrada: %s\n"
 msgid "no default public keyring\n"
 msgstr "sem chaveiro público padrão\n"
 
-#: g10/import.c:399 g10/openfile.c:215 g10/sign.c:269 g10/sign.c:582
+#: g10/import.c:399 g10/openfile.c:215 g10/sign.c:325 g10/sign.c:638
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
@@ -1948,7 +1962,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:129
+#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:185
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
@@ -2417,65 +2431,65 @@ msgstr "Realmente gerar os certificados de revogação? (s/N)"
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:212
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "a chave pública é %08lX\n"
 
-#: g10/mainproc.c:244
+#: g10/mainproc.c:243
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados criptografados com chave pública: DEK válido\n"
 
-#: g10/mainproc.c:275
+#: g10/mainproc.c:274
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "criptografado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:285
+#: g10/mainproc.c:284
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "criptografado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 msgid "no secret key for decryption available\n"
 msgstr "nenhuma chave secreta para descriptografia disponível\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:299
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descriptografia de chave pública falhou: %s\n"
 
-#: g10/mainproc.c:332
+#: g10/mainproc.c:331
 msgid "decryption okay\n"
 msgstr "descriptografia correta\n"
 
-#: g10/mainproc.c:337
+#: g10/mainproc.c:336
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem criptografada foi manipulada!\n"
 
-#: g10/mainproc.c:342
+#: g10/mainproc.c:341
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/mainproc.c:360
+#: g10/mainproc.c:359
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:361
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome de arquivo original='%.*s'\n"
 
-#: g10/mainproc.c:596 g10/mainproc.c:605
+#: g10/mainproc.c:595 g10/mainproc.c:604
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de notação inválidos encontrados\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:607
 msgid "Notation: "
 msgstr "Notação: "
 
-#: g10/mainproc.c:615
+#: g10/mainproc.c:614
 msgid "Policy: "
 msgstr "Política: "
 
@@ -2514,20 +2528,20 @@ msgstr "formato de assinatura antigo (PGP2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inválido detectado em proc_tree()\n"
 
-#: g10/misc.c:95
+#: g10/misc.c:83
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossível desativar core dumps: %s\n"
 
-#: g10/misc.c:98
+#: g10/misc.c:86
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:312
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Algoritmos experimentais não devem ser usados!\n"
 
-#: g10/misc.c:220
+#: g10/misc.c:326
 msgid ""
 "RSA keys are deprecated; please consider creating a new key and use this key "
 "in the future\n"
@@ -2535,18 +2549,18 @@ msgstr ""
 "Chaves RSA não são recomendáveis; por favor considere criar uma nova chave e "
 "usá-la no futuro\n"
 
-#: g10/misc.c:242
+#: g10/misc.c:348
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "este algoritmo de criptografia é depreciado; por favor use algum\n"
 "algoritmo padrão!\n"
 
-#: g10/parse-packet.c:113
+#: g10/parse-packet.c:112
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossível manipular algoritmo de chave pública %d\n"
 
-#: g10/parse-packet.c:939
+#: g10/parse-packet.c:938
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit crítico ligado\n"
@@ -2605,92 +2619,92 @@ msgstr "lendo de \"stdin\" ...\n"
 msgid "can't open signed data `%s'\n"
 msgstr "impossível abrir dados assinados `%s'\n"
 
-#: g10/pubkey-enc.c:80
+#: g10/pubkey-enc.c:147
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "destinatário anônimo; tentando chave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:86
+#: g10/pubkey-enc.c:153
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "certo, nós somos o destinatário anônimo.\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:209
 msgid "old encoding of the DEK is not supported\n"
 msgstr "codificação antiga do DEK não suportada\n"
 
-#: g10/pubkey-enc.c:192
+#: g10/pubkey-enc.c:263
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d não encontrado nas preferências\n"
 
-#: g10/seckey-cert.c:56
+#: g10/seckey-cert.c:101
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "algoritmo de proteção %d não é suportado\n"
 
-#: g10/seckey-cert.c:181
+#: g10/seckey-cert.c:242
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Frase secreta inválida; por favor tente novamente ...\n"
 
-#: g10/seckey-cert.c:246
+#: g10/seckey-cert.c:307
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Chave fraca detectada - por favor mude a frase secreta novamente.\n"
 
-#: g10/sig-check.c:201
+#: g10/sig-check.c:281
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr "assumindo MDC incorreto devido a um bit crítico desconhecido\n"
 
-#: g10/sig-check.c:297
+#: g10/sig-check.c:377
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "esta é uma chave ElGamal gerada pelo PGP que NÃO é segura para assinaturas!\n"
 
-#: g10/sig-check.c:305
+#: g10/sig-check.c:385
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "a chave pública é %lu segundo mais nova que a assinatura\n"
 
-#: g10/sig-check.c:306
+#: g10/sig-check.c:386
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "a chave pública é %lu segundos mais nova que a assinatura\n"
 
-#: g10/sig-check.c:322
+#: g10/sig-check.c:402
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTA: chave de assinatura expirou %s\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:459
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "assumindo assinatura incorreta devido a um bit crítico desconhecido\n"
 
-#: g10/sign.c:133
+#: g10/sign.c:189
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/sign.c:264 g10/sign.c:577
+#: g10/sign.c:320 g10/sign.c:633
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossível criar %s: %s\n"
 
-#: g10/sign.c:363
+#: g10/sign.c:419
 msgid "signing:"
 msgstr "assinando:"
 
-#: g10/sign.c:406
+#: g10/sign.c:462
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' é um arquivo vazio\n"
 
-#: g10/textfilter.c:129
+#: g10/textfilter.c:128
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "impossível manipular linhas de texto maiores que %d caracteres\n"
 
-#: g10/textfilter.c:198
+#: g10/textfilter.c:197
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linha de entrada maior que %d caracteres\n"
@@ -2714,12 +2728,12 @@ msgstr "transação de banco de dados de confiabilidade muito grande\n"
 msgid "%s: can't access: %s\n"
 msgstr "%s: impossível acessar: %s\n"
 
-#: g10/ringedit.c:298 g10/tdbio.c:445
+#: g10/ringedit.c:297 g10/tdbio.c:445
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: impossível criar diretório: %s\n"
 
-#: g10/ringedit.c:304 g10/tdbio.c:448
+#: g10/ringedit.c:303 g10/tdbio.c:448
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: diretório criado\n"
@@ -2729,7 +2743,7 @@ msgstr "%s: diretório criado\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diretório inexistente!\n"
 
-#: g10/openfile.c:211 g10/openfile.c:279 g10/ringedit.c:1350 g10/tdbio.c:458
+#: g10/openfile.c:211 g10/openfile.c:279 g10/ringedit.c:1349 g10/tdbio.c:458
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: impossível criar: %s\n"
@@ -2917,241 +2931,235 @@ msgstr "chave %08lX: aceita como chave confiável.\n"
 msgid "enumerate secret keys failed: %s\n"
 msgstr "enumeração de chaves secretas falhou: %s\n"
 
-#: g10/trustdb.c:877
+#: g10/trustdb.c:878
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "chave %08lX.%lu: Ligação de subchave válida\n"
 
-#: g10/trustdb.c:883 g10/trustdb.c:918
+#: g10/trustdb.c:884 g10/trustdb.c:919
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "chave %08lX.%lu: Ligação de subchave inválida: %s\n"
 
-#: g10/trustdb.c:895
+#: g10/trustdb.c:896
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "chave %08lX.%lu: Revogação de chave válida\n"
 
-#: g10/trustdb.c:901
+#: g10/trustdb.c:902
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "chave %08lX.%lu: Revogação de chave inválida: %s\n"
 
-#: g10/trustdb.c:912
+#: g10/trustdb.c:913
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "chave %08lX.%lu: Revogação de subchave válida\n"
 
-#: g10/trustdb.c:1023
+#: g10/trustdb.c:1024
 msgid "Good self-signature"
 msgstr "Auto-assinatura válida"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1034
 msgid "Invalid self-signature"
 msgstr "Auto-assinatura inválida"
 
-#: g10/trustdb.c:1060
+#: g10/trustdb.c:1061
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Revogação válida de ID de usuário ignorada devido a nova auto-assinatura"
 
-#: g10/trustdb.c:1066
+#: g10/trustdb.c:1067
 msgid "Valid user ID revocation"
 msgstr "Revogação de ID de usuário válida"
 
-#: g10/trustdb.c:1071
+#: g10/trustdb.c:1072
 msgid "Invalid user ID revocation"
 msgstr "Revogação de ID de usuário inválida"
 
-#: g10/trustdb.c:1112
+#: g10/trustdb.c:1113
 msgid "Valid certificate revocation"
 msgstr "Certificado de revogação válido"
 
-#: g10/trustdb.c:1113
+#: g10/trustdb.c:1114
 msgid "Good certificate"
 msgstr "Certificado correto"
 
-#: g10/trustdb.c:1134
+#: g10/trustdb.c:1135
 msgid "Invalid certificate revocation"
 msgstr "Certificado de revogação inválido"
 
-#: g10/trustdb.c:1135
+#: g10/trustdb.c:1136
 msgid "Invalid certificate"
 msgstr "Certificado inválido"
 
-#: g10/trustdb.c:1152 g10/trustdb.c:1156
+#: g10/trustdb.c:1153 g10/trustdb.c:1157
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "registro de assinatura %lu[%d] aponta para registro errado.\n"
 
-#: g10/trustdb.c:1208
+#: g10/trustdb.c:1209
 msgid "duplicated certificate - deleted"
 msgstr "certificado duplicado - removido"
 
-#: g10/trustdb.c:1514
+#: g10/trustdb.c:1515
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir falhou: %s\n"
 
-#: g10/trustdb.c:1636
+#: g10/trustdb.c:1637
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: inserção falhou: %s\n"
 
-#: g10/trustdb.c:1641
+#: g10/trustdb.c:1642
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: inserção falhou: %s\n"
 
-#: g10/trustdb.c:1647
+#: g10/trustdb.c:1648
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: inserido\n"
 
-#: g10/trustdb.c:1652
+#: g10/trustdb.c:1653
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "erro lendo registro de diretório: %s\n"
 
-#: g10/trustdb.c:1660 g10/trustdb.c:1714
+#: g10/trustdb.c:1661 g10/trustdb.c:1715
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu chaves processadas\n"
 
-#: g10/trustdb.c:1662 g10/trustdb.c:1718
+#: g10/trustdb.c:1663 g10/trustdb.c:1719
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu chaves com erros\n"
 
-#: g10/trustdb.c:1664
+#: g10/trustdb.c:1665
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu chaves inseridas\n"
 
-#: g10/trustdb.c:1667
+#: g10/trustdb.c:1668
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enumeração de blocos de chaves falhou: %s\n"
 
-#: g10/trustdb.c:1705
+#: g10/trustdb.c:1706
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: registro de diretório sem chave - ignorado\n"
 
-#: g10/trustdb.c:1716
+#: g10/trustdb.c:1717
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu chaves ignoradas\n"
 
-#: g10/trustdb.c:1720
+#: g10/trustdb.c:1721
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu chaves atualizadas\n"
 
-#: g10/trustdb.c:2057
+#: g10/trustdb.c:2058
 msgid "Ooops, no keys\n"
 msgstr "Ooops, nenhuma chave\n"
 
-#: g10/trustdb.c:2061
+#: g10/trustdb.c:2062
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, nenhum ID de usuário\n"
 
-#: g10/trustdb.c:2218
+#: g10/trustdb.c:2219
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: busca de registro de diretório falhou: %s\n"
 
-#: g10/trustdb.c:2227
+#: g10/trustdb.c:2228
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "chave %08lX: inserção de registro de confiança falhou: %s\n"
 
-#: g10/trustdb.c:2231
+#: g10/trustdb.c:2232
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "chave %08lX.%lu: inserida no banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:2239
+#: g10/trustdb.c:2240
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "chave %08lX.%lu: criada no futuro (viagem no tempo ou problema no relogio)\n"
 
-#: g10/trustdb.c:2248
+#: g10/trustdb.c:2249
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "chave %08lX.%lu: expirou em %s\n"
 
-#: g10/trustdb.c:2256
+#: g10/trustdb.c:2257
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "chave %08lX.%lu: verificação de confiança falhou: %s\n"
 
-#: g10/trustdb.c:2362
+#: g10/trustdb.c:2363
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "usuário `%s' não encontrado: %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2365
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problemas na procura de `%s' no banco de dados de confiabilidade: %s\n"
 
-#: g10/trustdb.c:2367
+#: g10/trustdb.c:2368
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr ""
 "usuário `%s' não encontrado no banco de dados de confiabilidade - inserindo\n"
 
-#: g10/trustdb.c:2370
+#: g10/trustdb.c:2371
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "falha ao colocar `%s' no banco de dados de confiabilidade: %s\n"
 
-#: g10/trustdb.c:2556 g10/trustdb.c:2586
+#: g10/trustdb.c:2557 g10/trustdb.c:2587
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "AVISO: ainda é impossível manipular registros de preferências longos\n"
 
-#: g10/ringedit.c:318
+#: g10/ringedit.c:317
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: impossível criar chaveiro: %s\n"
 
-#: g10/ringedit.c:335 g10/ringedit.c:1355
+#: g10/ringedit.c:334 g10/ringedit.c:1354
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro criado\n"
 
-#: g10/ringedit.c:1532
+#: g10/ringedit.c:1531
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existem 2 arquivos com informações confidenciais.\n"
 
-#: g10/ringedit.c:1533
+#: g10/ringedit.c:1532
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s é o não modificado\n"
 
-#: g10/ringedit.c:1534
+#: g10/ringedit.c:1533
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s é o novo\n"
 
-#: g10/ringedit.c:1535
+#: g10/ringedit.c:1534
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte este possível furo de segurança\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
-msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr ""
-"a chave não está marcada como insegura - impossível usá-la com o pseudo "
-"RNG!\n"
-
-#: g10/skclist.c:113
+#: g10/skclist.c:97
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:103
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3193,28 +3201,28 @@ msgstr "assumindo dados assinados em `%s'\n"
 msgid "%s: new options file created\n"
 msgstr "%s: novo arquivo de opções criado\n"
 
-#: g10/encr-data.c:66
+#: g10/encr-data.c:64
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "criptografado com algoritmo desconhecido %d\n"
 
-#: g10/encr-data.c:71
+#: g10/encr-data.c:69
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/encr-data.c:101
+#: g10/encr-data.c:99
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVISO: A mensagem foi criptografada com uma chave fraca na criptografia\n"
 "simétrica.\n"
 
-#: g10/seskey.c:63
+#: g10/seskey.c:62
 msgid "weak key created - retrying\n"
 msgstr "chave fraca criada - tentando novamente\n"
 
-#: g10/seskey.c:68
+#: g10/seskey.c:67
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
@@ -3464,6 +3472,11 @@ msgstr "Nenhuma ajuda disponível"
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda disponível para `%s'"
 
+#~ msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
+#~ msgstr ""
+#~ "a chave não está marcada como insegura - impossível usá-la com o pseudo "
+#~ "RNG!\n"
+
 #, fuzzy
 #~ msgid "tdbio_search_sdir failed: %s\n"
 #~ msgstr "tdbio_search_dir falhou: %s\n"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 6246fdf44..021a4ff1a 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
-"POT-Creation-Date: 1999-10-26 18:57+0200\n"
+"POT-Creation-Date: 2000-01-31 12:09+0100\n"
 "PO-Revision-Date: 1999-09-09 20:28+0000\n"
 "Last-Translator: Pedro Morais <morais@poli.org>\n"
 "Language-Team: pt\n"
@@ -15,250 +15,250 @@ msgstr ""
 "Content-Type:\n"
 "Content-Transfer-Encoding:\n"
 
-#: util/secmem.c:79
+#: gcrypt/secmem.c:77
 msgid "Warning: using insecure memory!\n"
 msgstr "Aviso: a utilizar memória insegura!\n"
 
-#: util/secmem.c:281
+#: gcrypt/secmem.c:279
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "a operação não é possível sem memória segura inicializada\n"
 
-#: util/secmem.c:282
+#: gcrypt/secmem.c:280
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(você pode ter usado o programa errado para esta tarefa)\n"
 
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:278 util/miscutil.c:307
 msgid "yes"
 msgstr "sim"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:279 util/miscutil.c:310
 msgid "yY"
 msgstr "sS"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:280 util/miscutil.c:308
 msgid "no"
 msgstr "não"
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:281 util/miscutil.c:311
 msgid "nN"
 msgstr "nN"
 
 # INICIO MENU
-#: g10/keyedit.c:564 util/miscutil.c:308
+#: g10/keyedit.c:564 util/miscutil.c:309
 msgid "quit"
 msgstr "sair"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:312
 msgid "qQ"
 msgstr "qQ"
 
-#: util/errors.c:54
+#: util/errors.c:55
 msgid "general error"
 msgstr "erro geral"
 
-#: util/errors.c:55
+#: util/errors.c:56
 msgid "unknown packet type"
 msgstr "formato de pacote desconhecido"
 
-#: util/errors.c:56
+#: util/errors.c:57
 msgid "unknown version"
 msgstr "versão desconhecida"
 
-#: util/errors.c:57
+#: util/errors.c:58
 msgid "unknown pubkey algorithm"
 msgstr "algoritmo de chave pública desconhecido"
 
-#: util/errors.c:58
+#: util/errors.c:59
 msgid "unknown digest algorithm"
 msgstr "algoritmo de \"digest\" desconhecido"
 
-#: util/errors.c:59
+#: util/errors.c:60
 msgid "bad public key"
 msgstr "chave pública incorrecta"
 
-#: util/errors.c:60
+#: util/errors.c:61
 msgid "bad secret key"
 msgstr "chave secreta incorrecta"
 
-#: util/errors.c:61
+#: util/errors.c:62
 msgid "bad signature"
 msgstr "assinatura incorrecta"
 
-#: util/errors.c:62
+#: util/errors.c:63
 msgid "checksum error"
 msgstr "erro de \"checksum\""
 
-#: util/errors.c:63
+#: util/errors.c:64
 msgid "bad passphrase"
 msgstr "frase secreta incorrecta"
 
-#: util/errors.c:64
+#: util/errors.c:65
 msgid "public key not found"
 msgstr "chave pública não encontrada"
 
-#: util/errors.c:65
+#: util/errors.c:66
 msgid "unknown cipher algorithm"
 msgstr "algoritmo de criptografia desconhecido"
 
-#: util/errors.c:66
+#: util/errors.c:67
 msgid "can't open the keyring"
 msgstr "não é possível abrir o porta-chaves"
 
-#: util/errors.c:67
+#: util/errors.c:68
 msgid "invalid packet"
 msgstr "pacote inválido"
 
-#: util/errors.c:68
+#: util/errors.c:69
 msgid "invalid armor"
 msgstr "armadura inválida"
 
-#: util/errors.c:69
+#: util/errors.c:70
 msgid "no such user id"
 msgstr "identificador de utilizador inexistente"
 
-#: util/errors.c:70
+#: util/errors.c:71
 msgid "secret key not available"
 msgstr "chave secreta não disponível"
 
-#: util/errors.c:71
+#: util/errors.c:72
 msgid "wrong secret key used"
 msgstr "chave secreta incorrecta"
 
-#: util/errors.c:72
+#: util/errors.c:73
 msgid "not supported"
 msgstr "não suportado"
 
-#: util/errors.c:73
+#: util/errors.c:74
 msgid "bad key"
 msgstr "chave incorrecta"
 
-#: util/errors.c:74
+#: util/errors.c:75
 msgid "file read error"
 msgstr "erro de leitura"
 
-#: util/errors.c:75
+#: util/errors.c:76
 msgid "file write error"
 msgstr "erro de escrita"
 
-#: util/errors.c:76
+#: util/errors.c:77
 msgid "unknown compress algorithm"
 msgstr "algoritmo de compressão desconhecido"
 
-#: util/errors.c:77
+#: util/errors.c:78
 msgid "file open error"
 msgstr "erro na abertura do ficheiro"
 
-#: util/errors.c:78
+#: util/errors.c:79
 msgid "file create error"
 msgstr "erro na criação do ficheiro"
 
-#: util/errors.c:79
+#: util/errors.c:80
 msgid "invalid passphrase"
 msgstr "frase-secreta inválida"
 
-#: util/errors.c:80
+#: util/errors.c:81
 msgid "unimplemented pubkey algorithm"
 msgstr "algoritmo de chave pública não implementado"
 
-#: util/errors.c:81
+#: util/errors.c:82
 msgid "unimplemented cipher algorithm"
 msgstr "algoritmo de criptografia não implementado"
 
-#: util/errors.c:82
+#: util/errors.c:83
 msgid "unknown signature class"
 msgstr "classe de assinatura desconhecida"
 
-#: util/errors.c:83
+#: util/errors.c:84
 msgid "trust database error"
 msgstr "erro na base de dados de confiança"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr "MPI incorreto"
 
-#: util/errors.c:85
+#: util/errors.c:86
 msgid "resource limit"
 msgstr "limite de recursos"
 
-#: util/errors.c:86
+#: util/errors.c:87
 msgid "invalid keyring"
 msgstr "porta-chaves inválido"
 
-#: util/errors.c:87
+#: util/errors.c:88
 msgid "bad certificate"
 msgstr "certificado incorrecto"
 
-#: util/errors.c:88
+#: util/errors.c:89
 msgid "malformed user id"
 msgstr "identificador de utilizador malformado"
 
-#: util/errors.c:89
+#: util/errors.c:90
 msgid "file close error"
 msgstr "erro ao fechar ficheiro"
 
-#: util/errors.c:90
+#: util/errors.c:91
 msgid "file rename error"
 msgstr "erro na renomeação do ficheiro"
 
-#: util/errors.c:91
+#: util/errors.c:92
 msgid "file delete error"
 msgstr "erro na remoção do ficheiro"
 
-#: util/errors.c:92
+#: util/errors.c:93
 msgid "unexpected data"
 msgstr "dados inesperados"
 
-#: util/errors.c:93
+#: util/errors.c:94
 msgid "timestamp conflict"
 msgstr "conflito de \"timestamp\""
 
-#: util/errors.c:94
+#: util/errors.c:95
 msgid "unusable pubkey algorithm"
 msgstr "algoritmo de chave pública inutilizável"
 
-#: util/errors.c:95
+#: util/errors.c:96
 msgid "file exists"
 msgstr "o ficheiro já existe"
 
-#: util/errors.c:96
+#: util/errors.c:97
 msgid "weak key"
 msgstr "chave fraca"
 
-#: util/errors.c:97
+#: util/errors.c:98
 msgid "invalid argument"
 msgstr "argumento inválido"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr "URI incorrecto"
 
-#: util/errors.c:99
+#: util/errors.c:100
 msgid "unsupported URI"
 msgstr "URI não suportado"
 
-#: util/errors.c:100
+#: util/errors.c:101
 msgid "network error"
 msgstr "erro na rede"
 
-#: util/errors.c:102
+#: util/errors.c:103
 msgid "not encrypted"
 msgstr "não encriptado"
 
-#: util/logger.c:218
+#: util/logger.c:219
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "... isto é um bug (%s:%d:%s)\n"
 
-#: util/logger.c:224
+#: util/logger.c:225
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "você encontrou um bug ... (%s:%d)\n"
 
-#: cipher/random.c:452
+#: cipher/random.c:463
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: a utilizar gerador de números aleatórios inseguro!\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:469
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -272,7 +272,7 @@ msgstr ""
 "NÃO USE NENHUM DADO GERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:125
 #, c-format
 msgid ""
 "\n"
@@ -283,7 +283,7 @@ msgstr ""
 "Não há bytes aleatórios suficientes. Por favor, faça outro trabalho para\n"
 "que o sistema possa recolher mais entropia! (São necessários mais %d bytes)\n"
 
-#: g10/g10.c:186
+#: g10/gpg.c:183
 msgid ""
 "@Commands:\n"
 " "
@@ -291,136 +291,141 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:188
+#: g10/gpg.c:185
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: g10/g10.c:189
+#: g10/gpg.c:186
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:190
+#: g10/gpg.c:187
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:191
+#: g10/gpg.c:188
 msgid "encrypt data"
 msgstr "encriptar dados"
 
-#: g10/g10.c:192
+#: g10/gpg.c:189
 msgid "encryption only with symmetric cipher"
 msgstr "encriptar apenas com cifra simétrica"
 
-#: g10/g10.c:193
+#: g10/gpg.c:190
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/g10.c:194
+#: g10/gpg.c:191
 msgid "decrypt data (default)"
 msgstr "desencriptar dados (acção por omissão)"
 
-#: g10/g10.c:195
+#: g10/gpg.c:192
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:196
+#: g10/gpg.c:193
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:198
+#: g10/gpg.c:195
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:199
+#: g10/gpg.c:196
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:200
+#: g10/gpg.c:197
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impressões digitais"
 
-#: g10/g10.c:201
+#: g10/gpg.c:198
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:202
+#: g10/gpg.c:199
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:203
+#: g10/gpg.c:200
 msgid "remove key from the public keyring"
 msgstr "remover a chave do porta-chaves público"
 
-#: g10/g10.c:204
+#: g10/gpg.c:202
+#, fuzzy
+msgid "remove key from the secret keyring"
+msgstr "remover a chave do porta-chaves público"
+
+#: g10/gpg.c:203
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:205
+#: g10/gpg.c:204
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:206
+#: g10/gpg.c:205
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:207
+#: g10/gpg.c:206
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revogação"
 
-#: g10/g10.c:208
+#: g10/gpg.c:207
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:209
+#: g10/gpg.c:208
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:210
+#: g10/gpg.c:209
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:213
+#: g10/gpg.c:212
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:215
+#: g10/gpg.c:214
 msgid "list only the sequence of packets"
 msgstr "listar apenas as sequências de pacotes"
 
 # ownertrust ???
-#: g10/g10.c:217
+#: g10/gpg.c:216
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confiança"
 
-#: g10/g10.c:219
+#: g10/gpg.c:218
 msgid "import ownertrust values"
 msgstr "importar os valores de confiança"
 
-#: g10/g10.c:221
+#: g10/gpg.c:220
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confiança"
 
-#: g10/g10.c:223
+#: g10/gpg.c:222
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMES]|verificar a base de dados de confiança"
 
-#: g10/g10.c:224
+#: g10/gpg.c:223
 msgid "fix a corrupted trust database"
 msgstr "consertar uma base de dados de confiança"
 
-#: g10/g10.c:225
+#: g10/gpg.c:224
 msgid "De-Armor a file or stdin"
 msgstr "retirar armadura de um ficheiro ou do \"stdin\""
 
-#: g10/g10.c:227
+#: g10/gpg.c:226
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um ficheiro ou \"stdin\""
 
-#: g10/g10.c:229
+#: g10/gpg.c:228
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:233
+#: g10/gpg.c:232
 msgid ""
 "@\n"
 "Options:\n"
@@ -430,185 +435,185 @@ msgstr ""
 "Opções:\n"
 " "
 
-#: g10/g10.c:235
+#: g10/gpg.c:234
 msgid "create ascii armored output"
 msgstr "criar saída com armadura ascii"
 
-#: g10/g10.c:237
+#: g10/gpg.c:236
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|encriptar para NOME"
 
-#: g10/g10.c:240
+#: g10/gpg.c:239
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinatário padrão"
 
-#: g10/g10.c:242
+#: g10/gpg.c:241
 msgid "use the default key as default recipient"
 msgstr "usar a chave padrão como destinatário padrão"
 
-#: g10/g10.c:246
+#: g10/gpg.c:245
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou desencriptar"
 
-#: g10/g10.c:247
+#: g10/gpg.c:246
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer nível de compressão N\n"
 "(0 desactiva)"
 
-#: g10/g10.c:249
+#: g10/gpg.c:248
 msgid "use canonical text mode"
 msgstr "usar modo de texto canônico"
 
-#: g10/g10.c:250
+#: g10/gpg.c:249
 msgid "use as output file"
 msgstr "usar como ficheiro de saída"
 
-#: g10/g10.c:251
+#: g10/gpg.c:250
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:252
+#: g10/gpg.c:251
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:253
+#: g10/gpg.c:252
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/g10.c:254
+#: g10/gpg.c:253
 msgid "force v3 signatures"
 msgstr "forçar assinaturas v3"
 
-#: g10/g10.c:255
+#: g10/gpg.c:254
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para encriptar"
 
-#: g10/g10.c:256
+#: g10/gpg.c:255
 msgid "do not make any changes"
 msgstr "não fazer alterações"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:258
+#: g10/gpg.c:257
 msgid "batch mode: never ask"
 msgstr "modo não-interactivo: nunca perguntar"
 
-#: g10/g10.c:259
+#: g10/gpg.c:258
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:260
+#: g10/gpg.c:259
 msgid "assume no on most questions"
 msgstr "assumir não para a maioria das perguntas"
 
-#: g10/g10.c:261
+#: g10/gpg.c:260
 msgid "add this keyring to the list of keyrings"
 msgstr ""
 "adicionar este porta-chaves\n"
 "à lista de porta-chaves"
 
-#: g10/g10.c:262
+#: g10/gpg.c:261
 msgid "add this secret keyring to the list"
 msgstr "adicionar este porta-chaves secreto à lista"
 
-#: g10/g10.c:263
+#: g10/gpg.c:262
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta por omissão"
 
-#: g10/g10.c:264
+#: g10/gpg.c:263
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDEREÇO|usar este servidor para buscar chaves"
 
-#: g10/g10.c:265
+#: g10/gpg.c:264
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/g10.c:266
+#: g10/gpg.c:265
 msgid "read options from file"
 msgstr "ler opções do ficheiro"
 
-#: g10/g10.c:268
+#: g10/gpg.c:267
 msgid "set debugging flags"
 msgstr "definir parâmetros de depuração"
 
-#: g10/g10.c:269
+#: g10/gpg.c:268
 msgid "enable full debugging"
 msgstr "habilitar depuração completa"
 
-#: g10/g10.c:270
+#: g10/gpg.c:269
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DF|escrever informações de estado para o\n"
 "descritor de ficheiro DF"
 
-#: g10/g10.c:271
+#: g10/gpg.c:270
 msgid "do not write comment packets"
 msgstr "não escrever pacotes de comentário"
 
-#: g10/g10.c:272
+#: g10/gpg.c:271
 msgid "(default is 1)"
 msgstr "(por omissão 1)"
 
-#: g10/g10.c:273
+#: g10/gpg.c:272
 msgid "(default is 3)"
 msgstr "(por omissão 3)"
 
-#: g10/g10.c:275
+#: g10/gpg.c:274
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: g10/g10.c:276
+#: g10/gpg.c:275
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/g10.c:277
+#: g10/gpg.c:276
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "configurar todas as opções de pacote,\n"
 "criptografia e \"digest\" para comportamento\n"
 "OpenPGP"
 
-#: g10/g10.c:278
+#: g10/gpg.c:277
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar mode de frase secreta N"
 
-#: g10/g10.c:280
+#: g10/gpg.c:279
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de \"digest\" de mensagens NOME\n"
 "para frases secretas"
 
-#: g10/g10.c:282
+#: g10/gpg.c:281
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:283
+#: g10/gpg.c:282
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:284
+#: g10/gpg.c:283
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:285
+#: g10/gpg.c:284
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compressão N"
 
-#: g10/g10.c:286
+#: g10/gpg.c:285
 msgid "throw keyid field of encrypted packets"
 msgstr "eliminar campo keyid dos pacotes encriptados"
 
-#: g10/g10.c:287
+#: g10/gpg.c:286
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALOR|usar estes dados de notação"
 
-#: g10/g10.c:289
+#: g10/gpg.c:288
 msgid ""
 "@\n"
 "Examples:\n"
@@ -628,15 +633,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impressões digitais\n"
 
-#: g10/g10.c:376
+#: g10/gpg.c:379
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:380
+#: g10/gpg.c:383
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: g10/g10.c:383
+#: g10/gpg.c:386
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -646,7 +651,7 @@ msgstr ""
 "assina, verifica, encripta ou desencripta\n"
 "a operação por omissão depende dos dados de entrada\n"
 
-#: g10/g10.c:388
+#: g10/gpg.c:391
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -654,185 +659,190 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:465
+#: g10/gpg.c:469
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opções] "
 
-#: g10/g10.c:518
+#: g10/gpg.c:549
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/g10.c:653
+#: g10/gpg.c:603
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
+#: g10/gpg.c:693
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: ficheiro de opções por omissão `%s' inexistente\n"
 
-#: g10/g10.c:657
+#: g10/gpg.c:697
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opções `%s': %s\n"
 
-#: g10/g10.c:664
+#: g10/gpg.c:704
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler opções de `%s'\n"
 
-#: g10/g10.c:844
+#: g10/gpg.c:885
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s não é um conjunto de caracteres válido\n"
 
-#: g10/g10.c:911 g10/g10.c:920
+#: g10/gpg.c:955 g10/gpg.c:964
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s não é para uso normal!\n"
 
-#: g10/g10.c:913
+#: g10/gpg.c:957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s não é permitido com %s!\n"
 
-#: g10/g10.c:916
+#: g10/gpg.c:960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s não faz sentido com %s!\n"
 
-#: g10/g10.c:935 g10/g10.c:947
+#: g10/gpg.c:980 g10/gpg.c:992
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado não é válido\n"
 
-#: g10/g10.c:941 g10/g10.c:953
+#: g10/gpg.c:986 g10/gpg.c:998
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado não é válido\n"
 
-#: g10/g10.c:957
+#: g10/gpg.c:1002
 msgid "the given policy URL is invalid\n"
 msgstr "a URL de política dada é inválida\n"
 
-#: g10/g10.c:960
+#: g10/gpg.c:1005
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "o algoritmo de compressão deve estar na faixa %d..%d\n"
 
-#: g10/g10.c:962
+#: g10/gpg.c:1007
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:964
+#: g10/gpg.c:1009
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:966
+#: g10/gpg.c:1011
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/g10.c:969
+#: g10/gpg.c:1014
 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:973
+#: g10/gpg.c:1018
 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:1050
+#: g10/gpg.c:1095
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar a base de dados de confiança: %s\n"
 
-#: g10/g10.c:1056
+#: g10/gpg.c:1101
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/g10.c:1063
+#: g10/gpg.c:1108
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:1071
+#: g10/gpg.c:1116
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1084
+#: g10/gpg.c:1129
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/g10.c:1097
+#: g10/gpg.c:1142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1111
+#: g10/gpg.c:1156
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/g10.c:1123
+#: g10/gpg.c:1168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1131
+#: g10/gpg.c:1176
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/g10.c:1139
+#: g10/gpg.c:1184
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/g10.c:1147
+#: g10/gpg.c:1192
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/g10.c:1163
+#: g10/gpg.c:1208
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-utilizador"
 
-#: g10/g10.c:1166
+#: g10/gpg.c:1211
 msgid "--delete-key user-id"
 msgstr "--delete-key id-utilizador"
 
-#: g10/encode.c:260 g10/g10.c:1190 g10/sign.c:368
+#: g10/encode.c:306 g10/gpg.c:1236 g10/sign.c:424
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossível abrir %s: %s\n"
 
-#: g10/g10.c:1201
+#: g10/gpg.c:1247
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/g10.c:1262
+#: g10/gpg.c:1308
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1270
+#: g10/gpg.c:1316
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
 # "hash" poderia ser "espalhamento", mas não fica claro
-#: g10/g10.c:1338
+#: g10/gpg.c:1386
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inválido `%s'\n"
 
-#: g10/g10.c:1419
+#: g10/gpg.c:1467
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/g10.c:1423
+#: g10/gpg.c:1471
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1426 g10/verify.c:66
+#: g10/decrypt.c:59 g10/gpg.c:1474 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossível abrir `%s'\n"
 
-#: g10/g10.c:1594
+#: g10/gpg.c:1642
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "o primeiro caracter de um nome de notação deve ser uma letra ou um "
 "sublinhado\n"
 
-#: g10/g10.c:1600
+#: g10/gpg.c:1648
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -840,12 +850,12 @@ msgstr ""
 "um nome de notação deve ter apenas letras, dígitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:1606
+#: g10/gpg.c:1654
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "pontos num nome de notação devem estar cercados por outros caracteres\n"
 
-#: g10/g10.c:1614
+#: g10/gpg.c:1662
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de notação não deve usar caracteres de controle\n"
 
@@ -854,70 +864,74 @@ msgstr "um valor de notação não deve usar caracteres de controle\n"
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:319
+#: g10/armor.c:325
 msgid "invalid armor header: "
 msgstr "cabeçalho de armadura inválido: "
 
-#: g10/armor.c:326
+#: g10/armor.c:332
 msgid "armor header: "
 msgstr "cabeçalho de armadura: "
 
-#: g10/armor.c:337
+#: g10/armor.c:343
 msgid "invalid clearsig header\n"
 msgstr "cabeçalho de assinatura em texto puro inválido\n"
 
-#: g10/armor.c:389
+#: g10/armor.c:395
 msgid "nested clear text signatures\n"
 msgstr "assinaturas em texto puro aninhadas\n"
 
-#: g10/armor.c:500
+#: g10/armor.c:506
 msgid "invalid dash escaped line: "
 msgstr "linha com hífen inválida: "
 
-#: g10/armor.c:512
+#: g10/armor.c:518
 msgid "unexpected armor:"
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:629
+#: g10/armor.c:635
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracter radix64 inválido %02x ignorado\n"
 
-#: g10/armor.c:672
+#: g10/armor.c:678
 msgid "premature eof (no CRC)\n"
 msgstr "fim de ficheiro prematuro (sem CRC)\n"
 
-#: g10/armor.c:706
+#: g10/armor.c:712
 msgid "premature eof (in CRC)\n"
 msgstr "fim de ficheiro prematuro (no CRC)\n"
 
-#: g10/armor.c:710
+#: g10/armor.c:716
 msgid "malformed CRC\n"
 msgstr "CRC malformado\n"
 
-#: g10/armor.c:714
+#: g10/armor.c:720
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:731
+#: g10/armor.c:737
 msgid "premature eof (in Trailer)\n"
 msgstr "fim de ficheiro prematuro (no \"Trailer\")\n"
 
-#: g10/armor.c:735
+#: g10/armor.c:741
 msgid "error in trailer line\n"
 msgstr "erro na linha \"trailer\"\n"
 
-#: g10/armor.c:1001
+#: g10/armor.c:892
+msgid "For info see http://www.gnupg.org"
+msgstr ""
+
+#: g10/armor.c:1007
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP válido encontrado.\n"
 
-#: g10/armor.c:1005
+#: g10/armor.c:1011
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inválida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1009
+#: g10/armor.c:1015
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1183,57 +1197,57 @@ msgstr "%s: ignorado: a chave pública está desactivada\n"
 msgid "no valid addressees\n"
 msgstr "nenhum endereço válido\n"
 
-#: g10/keygen.c:122
+#: g10/keygen.c:123
 msgid "writing self signature\n"
 msgstr "escrevendo auto-assinatura\n"
 
 # key binding ???
-#: g10/keygen.c:160
+#: g10/keygen.c:161
 msgid "writing key binding signature\n"
 msgstr "escrevendo assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:386
+#: g10/keygen.c:511
 msgid "Please select what kind of key you want:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/keygen.c:388
+#: g10/keygen.c:513
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (por omissão)\n"
 
-#: g10/keygen.c:389
+#: g10/keygen.c:514
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:391
+#: g10/keygen.c:516
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas encripção)\n"
 
-#: g10/keygen.c:392
+#: g10/keygen.c:517
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e encriptação)\n"
 
-#: g10/keygen.c:394
+#: g10/keygen.c:519
 #, c-format
 msgid "   (%d) ElGamal in a v3 packet\n"
 msgstr "   (%d) ElGamal num pacote v3\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
 msgid "Your selection? "
 msgstr "Opção? "
 
-#: g10/keygen.c:409
+#: g10/keygen.c:534
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Você quer realmente criar uma chave para assinatura e criptografia? "
 
-#: g10/keygen.c:430
+#: g10/keygen.c:555
 msgid "Invalid selection.\n"
 msgstr "Opção inválida.\n"
 
-#: g10/keygen.c:442
+#: g10/keygen.c:567
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1246,15 +1260,15 @@ msgstr ""
 "         tamanho por omissão é 1024 bits\n"
 "     tamanho máximo sugerido é 2048 bits\n"
 
-#: g10/keygen.c:449
+#: g10/keygen.c:574
 msgid "What keysize do you want? (1024) "
 msgstr "Qual o tamanho de chave desejado? (1024) "
 
-#: g10/keygen.c:454
+#: g10/keygen.c:579
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
 
-#: g10/keygen.c:456
+#: g10/keygen.c:581
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n"
 
@@ -1266,12 +1280,12 @@ msgstr "tamanho muito pequeno; 768 é o valor mínimo permitido.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:466
+#: g10/keygen.c:591
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "tamanho muito grande; %d é o valor máximo permitido.\n"
 
-#: g10/keygen.c:471
+#: g10/keygen.c:596
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1279,11 +1293,11 @@ msgstr ""
 "Tamanhos de chave maiores que 2048 não são recomendados\n"
 "porque o tempo de computação é REALMENTE longo!\n"
 
-#: g10/keygen.c:474
+#: g10/keygen.c:599
 msgid "Are you sure that you want this keysize? "
 msgstr "Você tem certeza de que quer este tamanho de chave? "
 
-#: g10/keygen.c:475
+#: g10/keygen.c:600
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1291,21 +1305,21 @@ msgstr ""
 "Tudo bem, mas não se esqueça que a radiação do seu monitor e teclado também "
 "é extremamente vulnerável a ataques!\n"
 
-#: g10/keygen.c:483
+#: g10/keygen.c:608
 msgid "Do you really need such a large keysize? "
 msgstr "Você precisa realmente de uma chave tão grande? "
 
-#: g10/keygen.c:489
+#: g10/keygen.c:614
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido é %u bits\n"
 
-#: g10/keygen.c:492 g10/keygen.c:496
+#: g10/keygen.c:617 g10/keygen.c:621
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:509
+#: g10/keygen.c:634
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1321,29 +1335,29 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:526
+#: g10/keygen.c:651
 msgid "Key is valid for? (0) "
 msgstr "A chave é valida por? (0) "
 
-#: g10/keygen.c:547
+#: g10/keygen.c:672
 msgid "invalid value\n"
 msgstr "valor inválido\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:677
 msgid "Key does not expire at all\n"
 msgstr "A chave não expira nunca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:558
+#: g10/keygen.c:683
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:563
+#: g10/keygen.c:688
 msgid "Is this correct (y/n)? "
 msgstr "Está correto (s/n)? "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:731
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1360,44 +1374,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:617
+#: g10/keygen.c:742
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:621
+#: g10/keygen.c:746
 msgid "Invalid character in name\n"
 msgstr "Caracter inválido no nome\n"
 
-#: g10/keygen.c:623
+#: g10/keygen.c:748
 msgid "Name may not start with a digit\n"
 msgstr "O nome não pode começar com um dígito\n"
 
-#: g10/keygen.c:625
+#: g10/keygen.c:750
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:633
+#: g10/keygen.c:758
 msgid "Email address: "
 msgstr "Endereço de correio eletrónico: "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:769
 msgid "Not a valid email address\n"
 msgstr "Endereço eletrónico inválido\n"
 
-#: g10/keygen.c:652
+#: g10/keygen.c:777
 msgid "Comment: "
 msgstr "Comentário: "
 
-#: g10/keygen.c:658
+#: g10/keygen.c:783
 msgid "Invalid character in comment\n"
 msgstr "Caracter inválido no comentário\n"
 
-#: g10/keygen.c:680
+#: g10/keygen.c:808
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Você está usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:686
+#: g10/keygen.c:814
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1408,15 +1422,15 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:689
+#: g10/keygen.c:817
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:699
+#: g10/keygen.c:827
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Mudar (N)ome, (C)omentário, (E)ndereço ou (O)k/(S)air? "
 
-#: g10/keygen.c:751
+#: g10/keygen.c:879
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1424,11 +1438,11 @@ msgstr ""
 "Você precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keyedit.c:456 g10/keygen.c:759
+#: g10/keyedit.c:456 g10/keygen.c:887
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "a frase secreta não foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keygen.c:765
+#: g10/keygen.c:893
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1440,7 +1454,7 @@ msgstr ""
 "qualquer hora, usando este programa com a opção \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:914
 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"
@@ -1452,33 +1466,33 @@ msgstr ""
 "geração dos números primos; isso dá ao gerador de números aleatórios\n"
 "uma hipótese maior de ganhar entropia suficiente.\n"
 
-#: g10/keygen.c:856
+#: g10/keygen.c:984
 msgid "Key generation can only be used in interactive mode\n"
 msgstr "A geração de chaves só pode ser feita em modo interactivo\n"
 
-#: g10/keygen.c:864
+#: g10/keygen.c:992
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA terá 1024 bits.\n"
 
-#: g10/keygen.c:870
+#: g10/keygen.c:998
 msgid "Key generation canceled.\n"
 msgstr "Geração de chave cancelada.\n"
 
-#: g10/keygen.c:880
+#: g10/keygen.c:1008
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "escrevendo certificado público para `%s'\n"
 
-#: g10/keygen.c:881
+#: g10/keygen.c:1009
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:958
+#: g10/keygen.c:1086
 msgid "public and secret key created and signed.\n"
 msgstr "chaves pública e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:960
+#: g10/keygen.c:1088
 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"
@@ -1486,12 +1500,12 @@ msgstr ""
 "Note que esta chave não pode ser usada para encriptação. Você pode usar\n"
 "o comando \"--edit-key\" para gerar uma chave secundária para esse fim.\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1073
+#: g10/keygen.c:1102 g10/keygen.c:1201
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/keygen.c:1018 g10/sig-check.c:314 g10/sign.c:106
+#: g10/keygen.c:1146 g10/sig-check.c:394 g10/sign.c:162
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1499,7 +1513,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:1020 g10/sig-check.c:316 g10/sign.c:108
+#: g10/keygen.c:1148 g10/sig-check.c:396 g10/sign.c:164
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1507,32 +1521,32 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:1051
+#: g10/keygen.c:1179
 msgid "Really create? "
 msgstr "Realmente criar? "
 
-#: g10/encode.c:91 g10/openfile.c:163 g10/openfile.c:272 g10/tdbio.c:468
+#: g10/encode.c:137 g10/openfile.c:163 g10/openfile.c:272 g10/tdbio.c:468
 #: g10/tdbio.c:529
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: impossível abrir: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:159
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:217 g10/encode.c:365
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVISO: ficheiro vazio\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:312
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:529
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s encriptado para: %s\n"
@@ -1591,7 +1605,7 @@ msgstr "impossível abrir `%s': %s\n"
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:169 g10/trustdb.c:1658 g10/trustdb.c:1697
+#: g10/import.c:169 g10/trustdb.c:1659 g10/trustdb.c:1698
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu chaves processadas até agora\n"
@@ -1679,7 +1693,7 @@ msgstr "chave %08lX: chave pública não encontrada: %s\n"
 msgid "no default public keyring\n"
 msgstr "sem porta-chaves público padrão\n"
 
-#: g10/import.c:399 g10/openfile.c:215 g10/sign.c:269 g10/sign.c:582
+#: g10/import.c:399 g10/openfile.c:215 g10/sign.c:325 g10/sign.c:638
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "a escrever para `%s'\n"
@@ -1937,7 +1951,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:129
+#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:185
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
@@ -2397,65 +2411,65 @@ msgstr "Realmente gerar os certificados de revogação? (s/N)"
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:212
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "a chave pública é %08lX\n"
 
-#: g10/mainproc.c:244
+#: g10/mainproc.c:243
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados encriptados com chave pública: DEK válido\n"
 
-#: g10/mainproc.c:275
+#: g10/mainproc.c:274
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "encriptado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:285
+#: g10/mainproc.c:284
 #, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "encriptado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 msgid "no secret key for decryption available\n"
 msgstr "nenhuma chave secreta para desencriptação disponível\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:299
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "desencriptação de chave pública falhou: %s\n"
 
-#: g10/mainproc.c:332
+#: g10/mainproc.c:331
 msgid "decryption okay\n"
 msgstr "desencriptação correcta\n"
 
-#: g10/mainproc.c:337
+#: g10/mainproc.c:336
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem encriptada foi manipulada!\n"
 
-#: g10/mainproc.c:342
+#: g10/mainproc.c:341
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "desencriptação falhou: %s\n"
 
-#: g10/mainproc.c:360
+#: g10/mainproc.c:359
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:361
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro original='%.*s'\n"
 
-#: g10/mainproc.c:596 g10/mainproc.c:605
+#: g10/mainproc.c:595 g10/mainproc.c:604
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de notação inválidos encontrados\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:607
 msgid "Notation: "
 msgstr "Notação: "
 
-#: g10/mainproc.c:615
+#: g10/mainproc.c:614
 msgid "Policy: "
 msgstr "Política: "
 
@@ -2494,20 +2508,20 @@ msgstr "formato de assinatura antigo (PGP2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inválido detectado em proc_tree()\n"
 
-#: g10/misc.c:95
+#: g10/misc.c:83
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossível desactivar core dumps: %s\n"
 
-#: g10/misc.c:98
+#: g10/misc.c:86
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/misc.c:206
+#: g10/misc.c:312
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Algoritmos experimentais não devem ser usados!\n"
 
-#: g10/misc.c:220
+#: g10/misc.c:326
 msgid ""
 "RSA keys are deprecated; please consider creating a new key and use this key "
 "in the future\n"
@@ -2515,18 +2529,18 @@ msgstr ""
 "Chaves RSA não são recomendáveis; por favor considere criar uma nova chave e "
 "usá-la no futuro\n"
 
-#: g10/misc.c:242
+#: g10/misc.c:348
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "este algoritmo de criptografia não é recomendado;\n"
 "por favor use um algoritmo mais standard!\n"
 
-#: g10/parse-packet.c:113
+#: g10/parse-packet.c:112
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossível manipular algoritmo de chave pública %d\n"
 
-#: g10/parse-packet.c:939
+#: g10/parse-packet.c:938
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit crítico ligado\n"
@@ -2585,92 +2599,92 @@ msgstr "lendo do \"stdin\" ...\n"
 msgid "can't open signed data `%s'\n"
 msgstr "impossível abrir dados assinados `%s'\n"
 
-#: g10/pubkey-enc.c:80
+#: g10/pubkey-enc.c:147
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "destinatário anónimo; a tentar chave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:86
+#: g10/pubkey-enc.c:153
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "certo, nós somos o destinatário anónimo.\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:209
 msgid "old encoding of the DEK is not supported\n"
 msgstr "codificação antiga do DEK não suportada\n"
 
-#: g10/pubkey-enc.c:192
+#: g10/pubkey-enc.c:263
 #, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "NOTA: algoritmo de cifragem %d não encontrado nas preferências\n"
 
-#: g10/seckey-cert.c:56
+#: g10/seckey-cert.c:101
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "algoritmo de protecção %d não é suportado\n"
 
-#: g10/seckey-cert.c:181
+#: g10/seckey-cert.c:242
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Frase secreta inválida; por favor tente novamente ...\n"
 
-#: g10/seckey-cert.c:246
+#: g10/seckey-cert.c:307
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Chave fraca detectada - por favor mude a frase secreta novamente.\n"
 
-#: g10/sig-check.c:201
+#: g10/sig-check.c:281
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr "assumindo MDC incorrecto devido a um bit crítico desconhecido\n"
 
-#: g10/sig-check.c:297
+#: g10/sig-check.c:377
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "esta é uma chave ElGamal gerada pelo PGP que NÃO é segura para assinaturas!\n"
 
-#: g10/sig-check.c:305
+#: g10/sig-check.c:385
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "a chave pública é %lu segundo mais nova que a assinatura\n"
 
-#: g10/sig-check.c:306
+#: g10/sig-check.c:386
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "a chave pública é %lu segundos mais nova que a assinatura\n"
 
-#: g10/sig-check.c:322
+#: g10/sig-check.c:402
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTA: chave de assinatura expirou %s\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:459
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "assumindo assinatura incorrecta devido a um bit crítico desconhecido\n"
 
-#: g10/sign.c:133
+#: g10/sign.c:189
 #, c-format
 msgid "%s signature from: %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/sign.c:264 g10/sign.c:577
+#: g10/sign.c:320 g10/sign.c:633
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "impossível criar %s: %s\n"
 
-#: g10/sign.c:363
+#: g10/sign.c:419
 msgid "signing:"
 msgstr "a assinar:"
 
-#: g10/sign.c:406
+#: g10/sign.c:462
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' é um ficheiro vazio\n"
 
-#: g10/textfilter.c:129
+#: g10/textfilter.c:128
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "impossível manipular linhas de texto maiores que %d caracteres\n"
 
-#: g10/textfilter.c:198
+#: g10/textfilter.c:197
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linha de entrada maior que %d caracteres\n"
@@ -2694,12 +2708,12 @@ msgstr "transação de base de dados de confiança muito grande\n"
 msgid "%s: can't access: %s\n"
 msgstr "%s: impossível aceder: %s\n"
 
-#: g10/ringedit.c:298 g10/tdbio.c:445
+#: g10/ringedit.c:297 g10/tdbio.c:445
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: impossível criar directoria: %s\n"
 
-#: g10/ringedit.c:304 g10/tdbio.c:448
+#: g10/ringedit.c:303 g10/tdbio.c:448
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: directoria criada\n"
@@ -2709,7 +2723,7 @@ msgstr "%s: directoria criada\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diretoria inexistente!\n"
 
-#: g10/openfile.c:211 g10/openfile.c:279 g10/ringedit.c:1350 g10/tdbio.c:458
+#: g10/openfile.c:211 g10/openfile.c:279 g10/ringedit.c:1349 g10/tdbio.c:458
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: impossível criar: %s\n"
@@ -2896,240 +2910,235 @@ msgstr "chave %08lX: aceite como chave confiável.\n"
 msgid "enumerate secret keys failed: %s\n"
 msgstr "enumeração de chaves secretas falhou: %s\n"
 
-#: g10/trustdb.c:877
+#: g10/trustdb.c:878
 #, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "chave %08lX.%lu: Ligação de subchave válida\n"
 
-#: g10/trustdb.c:883 g10/trustdb.c:918
+#: g10/trustdb.c:884 g10/trustdb.c:919
 #, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "chave %08lX.%lu: Ligação de subchave inválida: %s\n"
 
-#: g10/trustdb.c:895
+#: g10/trustdb.c:896
 #, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "chave %08lX.%lu: Revogação de chave válida\n"
 
-#: g10/trustdb.c:901
+#: g10/trustdb.c:902
 #, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "chave %08lX.%lu: Revogação de chave inválida: %s\n"
 
-#: g10/trustdb.c:912
+#: g10/trustdb.c:913
 #, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "chave %08lX.%lu: Revogação de subchave válida\n"
 
-#: g10/trustdb.c:1023
+#: g10/trustdb.c:1024
 msgid "Good self-signature"
 msgstr "Auto-assinatura válida"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1034
 msgid "Invalid self-signature"
 msgstr "Auto-assinatura inválida"
 
-#: g10/trustdb.c:1060
+#: g10/trustdb.c:1061
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 "Revogação válida de ID de utilizador ignorada devido a nova auto-assinatura"
 
-#: g10/trustdb.c:1066
+#: g10/trustdb.c:1067
 msgid "Valid user ID revocation"
 msgstr "Revogação de ID de utilizador válida"
 
-#: g10/trustdb.c:1071
+#: g10/trustdb.c:1072
 msgid "Invalid user ID revocation"
 msgstr "Revogação de ID de utilizador inválida"
 
-#: g10/trustdb.c:1112
+#: g10/trustdb.c:1113
 msgid "Valid certificate revocation"
 msgstr "Certificado de revogação válido"
 
-#: g10/trustdb.c:1113
+#: g10/trustdb.c:1114
 msgid "Good certificate"
 msgstr "Certificado correcto"
 
-#: g10/trustdb.c:1134
+#: g10/trustdb.c:1135
 msgid "Invalid certificate revocation"
 msgstr "Certificado de revogação inválido"
 
-#: g10/trustdb.c:1135
+#: g10/trustdb.c:1136
 msgid "Invalid certificate"
 msgstr "Certificado inválido"
 
-#: g10/trustdb.c:1152 g10/trustdb.c:1156
+#: g10/trustdb.c:1153 g10/trustdb.c:1157
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "registo de assinatura %lu[%d] aponta para registo errado.\n"
 
-#: g10/trustdb.c:1208
+#: g10/trustdb.c:1209
 msgid "duplicated certificate - deleted"
 msgstr "certificado duplicado - removido"
 
-#: g10/trustdb.c:1514
+#: g10/trustdb.c:1515
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir falhou: %s\n"
 
-#: g10/trustdb.c:1636
+#: g10/trustdb.c:1637
 #, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "lid ?: inserção falhou: %s\n"
 
-#: g10/trustdb.c:1641
+#: g10/trustdb.c:1642
 #, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "lid %lu: inserção falhou: %s\n"
 
-#: g10/trustdb.c:1647
+#: g10/trustdb.c:1648
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr "lid %lu: inserido\n"
 
-#: g10/trustdb.c:1652
+#: g10/trustdb.c:1653
 #, c-format
 msgid "error reading dir record: %s\n"
 msgstr "erro ao ler registo de directório: %s\n"
 
-#: g10/trustdb.c:1660 g10/trustdb.c:1714
+#: g10/trustdb.c:1661 g10/trustdb.c:1715
 #, c-format
 msgid "%lu keys processed\n"
 msgstr "%lu chaves processadas\n"
 
-#: g10/trustdb.c:1662 g10/trustdb.c:1718
+#: g10/trustdb.c:1663 g10/trustdb.c:1719
 #, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "\t%lu chaves com erros\n"
 
-#: g10/trustdb.c:1664
+#: g10/trustdb.c:1665
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr "\t%lu chaves inseridas\n"
 
-#: g10/trustdb.c:1667
+#: g10/trustdb.c:1668
 #, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "enumeração de blocos de chaves falhou: %s\n"
 
-#: g10/trustdb.c:1705
+#: g10/trustdb.c:1706
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr "lid %lu: registo de directório sem chave - ignorado\n"
 
-#: g10/trustdb.c:1716
+#: g10/trustdb.c:1717
 #, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "\t%lu chaves ignoradas\n"
 
-#: g10/trustdb.c:1720
+#: g10/trustdb.c:1721
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu chaves actualizadas\n"
 
-#: g10/trustdb.c:2057
+#: g10/trustdb.c:2058
 msgid "Ooops, no keys\n"
 msgstr "Ooops, nenhuma chave\n"
 
-#: g10/trustdb.c:2061
+#: g10/trustdb.c:2062
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, nenhum ID de utilizador\n"
 
-#: g10/trustdb.c:2218
+#: g10/trustdb.c:2219
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: busca de registo de directório falhou: %s\n"
 
-#: g10/trustdb.c:2227
+#: g10/trustdb.c:2228
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "chave %08lX: inserção de registo de confiança falhou: %s\n"
 
-#: g10/trustdb.c:2231
+#: g10/trustdb.c:2232
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "chave %08lX.%lu: inserida na base de dados de confiança\n"
 
-#: g10/trustdb.c:2239
+#: g10/trustdb.c:2240
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "chave %08lX.%lu: criada no futuro (viagem no tempo ou problema no relogio)\n"
 
-#: g10/trustdb.c:2248
+#: g10/trustdb.c:2249
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "chave %08lX.%lu: expirou em %s\n"
 
-#: g10/trustdb.c:2256
+#: g10/trustdb.c:2257
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "chave %08lX.%lu: verificação de confiança falhou: %s\n"
 
-#: g10/trustdb.c:2362
+#: g10/trustdb.c:2363
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "utilizador `%s' não encontrado: %s\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2365
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problemas na procura de `%s' na base de dados de confiança: %s\n"
 
-#: g10/trustdb.c:2367
+#: g10/trustdb.c:2368
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr ""
 "utilizador `%s' não encontrado na base de dados de confiança - a inserir\n"
 
-#: g10/trustdb.c:2370
+#: g10/trustdb.c:2371
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "falha ao colocar `%s' na base de dados de confiança: %s\n"
 
-#: g10/trustdb.c:2556 g10/trustdb.c:2586
+#: g10/trustdb.c:2557 g10/trustdb.c:2587
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "AVISO: ainda é impossível manipular registos de preferências longos\n"
 
-#: g10/ringedit.c:318
+#: g10/ringedit.c:317
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: impossível criar porta-chaves: %s\n"
 
-#: g10/ringedit.c:335 g10/ringedit.c:1355
+#: g10/ringedit.c:334 g10/ringedit.c:1354
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: porta-chaves criado\n"
 
-#: g10/ringedit.c:1532
+#: g10/ringedit.c:1531
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existem 2 ficheiros com informações confidenciais.\n"
 
-#: g10/ringedit.c:1533
+#: g10/ringedit.c:1532
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s é o não modificado\n"
 
-#: g10/ringedit.c:1534
+#: g10/ringedit.c:1533
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s é o novo\n"
 
-#: g10/ringedit.c:1535
+#: g10/ringedit.c:1534
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte esta possível falha de segurança\n"
 
-#: g10/skclist.c:88 g10/skclist.c:125
-msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr ""
-"a chave não está marcada insegura - impossível usá-la com o RNG falso!\n"
-
-#: g10/skclist.c:113
+#: g10/skclist.c:97
 #, c-format
 msgid "skipped `%s': %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:103
 #, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3171,28 +3180,28 @@ msgstr "a assumir dados assinados em `%s'\n"
 msgid "%s: new options file created\n"
 msgstr "%s: novo ficheiro de opções criado\n"
 
-#: g10/encr-data.c:66
+#: g10/encr-data.c:64
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "encriptado com algoritmo desconhecido %d\n"
 
-#: g10/encr-data.c:71
+#: g10/encr-data.c:69
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dados encriptados com %s\n"
 
-#: g10/encr-data.c:101
+#: g10/encr-data.c:99
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVISO: A mensagem foi encriptada com uma chave fraca na criptografia\n"
 "simétrica.\n"
 
-#: g10/seskey.c:63
+#: g10/seskey.c:62
 msgid "weak key created - retrying\n"
 msgstr "chave fraca criada - tentando novamente\n"
 
-#: g10/seskey.c:68
+#: g10/seskey.c:67
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
@@ -3437,3 +3446,7 @@ msgstr "Nenhuma ajuda disponível"
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda disponível para `%s'"
+
+#~ msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
+#~ msgstr ""
+#~ "a chave não está marcada insegura - impossível usá-la com o RNG falso!\n"
diff --git a/po/ru.po b/po/ru.po
index db99812a3..0020888df 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-10-26 18:57+0200\n"
+"POT-Creation-Date: 2000-01-31 12:09+0100\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-01-26 22:08:36+0100\n"
 "From: Gregory Steuck <steuck@iname.com>\n"
@@ -21,299 +21,299 @@ msgstr ""
 "g10/mainproc.c g10/passphrase.c g10/plaintext.c g10/pref.c g10/seckey-cert.c "
 "g10/sig-check.c g10/sign.c g10/trustdb.c g10/verify.c\n"
 
-#: util/secmem.c:79
+#: gcrypt/secmem.c:77
 msgid "Warning: using insecure memory!\n"
 msgstr ""
 "÷ÎÉÍÁÎÉÅ, ×ÏÚÍÏÖÎÁ ÕÔÅÞËÁ ÓÅËÒÅÔÎÙÈ ÄÁÎÎÙÈ!\n"
 "üÔÕ ÐÒÏÂÌÅÍÕ ÍÏÖÎÏ ÒÅÛÉÔØ, ÕÓÔÁÎÏ×É× ÐÒÏÇÒÁÍÍÕ suid(root).\n"
 "ïÂÒÁÔÉÔÅÓØ ÄÌÑ ÜÔÏÇÏ Ë ÁÄÍÉÎÉÓÔÒÁÔÏÒÕ ÷ÁÛÅÊ ÓÉÓÔÅÍÙ.\n"
 
-#: util/secmem.c:281
+#: gcrypt/secmem.c:279
 msgid "operation is not possible without initialized secure memory\n"
 msgstr ""
 
-#: util/secmem.c:282
+#: gcrypt/secmem.c:280
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 
-#: util/miscutil.c:277 util/miscutil.c:306
+#: util/miscutil.c:278 util/miscutil.c:307
 msgid "yes"
 msgstr "ÄÁ(y)"
 
-#: util/miscutil.c:278 util/miscutil.c:309
+#: util/miscutil.c:279 util/miscutil.c:310
 msgid "yY"
 msgstr "yY"
 
-#: util/miscutil.c:279 util/miscutil.c:307
+#: util/miscutil.c:280 util/miscutil.c:308
 msgid "no"
 msgstr ""
 
-#: util/miscutil.c:280 util/miscutil.c:310
+#: util/miscutil.c:281 util/miscutil.c:311
 msgid "nN"
 msgstr ""
 
-#: g10/keyedit.c:564 util/miscutil.c:308
+#: g10/keyedit.c:564 util/miscutil.c:309
 msgid "quit"
 msgstr "×ÙÈÏÄ"
 
-#: util/miscutil.c:311
+#: util/miscutil.c:312
 msgid "qQ"
 msgstr ""
 
-#: util/errors.c:54
+#: util/errors.c:55
 #, fuzzy
 msgid "general error"
 msgstr "ïÂÝÁÑ ÏÛÉÂËÁ"
 
-#: util/errors.c:55
+#: util/errors.c:56
 #, fuzzy
 msgid "unknown packet type"
 msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ ÐÁËÅÔÁ"
 
-#: util/errors.c:56
+#: util/errors.c:57
 #, fuzzy
 msgid "unknown version"
 msgstr "îÅÉÚ×ÅÓÔÎÁÑ ×ÅÒÓÉÑ"
 
-#: util/errors.c:57
+#: util/errors.c:58
 #, fuzzy
 msgid "unknown pubkey algorithm"
 msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÁÌÇÏÒÉÔÍ ÛÉÆÒÏ×ÁÎÉÑ Ó ÏÔËÒÙÔÙÍ ËÌÀÞÏÍ"
 
-#: util/errors.c:58
+#: util/errors.c:59
 #, fuzzy
 msgid "unknown digest algorithm"
 msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÁÌÇÏÒÉÔÍ ÇÅÎÅÒÁÃÉÉ ÄÁÊÄÖÅÓÔÁ"
 
-#: util/errors.c:59
+#: util/errors.c:60
 #, fuzzy
 msgid "bad public key"
 msgstr "ðÌÏÈÏÊ ÏÔËÒÙÔÙÊ ËÌÀÞ"
 
-#: util/errors.c:60
+#: util/errors.c:61
 #, fuzzy
 msgid "bad secret key"
 msgstr "ðÌÏÈÏÊ ÓÅËÒÅÔÎÙÊ ËÌÀÞ"
 
-#: util/errors.c:61
+#: util/errors.c:62
 #, fuzzy
 msgid "bad signature"
 msgstr "ðÌÏÈÁÑ ÐÏÄÐÉÓØ"
 
-#: util/errors.c:62
+#: util/errors.c:63
 #, fuzzy
 msgid "checksum error"
 msgstr "îÅÓÏ×ÐÁÄÅÎÉÅ ËÏÎÔÒÏÌØÎÏÊ ÓÕÍÍÙ"
 
-#: util/errors.c:63
+#: util/errors.c:64
 #, fuzzy
 msgid "bad passphrase"
 msgstr "îÅ×ÅÒÎÁÑ \"ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ\""
 
-#: util/errors.c:64
+#: util/errors.c:65
 #, fuzzy
 msgid "public key not found"
 msgstr "ïÔËÒÙÔÙÊ ËÌÀÞ ÎÅ ÎÁÊÄÅÎ"
 
-#: util/errors.c:65
+#: util/errors.c:66
 #, fuzzy
 msgid "unknown cipher algorithm"
 msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÁÌÇÏÒÉÔÍ ÛÉÆÒÏ×ÁÎÉÑ"
 
-#: util/errors.c:66
+#: util/errors.c:67
 #, fuzzy
 msgid "can't open the keyring"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ \"Ó×ÑÚËÕ ËÌÀÞÅÊ\""
 
-#: util/errors.c:67
+#: util/errors.c:68
 #, fuzzy
 msgid "invalid packet"
 msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÐÁËÅÔ"
 
-#: util/errors.c:68
+#: util/errors.c:69
 #, fuzzy
 msgid "invalid armor"
 msgstr "îÅÄÏÐÕÓÔÉÍÁÑ ASCII-ËÏÄÉÒÏ×ËÁ"
 
-#: util/errors.c:69
+#: util/errors.c:70
 #, fuzzy
 msgid "no such user id"
 msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: util/errors.c:70
+#: util/errors.c:71
 #, fuzzy
 msgid "secret key not available"
 msgstr "óÅËÒÅÔÎÙÊ ËÌÀÞ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ"
 
-#: util/errors.c:71
+#: util/errors.c:72
 #, fuzzy
 msgid "wrong secret key used"
 msgstr "éÓÐÏÌØÚÏ×ÁÎ ÎÅÐÒÁ×ÉÌØÎÙÊ ÓÅËÒÅÔÎÙÊ ËÌÀÞ"
 
-#: util/errors.c:72
+#: util/errors.c:73
 #, fuzzy
 msgid "not supported"
 msgstr "îÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
 
-#: util/errors.c:73
+#: util/errors.c:74
 #, fuzzy
 msgid "bad key"
 msgstr "ðÌÏÈÏÊ ËÌÀÞ"
 
-#: util/errors.c:74
+#: util/errors.c:75
 #, fuzzy
 msgid "file read error"
 msgstr "ïÛÉÂËÁ ÞÔÅÎÉÑ ÆÁÊÌÁ"
 
-#: util/errors.c:75
+#: util/errors.c:76
 #, fuzzy
 msgid "file write error"
 msgstr "ïÛÉÂËÁ ÚÁÐÉÓÉ ÆÁÊÌÁ"
 
-#: util/errors.c:76
+#: util/errors.c:77
 #, fuzzy
 msgid "unknown compress algorithm"
 msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÁÌÇÏÒÉÔÍ ÕÐÁËÏ×ËÉ"
 
-#: util/errors.c:77
+#: util/errors.c:78
 #, fuzzy
 msgid "file open error"
 msgstr "ïÛÉÂËÁ ÏÔËÒÙÔÉÑ ÆÁÊÌÁ"
 
-#: util/errors.c:78
+#: util/errors.c:79
 #, fuzzy
 msgid "file create error"
 msgstr "ïÛÉÂËÁ ÓÏÚÄÁÎÉÑ ÆÁÊÌÁ"
 
-#: util/errors.c:79
+#: util/errors.c:80
 #, fuzzy
 msgid "invalid passphrase"
 msgstr "îÅ×ÅÒÎÁÑ \"ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ\""
 
-#: util/errors.c:80
+#: util/errors.c:81
 #, fuzzy
 msgid "unimplemented pubkey algorithm"
 msgstr "îÅÒÅÁÌÉÚÏ×ÁÎÎÙÊ ÁÌÇÏÒÉÔÍ ÛÉÆÒÏ×ÁÎÉÑ Ó ÏÔËÒÙÔÙÍ ËÌÀÞÏÍ"
 
-#: util/errors.c:81
+#: util/errors.c:82
 #, fuzzy
 msgid "unimplemented cipher algorithm"
 msgstr "îÅÒÅÁÌÉÚÏ×ÁÎÎÙÊ ÁÌÇÏÒÉÔÍ ÛÉÆÒÏ×ÁÎÉÑ"
 
-#: util/errors.c:82
+#: util/errors.c:83
 #, fuzzy
 msgid "unknown signature class"
 msgstr "ðÏÄÐÉÓØ ÎÅÉÚ×ÅÓÔÎÏÇÏ ÔÉÐÁ"
 
-#: util/errors.c:83
+#: util/errors.c:84
 #, fuzzy
 msgid "trust database error"
 msgstr "ïÛÉÂËÁ × Trust-DB (ÂÁÚÁ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ)"
 
-#: util/errors.c:84
+#: util/errors.c:85
 msgid "bad MPI"
 msgstr ""
 
-#: util/errors.c:85
+#: util/errors.c:86
 #, fuzzy
 msgid "resource limit"
 msgstr "îÅÄÏÓÔÁÔÏÞÎÏ ÒÅÓÕÒÓÏ×"
 
-#: util/errors.c:86
+#: util/errors.c:87
 #, fuzzy
 msgid "invalid keyring"
 msgstr "îÅÄÏÐÕÓÔÉÍÁÑ \"Ó×ÑÚËÁ ËÌÀÞÅÊ\""
 
-#: util/errors.c:87
+#: util/errors.c:88
 #, fuzzy
 msgid "bad certificate"
 msgstr "ðÌÏÈÏÊ ÓÅÒÔÉÆÉËÁÔ"
 
-#: util/errors.c:88
+#: util/errors.c:89
 #, fuzzy
 msgid "malformed user id"
 msgstr "îÅÄÏÐÕÓÔÉÍÁÑ ÆÏÒÍÁ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: util/errors.c:89
+#: util/errors.c:90
 #, fuzzy
 msgid "file close error"
 msgstr "ïÛÉÂËÁ ÚÁËÒÙÔÉÑ ÆÁÊÌÁ"
 
-#: util/errors.c:90
+#: util/errors.c:91
 #, fuzzy
 msgid "file rename error"
 msgstr "ïÛÉÂËÁ ÐÅÒÅÉÍÅÎÏ×ÁÎÉÑ ÆÁÊÌÁ"
 
-#: util/errors.c:91
+#: util/errors.c:92
 #, fuzzy
 msgid "file delete error"
 msgstr "ïÛÉÂËÁ ÕÄÁÌÅÎÉÑ ÆÁÊÌÁ"
 
-#: util/errors.c:92
+#: util/errors.c:93
 #, fuzzy
 msgid "unexpected data"
 msgstr "îÅÏÖÉÄÁÎÎÙÅ ÄÁÎÎÙÅ"
 
-#: util/errors.c:93
+#: util/errors.c:94
 #, fuzzy
 msgid "timestamp conflict"
 msgstr "ëÏÎÆÌÉËÔ ×ÒÅÍÅÎÎÙÈ ÏÔÐÅÞÁÔËÏ× (timestamp)"
 
-#: util/errors.c:94
+#: util/errors.c:95
 #, fuzzy
 msgid "unusable pubkey algorithm"
 msgstr "îÅÐÒÉÇÏÄÎÙÊ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ ÁÌÇÏÒÉÔÍ ÏÔËÒÙÔÏÇÏ ËÌÀÞÁ"
 
-#: util/errors.c:95
+#: util/errors.c:96
 #, fuzzy
 msgid "file exists"
 msgstr "æÁÊÌ ÓÕÝÅÓÔ×ÕÅÔ"
 
-#: util/errors.c:96
+#: util/errors.c:97
 #, fuzzy
 msgid "weak key"
 msgstr "óÌÁÂÙÊ ËÌÀÞ"
 
-#: util/errors.c:97
+#: util/errors.c:98
 #, fuzzy
 msgid "invalid argument"
 msgstr "îÅÄÏÐÕÓÔÉÍÁÑ ASCII-ËÏÄÉÒÏ×ËÁ"
 
-#: util/errors.c:98
+#: util/errors.c:99
 msgid "bad URI"
 msgstr ""
 
-#: util/errors.c:99
+#: util/errors.c:100
 #, fuzzy
 msgid "unsupported URI"
 msgstr "îÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
 
-#: util/errors.c:100
+#: util/errors.c:101
 #, fuzzy
 msgid "network error"
 msgstr "ïÂÝÁÑ ÏÛÉÂËÁ"
 
-#: util/errors.c:102
+#: util/errors.c:103
 #, fuzzy
 msgid "not encrypted"
 msgstr "ÚÁÛÉÆÒÏ×ÁÔØ ÄÁÎÎÙÅ"
 
-#: util/logger.c:218
+#: util/logger.c:219
 #, fuzzy, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
 msgstr "ïÊ-ÊÏ ... ÏÛÉÂËÁ × ÐÒÏÇÒÁÍÍÅ (%s:%d:%s)\n"
 
-#: util/logger.c:224
+#: util/logger.c:225
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "÷Ù ÎÁÛÌÉ ÏÛÉÂËÕ × ÐÒÏÇÒÁÍÍÅ ... (%s:%d)\n"
 
-#: cipher/random.c:452
+#: cipher/random.c:463
 #, fuzzy
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "÷ÎÉÍÁÎÉÅ: ÉÓÐÏÌØÚÕÅÔÓÑ ÎÅÎÁÄÅÖÎÙÊ ÇÅÎÅÒÁÔÏÒ ÓÌÕÞÁÊÎÙÈ ÞÉÓÅÌ!\n"
 
-#: cipher/random.c:453
+#: cipher/random.c:469
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -327,7 +327,7 @@ msgstr ""
 "îå ðïìøúõêôåóø äáîîùíé óïúäáîîùíé üôïê ðòïçòáííïê!\n"
 "\n"
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:125
 #, c-format
 msgid ""
 "\n"
@@ -338,7 +338,7 @@ msgstr ""
 "îÅÄÏÓÔÁÔÏÞÎÏ ÓÌÕÞÁÊÎÙÈ ÄÁÎÎÙÈ. ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÅÌÁÊÔÅ ÞÔÏ-ÎÉÂÕÄØ, ÞÔÏÂÙ\n"
 "ïó ÍÏÇÌÁ ÎÁÂÒÁÔØ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÓÌÕÞÁÊÎÙÅ ÞÉÓÌÁ! (ÎÕÖÎÏ ÅÝÅ %d ÂÁÊÔ)\n"
 
-#: g10/g10.c:186
+#: g10/gpg.c:183
 msgid ""
 "@Commands:\n"
 " "
@@ -346,142 +346,147 @@ msgstr ""
 "@ëÏÍÁÎÄÙ:\n"
 " "
 
-#: g10/g10.c:188
+#: g10/gpg.c:185
 #, fuzzy
 msgid "|[file]|make a signature"
 msgstr "|[ÆÁÊÌ]|ÓÏÚÄÁÔØ ÐÏÄÐÉÓØ"
 
-#: g10/g10.c:189
+#: g10/gpg.c:186
 #, fuzzy
 msgid "|[file]|make a clear text signature"
 msgstr "|[ÆÁÊÌ]|ÓÏÚÄÁÔØ ÔÅËÓÔÏ×ÕÀ ÐÏÄÐÉÓØ"
 
-#: g10/g10.c:190
+#: g10/gpg.c:187
 msgid "make a detached signature"
 msgstr "ÓÏÚÄÁÔØ ÏÔÄÅÌØÎÕÀ ÐÏÄÐÉÓØ"
 
-#: g10/g10.c:191
+#: g10/gpg.c:188
 msgid "encrypt data"
 msgstr "ÚÁÛÉÆÒÏ×ÁÔØ ÄÁÎÎÙÅ"
 
-#: g10/g10.c:192
+#: g10/gpg.c:189
 msgid "encryption only with symmetric cipher"
 msgstr "ÚÁÛÉÆÒÏ×ÁÔØ ÓÉÍÍÅÔÒÉÞÎÙÍ ÁÌÇÏÒÉÔÍÏÍ"
 
-#: g10/g10.c:193
+#: g10/gpg.c:190
 msgid "store only"
 msgstr "ÔÏÌØËÏ ÓÏÈÒÁÎÉÔØ"
 
-#: g10/g10.c:194
+#: g10/gpg.c:191
 msgid "decrypt data (default)"
 msgstr "ÒÁÓÛÉÆÒÏ×ÁÔØ ÄÁÎÎÙÅ (ÐÏ ÕÍÏÌÞÁÎÉÀ)"
 
-#: g10/g10.c:195
+#: g10/gpg.c:192
 msgid "verify a signature"
 msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ"
 
-#: g10/g10.c:196
+#: g10/gpg.c:193
 msgid "list keys"
 msgstr "ÓÐÉÓÏË ËÌÀÞÅÊ"
 
-#: g10/g10.c:198
+#: g10/gpg.c:195
 msgid "list keys and signatures"
 msgstr "ÓÐÉÓÏË ËÌÀÞÅÊ É ÐÏÄÐÉÓÅÊ"
 
-#: g10/g10.c:199
+#: g10/gpg.c:196
 msgid "check key signatures"
 msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ ÎÁ ËÌÀÞÅ"
 
-#: g10/g10.c:200
+#: g10/gpg.c:197
 msgid "list keys and fingerprints"
 msgstr "ÓÐÉÓÏË ËÌÀÞÅÊ Ó ÉÈ \"ÏÔÐÅÞÁÔËÁÍÉ ÐÁÌØÃÅ×\""
 
-#: g10/g10.c:201
+#: g10/gpg.c:198
 msgid "list secret keys"
 msgstr "ÓÐÉÓÏË ÓÅËÒÅÔÎÙÈ ËÌÀÞÅÊ"
 
-#: g10/g10.c:202
+#: g10/gpg.c:199
 msgid "generate a new key pair"
 msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÎÏ×ÕÀ ÐÁÒÕ ËÌÀÞÅÊ (ÏÔËÒÙÔÙÊ É ÓÅËÒÅÔÎÙÊ)"
 
-#: g10/g10.c:203
+#: g10/gpg.c:200
 msgid "remove key from the public keyring"
 msgstr "ÕÄÁÌÉÔØ ËÌÀÞ ÓÏ Ó×ÑÚËÉ"
 
-#: g10/g10.c:204
+#: g10/gpg.c:202
+#, fuzzy
+msgid "remove key from the secret keyring"
+msgstr "ÕÄÁÌÉÔØ ËÌÀÞ ÓÏ Ó×ÑÚËÉ"
+
+#: g10/gpg.c:203
 #, fuzzy
 msgid "sign a key"
 msgstr "ÐÏÄÐÉÓÁÔØ ËÌÀÞ"
 
-#: g10/g10.c:205
+#: g10/gpg.c:204
 #, fuzzy
 msgid "sign a key locally"
 msgstr "ÐÏÄÐÉÓÁÔØ ËÌÀÞ"
 
-#: g10/g10.c:206
+#: g10/gpg.c:205
 msgid "sign or edit a key"
 msgstr "ÐÏÄÐÉÓÁÔØ ÉÌÉ ÒÅÄÁËÔÉÒÏ×ÁÔØ ËÌÀÞ"
 
-#: g10/g10.c:207
+#: g10/gpg.c:206
 msgid "generate a revocation certificate"
 msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ"
 
-#: g10/g10.c:208
+#: g10/gpg.c:207
 msgid "export keys"
 msgstr "ÜËÓÐÏÒÔÉÒÏ×ÁÔØ ËÌÀÞÉ"
 
-#: g10/g10.c:209
+#: g10/gpg.c:208
 msgid "export keys to a key server"
 msgstr ""
 
-#: g10/g10.c:210
+#: g10/gpg.c:209
 msgid "import keys from a key server"
 msgstr ""
 
-#: g10/g10.c:213
+#: g10/gpg.c:212
 msgid "import/merge keys"
 msgstr "ÉÍÐÏÒÔÉÒÏ×ÁÔØ/ÄÏÂÁ×ÉÔØ ËÌÀÞÉ"
 
-#: g10/g10.c:215
+#: g10/gpg.c:214
 msgid "list only the sequence of packets"
 msgstr "ÎÁÐÅÞÁÔÁÔØ ÔÏÌØËÏ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ÐÁËÅÔÏ×"
 
-#: g10/g10.c:217
+#: g10/gpg.c:216
 #, fuzzy
 msgid "export the ownertrust values"
 msgstr "ÜËÓÐÏÒÔÉÒÏ×ÁÔØ ÐÁÒÁÍÅÔÒÙ ÄÏ×ÅÒÉÑ\n"
 
-#: g10/g10.c:219
+#: g10/gpg.c:218
 #, fuzzy
 msgid "import ownertrust values"
 msgstr "ÉÍÐÏÒÔÉÒÏ×ÁÔØ ÐÁÒÁÍÅÔÒÙ ÄÏ×ÅÒÉÑ\n"
 
-#: g10/g10.c:221
+#: g10/gpg.c:220
 #, fuzzy
 msgid "update the trust database"
 msgstr "|[éíåîá]|ÐÒÏ×ÅÒÉÔØ ÂÁÚÕ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ"
 
-#: g10/g10.c:223
+#: g10/gpg.c:222
 msgid "|[NAMES]|check the trust database"
 msgstr "|[éíåîá]|ÐÒÏ×ÅÒÉÔØ ÂÁÚÕ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ"
 
-#: g10/g10.c:224
+#: g10/gpg.c:223
 msgid "fix a corrupted trust database"
 msgstr "ÉÓÐÒÁ×ÉÔØ ÒÁÚÒÕÛÅÎÎÕÀ ÂÁÚÕ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ"
 
-#: g10/g10.c:225
+#: g10/gpg.c:224
 msgid "De-Armor a file or stdin"
 msgstr "äÅËÏÄÉÒÏ×ÁÔØ stdin ÉÌÉ ÆÁÊÌ ÉÚ ASCII-ÐÒÅÄÓÔÁ×ÌÅÎÉÑ"
 
-#: g10/g10.c:227
+#: g10/gpg.c:226
 msgid "En-Armor a file or stdin"
 msgstr "úÁËÏÄÉÒÏ×ÁÔØ stdin ÉÌÉ ÆÁÊÌ × ASCII-ÐÒÅÄÓÔÁ×ÌÅÎÉÅ"
 
-#: g10/g10.c:229
+#: g10/gpg.c:228
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|ÎÁÐÅÞÁÔÁÔØ ÄÁÊÄÖÅÓÔ ÓÏÏÂÝÅÎÉÑ"
 
-#: g10/g10.c:233
+#: g10/gpg.c:232
 msgid ""
 "@\n"
 "Options:\n"
@@ -491,178 +496,178 @@ msgstr ""
 "ðÁÒÁÍÅÔÒÙ:\n"
 " "
 
-#: g10/g10.c:235
+#: g10/gpg.c:234
 msgid "create ascii armored output"
 msgstr "×Ù×ÏÄ × ASCII-ÐÒÅÄÓÔÁ×ÌÅÎÉÉ"
 
-#: g10/g10.c:237
+#: g10/gpg.c:236
 #, fuzzy
 msgid "|NAME|encrypt for NAME"
 msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÛÉÆÒÏ×ÁÌØÎÙÊ ÁÌÇÏÒÉÔÍÏÍ éíñ"
 
-#: g10/g10.c:240
+#: g10/gpg.c:239
 #, fuzzy
 msgid "|NAME|use NAME as default recipient"
 msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ éíñ × ËÁÞÅÓÔ×Å ÓÅËÒÅÔÎÏÇÏ ËÌÀÞÁ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
-#: g10/g10.c:242
+#: g10/gpg.c:241
 msgid "use the default key as default recipient"
 msgstr ""
 
-#: g10/g10.c:246
+#: g10/gpg.c:245
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "ÉÓÐÏÌØÚÏ×ÁÔØ ÕËÁÚÁÎÎÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÐÏÄÐÉÓÉ ÉÌÉ ÒÁÓÛÉÆÒÏ×ËÉ"
 
-#: g10/g10.c:247
+#: g10/gpg.c:246
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|ÕÓÔÁÎÏ×ÉÔØ ÕÒÏ×ÅÎØ ÓÖÁÔÉÑ (0 - ÎÅ ÓÖÉÍÁÔØ)"
 
-#: g10/g10.c:249
+#: g10/gpg.c:248
 msgid "use canonical text mode"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ ËÁÎÏÎÉÞÅÓËÉÊ ÔÅËÓÔÏ×ÙÊ ÒÅÖÉÍ"
 
-#: g10/g10.c:250
+#: g10/gpg.c:249
 msgid "use as output file"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ × ËÁÞÅÓÔ×Å ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ"
 
-#: g10/g10.c:251
+#: g10/gpg.c:250
 msgid "verbose"
 msgstr "ÍÎÏÇÏÓÌÏ×ÎÙÊ"
 
-#: g10/g10.c:252
+#: g10/gpg.c:251
 msgid "be somewhat more quiet"
 msgstr ""
 
-#: g10/g10.c:253
+#: g10/gpg.c:252
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: g10/g10.c:254
+#: g10/gpg.c:253
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ ÎÁ ËÌÀÞÅ"
 
-#: g10/g10.c:255
+#: g10/gpg.c:254
 #, fuzzy
 msgid "always use a MDC for encryption"
 msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ ÕËÁÚÁÎÎÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÛÉÆÒÏ×ÁÎÉÑ"
 
-#: g10/g10.c:256
+#: g10/gpg.c:255
 msgid "do not make any changes"
 msgstr "Keine wirklichen Änderungen durchführen"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:258
+#: g10/gpg.c:257
 msgid "batch mode: never ask"
 msgstr "ÐÁËÅÔÎÙÊ ÒÅÖÉÍ: ÎÉÞÅÇÏ ÎÅ ÓÐÒÁÛÉ×ÁÔØ"
 
-#: g10/g10.c:259
+#: g10/gpg.c:258
 msgid "assume yes on most questions"
 msgstr "ÏÔ×ÅÞÁÔØ \"ÄÁ\" ÎÁ ÂÏÌØÛÉÎÓÔ×Ï ×ÏÐÒÏÓÏ×"
 
-#: g10/g10.c:260
+#: g10/gpg.c:259
 msgid "assume no on most questions"
 msgstr "ÏÔ×ÅÞÁÔØ \"ÎÅÔ\" ÎÁ ÂÏÌØÛÉÎÓÔ×Ï ×ÏÐÒÏÓÏ×"
 
-#: g10/g10.c:261
+#: g10/gpg.c:260
 msgid "add this keyring to the list of keyrings"
 msgstr "ÄÏÂÁ×ÉÔØ ÜÔÕ Ó×ÑÚËÕ Ë ÓÐÉÓËÕ Ó×ÑÚÏË ËÌÀÞÅÊ"
 
-#: g10/g10.c:262
+#: g10/gpg.c:261
 msgid "add this secret keyring to the list"
 msgstr "ÄÏÂÁ×ÉÔØ ÜÔÕ ÓÅËÒÅÔÎÕÀ Ó×ÑÚËÕ Ë ÓÐÉÓËÕ Ó×ÑÚÏË ËÌÀÞÅÊ"
 
-#: g10/g10.c:263
+#: g10/gpg.c:262
 msgid "|NAME|use NAME as default secret key"
 msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ éíñ × ËÁÞÅÓÔ×Å ÓÅËÒÅÔÎÏÇÏ ËÌÀÞÁ ÐÏ ÕÍÏÌÞÁÎÉÀ"
 
-#: g10/g10.c:264
+#: g10/gpg.c:263
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: g10/g10.c:265
+#: g10/gpg.c:264
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÛÉÆÒÏ×ÁÌØÎÙÊ ÁÌÇÏÒÉÔÍÏÍ éíñ"
 
-#: g10/g10.c:266
+#: g10/gpg.c:265
 msgid "read options from file"
 msgstr "ÞÉÔÁÔØ ÐÁÒÁÍÅÔÒÙ ÉÚ ÆÁÊÌÁ"
 
-#: g10/g10.c:268
+#: g10/gpg.c:267
 msgid "set debugging flags"
 msgstr "ÕÓÔÁÎÏ×ÉÔØ ÏÔÌÁÄÏÞÎÙÅ ÆÌÁÇÉ"
 
-#: g10/g10.c:269
+#: g10/gpg.c:268
 msgid "enable full debugging"
 msgstr "ÒÁÚÒÅÛÉÔØ ×ÓÀ ÏÔÌÁÄËÕ"
 
-#: g10/g10.c:270
+#: g10/gpg.c:269
 msgid "|FD|write status info to this FD"
 msgstr "|FD| ÚÁÐÉÓÙ×ÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ÓÏÓÔÏÑÎÉÉ × ÄÅÓËÒÉÐÔÏÒ (FD)"
 
-#: g10/g10.c:271
+#: g10/gpg.c:270
 msgid "do not write comment packets"
 msgstr "ÎÅ ÐÉÓÁÔØ ÐÁËÅÔÙ Ó ËÏÍÍÅÎÔÁÒÉÑÍÉ"
 
-#: g10/g10.c:272
+#: g10/gpg.c:271
 msgid "(default is 1)"
 msgstr "(ÐÏ ÕÍÏÌÞÁÎÉÀ 1)"
 
-#: g10/g10.c:273
+#: g10/gpg.c:272
 msgid "(default is 3)"
 msgstr "(ÐÏ ÕÍÏÌÞÁÎÉÀ 3)"
 
-#: g10/g10.c:275
+#: g10/gpg.c:274
 #, fuzzy
 msgid "|FILE|load extension module FILE"
 msgstr "|æáêì|ÚÁÇÒÕÚÉÔØ æáêì Ó ÒÁÓÛÉÒÑÀÝÉÍÉ ÍÏÄÕÌÑÍÉ"
 
-#: g10/g10.c:276
+#: g10/gpg.c:275
 msgid "emulate the mode described in RFC1991"
 msgstr "ÜÍÕÌÉÒÏ×ÁÔØ ÒÅÖÉÍ ÏÐÉÓÁÎÎÙÊ × RFC1991"
 
-#: g10/g10.c:277
+#: g10/gpg.c:276
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:278
+#: g10/gpg.c:277
 #, fuzzy
 msgid "|N|use passphrase mode N"
 msgstr "|N|ÉÓÐÏÌØÚÏ×ÁÔØ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ ÒÅÖÉÍÁ N\n"
 
-#: g10/g10.c:280
+#: g10/gpg.c:279
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÈÜÛ-ÁÌÇÏÒÉÔÍ éíñ ÄÌÑ ËÌÀÞÅ×ÙÈ ÆÒÁÚ"
 
-#: g10/g10.c:282
+#: g10/gpg.c:281
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÛÉÆÒÏ×ÁÌØÎÙÊ ÁÌÇÏÒÉÔÍÏÍ éíñ ÄÌÑ ËÌÀÞÅ×ÙÈ ÆÒÁÚ"
 
-#: g10/g10.c:283
+#: g10/gpg.c:282
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÛÉÆÒÏ×ÁÌØÎÙÊ ÁÌÇÏÒÉÔÍÏÍ éíñ"
 
-#: g10/g10.c:284
+#: g10/gpg.c:283
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÈÜÛ-ÁÌÇÏÒÉÔÍ éíñ"
 
-#: g10/g10.c:285
+#: g10/gpg.c:284
 msgid "|N|use compress algorithm N"
 msgstr "|N|ÉÓÐÏÌØÚÏ×ÁÔØ ÁÌÇÏÒÉÔÍ ÓÖÁÔÉÑ N"
 
-#: g10/g10.c:286
+#: g10/gpg.c:285
 msgid "throw keyid field of encrypted packets"
 msgstr "×ÙÂÒÁÓÙ×ÁÔØ ÐÏÌÅ keyid Õ ÚÁÛÉÆÒÏ×ÁÎÎÙÈ ÐÁËÅÔÏ×"
 
-#: g10/g10.c:287
+#: g10/gpg.c:286
 msgid "|NAME=VALUE|use this notation data"
 msgstr ""
 
-#: g10/g10.c:289
+#: g10/gpg.c:288
 #, fuzzy
 msgid ""
 "@\n"
@@ -683,17 +688,17 @@ msgstr ""
 " --list-keys [names]        ÐÏËÁÚÁÔØ ÓÐÉÓÏË ËÌÀÞÅÊ\n"
 " --fingerprint [names]      ÐÏËÁÚÁÔØ \"ÏÔÐÅÞÁÔËÉ ÐÁÌØÃÅ×\" ËÌÀÞÅÊ\n"
 
-#: g10/g10.c:376
+#: g10/gpg.c:379
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "ðÏÖÁÌÕÊÓÔÁ, ÏÔÐÒÁ×ÌÑÊÔÅ ÓÏÏÂÝÅÎÉÑ Ï ÏÛÉÂËÁÈ ÐÏ ÁÄÒÅÓÕ "
 "<gnupg-bugs@gnu.org>.\n"
 
-#: g10/g10.c:380
+#: g10/gpg.c:383
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: gpg [ÐÁÒÁÍÅÔÒÙ] [ÆÁÊÌÙ] (-h ÄÌÑ ÐÏÍÏÝÉ)"
 
-#: g10/g10.c:383
+#: g10/gpg.c:386
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -703,7 +708,7 @@ msgstr ""
 "ÐÏÄÐÉÓÙ×ÁÅÔ, ÐÒÏ×ÅÒÑÅÔ ÐÏÄÐÉÓÉ, ÛÉÆÒÕÅÔ ÉÌÉ ÒÁÓÛÉÆÒÏ×Ù×ÁÅÔ\n"
 "ÒÅÖÉÍ ÒÁÂÏÔÙ ÚÁ×ÉÓÉÔ ÏÔ ×ÈÏÄÎÙÈ ÄÁÎÎÙÈ\n"
 
-#: g10/g10.c:388
+#: g10/gpg.c:391
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -711,198 +716,203 @@ msgstr ""
 "\n"
 "ðÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÁÌÇÏÒÉÔÍÙ:\n"
 
-#: g10/g10.c:465
+#: g10/gpg.c:469
 msgid "usage: gpg [options] "
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: gpg [ÐÁÒÁÍÅÔÒÙ] "
 
-#: g10/g10.c:518
+#: g10/gpg.c:549
 msgid "conflicting commands\n"
 msgstr "Widersprüchliche Kommandos\n"
 
-#: g10/g10.c:653
+#: g10/gpg.c:603
+#, c-format
+msgid "libgcrypt is too old (need %s, have %s)\n"
+msgstr ""
+
+#: g10/gpg.c:693
 #, fuzzy, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ÚÁÍÅÞÁÎÉÅ: ÆÁÊÌ ÐÁÒÁÍÅÔÒÏ× ÐÏ ÕÍÏÌÞÁÎÉÀ `%s' ÏÔÓÕÔÓÔ×ÕÅÔ\n"
 
-#: g10/g10.c:657
+#: g10/gpg.c:697
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ÆÁÊÌ ÐÁÒÁÍÅÔÒÏ× `%s': %s\n"
 
-#: g10/g10.c:664
+#: g10/gpg.c:704
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "ÞÉÔÁÀÔÓÑ ÐÁÒÁÍÅÔÒÙ ÉÚ `%s'\n"
 
-#: g10/g10.c:844
+#: g10/gpg.c:885
 #, fuzzy, c-format
 msgid "%s is not a valid character set\n"
 msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ × ËÏÍÍÅÎÔÁÒÉÉ.\n"
 
-#: g10/g10.c:911 g10/g10.c:920
+#: g10/gpg.c:955 g10/gpg.c:964
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/g10.c:913
+#: g10/gpg.c:957
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr ""
 
-#: g10/g10.c:916
+#: g10/gpg.c:960
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr ""
 
-#: g10/g10.c:935 g10/g10.c:947
+#: g10/gpg.c:980 g10/gpg.c:992
 msgid "selected cipher algorithm is invalid\n"
 msgstr "×ÙÂÒÁÎ ÎÅÄÏÐÕÓÔÉÍÙÊ ÁÌÇÏÒÉÔÍ ÛÉÆÒÏ×ÁÎÉÑ\n"
 
-#: g10/g10.c:941 g10/g10.c:953
+#: g10/gpg.c:986 g10/gpg.c:998
 msgid "selected digest algorithm is invalid\n"
 msgstr "×ÙÂÒÁÎ ÎÅÄÏÐÕÓÔÉÍÙÊ ÄÁÊÄÖÅÓÔ-ÁÌÇÏÒÉÔÍ\n"
 
-#: g10/g10.c:957
+#: g10/gpg.c:1002
 msgid "the given policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:960
+#: g10/gpg.c:1005
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "ÁÌÇÏÒÉÔÍ ÕÐÁËÏ×ËÉ ÍÏÖÅÔ ÉÍÅÔØ ÚÎÁÞÅÎÉÑ ÏÔ %d ÄÏ %d\n"
 
-#: g10/g10.c:962
+#: g10/gpg.c:1007
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ÄÏÌÖÅÎ ÂÙÔØ ÂÏÌØÛÅ 0\n"
 
-#: g10/g10.c:964
+#: g10/gpg.c:1009
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ÄÏÌÖÅÎ ÂÙÔØ ÂÏÌØÛÅ 1\n"
 
-#: g10/g10.c:966
+#: g10/gpg.c:1011
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:969
+#: g10/gpg.c:1014
 #, fuzzy
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ÚÁÍÅÞÁÎÉÅ: ÐÒÏÓÔÏÊ S2K ÒÅÖÉÍ (0) ÏÞÅÎØ ÎÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ\n"
 
-#: g10/g10.c:973
+#: g10/gpg.c:1018
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÒÅÖÉÍ S2K: ÄÏÌÖÅÎ ÂÙÔØ 0, 1 ÉÌÉ 3\n"
 
-#: g10/g10.c:1050
+#: g10/gpg.c:1095
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "ïÛÉÂËÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ: %s\n"
 
-#: g10/g10.c:1056
+#: g10/gpg.c:1101
 msgid "--store [filename]"
 msgstr "--store [ÉÍÑ ÆÁÊÌÁ]"
 
-#: g10/g10.c:1063
+#: g10/gpg.c:1108
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ÉÍÑ ÆÁÊÌÁ]"
 
-#: g10/g10.c:1071
+#: g10/gpg.c:1116
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ÉÍÑ ÆÁÊÌÁ]"
 
-#: g10/g10.c:1084
+#: g10/gpg.c:1129
 msgid "--sign [filename]"
 msgstr "--sign [ÉÍÑ ÆÁÊÌÁ]"
 
-#: g10/g10.c:1097
+#: g10/gpg.c:1142
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ÉÍÑ ÆÁÊÌÁ]"
 
-#: g10/g10.c:1111
+#: g10/gpg.c:1156
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ÉÍÑ ÆÁÊÌÁ]"
 
-#: g10/g10.c:1123
+#: g10/gpg.c:1168
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ÉÍÑ ÆÁÊÌÁ]"
 
-#: g10/g10.c:1131
+#: g10/gpg.c:1176
 msgid "--sign-key user-id"
 msgstr ""
 
-#: g10/g10.c:1139
+#: g10/gpg.c:1184
 #, fuzzy
 msgid "--lsign-key user-id"
 msgstr "--delete-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: g10/g10.c:1147
+#: g10/gpg.c:1192
 #, fuzzy
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: g10/g10.c:1163
+#: g10/gpg.c:1208
 #, fuzzy
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: g10/g10.c:1166
+#: g10/gpg.c:1211
 #, fuzzy
 msgid "--delete-key user-id"
 msgstr "--delete-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: g10/encode.c:260 g10/g10.c:1190 g10/sign.c:368
+#: g10/encode.c:306 g10/gpg.c:1236 g10/sign.c:424
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n"
 
-#: g10/g10.c:1201
+#: g10/gpg.c:1247
 #, fuzzy
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ] [Ó×ÑÚËÁ ËÌÀÞÅÊ]"
 
-#: g10/g10.c:1262
+#: g10/gpg.c:1308
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ÏÛÉÂËÁ ÄÅËÏÄÉÒÏ×ÁÎÉÑ: %s\n"
 
-#: g10/g10.c:1270
+#: g10/gpg.c:1316
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ÏÛÉÂËÁ ËÏÄÉÒÏ×ÁÎÉÑ: %s\n"
 
-#: g10/g10.c:1338
+#: g10/gpg.c:1386
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÈÜÛ-ÁÌÇÏÒÉÔÍ `%s'\n"
 
-#: g10/g10.c:1419
+#: g10/gpg.c:1467
 msgid "[filename]"
 msgstr "[ÉÍÑ ÆÁÊÌÁ]"
 
-#: g10/g10.c:1423
+#: g10/gpg.c:1471
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/decrypt.c:59 g10/g10.c:1426 g10/verify.c:66
+#: g10/decrypt.c:59 g10/gpg.c:1474 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s'\n"
 
-#: g10/g10.c:1594
+#: g10/gpg.c:1642
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 
-#: g10/g10.c:1600
+#: g10/gpg.c:1648
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1606
+#: g10/gpg.c:1654
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1614
+#: g10/gpg.c:1662
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
@@ -911,74 +921,78 @@ msgstr ""
 msgid "armor: %s\n"
 msgstr "ëÏÄÉÒÏ×ËÁ: %s\n"
 
-#: g10/armor.c:319
+#: g10/armor.c:325
 msgid "invalid armor header: "
 msgstr ""
 
-#: g10/armor.c:326
+#: g10/armor.c:332
 msgid "armor header: "
 msgstr ""
 
-#: g10/armor.c:337
+#: g10/armor.c:343
 #, fuzzy
 msgid "invalid clearsig header\n"
 msgstr "ÎÅÄÏÐÕÓÔÉÍÏÅ ÎÁÞÁÌÏ ÔÅËÓÔÏ×ÏÊ ÐÏÄÐÉÓÉ\n"
 
-#: g10/armor.c:389
+#: g10/armor.c:395
 #, fuzzy
 msgid "nested clear text signatures\n"
 msgstr "|[ÆÁÊÌ]|ÓÏÚÄÁÔØ ÔÅËÓÔÏ×ÕÀ ÐÏÄÐÉÓØ"
 
-#: g10/armor.c:500
+#: g10/armor.c:506
 msgid "invalid dash escaped line: "
 msgstr "ÎÅÄÏÐÕÓÔÉÍÁÑ ÓÔÒÏËÁ ÎÁÞÉÎÁÀÝÁÑÓÑ Ó ÍÉÎÕÓÏ×: "
 
-#: g10/armor.c:512
+#: g10/armor.c:518
 #, fuzzy
 msgid "unexpected armor:"
 msgstr "îÅÏÖÉÄÁÎÎÙÅ ÄÁÎÎÙÅ"
 
-#: g10/armor.c:629
+#: g10/armor.c:635
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÄÌÑ ËÏÄÉÒÏ×ËÉ radix64 ÓÉÍ×ÏÌ %02x ÐÒÏÐÕÝÅÎ\n"
 
-#: g10/armor.c:672
+#: g10/armor.c:678
 msgid "premature eof (no CRC)\n"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ (ÎÅÔ CRC)\n"
 
-#: g10/armor.c:706
+#: g10/armor.c:712
 msgid "premature eof (in CRC)\n"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅÃ ÆÁÊÌÁ (× CRC)\n"
 
-#: g10/armor.c:710
+#: g10/armor.c:716
 msgid "malformed CRC\n"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÁÑ ÆÏÒÍÁ CRC\n"
 
-#: g10/armor.c:714
+#: g10/armor.c:720
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "ÏÛÉÂËÁ CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:731
+#: g10/armor.c:737
 msgid "premature eof (in Trailer)\n"
 msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ (× È×ÏÓÔÅ)\n"
 
-#: g10/armor.c:735
+#: g10/armor.c:741
 msgid "error in trailer line\n"
 msgstr "ÏÛÉÂËÁ × ÚÁ×ÅÒÛÁÀÝÅÊ ÓÔÒÏËÅ\n"
 
-#: g10/armor.c:1001
+#: g10/armor.c:892
+msgid "For info see http://www.gnupg.org"
+msgstr ""
+
+#: g10/armor.c:1007
 #, fuzzy
 msgid "no valid OpenPGP data found.\n"
 msgstr "ÎÅ ÎÁÊÄÅÎÏ ÄÏÐÕÓÔÉÍÙÈ RFC1991 ÉÌÉ OpenPGP ÄÁÎÎÙÈ.\n"
 
-#: g10/armor.c:1005
+#: g10/armor.c:1011
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr ""
 
-#: g10/armor.c:1009
+#: g10/armor.c:1015
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1243,57 +1257,57 @@ msgstr ""
 msgid "no valid addressees\n"
 msgstr "ÎÅÔ ÄÏÐÕÓÔÉÍÙÈ ÁÄÒÅÓÏ×\n"
 
-#: g10/keygen.c:122
+#: g10/keygen.c:123
 msgid "writing self signature\n"
 msgstr "ÐÉÛÅÔÓÑ ÓÁÍÏ-ÐÏÄÐÉÓØ\n"
 
-#: g10/keygen.c:160
+#: g10/keygen.c:161
 msgid "writing key binding signature\n"
 msgstr "ÐÉÛÅÔÓÑ \"key-binding\" ÐÏÄÐÉÓØ\n"
 
-#: g10/keygen.c:386
+#: g10/keygen.c:511
 msgid "Please select what kind of key you want:\n"
 msgstr "÷ÙÂÅÒÉÔÅ ÖÅÌÁÅÍÙÊ ÔÉÐ ËÌÀÞÁ:\n"
 
-#: g10/keygen.c:388
+#: g10/keygen.c:513
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA É ElGamal (ÐÏ ÕÍÏÌÞÁÎÉÀ)\n"
 
-#: g10/keygen.c:389
+#: g10/keygen.c:514
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (ÔÏÌØËÏ ÐÏÄÐÉÓØ)\n"
 
-#: g10/keygen.c:391
+#: g10/keygen.c:516
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (ÔÏÌØËÏ ÛÉÆÒÏ×ÁÎÉÅ)\n"
 
-#: g10/keygen.c:392
+#: g10/keygen.c:517
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (ÐÏÄÐÉÓØ É ÛÉÆÒÏ×ÁÎÉÅ)\n"
 
-#: g10/keygen.c:394
+#: g10/keygen.c:519
 #, c-format
 msgid "   (%d) ElGamal in a v3 packet\n"
 msgstr "   (%d) ElGamal × v3-ÐÁËÅÔÅ\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:524
 msgid "Your selection? "
 msgstr "÷ÁÛ ×ÙÂÏÒ? "
 
-#: g10/keygen.c:409
+#: g10/keygen.c:534
 #, fuzzy
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ÕÄÁÌÉÔØ ×ÙÂÒÁÎÎÙÅ ËÌÀÞÉ? "
 
-#: g10/keygen.c:430
+#: g10/keygen.c:555
 msgid "Invalid selection.\n"
 msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ×ÙÂÏÒ.\n"
 
-#: g10/keygen.c:442
+#: g10/keygen.c:567
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1306,15 +1320,15 @@ msgstr ""
 "               ÄÌÉÎÁ ËÌÀÞÁ ÐÏ ÕÍÏÌÞÁÎÉÀ: 1024 ÂÉÔÁ\n"
 " ÍÁËÓÉÍÁÌØÎÁÑ ÒÅËÏÍÅÎÄÕÅÍÁÑ ÄÌÉÎÁ ËÌÀÞÁ: 2048 ÂÉÔ\n"
 
-#: g10/keygen.c:449
+#: g10/keygen.c:574
 msgid "What keysize do you want? (1024) "
 msgstr "ëÁËÏÇÏ ÒÁÚÍÅÒÁ ËÌÀÞ ×Ù ÖÅÌÁÅÔÅ? (1024)"
 
-#: g10/keygen.c:454
+#: g10/keygen.c:579
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "äÏÐÕÓÔÉÍÙÊ ÒÁÚÍÅÒ DSA ËÌÀÞÅÊ - ÏÔ 512 ÄÏ 1024 ÂÉÔ\n"
 
-#: g10/keygen.c:456
+#: g10/keygen.c:581
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "ÓÌÉÛËÏÍ ÍÁÌÅÎØËÁÑ ÄÌÉÎÁ ËÌÀÞÁ, ÎÁÉÍÅÎØÛÅÅ ÚÎÁÞÅÎÉÅ - 768.\n"
 
@@ -1326,12 +1340,12 @@ msgstr "ÓÌÉÛËÏÍ ÍÁÌÅÎØËÁÑ ÄÌÉÎÁ ËÌÀÞÁ, ÎÁÉÍÅÎØÛÅÅ ÚÎÁÞÅÎÉÅ - 768.\n"
 #. * So, before you complain about this limitation, I suggest that
 #. * you start a discussion with Marvin about this theme and then
 #. * do whatever you want.
-#: g10/keygen.c:466
+#: g10/keygen.c:591
 #, fuzzy, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "ÓÌÉÛËÏÍ ÍÁÌÅÎØËÁÑ ÄÌÉÎÁ ËÌÀÞÁ, ÎÁÉÍÅÎØÛÅÅ ÚÎÁÞÅÎÉÅ - 768.\n"
 
-#: g10/keygen.c:471
+#: g10/keygen.c:596
 #, fuzzy
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
@@ -1340,11 +1354,11 @@ msgstr ""
 "ëÌÀÞÉ ÄÌÉÎÏÊ ÂÏÌØÛÅ 2048 ÎÅ ÒÅËÏÍÅÎÄÕÀÔÓÑ, ÐÏÔÏÍÕ ÞÔÏ ×ÙÞÉÓÌÅÎÉÑÚÁÎÉÍÁÀÔ "
 "ïþåîø ÍÎÏÇÏ ×ÒÅÍÅÎÉ!\n"
 
-#: g10/keygen.c:474
+#: g10/keygen.c:599
 msgid "Are you sure that you want this keysize? "
 msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ËÌÀÞ ÔÁËÏÊ ÄÌÉÎÙ? "
 
-#: g10/keygen.c:475
+#: g10/keygen.c:600
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1352,21 +1366,21 @@ msgstr ""
 "ïË, ÔÏÌØËÏ ÎÅ ÚÁÂÙ×ÁÊÔÅ, ÞÔÏ ÉÚÌÕÞÅÎÉÅ ×ÁÛÉÈ ËÌÁ×ÉÁÔÕÒÙ É ÍÏÎÉÔÏÒÁ ÔÏÖÅ\n"
 "ÄÅÌÁÀÔ ×ÁÓ ÕÑÚ×ÉÍÙÍ ÄÌÑ ÁÔÁË.\n"
 
-#: g10/keygen.c:483
+#: g10/keygen.c:608
 msgid "Do you really need such a large keysize? "
 msgstr "÷ÁÍ ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÎÕÖÅÎ ÔÁËÏÊ ÄÌÉÎÎÙÊ ËÌÀÞ? "
 
-#: g10/keygen.c:489
+#: g10/keygen.c:614
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "úÁÐÒÏÛÅÎÎÙÊ ËÌÀÞ ÉÍÅÅÔ ÄÌÉÎÕ %u ÂÉÔ\n"
 
-#: g10/keygen.c:492 g10/keygen.c:496
+#: g10/keygen.c:617 g10/keygen.c:621
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "ÏËÒÕÇÌÅÎÏ ÄÏ %u ÂÉÔ\n"
 
-#: g10/keygen.c:509
+#: g10/keygen.c:634
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1382,29 +1396,29 @@ msgstr ""
 "      <n>m = ÓÒÏË ÄÅÊÓÔ×ÉÑ ËÌÀÞÁ n ÍÅÓÑÃÅ×\n"
 "      <n>y = ÓÒÏË ÄÅÊÓÔ×ÉÑ ËÌÀÞÁ n ÌÅÔ\n"
 
-#: g10/keygen.c:526
+#: g10/keygen.c:651
 msgid "Key is valid for? (0) "
 msgstr "ëÌÀÞ ÄÅÊÓÔ×ÉÔÅÌÅÎ × ÔÅÞÅÎÉÅ? (0) "
 
-#: g10/keygen.c:547
+#: g10/keygen.c:672
 msgid "invalid value\n"
 msgstr "ÎÅÄÏÐÕÓÔÉÍÏÅ ÚÎÁÞÅÎÉÅ.\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:677
 msgid "Key does not expire at all\n"
 msgstr "âÅÓÓÒÏÞÎÙÊ ËÌÀÞ.\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:558
+#: g10/keygen.c:683
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "ëÌÀÞ ÄÅÊÓÔ×ÕÅÔ ÄÏ %s\n"
 
-#: g10/keygen.c:563
+#: g10/keygen.c:688
 msgid "Is this correct (y/n)? "
 msgstr "üÔÏ ×ÅÒÎÏ? (y/n) "
 
-#: g10/keygen.c:606
+#: g10/keygen.c:731
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1420,44 +1434,44 @@ msgstr ""
 "    \"Vasya Pupkin (KRUTOI) <vasya@mega-cool.ru>\"\n"
 "\n"
 
-#: g10/keygen.c:617
+#: g10/keygen.c:742
 msgid "Real name: "
 msgstr "÷ÁÛÅ ÉÍÑ (\"éÍÑ æÁÍÉÌÉÑ\"): "
 
-#: g10/keygen.c:621
+#: g10/keygen.c:746
 msgid "Invalid character in name\n"
 msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ × ÉÍÅÎÉ\n"
 
-#: g10/keygen.c:623
+#: g10/keygen.c:748
 msgid "Name may not start with a digit\n"
 msgstr "ðÏÌÎÏÅ ÉÍÑ ÎÅ ÍÏÖÅÔ ÎÁÞÉÎÁÔØÓÑ Ó ÃÉÆÒÙ.\n"
 
-#: g10/keygen.c:625
+#: g10/keygen.c:750
 msgid "Name must be at least 5 characters long\n"
 msgstr "ðÏÌÎÏÅ ÉÍÑ ÄÏÌÖÎÏ ÓÏÓÔÏÑÔØ ÎÅ ÍÅÎÅÅ ÞÅÍ ÉÚ 5ÔÉ ÓÉÍ×ÏÌÏ×.\n"
 
-#: g10/keygen.c:633
+#: g10/keygen.c:758
 msgid "Email address: "
 msgstr "E-Mail: "
 
-#: g10/keygen.c:644
+#: g10/keygen.c:769
 msgid "Not a valid email address\n"
 msgstr "îÅÄÏÐÕÓÔÉÍÙÊ E-Mail\n"
 
-#: g10/keygen.c:652
+#: g10/keygen.c:777
 msgid "Comment: "
 msgstr "ëÏÍÍÅÎÔÁÒÉÊ: "
 
-#: g10/keygen.c:658
+#: g10/keygen.c:783
 msgid "Invalid character in comment\n"
 msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ × ËÏÍÍÅÎÔÁÒÉÉ.\n"
 
-#: g10/keygen.c:680
+#: g10/keygen.c:808
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:686
+#: g10/keygen.c:814
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1468,16 +1482,16 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:689
+#: g10/keygen.c:817
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:699
+#: g10/keygen.c:827
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "éÚÍÅÎÉÔØ: N=éÍÑ, C=ëÏÍÍÅÎÔÁÒÉÊ, E=E-Mail, O=Okay/Q=÷ÙÈÏÄ? "
 
-#: g10/keygen.c:751
+#: g10/keygen.c:879
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1485,11 +1499,11 @@ msgstr ""
 "äÌÑ ÚÁÝÉÔÙ ×ÁÛÅÇÏ ËÌÀÞÁ ÎÕÖÎÁ ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ.\n"
 "\n"
 
-#: g10/keyedit.c:456 g10/keygen.c:759
+#: g10/keyedit.c:456 g10/keygen.c:887
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ ÎÅ ÂÙÌÁ ×ÏÓÐÒÏÉÚ×ÅÄÅÎÁ, ÐÏÐÒÏÂÕÊÔÅ ÓÎÏ×Á.\n"
 
-#: g10/keygen.c:765
+#: g10/keygen.c:893
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1501,7 +1515,7 @@ msgstr ""
 "×ÒÅÍÑ, ÚÁÐÕÓÔÉ× ÜÔÕ ÐÒÏÇÒÁÍÍÕ Ó ÐÁÒÁÍÅÔÒÏÍ \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:786
+#: g10/keygen.c:914
 #, fuzzy
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
@@ -1514,34 +1528,34 @@ msgstr ""
 "ÎÁÇÒÕÚÉÔØ ÓÅÔÅ×ÕÀ ÉÌÉ ÄÉÓËÏ×ÕÀ ÐÏÄÓÉÓÔÅÍÕ). üÔÏ ÄÁÓÔ ÇÅÎÅÒÁÔÏÒÕ ÓÌÕÞÁÊÎÙÈ\n"
 "ÞÉÓÅÌ ×ÏÚÍÏÖÎÏÓÔØ ÎÁÂÒÁÔØ ÄÏÓÔÁÔÏÞÎÏ ÜÎÔÒÏÐÉÉ.\n"
 
-#: g10/keygen.c:856
+#: g10/keygen.c:984
 msgid "Key generation can only be used in interactive mode\n"
 msgstr "çÅÎÅÒÁÃÉÑ ËÌÀÞÁ ÍÏÖÅÔ ÂÙÔØ ×ÙÐÏÌÎÅÎÁ ÔÏÌØËÏ × ÉÎÔÅÒÁËÔÉ×ÎÏÍ ÒÅÖÉÍÅ.\n"
 
-#: g10/keygen.c:864
+#: g10/keygen.c:992
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "ëÌÀÞÅ×ÁÑ ÐÁÒÁ DSA ÂÕÄÅÔ ÉÍÅÔØ ÄÌÉÎÕ 1024 ÂÉÔÁ.\n"
 
-#: g10/keygen.c:870
+#: g10/keygen.c:998
 #, fuzzy
 msgid "Key generation canceled.\n"
 msgstr "çÅÎÅÒÁÃÉÑ ËÌÀÞÁ ÏÔÍÅÎÅÎÁ: %s\n"
 
-#: g10/keygen.c:880
+#: g10/keygen.c:1008
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "ÏÔËÒÙÔÙÊ ÓÅÒÔÉÆÉËÁÔ ÚÁÐÉÓÙ×ÁÅÔÓÑ × `%s'\n"
 
-#: g10/keygen.c:881
+#: g10/keygen.c:1009
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "ÓÅËÒÅÔÎÙÊ ÓÅÒÔÉÆÉËÁÔ ÚÁÐÉÓÙ×ÁÅÔÓÑ × `%s'\n"
 
-#: g10/keygen.c:958
+#: g10/keygen.c:1086
 msgid "public and secret key created and signed.\n"
 msgstr "ÏÔËÒÙÔÙÊ É ÓÅËÒÅÔÎÙÊ ËÌÀÞÉ ÓÏÚÄÁÎÙ É ÐÏÄÐÉÓÁÎÙ.\n"
 
-#: g10/keygen.c:960
+#: g10/keygen.c:1088
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -1552,12 +1566,12 @@ msgstr ""
 "ÄÏÐÏÌÎÉÔÅÌØÎÏÇÏ\n"
 "ËÌÀÞÁ ÄÌÑ ÛÉÆÒÏ×ÁÎÉÑ.\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1073
+#: g10/keygen.c:1102 g10/keygen.c:1201
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "çÅÎÅÒÁÃÉÑ ËÌÀÞÁ ÎÅ ÕÄÁÌÁÓØ: %s\n"
 
-#: g10/keygen.c:1018 g10/sig-check.c:314 g10/sign.c:106
+#: g10/keygen.c:1146 g10/sig-check.c:394 g10/sign.c:162
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1565,7 +1579,7 @@ msgstr ""
 "ÏÔËÒÙÔÙÊ ËÌÀÞ ÓÇÅÎÅÒÉÒÏ×ÁÎ × ÂÕÄÕÝÅÍ (ÉÓËÒÉ×ÌÅÎÉÅ ×ÒÅÍÅÎÉ ÉÌÉ ÎÅÐÒÁ×ÉÌØÎÏ "
 "ÕÓÔÁÎÏ×ÌÅÎÙ ÞÁÓÙ)\n"
 
-#: g10/keygen.c:1020 g10/sig-check.c:316 g10/sign.c:108
+#: g10/keygen.c:1148 g10/sig-check.c:396 g10/sign.c:164
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1573,33 +1587,33 @@ msgstr ""
 "ÏÔËÒÙÔÙÊ ËÌÀÞ ÓÇÅÎÅÒÉÒÏ×ÁÎ × ÂÕÄÕÝÅÍ (ÉÓËÒÉ×ÌÅÎÉÅ ×ÒÅÍÅÎÉ ÉÌÉ ÎÅÐÒÁ×ÉÌØÎÏ "
 "ÕÓÔÁÎÏ×ÌÅÎÙ ÞÁÓÙ)\n"
 
-#: g10/keygen.c:1051
+#: g10/keygen.c:1179
 #, fuzzy
 msgid "Really create? "
 msgstr "äÅÊÓÔ×ÉÔÅÌØÎÏ ÓÏÚÄÁÔØ? "
 
-#: g10/encode.c:91 g10/openfile.c:163 g10/openfile.c:272 g10/tdbio.c:468
+#: g10/encode.c:137 g10/openfile.c:163 g10/openfile.c:272 g10/tdbio.c:468
 #: g10/tdbio.c:529
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n"
 
-#: g10/encode.c:113
+#: g10/encode.c:159
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "ÏÛÉÂËÁ ÐÒÉ ÓÏÚÄÁÎÉÉ ËÌÀÞÅ×ÏÊ ÆÒÁÚÙ: %s\n"
 
-#: g10/encode.c:171 g10/encode.c:319
+#: g10/encode.c:217 g10/encode.c:365
 #, fuzzy, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÕÓÔÏÊ ÆÁÊÌ.\n"
 
-#: g10/encode.c:266
+#: g10/encode.c:312
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "þÉÔÁÅÔÓÑ ÉÚ `%s'\n"
 
-#: g10/encode.c:483
+#: g10/encode.c:529
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s ÚÁÛÉÆÒÏ×ÁÎÏ ÄÌÑ: %s\n"
@@ -1661,7 +1675,7 @@ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n"
 msgid "skipping block of type %d\n"
 msgstr "ÐÒÏÐÕÓËÁÅÍ ÂÌÏË ÔÉÐÁ %d\n"
 
-#: g10/import.c:169 g10/trustdb.c:1658 g10/trustdb.c:1697
+#: g10/import.c:169 g10/trustdb.c:1659 g10/trustdb.c:1698
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr ""
@@ -1749,7 +1763,7 @@ msgstr "ËÌÀÞ %08lX: ÏÔËÒÙÔÙÊ ËÌÀÞ ÎÅ ÎÁÊÄÅÎ: %s\n"
 msgid "no default public keyring\n"
 msgstr "ÎÅÔ Ó×ÑÚËÉ ÏÔËÒÙÔÙÈ ËÌÀÞÅÊ ÐÏ ÕÍÏÌÞÁÎÉÀ\n"
 
-#: g10/import.c:399 g10/openfile.c:215 g10/sign.c:269 g10/sign.c:582
+#: g10/import.c:399 g10/openfile.c:215 g10/sign.c:325 g10/sign.c:638
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "ÚÁÐÉÓÙ×ÁÅÔÓÑ × `%s'\n"
@@ -2010,7 +2024,7 @@ msgstr ""
 msgid "Really sign? "
 msgstr "äÅÊÓÔ×ÉÔÅÌØÎÏ ÐÏÄÐÉÓÁÔØ? "
 
-#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:129
+#: g10/keyedit.c:370 g10/keyedit.c:1832 g10/keyedit.c:1881 g10/sign.c:185
 #, fuzzy, c-format
 msgid "signing failed: %s\n"
 msgstr "ÏÛÉÂËÁ ÐÏÄÐÉÓÙ×ÁÎÉÑ: %s\n"
@@ -2513,70 +2527,70 @@ msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ"
 msgid "no secret key\n"
 msgstr "ðÌÏÈÏÊ ÓÅËÒÅÔÎÙÊ ËÌÀÞ"
 
-#: g10/mainproc.c:213
+#: g10/mainproc.c:212
 #, fuzzy, c-format
 msgid "public key is %08lX\n"
 msgstr "ïÔËÒÙÔÙÊ ËÌÀÞ ÎÅ ÎÁÊÄÅÎ"
 
-#: g10/mainproc.c:244
+#: g10/mainproc.c:243
 #, fuzzy
 msgid "public key encrypted data: good DEK\n"
 msgstr "ÒÁÓÛÉÆÒÏ×ËÁ ÏÔËÒÙÔÙÍ ËÌÀÞÏÍ ÎÅ ÕÄÁÌÁÓØ %s\n"
 
-#: g10/mainproc.c:275
+#: g10/mainproc.c:274
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %08lX, created %s\n"
 msgstr "(%u-ÂÉÔ %s ËÌÀÞ, ID %08lX, ÓÏÚÄÁÎ %s)\n"
 
-#: g10/mainproc.c:285
+#: g10/mainproc.c:284
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %08lX\n"
 msgstr "ðÏÄÐÉÓØ ÓÄÅÌÁÎÁ %.*s, ÉÓÐÏÌØÚÕÑ %s ËÌÀÞ %08lX\n"
 
-#: g10/mainproc.c:291
+#: g10/mainproc.c:290
 #, fuzzy
 msgid "no secret key for decryption available\n"
 msgstr "óÅËÒÅÔÎÙÊ ËÌÀÞ ÎÅ ÓÕÝÅÓÔ×ÕÅÔ"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:299
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "ÒÁÓÛÉÆÒÏ×ËÁ ÏÔËÒÙÔÙÍ ËÌÀÞÏÍ ÎÅ ÕÄÁÌÁÓØ %s\n"
 
-#: g10/mainproc.c:332
+#: g10/mainproc.c:331
 #, fuzzy
 msgid "decryption okay\n"
 msgstr "ÒÁÓÛÉÆÒÏ×ËÁ ÎÅ ÕÄÁÌÁÓØ: %s\n"
 
-#: g10/mainproc.c:337
+#: g10/mainproc.c:336
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:342
+#: g10/mainproc.c:341
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ÒÁÓÛÉÆÒÏ×ËÁ ÎÅ ÕÄÁÌÁÓØ: %s\n"
 
-#: g10/mainproc.c:360
+#: g10/mainproc.c:359
 #, fuzzy
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "ÚÁÍÅÞÁÎÉÅ: ÏÔÐÒÁ×ÉÔÅÌØ ÚÁÐÒÏÓÉÌ \"ÔÏÌØËÏ-ÄÌÑ-÷ÁÛÉÈ-ÇÌÁÚ\"\n"
 
-#: g10/mainproc.c:362
+#: g10/mainproc.c:361
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:596 g10/mainproc.c:605
+#: g10/mainproc.c:595 g10/mainproc.c:604
 #, fuzzy
 msgid "WARNING: invalid notation data found\n"
 msgstr "ÎÅ ÎÁÊÄÅÎÏ ÄÏÐÕÓÔÉÍÙÈ RFC1991 ÉÌÉ OpenPGP ÄÁÎÎÙÈ.\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:607
 msgid "Notation: "
 msgstr ""
 
-#: g10/mainproc.c:615
+#: g10/mainproc.c:614
 msgid "Policy: "
 msgstr ""
 
@@ -2615,20 +2629,20 @@ msgstr ""
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:95
+#: g10/misc.c:83
 #, fuzzy, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n"
 
-#: g10/misc.c:98
+#: g10/misc.c:86
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/misc.c:206
+#: g10/misc.c:312
 msgid "Experimental algorithms should not be used!\n"
 msgstr ""
 
-#: g10/misc.c:220
+#: g10/misc.c:326
 msgid ""
 "RSA keys are deprecated; please consider creating a new key and use this key "
 "in the future\n"
@@ -2636,16 +2650,16 @@ msgstr ""
 "ðÏÌØÚÏ×ÁÎÉÅ RSA ËÌÀÞÁÍÉ ÎÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ, ÐÏÖÁÌÕÊÓÔÁ, ÐÏÄÕÍÁÊÔÅ Ï ÓÏÚÄÁÎÉÉ\n"
 "ÎÏ×ÏÇÏ ËÌÀÞÁ ÄÌÑ ÉÓÐÏÌØÚÏ×ÁÎÉÑ × ÂÕÄÕÝÅÍ\n"
 
-#: g10/misc.c:242
+#: g10/misc.c:348
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 
-#: g10/parse-packet.c:113
+#: g10/parse-packet.c:112
 #, fuzzy, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÂÌÏËÉÒÏ×ÁÔØ Ó×ÑÚËÕ ÏÔËÒÙÔÙÈ ËÌÀÞÅÊ: %s\n"
 
-#: g10/parse-packet.c:939
+#: g10/parse-packet.c:938
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -2707,94 +2721,94 @@ msgstr ""
 msgid "can't open signed data `%s'\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÐÏÄÐÉÓÁÎÎÙÅ ÄÁÎÎÙÅ `%s' .\n"
 
-#: g10/pubkey-enc.c:80
+#: g10/pubkey-enc.c:147
 #, c-format
 msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "ÁÎÏÎÉÍÎÙÊ ÐÏÌÕÞÁÔÅÌØ, ÐÒÏÂÕÅÍ ÓÅËÒÅÔÎÙÊ ËÌÀÞ %08lX ...\n"
 
-#: g10/pubkey-enc.c:86
+#: g10/pubkey-enc.c:153
 #, fuzzy
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ïË, ÍÙ -- ÁÎÏÎÉÍÎÙÊ ÐÏÌÕÞÁÔÅÌØ.\n"
 
-#: g10/pubkey-enc.c:138
+#: g10/pubkey-enc.c:209
 #, fuzzy
 msgid "old encoding of the DEK is not supported\n"
 msgstr "ÁÌÇÏÒÉÔÍ ÚÁÝÉÔÙ %d ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n"
 
-#: g10/pubkey-enc.c:192
+#: g10/pubkey-enc.c:263
 #, fuzzy, c-format
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "ÚÁÍÅÞÁÎÉÅ: ÛÉÆÒÏ×ÁÌØÎÙÊ ÁÌÇÏÒÉÔÍ %d ÎÅ ÎÁÊÄÅÎ × ÐÒÅÄÐÏÞÔÅÎÉÑÈ\n"
 
-#: g10/seckey-cert.c:56
+#: g10/seckey-cert.c:101
 #, fuzzy, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "ÁÌÇÏÒÉÔÍ ÚÁÝÉÔÙ %d ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ\n"
 
-#: g10/seckey-cert.c:181
+#: g10/seckey-cert.c:242
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "îÅÐÒÁ×ÉÌØÎÁÑ ËÌÀÞÅ×ÁÑ ÆÒÁÚÁ, ÐÏÐÒÏÂÕÊÔÅ ÓÎÏ×Á ...\n"
 
-#: g10/seckey-cert.c:246
+#: g10/seckey-cert.c:307
 #, fuzzy
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÏÂÎÁÒÕÖÅÎ ÓÌÁÂÙÊ ËÌÀÞ - ÓÍÅÎÉÔÅ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ.\n"
 
-#: g10/sig-check.c:201
+#: g10/sig-check.c:281
 msgid "assuming bad MDC due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sig-check.c:297
+#: g10/sig-check.c:377
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr "ÜÔÏÔ ElGamal ËÌÀÞ, ÓÏÚÄÁÎÎÙÊ PGP, ÎÅ ÎÁÄÅÖÅÎ ÄÌÑ ÓÏÚÄÁÎÉÑ ÐÏÄÐÉÓÅÊ!\n"
 
-#: g10/sig-check.c:305
+#: g10/sig-check.c:385
 #, fuzzy, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "ËÌÀÞ %08lX: ÎÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÐÏÄÐÉÓÉ\n"
 
-#: g10/sig-check.c:306
+#: g10/sig-check.c:386
 #, fuzzy, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "ËÌÀÞ %08lX: ÎÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÐÏÄÐÉÓÉ\n"
 
-#: g10/sig-check.c:322
+#: g10/sig-check.c:402
 #, fuzzy, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ËÌÀÞ ÐÏÄÐÉÓÉ ÕÓÔÁÒÅÌ %s\n"
 
-#: g10/sig-check.c:379
+#: g10/sig-check.c:459
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 
-#: g10/sign.c:133
+#: g10/sign.c:189
 #, fuzzy, c-format
 msgid "%s signature from: %s\n"
 msgstr "ðìïèáñ ÐÏÄÐÉÓØ ÏÔ \""
 
-#: g10/sign.c:264 g10/sign.c:577
+#: g10/sign.c:320 g10/sign.c:633
 #, fuzzy, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n"
 
-#: g10/sign.c:363
+#: g10/sign.c:419
 #, fuzzy
 msgid "signing:"
 msgstr "ÐÏÄÐÉÓÁÔØ"
 
-#: g10/sign.c:406
+#: g10/sign.c:462
 #, fuzzy, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÕÓÔÏÊ ÆÁÊÌ.\n"
 
-#: g10/textfilter.c:129
+#: g10/textfilter.c:128
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr ""
 
-#: g10/textfilter.c:198
+#: g10/textfilter.c:197
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr ""
@@ -2818,12 +2832,12 @@ msgstr ""
 msgid "%s: can't access: %s\n"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n"
 
-#: g10/ringedit.c:298 g10/tdbio.c:445
+#: g10/ringedit.c:297 g10/tdbio.c:445
 #, fuzzy, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n"
 
-#: g10/ringedit.c:304 g10/tdbio.c:448
+#: g10/ringedit.c:303 g10/tdbio.c:448
 #, fuzzy, c-format
 msgid "%s: directory created\n"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n"
@@ -2833,7 +2847,7 @@ msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/openfile.c:211 g10/openfile.c:279 g10/ringedit.c:1350 g10/tdbio.c:458
+#: g10/openfile.c:211 g10/openfile.c:279 g10/ringedit.c:1349 g10/tdbio.c:458
 #, fuzzy, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n"
@@ -3019,247 +3033,243 @@ msgstr "ËÌÀÞ %08lX: ÕÖÅ ÎÁ Ó×ÑÚËÅ ÓÅËÒÅÔÎÙÈ ËÌÀÞÅÊ\n"
 msgid "enumerate secret keys failed: %s\n"
 msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÓÅËÒÅÔÁ ÎÅ ÕÄÁÌÏÓØ: %s\n"
 
-#: g10/trustdb.c:877
+#: g10/trustdb.c:878
 #, fuzzy, c-format
 msgid "key %08lX.%lu: Good subkey binding\n"
 msgstr "ËÌÀÞ %08lX: ÎÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ\n"
 
-#: g10/trustdb.c:883 g10/trustdb.c:918
+#: g10/trustdb.c:884 g10/trustdb.c:919
 #, fuzzy, c-format
 msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
 msgstr "ËÌÀÞ %08lX: ÎÅÔ ÄÏÐÕÓÔÉÍÙÈ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× ÐÏÌØÚÏ×ÁÔÅÌÅÊ\n"
 
-#: g10/trustdb.c:895
+#: g10/trustdb.c:896
 #, fuzzy, c-format
 msgid "key %08lX.%lu: Valid key revocation\n"
 msgstr "ËÌÀÞ %08lX.%lu: ÓÒÏË ÄÅÊÓÔ×ÉÑ ÉÓÔÅË %s\n"
 
-#: g10/trustdb.c:901
+#: g10/trustdb.c:902
 #, fuzzy, c-format
 msgid "key %08lX.%lu: Invalid key revocation: %s\n"
 msgstr "ËÌÀÞ %08lX: ÏÔËÒÙÔÙÊ ËÌÀÞ ÎÅ ÎÁÊÄÅÎ: %s\n"
 
-#: g10/trustdb.c:912
+#: g10/trustdb.c:913
 #, fuzzy, c-format
 msgid "key %08lX.%lu: Valid subkey revocation\n"
 msgstr "ËÌÀÞ %08lX: ÎÅÔ ÄÏÐÕÓÔÉÍÙÈ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× ÐÏÌØÚÏ×ÁÔÅÌÅÊ\n"
 
-#: g10/trustdb.c:1023
+#: g10/trustdb.c:1024
 #, fuzzy
 msgid "Good self-signature"
 msgstr "[ÓÁÍÏ-ÐÏÄÐÉÓØ]\n"
 
-#: g10/trustdb.c:1033
+#: g10/trustdb.c:1034
 #, fuzzy
 msgid "Invalid self-signature"
 msgstr "ËÌÀÞ %08lX: ÎÅÄÏÐÕÓÔÉÍÁÑ ÓÁÍÏ-ÐÏÄÐÉÓØ\n"
 
-#: g10/trustdb.c:1060
+#: g10/trustdb.c:1061
 msgid "Valid user ID revocation skipped due to a newer self signature"
 msgstr ""
 
-#: g10/trustdb.c:1066
+#: g10/trustdb.c:1067
 #, fuzzy
 msgid "Valid user ID revocation"
 msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ×ÙÂÏÒ.\n"
 
-#: g10/trustdb.c:1071
+#: g10/trustdb.c:1072
 #, fuzzy
 msgid "Invalid user ID revocation"
 msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ×ÙÂÏÒ.\n"
 
-#: g10/trustdb.c:1112
+#: g10/trustdb.c:1113
 #, fuzzy
 msgid "Valid certificate revocation"
 msgstr "ðÌÏÈÏÊ ÓÅÒÔÉÆÉËÁÔ"
 
-#: g10/trustdb.c:1113
+#: g10/trustdb.c:1114
 #, fuzzy
 msgid "Good certificate"
 msgstr "ðÌÏÈÏÊ ÓÅÒÔÉÆÉËÁÔ"
 
-#: g10/trustdb.c:1134
+#: g10/trustdb.c:1135
 #, fuzzy
 msgid "Invalid certificate revocation"
 msgstr "ðÌÏÈÏÊ ÓÅÒÔÉÆÉËÁÔ"
 
-#: g10/trustdb.c:1135
+#: g10/trustdb.c:1136
 #, fuzzy
 msgid "Invalid certificate"
 msgstr "ðÌÏÈÏÊ ÓÅÒÔÉÆÉËÁÔ"
 
-#: g10/trustdb.c:1152 g10/trustdb.c:1156
+#: g10/trustdb.c:1153 g10/trustdb.c:1157
 #, c-format
 msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr ""
 
-#: g10/trustdb.c:1208
+#: g10/trustdb.c:1209
 #, fuzzy
 msgid "duplicated certificate - deleted"
 msgstr "ðÌÏÈÏÊ ÓÅÒÔÉÆÉËÁÔ"
 
-#: g10/trustdb.c:1514
+#: g10/trustdb.c:1515
 #, fuzzy, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "ÏÛÉÂËÁ ÄÅËÏÄÉÒÏ×ÁÎÉÑ: %s\n"
 
-#: g10/trustdb.c:1636
+#: g10/trustdb.c:1637
 #, fuzzy, c-format
 msgid "lid ?: insert failed: %s\n"
 msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÓÅËÒÅÔÁ ÎÅ ÕÄÁÌÏÓØ: %s\n"
 
-#: g10/trustdb.c:1641
+#: g10/trustdb.c:1642
 #, fuzzy, c-format
 msgid "lid %lu: insert failed: %s\n"
 msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÓÅËÒÅÔÁ ÎÅ ÕÄÁÌÏÓØ: %s\n"
 
-#: g10/trustdb.c:1647
+#: g10/trustdb.c:1648
 #, c-format
 msgid "lid %lu: inserted\n"
 msgstr ""
 
-#: g10/trustdb.c:1652
+#: g10/trustdb.c:1653
 #, fuzzy, c-format
 msgid "error reading dir record: %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/trustdb.c:1660 g10/trustdb.c:1714
+#: g10/trustdb.c:1661 g10/trustdb.c:1715
 #, c-format
 msgid "%lu keys processed\n"
 msgstr ""
 
-#: g10/trustdb.c:1662 g10/trustdb.c:1718
+#: g10/trustdb.c:1663 g10/trustdb.c:1719
 #, fuzzy, c-format
 msgid "\t%lu keys with errors\n"
 msgstr "ïÛÉÂËÁ ÚÁÐÉÓÉ ÆÁÊÌÁ"
 
-#: g10/trustdb.c:1664
+#: g10/trustdb.c:1665
 #, c-format
 msgid "\t%lu keys inserted\n"
 msgstr ""
 
-#: g10/trustdb.c:1667
+#: g10/trustdb.c:1668
 #, fuzzy, c-format
 msgid "enumerate keyblocks failed: %s\n"
 msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÓÅËÒÅÔÁ ÎÅ ÕÄÁÌÏÓØ: %s\n"
 
-#: g10/trustdb.c:1705
+#: g10/trustdb.c:1706
 #, c-format
 msgid "lid %lu: dir record w/o key - skipped\n"
 msgstr ""
 
-#: g10/trustdb.c:1716
+#: g10/trustdb.c:1717
 #, fuzzy, c-format
 msgid "\t%lu keys skipped\n"
 msgstr "%s: ÐÒÏÐÕÝÅÎ: %s\n"
 
-#: g10/trustdb.c:1720
+#: g10/trustdb.c:1721
 #, c-format
 msgid "\t%lu keys updated\n"
 msgstr ""
 
-#: g10/trustdb.c:2057
+#: g10/trustdb.c:2058
 msgid "Ooops, no keys\n"
 msgstr ""
 
-#: g10/trustdb.c:2061
+#: g10/trustdb.c:2062
 #, fuzzy
 msgid "Ooops, no user IDs\n"
 msgstr "ÓÐÉÓÏË ËÌÀÞÅÊ É ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× ÐÏÌØÚÏ×ÁÔÅÌÅÊ"
 
-#: g10/trustdb.c:2218
+#: g10/trustdb.c:2219
 #, fuzzy, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "ËÌÀÞ %08lX.%lu: ×ÓÔÁ×ËÁ ÄÏ×ÅÒÉÔÅÌØÎÏÊ ÚÁÐÉÓÉ ÎÅ ÕÄÁÌÁÓØ: %s\n"
 
-#: g10/trustdb.c:2227
+#: g10/trustdb.c:2228
 #, fuzzy, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "ËÌÀÞ %08lX.%lu: ×ÓÔÁ×ËÁ ÄÏ×ÅÒÉÔÅÌØÎÏÊ ÚÁÐÉÓÉ ÎÅ ÕÄÁÌÁÓØ: %s\n"
 
-#: g10/trustdb.c:2231
+#: g10/trustdb.c:2232
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "ËÌÀÞ %08lX.%lu: ×ÓÔÁ×ÌÅÎ × ÂÁÚÕ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ\n"
 
-#: g10/trustdb.c:2239
+#: g10/trustdb.c:2240
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "ËÌÀÞ %08lX.%lu: ÓÇÅÎÅÒÉÒÏ×ÁÎ × ÂÕÄÕÝÅÍ (ÎÅÐÒÁ×ÉÌØÎÏ ÕÓÔÁÎÏ×ÌÅÎÙ ÞÁÓÙ)\n"
 
-#: g10/trustdb.c:2248
+#: g10/trustdb.c:2249
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "ËÌÀÞ %08lX.%lu: ÓÒÏË ÄÅÊÓÔ×ÉÑ ÉÓÔÅË %s\n"
 
-#: g10/trustdb.c:2256
+#: g10/trustdb.c:2257
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "ËÌÀÞ %08lX.%lu: ÐÒÏ×ÅÒËÁ ÄÏ×ÅÒÉÑ ÎÅ ÕÄÁÌÁÓØ: %s\n"
 
-#: g10/trustdb.c:2362
+#: g10/trustdb.c:2363
 #, fuzzy, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "%s: ÐÏÌØÚÏ×ÁÔÅÌØ ÎÅ ÎÁÊÄÅÎ\n"
 
-#: g10/trustdb.c:2364
+#: g10/trustdb.c:2365
 #, fuzzy, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "ïÛÉÂËÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ: %s\n"
 
-#: g10/trustdb.c:2367
+#: g10/trustdb.c:2368
 #, fuzzy, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "ÏÂÎÏ×ÌÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ ÎÅ ÕÄÁÌÏÓØ: %s\n"
 
-#: g10/trustdb.c:2370
+#: g10/trustdb.c:2371
 #, fuzzy, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "ïÛÉÂËÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ: %s\n"
 
-#: g10/trustdb.c:2556 g10/trustdb.c:2586
+#: g10/trustdb.c:2557 g10/trustdb.c:2587
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr ""
 
-#: g10/ringedit.c:318
+#: g10/ringedit.c:317
 #, fuzzy, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n"
 
-#: g10/ringedit.c:335 g10/ringedit.c:1355
+#: g10/ringedit.c:334 g10/ringedit.c:1354
 #, fuzzy, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n"
 
-#: g10/ringedit.c:1532
+#: g10/ringedit.c:1531
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/ringedit.c:1533
+#: g10/ringedit.c:1532
 #, fuzzy, c-format
 msgid "%s is the unchanged one\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎ ÎÅÐÒÁ×ÉÌØÎÙÊ ÓÅËÒÅÔÎÙÊ ËÌÀÞ"
 
-#: g10/ringedit.c:1534
+#: g10/ringedit.c:1533
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/ringedit.c:1535
+#: g10/ringedit.c:1534
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
-#: g10/skclist.c:88 g10/skclist.c:125
-msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr ""
-
-#: g10/skclist.c:113
+#: g10/skclist.c:97
 #, fuzzy, c-format
 msgid "skipped `%s': %s\n"
 msgstr "%s: ÐÒÏÐÕÝÅÎ: %s\n"
 
-#: g10/skclist.c:119
+#: g10/skclist.c:103
 #, fuzzy, c-format
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
@@ -3301,17 +3311,17 @@ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÐÏÄÐÉÓÁÎÎÙÅ ÄÁÎÎÙÅ `%s' .\n"
 msgid "%s: new options file created\n"
 msgstr ""
 
-#: g10/encr-data.c:66
+#: g10/encr-data.c:64
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
 
-#: g10/encr-data.c:71
+#: g10/encr-data.c:69
 #, fuzzy, c-format
 msgid "%s encrypted data\n"
 msgstr "ÚÁÛÉÆÒÏ×ÁÔØ ÄÁÎÎÙÅ"
 
-#: g10/encr-data.c:101
+#: g10/encr-data.c:99
 #, fuzzy
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -3319,11 +3329,11 @@ msgstr ""
 "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÓÏÏÂÝÅÎÉÅ ÂÙÌÏ ÚÁÛÉÆÒÏ×ÁÎÏ, ÉÓÐÏÌØÚÕÑ ÓÌÁÂÙÊ ËÌÀÞ, × "
 "ÓÉÍÍÅÔÒÉÞÎÏÍ ÁÌÇÏÒÉÔÍÅ ÛÉÆÒÏ×ÁÎÉÑ.\n"
 
-#: g10/seskey.c:63
+#: g10/seskey.c:62
 msgid "weak key created - retrying\n"
 msgstr "ÐÏÌÕÞÉÌÓÑ ÓÌÁÂÙÊ ËÌÀÞ, ÐÒÏÂÕÅÍ ÅÝÅ ÒÁÚ\n"
 
-#: g10/seskey.c:68
+#: g10/seskey.c:67
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""