See ChangeLog: Sat Dec 4 15:32:20 CET 1999 Werner Koch

author: Werner Koch <[email protected]> 1999-12-04 14:36:34 +0000
committer: Werner Koch <[email protected]> 1999-12-04 14:36:34 +0000
commit: 5553cc985e174248a60e50530db6815d3f7751c0 (patch)
tree: d46dac5638347a00af1889f8b2e959c75b5a472f
parent: See ChangeLog: Sat Dec 4 12:30:28 CET 1999 Werner Koch (diff)
download: gnupg-5553cc985e174248a60e50530db6815d3f7751c0.tar.gz
gnupg-5553cc985e174248a60e50530db6815d3f7751c0.zip
14 files changed, 2576 insertions, 2478 deletions
diff --git a/AUTHORS b/AUTHORS
index 4bd60bede..0577aea33 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,7 +4,7 @@ Authors of GNU Privacy Guard (GnuPG)
 GNUPG	Werner Koch		  1998-02-23
 Assigns GNU Privacy Guard and future changes.
 [email protected]
-Designed and implemented GnuPG.
+Designed and implemented GnuPG and is the current maintainer.
 
 
 GNUPG	Matthew Skala		   1998-08-10
diff --git a/README b/README
index 63bd380fd..d7185dcb6 100644
--- a/README
+++ b/README
@@ -1,3 +1,5 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+
 		    GnuPG - The GNU Privacy Guard
 		   -------------------------------
 			    Version 1.0
@@ -508,3 +510,10 @@
     Commercial grade support for GnuPG is available; please see
     the GNU service directory or search other resources.
 
+-----BEGIN PGP SIGNATURE-----
+
+iQB1AwUBOEkX0B0Z9MEMmFelAQE2aQL/bo8po/atFACnG7eZBodfV0ikE+PFynOf
+uzQjirp00hSFwP8jMmv+ccnlyZkHRwrhl/Xc8GCmmeATwtb1fuAWvCO51T1YIv3i
++K8Y6ThnQxG6TS0A/DBcoxwKpT7jEEPG
+=WYfE
+-----END PGP SIGNATURE-----
diff --git a/VERSION b/VERSION
index b60339ba5..2c2f08a73 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.0h
+1.0.0i
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 09bc6f766..0d4e36799 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+Sat Dec  4 15:32:20 CET 1999  Werner Koch  <[email protected]>
+
+	* trustdb.c (verify_key): Shortcut for ultimately trusted keys.
+
 Sat Dec  4 12:30:28 CET 1999  Werner Koch  <[email protected]>
 
 	* pkclist.c (build_pk_list): Validate the trust using the namehash
diff --git a/g10/trustdb.c b/g10/trustdb.c
index 69e3936b0..472daf2c1 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -2082,8 +2082,12 @@ verify_key( int max_depth, TRUSTREC *drec, const char *namehash,
     if( !tree )
 	return TRUST_UNDEFINED;
     pv_result = propagate_validity( tree, tree, add_fnc, retflgs );
-    if( namehash ) {
+    if( namehash && tree->n.k.validity != TRUST_ULTIMATE ) {
 	/* find the matching user id.
+	 * We don't do this here if the key is ultimately trusted; in
+	 * this case there will be no lits od user IDs and frankly
+	 * it doe not make sense to compare by the name if we do
+	 * have the secret key.
 	 * fixme: the way we handle this is too inefficient */
 	TN ur;
 	TRUSTREC rec;
diff --git a/po/de.po b/po/de.po
index d6d3f3eeb..b4f7172a3 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,7 +3,7 @@
 # Walter Koch <[email protected]>, 1998.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-11-22 11:18+0100\n"
+"POT-Creation-Date: 1999-12-04 14:36+0100\n"
 "PO-Revision-Date: 1999-11-07 10:36+0100\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -286,7 +286,7 @@ msgstr ""
 "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n"
 "(Es werden noch %d Byte ben�tigt.)\n"
 
-#: g10/g10.c:188
+#: g10/g10.c:189
 msgid ""
 "@Commands:\n"
 " "
@@ -294,135 +294,140 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: g10/g10.c:190
+#: g10/g10.c:191
 msgid "|[file]|make a signature"
 msgstr "|[Datei]|Eine Unterschrift erzeugen"
 
-#: g10/g10.c:191
+#: g10/g10.c:192
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/g10.c:192
+#: g10/g10.c:193
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/g10.c:193
+#: g10/g10.c:194
 msgid "encrypt data"
 msgstr "Daten verschl�sseln"
 
-#: g10/g10.c:194
+#: g10/g10.c:195
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschl�sseln"
 
-#: g10/g10.c:195
+#: g10/g10.c:196
 msgid "store only"
 msgstr "Nur speichern"
 
-#: g10/g10.c:196
+#: g10/g10.c:197
 msgid "decrypt data (default)"
 msgstr "Daten entschl�sseln (Voreinstellung)"
 
-#: g10/g10.c:197
+#: g10/g10.c:198
 msgid "verify a signature"
 msgstr "Signatur pr�fen"
 
-#: g10/g10.c:199
+#: g10/g10.c:200
 msgid "list keys"
 msgstr "Liste der Schl�ssel"
 
-#: g10/g10.c:201
+#: g10/g10.c:202
 msgid "list keys and signatures"
 msgstr "Liste der Schl�ssel und ihrer Signaturen"
 
-#: g10/g10.c:202
+#: g10/g10.c:203
 msgid "check key signatures"
 msgstr "Signaturen der Schl�ssel pr�fen"
 
-#: g10/g10.c:203
+#: g10/g10.c:204
 msgid "list keys and fingerprints"
 msgstr "Liste der Schl�ssel und ihrer \"Fingerabdr�cke\""
 
-#: g10/g10.c:204
+#: g10/g10.c:205
 msgid "list secret keys"
 msgstr "Liste der geheimen Schl�ssel"
 
-#: g10/g10.c:205
+#: g10/g10.c:206
 msgid "generate a new key pair"
 msgstr "Ein neues Schl�sselpaar erzeugen"
 
-#: g10/g10.c:206
+#: g10/g10.c:207
 msgid "remove key from the public keyring"
 msgstr "Schl�ssel entfernen"
 
-#: g10/g10.c:207
+#: g10/g10.c:209
+#, fuzzy
+msgid "remove key from the secret keyring"
+msgstr "Schl�ssel entfernen"
+
+#: g10/g10.c:210
 msgid "sign a key"
 msgstr "Schl�ssel signieren"
 
-#: g10/g10.c:208
+#: g10/g10.c:211
 msgid "sign a key locally"
 msgstr "Schl�ssel nur auf diesem Rechner signieren"
 
-#: g10/g10.c:209
+#: g10/g10.c:212
 msgid "sign or edit a key"
 msgstr "Unterschreiben o. Bearbeiten eines Schl�ssels"
 
-#: g10/g10.c:210
+#: g10/g10.c:213
 msgid "generate a revocation certificate"
 msgstr "Ein Schl�sselwiderruf-Zertifikat erzeugen"
 
-#: g10/g10.c:211
+#: g10/g10.c:214
 msgid "export keys"
 msgstr "Schl�ssel exportieren"
 
-#: g10/g10.c:212
+#: g10/g10.c:215
 msgid "export keys to a key server"
 msgstr "Schl�ssel zu einem Schl�.server exportieren"
 
-#: g10/g10.c:213
+#: g10/g10.c:216
 msgid "import keys from a key server"
 msgstr "Schl�ssel von einem Schl�.server importieren"
 
-#: g10/g10.c:216
+#: g10/g10.c:219
 msgid "import/merge keys"
 msgstr "Schl�ssel importieren/kombinieren"
 
-#: g10/g10.c:218
+#: g10/g10.c:221
 msgid "list only the sequence of packets"
 msgstr "Lediglich Struktur der Datenpakete anzeigen"
 
-#: g10/g10.c:220
+#: g10/g10.c:223
 msgid "export the ownertrust values"
 msgstr "Exportieren der \"Owner trust\" Werte"
 
-#: g10/g10.c:222
+#: g10/g10.c:225
 msgid "import ownertrust values"
 msgstr "Importieren der \"Owner trust\" Werte"
 
-#: g10/g10.c:224
+#: g10/g10.c:227
 msgid "update the trust database"
 msgstr "�ndern der \"Trust\"-Datenbank"
 
-#: g10/g10.c:226
+#: g10/g10.c:229
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMEN]|�berpr�fen der \"Trust\"-Datenbank"
 
-#: g10/g10.c:227
+#: g10/g10.c:230
 msgid "fix a corrupted trust database"
 msgstr "Reparieren einer besch�digten \"Trust\"-Datenb."
 
-#: g10/g10.c:228
+#: g10/g10.c:231
 msgid "De-Armor a file or stdin"
 msgstr "Datei oder stdin von der ASCII-H�lle befreien"
 
-#: g10/g10.c:230
+#: g10/g10.c:233
 msgid "En-Armor a file or stdin"
 msgstr "Datei oder stdin in eine ASCII-H�lle einpacken"
 
-#: g10/g10.c:232
+#: g10/g10.c:235
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests f�r die Dateien ausgeben"
 
-#: g10/g10.c:236
+#: g10/g10.c:239
 msgid ""
 "@\n"
 "Options:\n"
@@ -432,172 +437,172 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/g10.c:238
+#: g10/g10.c:241
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-H�lle versehen"
 
-#: g10/g10.c:240
+#: g10/g10.c:243
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschl�sseln f�r NAME"
 
-#: g10/g10.c:243
+#: g10/g10.c:246
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|NAME als voreingestellten Empf�nger benutzen"
 
-#: g10/g10.c:245
+#: g10/g10.c:248
 msgid "use the default key as default recipient"
 msgstr ""
 "Den Standardschl�ssel als voreingestellten\n"
 "Empf�nger benutzen"
 
-#: g10/g10.c:249
+#: g10/g10.c:252
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/g10.c:250
+#: g10/g10.c:253
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/g10.c:252
+#: g10/g10.c:255
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/g10.c:253
+#: g10/g10.c:256
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/g10.c:254
+#: g10/g10.c:257
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: g10/g10.c:255
+#: g10/g10.c:258
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
-#: g10/g10.c:256
+#: g10/g10.c:259
 msgid "don't use the terminal at all"
 msgstr "das Terminal gar nicht benutzen"
 
-#: g10/g10.c:257
+#: g10/g10.c:260
 msgid "force v3 signatures"
 msgstr "v3 Signaturen erzwingen"
 
-#: g10/g10.c:258
+#: g10/g10.c:261
 msgid "always use a MDC for encryption"
 msgstr "Beim Verschl�sseln ein Siegel (MDC) verwenden"
 
-#: g10/g10.c:259
+#: g10/g10.c:262
 msgid "do not make any changes"
 msgstr "Keine wirklichen �nderungen durchf�hren"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:261
+#: g10/g10.c:264
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: g10/g10.c:262
+#: g10/g10.c:265
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: g10/g10.c:263
+#: g10/g10.c:266
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: g10/g10.c:264
+#: g10/g10.c:267
 msgid "add this keyring to the list of keyrings"
 msgstr "Als �ffentlichen Schl�sselbund mitbenutzen"
 
-#: g10/g10.c:265
+#: g10/g10.c:268
 msgid "add this secret keyring to the list"
 msgstr "Als geheimen Schl�sselbund mitbenutzen"
 
-#: g10/g10.c:266
+#: g10/g10.c:269
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten Schl�ssel benutzen"
 
-#: g10/g10.c:267
+#: g10/g10.c:270
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|Schl�ssel bei diesem Server nachschlagen"
 
-#: g10/g10.c:268
+#: g10/g10.c:271
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|Terminalzeichensatz NAME benutzen"
 
-#: g10/g10.c:269
+#: g10/g10.c:272
 msgid "read options from file"
 msgstr "Optionen aus der Datei lesen"
 
-#: g10/g10.c:271
+#: g10/g10.c:274
 msgid "set debugging flags"
 msgstr "Debug-Flags einschalten"
 
-#: g10/g10.c:272
+#: g10/g10.c:275
 msgid "enable full debugging"
 msgstr "Alle Debug-Flags einschalten"
 
-#: g10/g10.c:273
+#: g10/g10.c:276
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
-#: g10/g10.c:274
+#: g10/g10.c:277
 msgid "do not write comment packets"
 msgstr "Keine Kommentarpakete schreiben"
 
-#: g10/g10.c:275
+#: g10/g10.c:278
 msgid "(default is 1)"
 msgstr "Ben�tigte Vollvertrauen (Voreinstellung 1)"
 
-#: g10/g10.c:276
+#: g10/g10.c:279
 msgid "(default is 3)"
 msgstr "Ben�tigte Teilvertrauen (Voreinstellung 3)"
 
-#: g10/g10.c:278
+#: g10/g10.c:281
 msgid "|FILE|load extension module FILE"
 msgstr "|DATEI|Erweiterungsmodul DATEI laden"
 
-#: g10/g10.c:279
+#: g10/g10.c:282
 msgid "emulate the mode described in RFC1991"
 msgstr "Den in RFC1991 beschriebenen Modus nachahmen"
 
-#: g10/g10.c:280
+#: g10/g10.c:283
 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:281
+#: g10/g10.c:284
 msgid "|N|use passphrase mode N"
 msgstr "|N|Verwenden des Mantra-Modus N"
 
-#: g10/g10.c:283
+#: g10/g10.c:286
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|Hashverfahren NAME f�r Mantras benutzen"
 
-#: g10/g10.c:285
+#: g10/g10.c:288
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|Verschl�.verfahren NAME f�r Mantras benutzen"
 
-#: g10/g10.c:286
+#: g10/g10.c:289
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Verschl�.verfahren NAME benutzen"
 
-#: g10/g10.c:287
+#: g10/g10.c:290
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Hashverfahren NAME benutzen"
 
-#: g10/g10.c:288
+#: g10/g10.c:291
 msgid "|N|use compress algorithm N"
 msgstr "|N|Komprimierverfahren N benutzen"
 
-#: g10/g10.c:289
+#: g10/g10.c:292
 msgid "throw keyid field of encrypted packets"
 msgstr "Entferne Empf�nger-ID verschl�sselter Pakete"
 
-#: g10/g10.c:290
+#: g10/g10.c:293
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=WERT|verwende diese \"notation\"-Daten"
 
-#: g10/g10.c:292
+#: g10/g10.c:295
 msgid ""
 "@\n"
 "Examples:\n"
@@ -617,17 +622,17 @@ msgstr ""
 " --list-keys [Namen]        Schl�ssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdr�cke\" anzeigen\n"
 
-#: g10/g10.c:380
+#: g10/g10.c:383
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Berichte �ber Bugs (Programmfehler) bitte an <[email protected]>.\n"
 "Sinn- oder Schreibfehler in den deutschen Texten bitte an <[email protected]>.\n"
 
-#: g10/g10.c:384
+#: g10/g10.c:387
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
 
-#: g10/g10.c:387
+#: g10/g10.c:390
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -637,7 +642,7 @@ msgstr ""
 "Signieren, pr�fen, verschl�sseln, entschl�sseln\n"
 "Die voreingestellte Operation ist abh�ngig von den Eingabedaten\n"
 
-#: g10/g10.c:392
+#: g10/g10.c:397
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -645,184 +650,184 @@ msgstr ""
 "\n"
 "Unterst�tzte Verfahren:\n"
 
-#: g10/g10.c:470
+#: g10/g10.c:476
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/g10.c:523
+#: g10/g10.c:529
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/g10.c:662
+#: g10/g10.c:668
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/g10.c:666
+#: g10/g10.c:672
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/g10.c:673
+#: g10/g10.c:679
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:855
+#: g10/g10.c:861
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ist kein g�ltiger Zeichensatz.\n"
 
-#: g10/g10.c:910 g10/g10.c:919
+#: g10/g10.c:917 g10/g10.c:926
 #, 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:912
+#: g10/g10.c:919
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/g10.c:915
+#: g10/g10.c:922
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/g10.c:934 g10/g10.c:946
+#: g10/g10.c:941 g10/g10.c:953
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgew�hlte Verschl�sslungsverfahren ist ung�ltig\n"
 
-#: g10/g10.c:940 g10/g10.c:952
+#: g10/g10.c:947 g10/g10.c:959
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:956
+#: g10/g10.c:963
 msgid "the given policy URL is invalid\n"
 msgstr "Die angegebene URL f�r Richtlinien ist ung�ltig\n"
 
-#: g10/g10.c:959
+#: g10/g10.c:966
 #, 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:961
+#: g10/g10.c:968
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m�ssen gr��er als 0 sein\n"
 
-#: g10/g10.c:963
+#: g10/g10.c:970
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed m�ssen gr��er als 1 sein\n"
 
-#: g10/g10.c:965
+#: g10/g10.c:972
 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:968
+#: g10/g10.c:975
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:972
+#: g10/g10.c:979
 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:1049
+#: g10/g10.c:1056
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:1055
+#: g10/g10.c:1062
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:1062
+#: g10/g10.c:1069
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:1070
+#: g10/g10.c:1077
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:1083
+#: g10/g10.c:1090
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:1096
+#: g10/g10.c:1103
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:1110
+#: g10/g10.c:1117
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:1127
+#: g10/g10.c:1134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:1135
+#: g10/g10.c:1142
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/g10.c:1143
+#: g10/g10.c:1150
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/g10.c:1151
+#: g10/g10.c:1158
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/g10.c:1167
+#: g10/g10.c:1174
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key User-ID"
 
-#: g10/g10.c:1170
+#: g10/g10.c:1177
 msgid "--delete-key user-id"
 msgstr "--delete-key User-ID"
 
-#: g10/encode.c:260 g10/g10.c:1207 g10/sign.c:366
+#: g10/encode.c:260 g10/g10.c:1214 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
 
-#: g10/g10.c:1222
+#: g10/g10.c:1229
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schl�sselbund]"
 
-#: g10/g10.c:1273
+#: g10/g10.c:1280
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1281
+#: g10/g10.c:1288
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1349
+#: g10/g10.c:1356
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ung�ltiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:1430
+#: g10/g10.c:1437
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:1434
+#: g10/g10.c:1441
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1437 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1444 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht ge�ffnet werden\n"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1613
 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:1612
+#: g10/g10.c:1619
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -830,12 +835,12 @@ msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und mu� mit einem '=' enden\n"
 
-#: g10/g10.c:1618
+#: g10/g10.c:1625
 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:1626
+#: g10/g10.c:1633
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
@@ -898,16 +903,16 @@ msgstr "vorzeitiges Dateiende (im Nachsatz)\n"
 msgid "error in trailer line\n"
 msgstr "Fehler in der Nachsatzzeile\n"
 
-#: g10/armor.c:1007
+#: g10/armor.c:1012
 msgid "no valid OpenPGP data found.\n"
 msgstr "Keine g�ltigen OpenPGP-Daten gefunden.\n"
 
-#: g10/armor.c:1012
+#: g10/armor.c:1017
 #, 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:1016
+#: g10/armor.c:1021
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1127,12 +1132,12 @@ msgstr ""
 "         Es ist nicht sicher, da� die Signatur wirklich dem vorgeblichen "
 "Besitzer geh�rt.\n"
 
-#: g10/pkclist.c:700 g10/pkclist.c:722 g10/pkclist.c:847 g10/pkclist.c:892
+#: g10/pkclist.c:700 g10/pkclist.c:722 g10/pkclist.c:848 g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: �bersprungen: %s\n"
 
-#: g10/pkclist.c:708 g10/pkclist.c:874
+#: g10/pkclist.c:708 g10/pkclist.c:875
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: �bersprungen: �ffentlicher Schl�ssel bereits vorhanden\n"
@@ -1158,86 +1163,86 @@ msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "�bersprungen: �ffentlicher Schl�ssel bereits als Standardempf�nger gesetzt\n"
 
-#: g10/pkclist.c:784
+#: g10/pkclist.c:785
 msgid "Public key is disabled.\n"
 msgstr "�ffentlicher Schl�ssel ist abgeschaltet.\n"
 
-#: g10/pkclist.c:791
+#: g10/pkclist.c:792
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr ""
 "�bersprungen: �ffentlicher Schl�ssel bereits mittels --encrypt-to gesetzt\n"
 
-#: g10/pkclist.c:822
+#: g10/pkclist.c:823
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "Unbekannter voreingestellter Empf�nger '%s'\n"
 
-#: g10/pkclist.c:855
+#: g10/pkclist.c:856
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: Fehler beim Pr�fen des Schl�ssels: %s\n"
 
-#: g10/pkclist.c:860
+#: g10/pkclist.c:861
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: �bersprungen: �ffentlicher Schl�ssel ist abgeschaltet\n"
 
-#: g10/pkclist.c:898
+#: g10/pkclist.c:899
 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:387
 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:389
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA und ElGamal (voreingestellt)\n"
 
-#: g10/keygen.c:389
+#: g10/keygen.c:390
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:391
+#: g10/keygen.c:392
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur verschl�sseln)\n"
 
-#: g10/keygen.c:392
+#: g10/keygen.c:393
 #, 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:395
 #, 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:400
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
-#: g10/keygen.c:409
+#: g10/keygen.c:410
 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:431
 msgid "Invalid selection.\n"
 msgstr "Ung�ltige Auswahl.\n"
 
-#: g10/keygen.c:442
+#: g10/keygen.c:443
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1250,15 +1255,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:450
 msgid "What keysize do you want? (1024) "
 msgstr "Welche Schl�ssell�nge w�nschen Sie? (1024) "
 
-#: g10/keygen.c:454
+#: g10/keygen.c:455
 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:457
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "zu kurz; 768 ist die kleinste m�gliche Schl�ssell�nge.\n"
 
@@ -1270,12 +1275,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:467
 #, 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:472
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1283,11 +1288,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:475
 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:476
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1295,21 +1300,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:484
 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:490
 #, 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:493 g10/keygen.c:497
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "aufgerundet auf %u Bit\n"
 
-#: g10/keygen.c:509
+#: g10/keygen.c:510
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1325,35 +1330,35 @@ 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:527
 msgid "Key is valid for? (0) "
 msgstr "Der Schl�ssel bleibt wie lange g�ltig? (0) "
 
-#: g10/keygen.c:547
+#: g10/keygen.c:548
 msgid "invalid value\n"
 msgstr "Ung�ltiger Wert.\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:553
 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:559
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Der Schl�ssel verf�llt am %s\n"
 
-#: g10/keygen.c:561
+#: g10/keygen.c:562
 msgid ""
-"Your system can't display dates beyond 2036.\n"
+"Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:566
+#: g10/keygen.c:567
 msgid "Is this correct (y/n)? "
 msgstr "Ist dies richtig? (j/n) "
 
-#: g10/keygen.c:609
+#: g10/keygen.c:610
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1369,44 +1374,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:620
+#: g10/keygen.c:621
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:624
+#: g10/keygen.c:625
 msgid "Invalid character in name\n"
 msgstr "Ung�ltiges Zeichen im Namen\n"
 
-#: g10/keygen.c:626
+#: g10/keygen.c:627
 msgid "Name may not start with a digit\n"
 msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
-#: g10/keygen.c:628
+#: g10/keygen.c:629
 msgid "Name must be at least 5 characters long\n"
 msgstr "Der Name mu� min. 5 Zeichen lang sein.\n"
 
-#: g10/keygen.c:636
+#: g10/keygen.c:637
 msgid "Email address: "
 msgstr "E-Mail-Adresse: "
 
-#: g10/keygen.c:647
+#: g10/keygen.c:648
 msgid "Not a valid email address\n"
 msgstr "Diese E-Mail-Adresse ist ung�ltig\n"
 
-#: g10/keygen.c:655
+#: g10/keygen.c:656
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:661
+#: g10/keygen.c:662
 msgid "Invalid character in comment\n"
 msgstr "Ung�ltiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:683
+#: g10/keygen.c:684
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Sie benutzen den Zeichensatz `%s'\n"
 
-#: g10/keygen.c:689
+#: g10/keygen.c:690
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1417,15 +1422,15 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:692
+#: g10/keygen.c:693
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfBb"
 
-#: g10/keygen.c:702
+#: g10/keygen.c:703
 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:754
+#: g10/keygen.c:755
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1433,11 +1438,11 @@ msgstr ""
 "Sie ben�tigen ein Mantra, um den geheimen Schl�ssel zu sch�tzen.\n"
 "\n"
 
-#: g10/keyedit.c:456 g10/keygen.c:762
+#: g10/keyedit.c:456 g10/keygen.c:763
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "Mantra wurde nicht richtig wiederholt; noch einmal versuchen.\n"
 
-#: g10/keygen.c:768
+#: g10/keygen.c:769
 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"
@@ -1450,7 +1455,7 @@ msgstr ""
 "aufrufen.\n"
 "\n"
 
-#: g10/keygen.c:789
+#: g10/keygen.c:790
 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"
@@ -1461,34 +1466,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:859
+#: g10/keygen.c:860
 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:867
+#: g10/keygen.c:868
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Der DSA Schl�ssel wird 1024 Bits haben.\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:874
 msgid "Key generation canceled.\n"
 msgstr "Schl�sselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:883
+#: g10/keygen.c:884
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "schreiben des �ffentlichen Zertifikats nach '%s'\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:885
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "schreiben des geheimen Zertifikats nach '%s'\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:962
 msgid "public and secret key created and signed.\n"
 msgstr "�ffentlichen und geheimen Schl�ssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:964
 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 +1502,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:977 g10/keygen.c:1076
+#: g10/keygen.c:978 g10/keygen.c:1077
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:1021 g10/sig-check.c:312 g10/sign.c:105
+#: g10/keygen.c:1022 g10/sig-check.c:312 g10/sign.c:105
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1510,7 +1515,7 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht �berein)\n"
 
-#: g10/keygen.c:1023 g10/sig-check.c:314 g10/sign.c:107
+#: g10/keygen.c:1024 g10/sig-check.c:314 g10/sign.c:107
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1518,12 +1523,12 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht �berein)\n"
 
-#: g10/keygen.c:1054
+#: g10/keygen.c:1055
 msgid "Really create? "
 msgstr "Wirklich erzeugen? "
 
-#: g10/encode.c:91 g10/openfile.c:161 g10/openfile.c:270 g10/tdbio.c:468
-#: g10/tdbio.c:529
+#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: kann nicht ge�ffnet werden: %s\n"
@@ -1691,7 +1696,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:420 g10/openfile.c:213 g10/sign.c:268 g10/sign.c:580
+#: g10/import.c:420 g10/openfile.c:220 g10/sign.c:268 g10/sign.c:580
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
@@ -1822,17 +1827,17 @@ msgstr "Schl�ssel %08lX: Kein Unterschl�ssel f�r die Schl�sselanbindung\n"
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung\n"
 
-#: g10/import.c:799
+#: g10/import.c:800
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "Schl�ssel %08lX: Nicht eigenbeglaubigte User-ID �bernommen'"
 
-#: g10/import.c:828
+#: g10/import.c:829
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "Schl�ssel %08lX: User-ID �bergangen '"
 
-#: g10/import.c:851
+#: g10/import.c:852
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "Schl�ssel %08lX: Unterschl�ssel ignoriert\n"
@@ -1841,32 +1846,32 @@ msgstr "Schl�ssel %08lX: Unterschl�ssel ignoriert\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:876
+#: g10/import.c:877
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "Schl�ssel %08lX: Nicht exportf�hige Unterschrift - �bergangen\n"
 
-#: g10/import.c:885
+#: g10/import.c:886
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat an falschem Platz - �bergangen\n"
 
-#: g10/import.c:893
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - �bergangen\n"
 
-#: g10/import.c:993
+#: g10/import.c:994
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "Schl�ssel %08lX: Doppelte User-ID entdeckt - zusammengef�hrt\n"
 
-#: g10/import.c:1044
+#: g10/import.c:1045
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat hinzugef�gt\n"
 
-#: g10/import.c:1158 g10/import.c:1211
+#: g10/import.c:1159 g10/import.c:1212
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "Schl�ssel %08lX: Unsere Kopie hat keine Eigenbeglaubigung\n"
@@ -2480,44 +2485,44 @@ msgstr "\"Notation\": "
 msgid "Policy: "
 msgstr "Richtlinie: "
 
-#: g10/mainproc.c:1035
+#: g10/mainproc.c:1037
 msgid "signature verification suppressed\n"
 msgstr "Unterschriften-�berpr�fung unterdr�ckt\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1041
+#: g10/mainproc.c:1043
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Unterschrift vom %.*s, %s Schl�ssel ID %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1067 g10/mainproc.c:1078
+#: g10/mainproc.c:1069 g10/mainproc.c:1080
 msgid "BAD signature from \""
 msgstr "FALSCHE Unterschrift von \""
 
-#: g10/mainproc.c:1068 g10/mainproc.c:1079
+#: g10/mainproc.c:1070 g10/mainproc.c:1081
 msgid "Good signature from \""
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:1070
+#: g10/mainproc.c:1072
 msgid "                aka \""
 msgstr "                    alias \""
 
-#: g10/mainproc.c:1126
+#: g10/mainproc.c:1128
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht gepr�ft werden: %s\n"
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1189
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Unterschrift der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:1226
+#: g10/mainproc.c:1228
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:1231
+#: g10/mainproc.c:1233
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ung�ltiges root-Paket in proc_tree() entdeckt\n"
 
@@ -2709,137 +2714,127 @@ msgstr "Textzeilen l�nger als %d Zeichen k�nnen nicht benutzt werden\n"
 msgid "input line longer than %d characters\n"
 msgstr "Eingabezeile ist l�nger als %d Zeichen\n"
 
-#: g10/tdbio.c:121 g10/tdbio.c:1637
+#: g10/tdbio.c:116 g10/tdbio.c:1623
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb Satz %lu: lseek fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1644
+#: g10/tdbio.c:122 g10/tdbio.c:1630
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb Satz %lu: write fehlgeschlagen (n=%d): %s\n"
 
-#: g10/tdbio.c:237
+#: g10/tdbio.c:232
 msgid "trustdb transaction too large\n"
 msgstr "trustdb Transaktion zu gro�\n"
 
-#: g10/tdbio.c:429
+#: g10/tdbio.c:424
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: kann nicht zugegriffen werden: %s\n"
 
-#: g10/ringedit.c:298 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
-#, c-format
-msgid "%s: directory created\n"
-msgstr "%s: Verzeichnis erzeugt\n"
-
-#: g10/tdbio.c:452
+#: g10/tdbio.c:438
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: Verzeichnis existiert nicht!\n"
 
-#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1350 g10/tdbio.c:458
+#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1335 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: kann nicht erzeugt werden: %s\n"
 
-#: g10/tdbio.c:473 g10/tdbio.c:522
+#: g10/tdbio.c:459 g10/tdbio.c:508
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: Sperre kann nicht erzeugt werden\n"
 
-#: g10/tdbio.c:487
+#: g10/tdbio.c:473
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: Fehler beim Erzeugen des Versionsatzes: %s"
 
-#: g10/tdbio.c:491
+#: g10/tdbio.c:477
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ung�ltige trust-db erzeugt\n"
 
-#: g10/tdbio.c:494
+#: g10/tdbio.c:480
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trust-db erzeugt\n"
 
-#: g10/tdbio.c:531
+#: g10/tdbio.c:517
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ung�ltige 'Trust'-Datenbank\n"
 
-#: g10/tdbio.c:564
+#: g10/tdbio.c:550
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: hashtable kann nicht erzeugt werden: %s\n"
 
-#: g10/tdbio.c:572
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: Fehler beim �ndern des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:588 g10/tdbio.c:627 g10/tdbio.c:649 g10/tdbio.c:679
-#: g10/tdbio.c:704 g10/tdbio.c:1570 g10/tdbio.c:1597
+#: g10/tdbio.c:574 g10/tdbio.c:613 g10/tdbio.c:635 g10/tdbio.c:665
+#: g10/tdbio.c:690 g10/tdbio.c:1556 g10/tdbio.c:1583
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: Fehler beim Lesen des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:601 g10/tdbio.c:660
+#: g10/tdbio.c:587 g10/tdbio.c:646
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: Fehler beim Schreiben des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:1249
+#: g10/tdbio.c:1235
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:1257
+#: g10/tdbio.c:1243
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1278
+#: g10/tdbio.c:1264
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: keine trustdb Datei\n"
 
-#: g10/tdbio.c:1294
+#: g10/tdbio.c:1280
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: version record with recnum %lu\n"
 
-#: g10/tdbio.c:1299
+#: g10/tdbio.c:1285
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: invalid file version %d\n"
 
-#: g10/tdbio.c:1603
+#: g10/tdbio.c:1589
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: Fehler beim Lesen eines freien Satzes: %s\n"
 
-#: g10/tdbio.c:1611
+#: g10/tdbio.c:1597
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: Fehler beim Schreiben eines Verzeichnis-Satzes: %s\n"
 
-#: g10/tdbio.c:1621
+#: g10/tdbio.c:1607
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: konnte einen Satz nicht Nullen: %s\n"
 
-#: g10/tdbio.c:1651
+#: g10/tdbio.c:1637
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: konnte Satz nicht anh�ngen: %s\n"
 
-#: g10/tdbio.c:1762
+#: g10/tdbio.c:1748
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "Die \"Trust\"-Datenbank ist besch�digt; verwenden Sie \"gpg "
@@ -3070,67 +3065,67 @@ msgstr "\t%lu Schl�ssel �bersprungen\n"
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu Schl�ssel ge�ndert\n"
 
-#: g10/trustdb.c:2139
+#: g10/trustdb.c:2143
 msgid "Ooops, no keys\n"
 msgstr "Huch, keine Schl�ssel\n"
 
-#: g10/trustdb.c:2143
+#: g10/trustdb.c:2147
 msgid "Ooops, no user IDs\n"
 msgstr "Huch, keine User-IDs\n"
 
-#: g10/trustdb.c:2301
+#: g10/trustdb.c:2305
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: Suche nach Dir-Satz fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:2310
+#: g10/trustdb.c:2314
 #, 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:2314
+#: g10/trustdb.c:2318
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "Schl�ssel %08lX.%lu: in \"trustdb\" eingef�gt\n"
 
-#: g10/trustdb.c:2322
+#: g10/trustdb.c:2326
 #, 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:2336
+#: g10/trustdb.c:2340
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "Schl�ssel %08lX.%lu: verfallen am %s\n"
 
-#: g10/trustdb.c:2344
+#: g10/trustdb.c:2348
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "Schl�ssel %08lX.%lu: Vertrauenspr�fung fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:2495
+#: g10/trustdb.c:2499
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "Benutzer '%s' nicht gefunden: %s\n"
 
-#: g10/trustdb.c:2497
+#: g10/trustdb.c:2501
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "Problem, '%s' in der Trust-DB zu finden: %s\n"
 
-#: g10/trustdb.c:2500
+#: g10/trustdb.c:2504
 #, 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:2503
+#: g10/trustdb.c:2507
 #, 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:2689 g10/trustdb.c:2719
+#: g10/trustdb.c:2693 g10/trustdb.c:2723
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "WARNUNG: Lange 'Pref'-Records k�nnen noch nicht benutzt werden\n"
 
@@ -3149,31 +3144,31 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "Eingabezeile %u ist zu lang oder es fehlt ein LF\n"
 
-#: g10/ringedit.c:318
+#: g10/ringedit.c:303
 #, 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:320 g10/ringedit.c:1340
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: Schl�sselbund erstellt\n"
 
-#: g10/ringedit.c:1532
+#: g10/ringedit.c:1517
 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:1518
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ist der Unver�nderte\n"
 
-#: g10/ringedit.c:1534
+#: g10/ringedit.c:1519
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s ist der Neue\n"
 
-#: g10/ringedit.c:1535
+#: g10/ringedit.c:1520
 msgid "Please fix this possible security flaw\n"
 msgstr "Bitte diesen potentiellen Sicherheitsmangel beseitigen\n"
 
@@ -3198,38 +3193,52 @@ msgstr ""
 "ist f�r Signaturen NICHT sicher genug!\n"
 
 #. do not overwrite
-#: g10/openfile.c:72
+#: g10/openfile.c:79
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Datei '%s' existiert bereits. "
 
-#: g10/openfile.c:74
+#: g10/openfile.c:81
 msgid "Overwrite (y/N)? "
 msgstr "�berschreiben (j/N)? "
 
-#: g10/openfile.c:102
+#: g10/openfile.c:109
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: unbekannte Dateinamenerweiterung\n"
 
-#: g10/openfile.c:124
+#: g10/openfile.c:131
 msgid "Enter new filename"
 msgstr "Neuen Dateinamen eingeben"
 
-#: g10/openfile.c:165
+#: g10/openfile.c:172
 msgid "writing to stdout\n"
 msgstr "Schreiben auf die Standardausgabe\n"
 
-#: g10/openfile.c:243
+#: g10/openfile.c:250
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "die unterzeichneten Daten sind wohl in '%s'\n"
 
-#: g10/openfile.c:293
+#: g10/openfile.c:300
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: neue Optionendatei erstellt\n"
 
+#: g10/openfile.c:313
+#, c-format
+msgid "%s: can't create directory: %s\n"
+msgstr "%s: Verzeichnis kann nicht erzeugt werden: %s\n"
+
+#: g10/openfile.c:316
+#, c-format
+msgid "%s: directory created\n"
+msgstr "%s: Verzeichnis erzeugt\n"
+
+#: g10/openfile.c:318
+msgid "you have to start GnuPG again, so it can read the new options file\n"
+msgstr ""
+
 #: g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
diff --git a/po/es_ES.po b/po/es_ES.po
index a5855b5b3..216802740 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@
 # GPG version: 1.0.0
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-11-22 11:18+0100\n"
+"POT-Creation-Date: 1999-12-04 14:36+0100\n"
 "PO-Revision-Date: 1999-10-27 06:35+0200\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-13 10:49:25+0100\n"
@@ -296,7 +296,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:188
+#: g10/g10.c:189
 msgid ""
 "@Commands:\n"
 " "
@@ -304,135 +304,140 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:190
+#: g10/g10.c:191
 msgid "|[file]|make a signature"
 msgstr "|[file]|hace una firma"
 
-#: g10/g10.c:191
+#: g10/g10.c:192
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|hace una firma en texto claro"
 
-#: g10/g10.c:192
+#: g10/g10.c:193
 msgid "make a detached signature"
 msgstr "hace una firma separada"
 
-#: g10/g10.c:193
+#: g10/g10.c:194
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/g10.c:194
+#: g10/g10.c:195
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/g10.c:195
+#: g10/g10.c:196
 msgid "store only"
 msgstr "s�lo almacenar"
 
-#: g10/g10.c:196
+#: g10/g10.c:197
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/g10.c:197
+#: g10/g10.c:198
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:199
+#: g10/g10.c:200
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/g10.c:201
+#: g10/g10.c:202
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/g10.c:202
+#: g10/g10.c:203
 msgid "check key signatures"
 msgstr "comprueba las firmas de las claves"
 
-#: g10/g10.c:203
+#: g10/g10.c:204
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/g10.c:204
+#: g10/g10.c:205
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/g10.c:205
+#: g10/g10.c:206
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/g10.c:206
+#: g10/g10.c:207
 msgid "remove key from the public keyring"
 msgstr "elimina la clave del anillo p�blico"
 
-#: g10/g10.c:207
+#: g10/g10.c:209
+#, fuzzy
+msgid "remove key from the secret keyring"
+msgstr "elimina la clave del anillo p�blico"
+
+#: g10/g10.c:210
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/g10.c:208
+#: g10/g10.c:211
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/g10.c:209
+#: g10/g10.c:212
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/g10.c:210
+#: g10/g10.c:213
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocaci�n"
 
-#: g10/g10.c:211
+#: g10/g10.c:214
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/g10.c:212
+#: g10/g10.c:215
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/g10.c:213
+#: g10/g10.c:216
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/g10.c:216
+#: g10/g10.c:219
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/g10.c:218
+#: g10/g10.c:221
 msgid "list only the sequence of packets"
 msgstr "lista s�lo la secuencia de paquetes"
 
-#: g10/g10.c:220
+#: g10/g10.c:223
 msgid "export the ownertrust values"
 msgstr "exporta los valores de confianza"
 
-#: g10/g10.c:222
+#: g10/g10.c:225
 msgid "import ownertrust values"
 msgstr "importa los valores de confianza"
 
-#: g10/g10.c:224
+#: g10/g10.c:227
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/g10.c:226
+#: g10/g10.c:229
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMBRES]|comprueba la base de datos de confianza"
 
-#: g10/g10.c:227
+#: g10/g10.c:230
 msgid "fix a corrupted trust database"
 msgstr "arregla una base de datos de confianza da�ada"
 
-#: g10/g10.c:228
+#: g10/g10.c:231
 msgid "De-Armor a file or stdin"
 msgstr "quita la armadura de un fichero o stdin"
 
-#: g10/g10.c:230
+#: g10/g10.c:233
 msgid "En-Armor a file or stdin"
 msgstr "crea la armadura a un fichero o stdin"
 
-#: g10/g10.c:232
+#: g10/g10.c:235
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime res�menes de mensaje"
 
-#: g10/g10.c:236
+#: g10/g10.c:239
 msgid ""
 "@\n"
 "Options:\n"
@@ -442,174 +447,174 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/g10.c:238
+#: g10/g10.c:241
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/g10.c:240
+#: g10/g10.c:243
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/g10.c:243
+#: g10/g10.c:246
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
 
-#: g10/g10.c:245
+#: g10/g10.c:248
 msgid "use the default key as default recipient"
 msgstr "usa la clave por defecto como destinatario"
 
-#: g10/g10.c:249
+#: g10/g10.c:252
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/g10.c:250
+#: g10/g10.c:253
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivel de compresi�n N (0 no comprime)"
 
-#: g10/g10.c:252
+#: g10/g10.c:255
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/g10.c:253
+#: g10/g10.c:256
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/g10.c:254
+#: g10/g10.c:257
 msgid "verbose"
 msgstr "prolijo"
 
-#: g10/g10.c:255
+#: g10/g10.c:258
 msgid "be somewhat more quiet"
 msgstr "algo m�s discreto"
 
-#: g10/g10.c:256
+#: g10/g10.c:259
 msgid "don't use the terminal at all"
 msgstr "no usa la terminal en absoluto"
 
-#: g10/g10.c:257
+#: g10/g10.c:260
 msgid "force v3 signatures"
 msgstr "fuerza firmas v3"
 
-#: g10/g10.c:258
+#: g10/g10.c:261
 msgid "always use a MDC for encryption"
 msgstr "siempre usa un MCD para cifrar"
 
-#: g10/g10.c:259
+#: g10/g10.c:262
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:261
+#: g10/g10.c:264
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
-#: g10/g10.c:262
+#: g10/g10.c:265
 msgid "assume yes on most questions"
 msgstr "asume \"s�\" en casi todas las preguntas"
 
-#: g10/g10.c:263
+#: g10/g10.c:266
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: g10/g10.c:264
+#: g10/g10.c:267
 msgid "add this keyring to the list of keyrings"
 msgstr "a�ade este anillo a la lista de anillos"
 
-#: g10/g10.c:265
+#: g10/g10.c:268
 msgid "add this secret keyring to the list"
 msgstr "a�ade este anillo secreto a la lista"
 
-#: g10/g10.c:266
+#: g10/g10.c:269
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
-#: g10/g10.c:267
+#: g10/g10.c:270
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVIDOR|usa este servidor de claves"
 
-#: g10/g10.c:268
+#: g10/g10.c:271
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
 
-#: g10/g10.c:269
+#: g10/g10.c:272
 msgid "read options from file"
 msgstr "lee opciones del fichero"
 
-#: g10/g10.c:271
+#: g10/g10.c:274
 msgid "set debugging flags"
 msgstr "establece los par�metros de depuraci�n"
 
-#: g10/g10.c:272
+#: g10/g10.c:275
 msgid "enable full debugging"
 msgstr "habilita depuraci�n completa"
 
-#: g10/g10.c:273
+#: g10/g10.c:276
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe informaci�n de estado en descriptor DF"
 
-#: g10/g10.c:274
+#: g10/g10.c:277
 msgid "do not write comment packets"
 msgstr "no escribe paquetes de comentario"
 
-#: g10/g10.c:275
+#: g10/g10.c:278
 msgid "(default is 1)"
 msgstr "(por defecto es 1)"
 
-#: g10/g10.c:276
+#: g10/g10.c:279
 msgid "(default is 3)"
 msgstr "(por defecto es 3)"
 
-#: g10/g10.c:278
+#: g10/g10.c:281
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
 
-#: g10/g10.c:279
+#: g10/g10.c:282
 msgid "emulate the mode described in RFC1991"
 msgstr "emula el modo descrito en la RFC1991"
 
-#: g10/g10.c:280
+#: g10/g10.c:283
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "todas las opciones de paquete, cifrado y\n"
 "resumen tipo OpenPGP"
 
-#: g10/g10.c:281
+#: g10/g10.c:284
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa modo de contrase�a N"
 
-#: g10/g10.c:283
+#: g10/g10.c:286
 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:285
+#: g10/g10.c:288
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las\n"
 "contrase�as"
 
-#: g10/g10.c:286
+#: g10/g10.c:289
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
 
-#: g10/g10.c:287
+#: g10/g10.c:290
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: g10/g10.c:288
+#: g10/g10.c:291
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa el algoritmo de compresi�n N"
 
-#: g10/g10.c:289
+#: g10/g10.c:292
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina campo keyid de los paquetes cifrados"
 
-#: g10/g10.c:290
+#: g10/g10.c:293
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOMBRE=VALOR|usa estos datos de notaci�n"
 
-#: g10/g10.c:292
+#: g10/g10.c:295
 msgid ""
 "@\n"
 "Examples:\n"
@@ -629,15 +634,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/g10.c:380
+#: g10/g10.c:383
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
-#: g10/g10.c:384
+#: g10/g10.c:387
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/g10.c:387
+#: g10/g10.c:390
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -647,7 +652,7 @@ msgstr ""
 "Firma, comprueba, cifra o descifra.\n"
 "La operaci�n por defecto depende del tipo de datos de entrada.\n"
 
-#: g10/g10.c:392
+#: g10/g10.c:397
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -655,182 +660,182 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/g10.c:470
+#: g10/g10.c:476
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/g10.c:523
+#: g10/g10.c:529
 msgid "conflicting commands\n"
 msgstr "comandos incompatibles\n"
 
-#: g10/g10.c:662
+#: g10/g10.c:668
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/g10.c:666
+#: g10/g10.c:672
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/g10.c:673
+#: g10/g10.c:679
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/g10.c:855
+#: g10/g10.c:861
 #, 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:910 g10/g10.c:919
+#: g10/g10.c:917 g10/g10.c:926
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/g10.c:912
+#: g10/g10.c:919
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/g10.c:915
+#: g10/g10.c:922
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/g10.c:934 g10/g10.c:946
+#: g10/g10.c:941 g10/g10.c:953
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado no es v�lido\n"
 
-#: g10/g10.c:940 g10/g10.c:952
+#: g10/g10.c:947 g10/g10.c:959
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no es v�lido\n"
 
-#: g10/g10.c:956
+#: g10/g10.c:963
 msgid "the given policy URL is invalid\n"
 msgstr "URL de pol�tica no v�lida\n"
 
-#: g10/g10.c:959
+#: g10/g10.c:966
 #, 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:961
+#: g10/g10.c:968
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/g10.c:963
+#: g10/g10.c:970
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/g10.c:965
+#: g10/g10.c:972
 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:968
+#: g10/g10.c:975
 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:972
+#: g10/g10.c:979
 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:1049
+#: g10/g10.c:1056
 #, 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:1055
+#: g10/g10.c:1062
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/g10.c:1062
+#: g10/g10.c:1069
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:1070
+#: g10/g10.c:1077
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/g10.c:1083
+#: g10/g10.c:1090
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/g10.c:1096
+#: g10/g10.c:1103
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:1110
+#: g10/g10.c:1117
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/g10.c:1127
+#: g10/g10.c:1134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/g10.c:1135
+#: g10/g10.c:1142
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/g10.c:1143
+#: g10/g10.c:1150
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/g10.c:1151
+#: g10/g10.c:1158
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [comandos]"
 
-#: g10/g10.c:1167
+#: g10/g10.c:1174
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-usuario"
 
-#: g10/g10.c:1170
+#: g10/g10.c:1177
 msgid "--delete-key user-id"
 msgstr "--delete-key id-usuario"
 
-#: g10/encode.c:260 g10/g10.c:1207 g10/sign.c:366
+#: g10/encode.c:260 g10/g10.c:1214 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: g10/g10.c:1222
+#: g10/g10.c:1229
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/g10.c:1273
+#: g10/g10.c:1280
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:1281
+#: g10/g10.c:1288
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:1349
+#: g10/g10.c:1356
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n no v�lido `%s'\n"
 
-#: g10/g10.c:1430
+#: g10/g10.c:1437
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
-#: g10/g10.c:1434
+#: g10/g10.c:1441
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1437 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1444 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no puede abrirse `%s'\n"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1613
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "El primer caracter de una notaci�n debe ser una letra o un subrayado\n"
 
-#: g10/g10.c:1612
+#: g10/g10.c:1619
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -838,11 +843,11 @@ msgstr ""
 "un nombre de notaci�n debe tener s�lo letras, d�gitos, puntos o subrayados, "
 "y acabar con un '='\n"
 
-#: g10/g10.c:1618
+#: g10/g10.c:1625
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "los puntos en una notaci�n deben estar rodeados por otros caracteres\n"
 
-#: g10/g10.c:1626
+#: g10/g10.c:1633
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notaci�n no debe usar ning�n caracter de control\n"
 
@@ -905,16 +910,16 @@ msgstr "fin de fichero prematuro (en el cierre)\n"
 msgid "error in trailer line\n"
 msgstr "error en la l�nea de cierre\n"
 
-#: g10/armor.c:1007
+#: g10/armor.c:1012
 msgid "no valid OpenPGP data found.\n"
 msgstr "no se han encontrados datos OpenPGP v�lidos\n"
 
-#: g10/armor.c:1012
+#: g10/armor.c:1017
 #, 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:1016
+#: g10/armor.c:1021
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1125,12 +1130,12 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "          No es seguro que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:700 g10/pkclist.c:722 g10/pkclist.c:847 g10/pkclist.c:892
+#: g10/pkclist.c:700 g10/pkclist.c:722 g10/pkclist.c:848 g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:708 g10/pkclist.c:874
+#: g10/pkclist.c:708 g10/pkclist.c:875
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: clave p�blica ya presente\n"
@@ -1155,83 +1160,83 @@ msgstr "ID de usuario inexistente.\n"
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorado: clave p�blica ya designada como destinataria por defecto\n"
 
-#: g10/pkclist.c:784
+#: g10/pkclist.c:785
 msgid "Public key is disabled.\n"
 msgstr "Clave p�blica deshabilitada.\n"
 
-#: g10/pkclist.c:791
+#: g10/pkclist.c:792
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "ignorado: clave p�blica ya designada con --encrypt-to\n"
 
-#: g10/pkclist.c:822
+#: g10/pkclist.c:823
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "desconocido el destinatario predefinido `%s'\n"
 
-#: g10/pkclist.c:855
+#: g10/pkclist.c:856
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: error comprobando la clave: %s\n"
 
-#: g10/pkclist.c:860
+#: g10/pkclist.c:861
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: clave p�blica deshabilitada\n"
 
-#: g10/pkclist.c:898
+#: g10/pkclist.c:899
 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:387
 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:389
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA y ElGamal (por defecto)\n"
 
-#: g10/keygen.c:389
+#: g10/keygen.c:390
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (s�lo firma)\n"
 
-#: g10/keygen.c:391
+#: g10/keygen.c:392
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (s�lo cifrado)\n"
 
-#: g10/keygen.c:392
+#: g10/keygen.c:393
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firma y cifrado)\n"
 
-#: g10/keygen.c:394
+#: g10/keygen.c:395
 #, 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:400
 msgid "Your selection? "
 msgstr "Su elecci�n: "
 
-#: g10/keygen.c:409
+#: g10/keygen.c:410
 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:431
 msgid "Invalid selection.\n"
 msgstr "Elecci�n no v�lida.\n"
 
-#: g10/keygen.c:442
+#: g10/keygen.c:443
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1244,15 +1249,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:450
 msgid "What keysize do you want? (1024) "
 msgstr "�De qu� tama�o quiere la clave (1024)? "
 
-#: g10/keygen.c:454
+#: g10/keygen.c:455
 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:457
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tama�o insuficiente; 768 es el valor m�nimo permitido\n"
 
@@ -1264,12 +1269,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:467
 #, 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:472
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1277,11 +1282,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:475
 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:476
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1290,21 +1295,21 @@ msgstr ""
 "teclado\n"
 "tambi�n son vulnerables a un ataque!\n"
 
-#: g10/keygen.c:483
+#: g10/keygen.c:484
 msgid "Do you really need such a large keysize? "
 msgstr "�De verdad necesita una clave tan grande? "
 
-#: g10/keygen.c:489
+#: g10/keygen.c:490
 #, 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:493 g10/keygen.c:497
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:509
+#: g10/keygen.c:510
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1320,35 +1325,35 @@ 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:527
 msgid "Key is valid for? (0) "
 msgstr "�Validez de la clave (0)? "
 
-#: g10/keygen.c:547
+#: g10/keygen.c:548
 msgid "invalid value\n"
 msgstr "valor no v�lido\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:553
 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:559
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clave caduca el %s\n"
 
-#: g10/keygen.c:561
+#: g10/keygen.c:562
 msgid ""
-"Your system can't display dates beyond 2036.\n"
+"Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:566
+#: g10/keygen.c:567
 msgid "Is this correct (y/n)? "
 msgstr "�Es correcto (s/n)? "
 
-#: g10/keygen.c:609
+#: g10/keygen.c:610
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1366,44 +1371,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:620
+#: g10/keygen.c:621
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:624
+#: g10/keygen.c:625
 msgid "Invalid character in name\n"
 msgstr "Caracter no v�lido en el nombre\n"
 
-#: g10/keygen.c:626
+#: g10/keygen.c:627
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un n�mero\n"
 
-#: g10/keygen.c:628
+#: g10/keygen.c:629
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:636
+#: g10/keygen.c:637
 msgid "Email address: "
 msgstr "Direcci�n de correo electr�nico: "
 
-#: g10/keygen.c:647
+#: g10/keygen.c:648
 msgid "Not a valid email address\n"
 msgstr "Direcci�n no v�lida\n"
 
-#: g10/keygen.c:655
+#: g10/keygen.c:656
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:661
+#: g10/keygen.c:662
 msgid "Invalid character in comment\n"
 msgstr "Caracter no v�lido en el comentario\n"
 
-#: g10/keygen.c:683
+#: g10/keygen.c:684
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� usando el juego de caracteres `%s'.\n"
 
-#: g10/keygen.c:689
+#: g10/keygen.c:690
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1414,15 +1419,15 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:692
+#: g10/keygen.c:693
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:702
+#: g10/keygen.c:703
 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:754
+#: g10/keygen.c:755
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1430,11 +1435,11 @@ msgstr ""
 "Necesita una contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:456 g10/keygen.c:762
+#: g10/keyedit.c:456 g10/keygen.c:763
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "contrase�a repetida incorrecta, int�ntelo de nuevo.\n"
 
-#: g10/keygen.c:768
+#: g10/keygen.c:769
 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"
@@ -1446,7 +1451,7 @@ msgstr ""
 "la opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:789
+#: g10/keygen.c:790
 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"
@@ -1459,33 +1464,33 @@ msgstr ""
 "generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n"
 "entrop�a.\n"
 
-#: g10/keygen.c:859
+#: g10/keygen.c:860
 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:867
+#: g10/keygen.c:868
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "El par de claves DSA tendr� 1024 bits.\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:874
 msgid "Key generation canceled.\n"
 msgstr "Creaci�n de claves cancelada.\n"
 
-#: g10/keygen.c:883
+#: g10/keygen.c:884
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "escribiendo certificado p�blico en `%s'\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:885
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "escribiendo certificado privado en `%s'\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:962
 msgid "public and secret key created and signed.\n"
 msgstr "Claves p�blica y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:964
 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 +1499,12 @@ msgstr ""
 "el comando \"--edit-key\" para crear una clave secundaria con este "
 "prop�sito.\n"
 
-#: g10/keygen.c:977 g10/keygen.c:1076
+#: g10/keygen.c:978 g10/keygen.c:1077
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: g10/keygen.c:1021 g10/sig-check.c:312 g10/sign.c:105
+#: g10/keygen.c:1022 g10/sig-check.c:312 g10/sign.c:105
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1507,7 +1512,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:1023 g10/sig-check.c:314 g10/sign.c:107
+#: g10/keygen.c:1024 g10/sig-check.c:314 g10/sign.c:107
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1515,12 +1520,12 @@ msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:1054
+#: g10/keygen.c:1055
 msgid "Really create? "
 msgstr "�Crear de verdad? "
 
-#: g10/encode.c:91 g10/openfile.c:161 g10/openfile.c:270 g10/tdbio.c:468
-#: g10/tdbio.c:529
+#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: no puede abrirse: %s\n"
@@ -1687,7 +1692,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:420 g10/openfile.c:213 g10/sign.c:268 g10/sign.c:580
+#: g10/import.c:420 g10/openfile.c:220 g10/sign.c:268 g10/sign.c:580
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
@@ -1815,17 +1820,17 @@ msgstr "clave %08lX: no hay subclave para unir\n"
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "clave %08lX.%lu: uni�n de subclave no v�lida\n"
 
-#: g10/import.c:799
+#: g10/import.c:800
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "clave %08lX: aceptado ID de usuario sin autofirma '"
 
-#: g10/import.c:828
+#: g10/import.c:829
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "clave %08lX: ignorado ID de usuario '"
 
-#: g10/import.c:851
+#: g10/import.c:852
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "clave %08lX: subclave ignorada\n"
@@ -1834,33 +1839,33 @@ msgstr "clave %08lX: subclave ignorada\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:876
+#: g10/import.c:877
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "clave %08lX: firma no exportable (clase %02x) - ignorada\n"
 
-#: g10/import.c:885
+#: g10/import.c:886
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "clave %08lX: certificado de revocaci�n en lugar equivocado - ignorado\n"
 
-#: g10/import.c:893
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "clave %08lX: certificado de revocaci�n no valido: %s - ignorado\n"
 
-#: g10/import.c:993
+#: g10/import.c:994
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "clave %08lX: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:1044
+#: g10/import.c:1045
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "clave %08lX: certificado de revocaci�n a�adido\n"
 
-#: g10/import.c:1158 g10/import.c:1211
+#: g10/import.c:1159 g10/import.c:1212
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "clave %08lX: nuestra copia no tiene autofirma\n"
@@ -2471,43 +2476,43 @@ msgstr "Notaci�n: "
 msgid "Policy: "
 msgstr "Pol�tica: "
 
-#: g10/mainproc.c:1035
+#: g10/mainproc.c:1037
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificaci�n de la firma\n"
 
-#: g10/mainproc.c:1041
+#: g10/mainproc.c:1043
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Firma creada el %.*s usando clave %s ID %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1067 g10/mainproc.c:1078
+#: g10/mainproc.c:1069 g10/mainproc.c:1080
 msgid "BAD signature from \""
 msgstr "Firma INCORRECTA de \""
 
-#: g10/mainproc.c:1068 g10/mainproc.c:1079
+#: g10/mainproc.c:1070 g10/mainproc.c:1081
 msgid "Good signature from \""
 msgstr "Firma correcta de \""
 
-#: g10/mainproc.c:1070
+#: g10/mainproc.c:1072
 msgid "                aka \""
 msgstr "tambi�n conocido como \""
 
-#: g10/mainproc.c:1126
+#: g10/mainproc.c:1128
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1189
 #, fuzzy, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Clase de firma desconocida"
 
-#: g10/mainproc.c:1226
+#: g10/mainproc.c:1228
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1231
+#: g10/mainproc.c:1233
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z no v�lido detectado en proc_tree()\n"
 
@@ -2692,138 +2697,128 @@ msgstr "no se pueden manejar l�neas de texto de m�s de %d caracteres\n"
 msgid "input line longer than %d characters\n"
 msgstr "l�nea de longitud superior a %d caracteres\n"
 
-#: g10/tdbio.c:121 g10/tdbio.c:1637
+#: g10/tdbio.c:116 g10/tdbio.c:1623
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "registro base de datos de confianza %lu: lseek fallido: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1644
+#: g10/tdbio.c:122 g10/tdbio.c:1630
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 "resgistro base de datos de confianza %lu: escritura fallida (n=%d): %s\n"
 
-#: g10/tdbio.c:237
+#: g10/tdbio.c:232
 msgid "trustdb transaction too large\n"
 msgstr "transacci�n en la base de datos de confianza demasiado grande\n"
 
-#: g10/tdbio.c:429
+#: g10/tdbio.c:424
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: no puede abrirse: %s\n"
 
-#: g10/ringedit.c:298 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
-#, c-format
-msgid "%s: directory created\n"
-msgstr "%s: directorio creado\n"
-
-#: g10/tdbio.c:452
+#: g10/tdbio.c:438
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: �el directorio no existe!\n"
 
-#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1350 g10/tdbio.c:458
+#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1335 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: no puede crearse: %s\n"
 
-#: g10/tdbio.c:473 g10/tdbio.c:522
+#: g10/tdbio.c:459 g10/tdbio.c:508
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: no puede crearse bloqueo\n"
 
-#: g10/tdbio.c:487
+#: g10/tdbio.c:473
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: fallo en la creaci�n del registro de versi�n: %s"
 
-#: g10/tdbio.c:491
+#: g10/tdbio.c:477
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: se ha creado base de datos de confianza no v�lida\n"
 
-#: g10/tdbio.c:494
+#: g10/tdbio.c:480
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: se ha creado base de datos de confianza\n"
 
-#: g10/tdbio.c:531
+#: g10/tdbio.c:517
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de datos de confianza no v�lida\n"
 
-#: g10/tdbio.c:564
+#: g10/tdbio.c:550
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: fallo en la creaci�n de la tabla hash: %s\n"
 
-#: g10/tdbio.c:572
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error actualizando el registro de versi�n: %s\n"
 
-#: g10/tdbio.c:588 g10/tdbio.c:627 g10/tdbio.c:649 g10/tdbio.c:679
-#: g10/tdbio.c:704 g10/tdbio.c:1570 g10/tdbio.c:1597
+#: g10/tdbio.c:574 g10/tdbio.c:613 g10/tdbio.c:635 g10/tdbio.c:665
+#: g10/tdbio.c:690 g10/tdbio.c:1556 g10/tdbio.c:1583
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error leyendo registro de versi�n: %s\n"
 
-#: g10/tdbio.c:601 g10/tdbio.c:660
+#: g10/tdbio.c:587 g10/tdbio.c:646
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error escribiendo registro de versi�n: %s\n"
 
-#: g10/tdbio.c:1249
+#: g10/tdbio.c:1235
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de datos de confianza: fallo lseek: %s\n"
 
-#: g10/tdbio.c:1257
+#: g10/tdbio.c:1243
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de datos de confianza: error lectura (n=%d): %s\n"
 
-#: g10/tdbio.c:1278
+#: g10/tdbio.c:1264
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: no es una base de datos de confianza\n"
 
-#: g10/tdbio.c:1294
+#: g10/tdbio.c:1280
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registro de versi�n con n�mero de registro %lu\n"
 
-#: g10/tdbio.c:1299
+#: g10/tdbio.c:1285
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi�n del fichero %d no v�lida\n"
 
-#: g10/tdbio.c:1603
+#: g10/tdbio.c:1589
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error leyendo registro libre: %s\n"
 
-#: g10/tdbio.c:1611
+#: g10/tdbio.c:1597
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error escribiendo registro de directorio: %s\n"
 
-#: g10/tdbio.c:1621
+#: g10/tdbio.c:1607
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: fallo en poner a cero un registro: %s\n"
 
-#: g10/tdbio.c:1651
+#: g10/tdbio.c:1637
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: fallo al a�adir un registro: %s\n"
 
-#: g10/tdbio.c:1762
+#: g10/tdbio.c:1748
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "La base de datos de confianza est� da�ada. Por favor, ejecute\n"
@@ -3050,67 +3045,67 @@ msgstr "\t%lu claves ignoradas\n"
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu claves actualizadas\n"
 
-#: g10/trustdb.c:2139
+#: g10/trustdb.c:2143
 msgid "Ooops, no keys\n"
 msgstr "Oh oh, no hay claves\n"
 
-#: g10/trustdb.c:2143
+#: g10/trustdb.c:2147
 msgid "Ooops, no user IDs\n"
 msgstr "Oh oh, no hay ning�n ID de usuario\n"
 
-#: g10/trustdb.c:2301
+#: g10/trustdb.c:2305
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: b�squeda registro directorio fallida: %s\n"
 
-#: g10/trustdb.c:2310
+#: g10/trustdb.c:2314
 #, 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:2314
+#: g10/trustdb.c:2318
 #, 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:2322
+#: g10/trustdb.c:2326
 #, 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:2336
+#: g10/trustdb.c:2340
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "clave %08lX.%lu: caducada el %s\n"
 
-#: g10/trustdb.c:2344
+#: g10/trustdb.c:2348
 #, 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:2495
+#: g10/trustdb.c:2499
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "usuario '%s' no encontrado: %s\n"
 
-#: g10/trustdb.c:2497
+#: g10/trustdb.c:2501
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problema buscando '%s' en la tabla de confianza: %s\n"
 
-#: g10/trustdb.c:2500
+#: g10/trustdb.c:2504
 #, 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:2503
+#: g10/trustdb.c:2507
 #, 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:2689 g10/trustdb.c:2719
+#: g10/trustdb.c:2693 g10/trustdb.c:2723
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "ATENC�ON: todav�a no puedo tratar registros de preferencias largos\n"
 
@@ -3126,31 +3121,31 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: g10/ringedit.c:318
+#: g10/ringedit.c:303
 #, 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:320 g10/ringedit.c:1340
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anillo creado\n"
 
-#: g10/ringedit.c:1532
+#: g10/ringedit.c:1517
 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:1518
 #, 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:1519
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s es el nuevo\n"
 
-#: g10/ringedit.c:1535
+#: g10/ringedit.c:1520
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor arregle este posible fallo de seguridad\n"
 
@@ -3173,38 +3168,52 @@ msgstr ""
 "para las firmas\n"
 
 #. do not overwrite
-#: g10/openfile.c:72
+#: g10/openfile.c:79
 #, c-format
 msgid "File `%s' exists. "
 msgstr "El fichero `%s' ya existe. "
 
-#: g10/openfile.c:74
+#: g10/openfile.c:81
 msgid "Overwrite (y/N)? "
 msgstr "�Sobreescribir (s/N)? "
 
-#: g10/openfile.c:102
+#: g10/openfile.c:109
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufijo desconocido\n"
 
-#: g10/openfile.c:124
+#: g10/openfile.c:131
 msgid "Enter new filename"
 msgstr "Introduzca nuevo nombre de fichero"
 
-#: g10/openfile.c:165
+#: g10/openfile.c:172
 msgid "writing to stdout\n"
 msgstr "escribiendo en stdout\n"
 
-#: g10/openfile.c:243
+#: g10/openfile.c:250
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "asumiendo que hay datos firmados en `%s'\n"
 
-#: g10/openfile.c:293
+#: g10/openfile.c:300
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: se ha creado un nuevo fichero de opciones\n"
 
+#: g10/openfile.c:313
+#, c-format
+msgid "%s: can't create directory: %s\n"
+msgstr "%s: no puede crearse el directorio: %s\n"
+
+#: g10/openfile.c:316
+#, c-format
+msgid "%s: directory created\n"
+msgstr "%s: directorio creado\n"
+
+#: g10/openfile.c:318
+msgid "you have to start GnuPG again, so it can read the new options file\n"
+msgstr ""
+
 #: g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
diff --git a/po/fr.po b/po/fr.po
index e8acd2b6a..20c75118e 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-11-22 11:18+0100\n"
+"POT-Creation-Date: 1999-12-04 14:36+0100\n"
 "PO-Revision-Date: 1999-10-06 21:43+0200\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -290,7 +290,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:188
+#: g10/g10.c:189
 msgid ""
 "@Commands:\n"
 " "
@@ -298,136 +298,141 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: g10/g10.c:190
+#: g10/g10.c:191
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/g10.c:191
+#: g10/g10.c:192
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/g10.c:192
+#: g10/g10.c:193
 msgid "make a detached signature"
 msgstr "faire une signature d�tach�e"
 
-#: g10/g10.c:193
+#: g10/g10.c:194
 msgid "encrypt data"
 msgstr "chiffrer les donn�es"
 
-#: g10/g10.c:194
+#: g10/g10.c:195
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement sym�trique seulement"
 
-#: g10/g10.c:195
+#: g10/g10.c:196
 msgid "store only"
 msgstr "pas d'action"
 
-#: g10/g10.c:196
+#: g10/g10.c:197
 msgid "decrypt data (default)"
 msgstr "d�chiffrer les donn�es (d�faut)"
 
-#: g10/g10.c:197
+#: g10/g10.c:198
 msgid "verify a signature"
 msgstr "v�rifier une signature"
 
-#: g10/g10.c:199
+#: g10/g10.c:200
 msgid "list keys"
 msgstr "lister les cl�s"
 
-#: g10/g10.c:201
+#: g10/g10.c:202
 msgid "list keys and signatures"
 msgstr "lister les cl�s et les signatures"
 
-#: g10/g10.c:202
+#: g10/g10.c:203
 msgid "check key signatures"
 msgstr "v�rifier les signatures des cl�s"
 
-#: g10/g10.c:203
+#: g10/g10.c:204
 msgid "list keys and fingerprints"
 msgstr "lister les cl�s et les empreintes"
 
-#: g10/g10.c:204
+#: g10/g10.c:205
 msgid "list secret keys"
 msgstr "lister les cl�s secr�tes"
 
-#: g10/g10.c:205
+#: g10/g10.c:206
 msgid "generate a new key pair"
 msgstr "g�n�rer une nouvelle paire de cl�s"
 
-#: g10/g10.c:206
+#: g10/g10.c:207
 msgid "remove key from the public keyring"
 msgstr "enlever la cl� du porte-cl�s public"
 
-#: g10/g10.c:207
+#: g10/g10.c:209
+#, fuzzy
+msgid "remove key from the secret keyring"
+msgstr "enlever la cl� du porte-cl�s public"
+
+#: g10/g10.c:210
 msgid "sign a key"
 msgstr "signer une cl�"
 
-#: g10/g10.c:208
+#: g10/g10.c:211
 msgid "sign a key locally"
 msgstr "signer une cl� localement"
 
-#: g10/g10.c:209
+#: g10/g10.c:212
 msgid "sign or edit a key"
 msgstr "signer ou �diter une cl�"
 
-#: g10/g10.c:210
+#: g10/g10.c:213
 msgid "generate a revocation certificate"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: g10/g10.c:211
+#: g10/g10.c:214
 msgid "export keys"
 msgstr "exporter les cl�s"
 
-#: g10/g10.c:212
+#: g10/g10.c:215
 msgid "export keys to a key server"
 msgstr "exporter les cl�s vers un serveur de cl�s"
 
-#: g10/g10.c:213
+#: g10/g10.c:216
 msgid "import keys from a key server"
 msgstr "importer les cl�s d'un serveur de cl�s"
 
-#: g10/g10.c:216
+#: g10/g10.c:219
 msgid "import/merge keys"
 msgstr "importer/fusionner les cl�s"
 
-#: g10/g10.c:218
+#: g10/g10.c:221
 msgid "list only the sequence of packets"
 msgstr "ne lister que les paquets"
 
-#: g10/g10.c:220
+#: g10/g10.c:223
 msgid "export the ownertrust values"
 msgstr "exporter les indices de confiance"
 
-#: g10/g10.c:222
+#: g10/g10.c:225
 msgid "import ownertrust values"
 msgstr "importer les indices de confiance"
 
 #
-#: g10/g10.c:224
+#: g10/g10.c:227
 msgid "update the trust database"
 msgstr "mettre la base de confiance � jour"
 
-#: g10/g10.c:226
+#: g10/g10.c:229
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMS]|v�rifier la base de confiance"
 
-#: g10/g10.c:227
+#: g10/g10.c:230
 msgid "fix a corrupted trust database"
 msgstr "r�parer une base de confiance corrompue"
 
-#: g10/g10.c:228
+#: g10/g10.c:231
 msgid "De-Armor a file or stdin"
 msgstr "Enlever l'armure d'un fichier ou de stdin"
 
-#: g10/g10.c:230
+#: g10/g10.c:233
 msgid "En-Armor a file or stdin"
 msgstr "Mettre une armure � un fichier ou � stdin"
 
-#: g10/g10.c:232
+#: g10/g10.c:235
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/g10.c:236
+#: g10/g10.c:239
 msgid ""
 "@\n"
 "Options:\n"
@@ -437,169 +442,169 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/g10.c:238
+#: g10/g10.c:241
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: g10/g10.c:240
+#: g10/g10.c:243
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/g10.c:243
+#: g10/g10.c:246
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOM|utiliser NOM comme r�cipient par d�faut"
 
-#: g10/g10.c:245
+#: g10/g10.c:248
 msgid "use the default key as default recipient"
 msgstr "utiliser la cl� par d�f. comme r�cipient"
 
-#: g10/g10.c:249
+#: g10/g10.c:252
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou d�chiffrer"
 
-#: g10/g10.c:250
+#: g10/g10.c:253
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 d�sactive)"
 
-#: g10/g10.c:252
+#: g10/g10.c:255
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/g10.c:253
+#: g10/g10.c:256
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/g10.c:254
+#: g10/g10.c:257
 msgid "verbose"
 msgstr "bavard"
 
-#: g10/g10.c:255
+#: g10/g10.c:258
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: g10/g10.c:256
+#: g10/g10.c:259
 msgid "don't use the terminal at all"
 msgstr "ne pas utiliser du tout le terminal"
 
 #
-#: g10/g10.c:257
+#: g10/g10.c:260
 msgid "force v3 signatures"
 msgstr "forcer les signatures en v3"
 
-#: g10/g10.c:258
+#: g10/g10.c:261
 msgid "always use a MDC for encryption"
 msgstr "toujours utiliser un sceau pour le chiffrement"
 
-#: g10/g10.c:259
+#: g10/g10.c:262
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:261
+#: g10/g10.c:264
 msgid "batch mode: never ask"
 msgstr "mode automatique : ne jamais rien demander"
 
-#: g10/g10.c:262
+#: g10/g10.c:265
 msgid "assume yes on most questions"
 msgstr "r�pondre oui � la plupart des questions"
 
-#: g10/g10.c:263
+#: g10/g10.c:266
 msgid "assume no on most questions"
 msgstr "r�pondre non � la plupart des questions"
 
-#: g10/g10.c:264
+#: g10/g10.c:267
 msgid "add this keyring to the list of keyrings"
 msgstr "ajouter ce porte-cl�s � la liste"
 
-#: g10/g10.c:265
+#: g10/g10.c:268
 msgid "add this secret keyring to the list"
 msgstr "ajouter ce porte-cl�s secret � la liste"
 
-#: g10/g10.c:266
+#: g10/g10.c:269
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|utiliser NOM comme cl� secr�te par d�faut"
 
-#: g10/g10.c:267
+#: g10/g10.c:270
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|H�TE|utiliser ce serveur pour chercher des cl�s"
 
-#: g10/g10.c:268
+#: g10/g10.c:271
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|le terminal utilise la table de caract�res NOM"
 
-#: g10/g10.c:269
+#: g10/g10.c:272
 msgid "read options from file"
 msgstr "lire les options du fichier"
 
-#: g10/g10.c:271
+#: g10/g10.c:274
 msgid "set debugging flags"
 msgstr "choisir les attributs de d�boguage"
 
-#: g10/g10.c:272
+#: g10/g10.c:275
 msgid "enable full debugging"
 msgstr "permettre un d�boguage complet"
 
-#: g10/g10.c:273
+#: g10/g10.c:276
 msgid "|FD|write status info to this FD"
 msgstr "|FD|�crire l'�tat sur ce descripteur"
 
-#: g10/g10.c:274
+#: g10/g10.c:277
 msgid "do not write comment packets"
 msgstr "ne pas �crire de paquets de commentaire"
 
-#: g10/g10.c:275
+#: g10/g10.c:278
 msgid "(default is 1)"
 msgstr "nombre de signatures compl�tes requises (1)"
 
-#: g10/g10.c:276
+#: g10/g10.c:279
 msgid "(default is 3)"
 msgstr "nombre de signatures marginales requises (3)"
 
-#: g10/g10.c:278
+#: g10/g10.c:281
 msgid "|FILE|load extension module FILE"
 msgstr "|FICH|charger le module d'extension FICH"
 
-#: g10/g10.c:279
+#: g10/g10.c:282
 msgid "emulate the mode described in RFC1991"
 msgstr "imiter le mode d�crit dans la RFC1991"
 
-#: g10/g10.c:280
+#: g10/g10.c:283
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "utiliser le comportement d�fini par OpenPGP"
 
-#: g10/g10.c:281
+#: g10/g10.c:284
 msgid "|N|use passphrase mode N"
 msgstr "|N|coder les mots de passe suivant le mode N"
 
-#: g10/g10.c:283
+#: g10/g10.c:286
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le hachage NOM pour les mots de passe"
 
-#: g10/g10.c:285
+#: g10/g10.c:288
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe"
 
-#: g10/g10.c:286
+#: g10/g10.c:289
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
 
-#: g10/g10.c:287
+#: g10/g10.c:290
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|utiliser la fonction de hachage NOM"
 
-#: g10/g10.c:288
+#: g10/g10.c:291
 msgid "|N|use compress algorithm N"
 msgstr "|N|utiliser l'algorithme de compression N"
 
-#: g10/g10.c:289
+#: g10/g10.c:292
 msgid "throw keyid field of encrypted packets"
 msgstr "supprimer l'ident. des paquets chiffr�s"
 
-#: g10/g10.c:290
+#: g10/g10.c:293
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOM=VALEUR|utiliser ces donn�es de notation"
 
-#: g10/g10.c:292
+#: g10/g10.c:295
 msgid ""
 "@\n"
 "Examples:\n"
@@ -619,15 +624,15 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les cl�s\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/g10.c:380
+#: g10/g10.c:383
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Rapporter toutes anomalies � <[email protected]>.\n"
 
-#: g10/g10.c:384
+#: g10/g10.c:387
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/g10.c:387
+#: g10/g10.c:390
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -637,7 +642,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:392
+#: g10/g10.c:397
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -645,184 +650,184 @@ msgstr ""
 "\n"
 "Algorithmes support�s :\n"
 
-#: g10/g10.c:470
+#: g10/g10.c:476
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/g10.c:523
+#: g10/g10.c:529
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/g10.c:662
+#: g10/g10.c:668
 #, 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:666
+#: g10/g10.c:672
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s' : %s\n"
 
-#: g10/g10.c:673
+#: g10/g10.c:679
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/g10.c:855
+#: g10/g10.c:861
 #, 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:910 g10/g10.c:919
+#: g10/g10.c:917 g10/g10.c:926
 #, 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:912
+#: g10/g10.c:919
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/g10.c:915
+#: g10/g10.c:922
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/g10.c:934 g10/g10.c:946
+#: g10/g10.c:941 g10/g10.c:953
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/g10.c:940 g10/g10.c:952
+#: g10/g10.c:947 g10/g10.c:959
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/g10.c:956
+#: g10/g10.c:963
 msgid "the given policy URL is invalid\n"
 msgstr "l'URL de politique donn�e est invalide\n"
 
-#: g10/g10.c:959
+#: g10/g10.c:966
 #, 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:961
+#: g10/g10.c:968
 msgid "completes-needed must be greater than 0\n"
 msgstr "� completes-needed � doit �tre sup�rieur � 0\n"
 
-#: g10/g10.c:963
+#: g10/g10.c:970
 msgid "marginals-needed must be greater than 1\n"
 msgstr "� marginals-needed � doit �tre sup�rieur � 1\n"
 
-#: g10/g10.c:965
+#: g10/g10.c:972
 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:968
+#: g10/g10.c:975
 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:972
+#: g10/g10.c:979
 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:1049
+#: g10/g10.c:1056
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance : %s\n"
 
-#: g10/g10.c:1055
+#: g10/g10.c:1062
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/g10.c:1062
+#: g10/g10.c:1069
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/g10.c:1070
+#: g10/g10.c:1077
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/g10.c:1083
+#: g10/g10.c:1090
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/g10.c:1096
+#: g10/g10.c:1103
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:1110
+#: g10/g10.c:1117
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/g10.c:1127
+#: g10/g10.c:1134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/g10.c:1135
+#: g10/g10.c:1142
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/g10.c:1143
+#: g10/g10.c:1150
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/g10.c:1151
+#: g10/g10.c:1158
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/g10.c:1167
+#: g10/g10.c:1174
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key utilisateur"
 
-#: g10/g10.c:1170
+#: g10/g10.c:1177
 msgid "--delete-key user-id"
 msgstr "--delete-key utilisateur"
 
-#: g10/encode.c:260 g10/g10.c:1207 g10/sign.c:366
+#: g10/encode.c:260 g10/g10.c:1214 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossible d'ouvrir %s: %s\n"
 
-#: g10/g10.c:1222
+#: g10/g10.c:1229
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
 
-#: g10/g10.c:1273
+#: g10/g10.c:1280
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "suppression d'armure non r�ussie : %s\n"
 
-#: g10/g10.c:1281
+#: g10/g10.c:1288
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "construction d'armure non r�ussie : %s \n"
 
-#: g10/g10.c:1349
+#: g10/g10.c:1356
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/g10.c:1430
+#: g10/g10.c:1437
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/g10.c:1434
+#: g10/g10.c:1441
 msgid "Go ahead and type your message ...\n"
 msgstr "Continuez et tapez votre message...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1437 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1444 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir `%s'\n"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1613
 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:1612
+#: g10/g10.c:1619
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -831,13 +836,13 @@ msgstr ""
 "des points ou des traits de soulignement et doit se terminer par un signe "
 "�gal\n"
 
-#: g10/g10.c:1618
+#: g10/g10.c:1625
 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:1626
+#: g10/g10.c:1633
 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"
 
@@ -900,16 +905,16 @@ msgstr "fin de fichier pr�matur�e (dans la remorque)\n"
 msgid "error in trailer line\n"
 msgstr "erreur dans la ligne de remorque\n"
 
-#: g10/armor.c:1007
+#: g10/armor.c:1012
 msgid "no valid OpenPGP data found.\n"
 msgstr "aucune donn�e OpenPGP valide n'a �t� trouv�e.\n"
 
-#: g10/armor.c:1012
+#: g10/armor.c:1017
 #, 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:1016
+#: g10/armor.c:1021
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1121,12 +1126,12 @@ msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "         Il n'est pas s�r que la signature appartient � son propri�taire.\n"
 
-#: g10/pkclist.c:700 g10/pkclist.c:722 g10/pkclist.c:847 g10/pkclist.c:892
+#: g10/pkclist.c:700 g10/pkclist.c:722 g10/pkclist.c:848 g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s : ignor� : %s\n"
 
-#: g10/pkclist.c:708 g10/pkclist.c:874
+#: g10/pkclist.c:708 g10/pkclist.c:875
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s : ignor� : cl� publique d�j� pr�sente\n"
@@ -1152,85 +1157,85 @@ msgstr "Pas de tel utilisateur.\n"
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignor� : la cl� publique est d�j� le r�cipient par d�faut\n"
 
-#: g10/pkclist.c:784
+#: g10/pkclist.c:785
 msgid "Public key is disabled.\n"
 msgstr "La cl� publique est d�sactiv�e.\n"
 
-#: g10/pkclist.c:791
+#: g10/pkclist.c:792
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "ignor� : cl� publique configur�e par --encrypt-to\n"
 
-#: g10/pkclist.c:822
+#: g10/pkclist.c:823
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "r�cipient par d�faut `%s' inconnu\n"
 
-#: g10/pkclist.c:855
+#: g10/pkclist.c:856
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s : erreur pendant la v�rification de la cl� : %s\n"
 
-#: g10/pkclist.c:860
+#: g10/pkclist.c:861
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s : ignor� : la cl� publique est d�sactiv�e\n"
 
-#: g10/pkclist.c:898
+#: g10/pkclist.c:899
 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:387
 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:389
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA et ElGamal (d�faut)\n"
 
-#: g10/keygen.c:389
+#: g10/keygen.c:390
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (signature seule)\n"
 
-#: g10/keygen.c:391
+#: g10/keygen.c:392
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (chiffrement seul)\n"
 
-#: g10/keygen.c:392
+#: g10/keygen.c:393
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (signature et chiffrement)\n"
 
-#: g10/keygen.c:394
+#: g10/keygen.c:395
 #, 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:400
 msgid "Your selection? "
 msgstr "Votre choix ? "
 
-#: g10/keygen.c:409
+#: g10/keygen.c:410
 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:431
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
-#: g10/keygen.c:442
+#: g10/keygen.c:443
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1243,15 +1248,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:450
 msgid "What keysize do you want? (1024) "
 msgstr "Quelle taille de cl� d�sirez-vous ? (1024) "
 
-#: g10/keygen.c:454
+#: g10/keygen.c:455
 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:457
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "taille trop petite ; 768 est la plus petite valeur permise.\n"
 
@@ -1263,12 +1268,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:467
 #, 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:472
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1276,11 +1281,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:475
 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:476
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1288,21 +1293,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:484
 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:490
 #, 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:493 g10/keygen.c:497
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrondie � %u bits\n"
 
-#: g10/keygen.c:509
+#: g10/keygen.c:510
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1318,35 +1323,35 @@ 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:527
 msgid "Key is valid for? (0) "
 msgstr "La cl� est valide pour ? (0) "
 
-#: g10/keygen.c:547
+#: g10/keygen.c:548
 msgid "invalid value\n"
 msgstr "valeur invalide\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:553
 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:559
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La cl� expire le %s\n"
 
-#: g10/keygen.c:561
+#: g10/keygen.c:562
 msgid ""
-"Your system can't display dates beyond 2036.\n"
+"Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:566
+#: g10/keygen.c:567
 msgid "Is this correct (y/n)? "
 msgstr "Est-ce correct (o/n) ? "
 
-#: g10/keygen.c:609
+#: g10/keygen.c:610
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1362,44 +1367,44 @@ msgstr ""
 "   � Heinrich Heine (Der Dichter) <[email protected]> �\n"
 "\n"
 
-#: g10/keygen.c:620
+#: g10/keygen.c:621
 msgid "Real name: "
 msgstr "Nom r�el : "
 
-#: g10/keygen.c:624
+#: g10/keygen.c:625
 msgid "Invalid character in name\n"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: g10/keygen.c:626
+#: g10/keygen.c:627
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
-#: g10/keygen.c:628
+#: g10/keygen.c:629
 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:636
+#: g10/keygen.c:637
 msgid "Email address: "
 msgstr "Adresse e-mail : "
 
-#: g10/keygen.c:647
+#: g10/keygen.c:648
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse e-mail valide\n"
 
-#: g10/keygen.c:655
+#: g10/keygen.c:656
 msgid "Comment: "
 msgstr "Commentaire : "
 
-#: g10/keygen.c:661
+#: g10/keygen.c:662
 msgid "Invalid character in comment\n"
 msgstr "Caract�re invalide dans le commentaire\n"
 
-#: g10/keygen.c:683
+#: g10/keygen.c:684
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vous utilisez le jeu de caract�res '%s'.\n"
 
-#: g10/keygen.c:689
+#: g10/keygen.c:690
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1410,15 +1415,15 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:692
+#: g10/keygen.c:693
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:702
+#: g10/keygen.c:703
 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:754
+#: g10/keygen.c:755
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1426,11 +1431,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:762
+#: g10/keyedit.c:456 g10/keygen.c:763
 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:768
+#: g10/keygen.c:769
 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"
@@ -1442,7 +1447,7 @@ msgstr ""
 "le d�sirez, en utilisant ce programme avec l'option � --edit-key �.\n"
 "\n"
 
-#: g10/keygen.c:789
+#: g10/keygen.c:790
 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"
@@ -1454,33 +1459,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:859
+#: g10/keygen.c:860
 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:867
+#: g10/keygen.c:868
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La paire de cl�s DSA fera 1024 bits.\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:874
 msgid "Key generation canceled.\n"
 msgstr "La g�n�ration de cl� a �t� annul�e.\n"
 
-#: g10/keygen.c:883
+#: g10/keygen.c:884
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "�criture d'un certificat public � `%s'\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:885
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "�criture d'un certificat secret � `%s'\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:962
 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:963
+#: g10/keygen.c:964
 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"
@@ -1489,13 +1494,13 @@ msgstr ""
 "utiliser la commande � --edit-key � pour g�n�rer une cl� secondaire �\n"
 "cette fin.\n"
 
-#: g10/keygen.c:977 g10/keygen.c:1076
+#: g10/keygen.c:978 g10/keygen.c:1077
 #, 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:1021 g10/sig-check.c:312 g10/sign.c:105
+#: g10/keygen.c:1022 g10/sig-check.c:312 g10/sign.c:105
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1503,7 +1508,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:1023 g10/sig-check.c:314 g10/sign.c:107
+#: g10/keygen.c:1024 g10/sig-check.c:314 g10/sign.c:107
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1511,12 +1516,12 @@ msgstr ""
 "la cl� a �t� cr��e %lu secondes dans le futur (discontinuit� temporelle ou\n"
 "probl�me d'horloge\n"
 
-#: g10/keygen.c:1054
+#: g10/keygen.c:1055
 msgid "Really create? "
 msgstr "Cr�er vraiment ? "
 
-#: g10/encode.c:91 g10/openfile.c:161 g10/openfile.c:270 g10/tdbio.c:468
-#: g10/tdbio.c:529
+#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s : impossible d'ouvrir : %s\n"
@@ -1685,7 +1690,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:420 g10/openfile.c:213 g10/sign.c:268 g10/sign.c:580
+#: g10/import.c:420 g10/openfile.c:220 g10/sign.c:268 g10/sign.c:580
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�criture de `%s'\n"
@@ -1813,17 +1818,17 @@ msgstr "cl� %08lX : pas de sous-cl� pour relier la cl�\n"
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "cl� %08lX : liaison avec la sous-cl� invalide\n"
 
-#: g10/import.c:799
+#: g10/import.c:800
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "cl� %08lX : utilisateur non sign� par lui-m�me accept� : '"
 
-#: g10/import.c:828
+#: g10/import.c:829
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "cl� %08lX : utilisateur non pris en compte : '"
 
-#: g10/import.c:851
+#: g10/import.c:852
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "cl� %08lX : sous-cl� non prise en compte\n"
@@ -1832,32 +1837,32 @@ msgstr "cl� %08lX : sous-cl� non prise en compte\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:876
+#: g10/import.c:877
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "cl� %08lX : signature non exportable (classe %02x) - ignor�e\n"
 
-#: g10/import.c:885
+#: g10/import.c:886
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "cl� %08lX : certificat de r�vocation au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:893
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "cl� %08lX : certificat de r�vocation invalide : %s - ignor�e\n"
 
-#: g10/import.c:993
+#: g10/import.c:994
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "cl� %08lX: nom d'utilisateur doublon fusionn�\n"
 
-#: g10/import.c:1044
+#: g10/import.c:1045
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "cl� %08lX : certificat de r�vocation ajout�\n"
 
-#: g10/import.c:1158 g10/import.c:1211
+#: g10/import.c:1159 g10/import.c:1212
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "cl� %08lX : notre copie n'a pas d'auto-signature\n"
@@ -2470,43 +2475,43 @@ msgstr "Notation : "
 msgid "Policy: "
 msgstr "Politique : "
 
-#: g10/mainproc.c:1035
+#: g10/mainproc.c:1037
 msgid "signature verification suppressed\n"
 msgstr "v�rification de signature supprim�e\n"
 
-#: g10/mainproc.c:1041
+#: g10/mainproc.c:1043
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signature faite %.*s avec une cl� %s ID %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1067 g10/mainproc.c:1078
+#: g10/mainproc.c:1069 g10/mainproc.c:1080
 msgid "BAD signature from \""
 msgstr "MAUVAISE signature de \""
 
-#: g10/mainproc.c:1068 g10/mainproc.c:1079
+#: g10/mainproc.c:1070 g10/mainproc.c:1081
 msgid "Good signature from \""
 msgstr "Bonne signature de \""
 
-#: g10/mainproc.c:1070
+#: g10/mainproc.c:1072
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1126
+#: g10/mainproc.c:1128
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de v�rifier la signature : %s\n"
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1189
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:1226
+#: g10/mainproc.c:1228
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:1231
+#: g10/mainproc.c:1233
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
 
@@ -2697,142 +2702,132 @@ msgstr "impossible de traiter les lignes plus longues que %d caract�res\n"
 msgid "input line longer than %d characters\n"
 msgstr "la ligne d'entr�e est plus longue que %d caract�res\n"
 
-#: g10/tdbio.c:121 g10/tdbio.c:1637
+#: g10/tdbio.c:116 g10/tdbio.c:1623
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "enregistrement de base de confiance %lu : lseek a �chou� : %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1644
+#: g10/tdbio.c:122 g10/tdbio.c:1630
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 "enregistrement de la base de confiance %lu : l'�criture a �chou� (n=%d) : "
 "%s\n"
 
-#: g10/tdbio.c:237
+#: g10/tdbio.c:232
 msgid "trustdb transaction too large\n"
 msgstr "transaction de base de confiance trop volumineuse\n"
 
-#: g10/tdbio.c:429
+#: g10/tdbio.c:424
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s : impossible d'acc�der : %s\n"
 
-#: g10/ringedit.c:298 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
-#, c-format
-msgid "%s: directory created\n"
-msgstr "%s : r�pertoire cr��\n"
-
-#: g10/tdbio.c:452
+#: g10/tdbio.c:438
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s : le r�pertoire n'existe pas !\n"
 
-#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1350 g10/tdbio.c:458
+#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1335 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s : impossible de cr�er : %s\n"
 
-#: g10/tdbio.c:473 g10/tdbio.c:522
+#: g10/tdbio.c:459 g10/tdbio.c:508
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s : impossible de cr�er de verrouillage\n"
 
-#: g10/tdbio.c:487
+#: g10/tdbio.c:473
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s : impossible de cr�er un enregistrement de version : %s"
 
-#: g10/tdbio.c:491
+#: g10/tdbio.c:477
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s : base de confiance invalide cr��e\n"
 
-#: g10/tdbio.c:494
+#: g10/tdbio.c:480
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s : base de confiance cr��e\n"
 
-#: g10/tdbio.c:531
+#: g10/tdbio.c:517
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s : base de confiance invalide\n"
 
-#: g10/tdbio.c:564
+#: g10/tdbio.c:550
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s : la cr�ation de la table de hachage a �chou� : %s\n"
 
-#: g10/tdbio.c:572
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr ""
 "%s : erreur pendant la mise � jour de l'enregistrement de version : %s\n"
 
-#: g10/tdbio.c:588 g10/tdbio.c:627 g10/tdbio.c:649 g10/tdbio.c:679
-#: g10/tdbio.c:704 g10/tdbio.c:1570 g10/tdbio.c:1597
+#: g10/tdbio.c:574 g10/tdbio.c:613 g10/tdbio.c:635 g10/tdbio.c:665
+#: g10/tdbio.c:690 g10/tdbio.c:1556 g10/tdbio.c:1583
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s : erreur pendant la lecture de l'enregistrement de version : %s\n"
 
-#: g10/tdbio.c:601 g10/tdbio.c:660
+#: g10/tdbio.c:587 g10/tdbio.c:646
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s : erreur pendant l'�criture de l'enregistrement de version : %s\n"
 
-#: g10/tdbio.c:1249
+#: g10/tdbio.c:1235
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de confiance : � lseek() � a �chou� : %s\n"
 
-#: g10/tdbio.c:1257
+#: g10/tdbio.c:1243
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de confiance : la lecture a �chou� (n=%d) : %s\n"
 
-#: g10/tdbio.c:1278
+#: g10/tdbio.c:1264
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s : ce n'est pas un fichier de base de confiance\n"
 
-#: g10/tdbio.c:1294
+#: g10/tdbio.c:1280
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s : enregistrement de version avec un num�ro %lu\n"
 
-#: g10/tdbio.c:1299
+#: g10/tdbio.c:1285
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s : version %d du fichier invalide\n"
 
-#: g10/tdbio.c:1603
+#: g10/tdbio.c:1589
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s : erreur pendant la lecture de l'enregistrement libre : %s\n"
 
-#: g10/tdbio.c:1611
+#: g10/tdbio.c:1597
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 "%s : erreur pendant l'�criture de l'enregistrement de\n"
 "r�pertoire : %s\n"
 
-#: g10/tdbio.c:1621
+#: g10/tdbio.c:1607
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s : n'a pu mettre un enregistrement � z�ro : %s\n"
 
-#: g10/tdbio.c:1651
+#: g10/tdbio.c:1637
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s : impossible d'ajouter un enregistrement : %s\n"
 
-#: g10/tdbio.c:1762
+#: g10/tdbio.c:1748
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "la base de confiance est corrompue ; ex�cutez � gpg --fix-trustdb �.\n"
 
@@ -3064,68 +3059,68 @@ msgstr "\t%lu cl�s ignor�es\n"
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu cl�s mises � jour\n"
 
-#: g10/trustdb.c:2139
+#: g10/trustdb.c:2143
 msgid "Ooops, no keys\n"
 msgstr "Ooops, pas de cl�\n"
 
-#: g10/trustdb.c:2143
+#: g10/trustdb.c:2147
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, pas de nom d'utilisateur\n"
 
-#: g10/trustdb.c:2301
+#: g10/trustdb.c:2305
 #, 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:2310
+#: g10/trustdb.c:2314
 #, 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:2314
+#: g10/trustdb.c:2318
 #, 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:2322
+#: g10/trustdb.c:2326
 #, 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:2336
+#: g10/trustdb.c:2340
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "cl� %08lX.%lu : a expir� le %s\n"
 
-#: g10/trustdb.c:2344
+#: g10/trustdb.c:2348
 #, 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:2495
+#: g10/trustdb.c:2499
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "l'utilisateur '%s' n'a pas �t� trouv� : %s\n"
 
-#: g10/trustdb.c:2497
+#: g10/trustdb.c:2501
 #, 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:2500
+#: g10/trustdb.c:2504
 #, 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:2503
+#: g10/trustdb.c:2507
 #, 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:2689 g10/trustdb.c:2719
+#: g10/trustdb.c:2693 g10/trustdb.c:2723
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr ""
 "ATTENTION : les enregistrements de pr�f�rences longs ne sont pas encore\n"
@@ -3148,32 +3143,32 @@ msgstr ""
 "la ligne d'entr�e %u est trop longue ou il manque un caract�re de saut\n"
 "de ligne\n"
 
-#: g10/ringedit.c:318
+#: g10/ringedit.c:303
 #, 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:320 g10/ringedit.c:1340
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s : porte-cl�s cr��\n"
 
-#: g10/ringedit.c:1532
+#: g10/ringedit.c:1517
 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:1518
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s est le fichier original\n"
 
-#: g10/ringedit.c:1534
+#: g10/ringedit.c:1519
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s est le nouveau\n"
 
-#: g10/ringedit.c:1535
+#: g10/ringedit.c:1520
 msgid "Please fix this possible security flaw\n"
 msgstr "R�parez ce probl�me de s�curit� possible\n"
 
@@ -3198,38 +3193,52 @@ msgstr ""
 "s�re pour les signatures !\n"
 
 #. do not overwrite
-#: g10/openfile.c:72
+#: g10/openfile.c:79
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Le fichier `%s' existe. "
 
-#: g10/openfile.c:74
+#: g10/openfile.c:81
 msgid "Overwrite (y/N)? "
 msgstr "R��crire (o/N)? "
 
-#: g10/openfile.c:102
+#: g10/openfile.c:109
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s : suffixe inconnu\n"
 
-#: g10/openfile.c:124
+#: g10/openfile.c:131
 msgid "Enter new filename"
 msgstr "Entrez le nouveau nom de fichier"
 
-#: g10/openfile.c:165
+#: g10/openfile.c:172
 msgid "writing to stdout\n"
 msgstr "�criture vers la sortie standard\n"
 
-#: g10/openfile.c:243
+#: g10/openfile.c:250
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "les donn�es sign�es sont suppos�es �tre dans `%s'\n"
 
-#: g10/openfile.c:293
+#: g10/openfile.c:300
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s : nouveau fichier d'options cr��\n"
 
+#: g10/openfile.c:313
+#, c-format
+msgid "%s: can't create directory: %s\n"
+msgstr "%s : impossible de cr�er le r�pertoire : %s\n"
+
+#: g10/openfile.c:316
+#, c-format
+msgid "%s: directory created\n"
+msgstr "%s : r�pertoire cr��\n"
+
+#: g10/openfile.c:318
+msgid "you have to start GnuPG again, so it can read the new options file\n"
+msgstr ""
+
 #: g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
diff --git a/po/id.po b/po/id.po
index 6ca4a986c..69f6c26ea 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU Privacy Guard 1.0.0\n"
-"POT-Creation-Date: 1999-11-22 11:18+0100\n"
+"POT-Creation-Date: 1999-12-04 14:36+0100\n"
 "PO-Revision-Date: 1999-09-17 15:21+07:00\n"
 "Last-Translator: Tedi Heriyanto <[email protected]>\n"
 "Language-Team: Indonesia <[email protected]>\n"
@@ -285,7 +285,7 @@ msgstr ""
 "Tidak tersedia cukup byte random. Silakan melakukan aktivitas lain agar\n"
 "memungkinkan SO mengumpulkan lebih banyak entropi! (Perlu %d byte lagi)\n"
 
-#: g10/g10.c:188
+#: g10/g10.c:189
 msgid ""
 "@Commands:\n"
 " "
@@ -293,135 +293,140 @@ msgstr ""
 "@Perintah:\n"
 "  "
 
-#: g10/g10.c:190
+#: g10/g10.c:191
 msgid "|[file]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: g10/g10.c:191
+#: g10/g10.c:192
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/g10.c:192
+#: g10/g10.c:193
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/g10.c:193
+#: g10/g10.c:194
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/g10.c:194
+#: g10/g10.c:195
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/g10.c:195
+#: g10/g10.c:196
 msgid "store only"
 msgstr "hanya disimpan"
 
-#: g10/g10.c:196
+#: g10/g10.c:197
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/g10.c:197
+#: g10/g10.c:198
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/g10.c:199
+#: g10/g10.c:200
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/g10.c:201
+#: g10/g10.c:202
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/g10.c:202
+#: g10/g10.c:203
 msgid "check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/g10.c:203
+#: g10/g10.c:204
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/g10.c:204
+#: g10/g10.c:205
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/g10.c:205
+#: g10/g10.c:206
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/g10.c:206
+#: g10/g10.c:207
 msgid "remove key from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/g10.c:207
+#: g10/g10.c:209
+#, fuzzy
+msgid "remove key from the secret keyring"
+msgstr "hapus kunci dari keyring publik"
+
+#: g10/g10.c:210
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/g10.c:208
+#: g10/g10.c:211
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/g10.c:209
+#: g10/g10.c:212
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/g10.c:210
+#: g10/g10.c:213
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/g10.c:211
+#: g10/g10.c:214
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/g10.c:212
+#: g10/g10.c:215
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke server kunci"
 
-#: g10/g10.c:213
+#: g10/g10.c:216
 msgid "import keys from a key server"
 msgstr "impor kunci dari server kunci"
 
-#: g10/g10.c:216
+#: g10/g10.c:219
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/g10.c:218
+#: g10/g10.c:221
 msgid "list only the sequence of packets"
 msgstr "tampilkan hanya urutan paket"
 
-#: g10/g10.c:220
+#: g10/g10.c:223
 msgid "export the ownertrust values"
 msgstr "ekspor nilai ownertrust"
 
-#: g10/g10.c:222
+#: g10/g10.c:225
 msgid "import ownertrust values"
 msgstr "import nilai ownertrust"
 
-#: g10/g10.c:224
+#: g10/g10.c:227
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/g10.c:226
+#: g10/g10.c:229
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMA]|periksa database trust"
 
-#: g10/g10.c:227
+#: g10/g10.c:230
 msgid "fix a corrupted trust database"
 msgstr "perbaiki database trust yang terkorupsi"
 
-#: g10/g10.c:228
+#: g10/g10.c:231
 msgid "De-Armor a file or stdin"
 msgstr "De-Armor file atau stdin"
 
-#: g10/g10.c:230
+#: g10/g10.c:233
 msgid "En-Armor a file or stdin"
 msgstr "En-Armor file atau stdin"
 
-#: g10/g10.c:232
+#: g10/g10.c:235
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/g10.c:236
+#: g10/g10.c:239
 msgid ""
 "@\n"
 "Options:\n"
@@ -431,168 +436,168 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: g10/g10.c:238
+#: g10/g10.c:241
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/g10.c:240
+#: g10/g10.c:243
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/g10.c:243
+#: g10/g10.c:246
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: g10/g10.c:245
+#: g10/g10.c:248
 msgid "use the default key as default recipient"
 msgstr "gunakan kunci baku sebagai penerima baku"
 
-#: g10/g10.c:249
+#: g10/g10.c:252
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai atau dekripsi"
 
-#: g10/g10.c:250
+#: g10/g10.c:253
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/g10.c:252
+#: g10/g10.c:255
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/g10.c:253
+#: g10/g10.c:256
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/g10.c:254
+#: g10/g10.c:257
 msgid "verbose"
 msgstr "detil"
 
-#: g10/g10.c:255
+#: g10/g10.c:258
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: g10/g10.c:256
+#: g10/g10.c:259
 msgid "don't use the terminal at all"
 msgstr "jangan menggunakan terminal"
 
-#: g10/g10.c:257
+#: g10/g10.c:260
 msgid "force v3 signatures"
 msgstr "paksa signature v3"
 
-#: g10/g10.c:258
+#: g10/g10.c:261
 msgid "always use a MDC for encryption"
 msgstr "selalu gunakan MDC untuk enkripsi"
 
-#: g10/g10.c:259
+#: g10/g10.c:262
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:261
+#: g10/g10.c:264
 msgid "batch mode: never ask"
 msgstr "mode batch: tanpa tanya"
 
-#: g10/g10.c:262
+#: g10/g10.c:265
 msgid "assume yes on most questions"
 msgstr "asumsikan ya untuk seluruh pertanyaan"
 
-#: g10/g10.c:263
+#: g10/g10.c:266
 msgid "assume no on most questions"
 msgstr "asumsikan tidak untuk seluruh pertanyaan"
 
-#: g10/g10.c:264
+#: g10/g10.c:267
 msgid "add this keyring to the list of keyrings"
 msgstr "tambah keyring ini ke daftar keyring"
 
-#: g10/g10.c:265
+#: g10/g10.c:268
 msgid "add this secret keyring to the list"
 msgstr "tambah keyring rahasia ini ke daftar"
 
-#: g10/g10.c:266
+#: g10/g10.c:269
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: g10/g10.c:267
+#: g10/g10.c:270
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|gunakan sebagai server kunci untuk melihat kunci"
 
-#: g10/g10.c:268
+#: g10/g10.c:271
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMA|set charset terminal ke NAMA"
 
-#: g10/g10.c:269
+#: g10/g10.c:272
 msgid "read options from file"
 msgstr "baca pilihan dari file"
 
-#: g10/g10.c:271
+#: g10/g10.c:274
 msgid "set debugging flags"
 msgstr "set flag debugging"
 
-#: g10/g10.c:272
+#: g10/g10.c:275
 msgid "enable full debugging"
 msgstr "aktifkan full debugging"
 
-#: g10/g10.c:273
+#: g10/g10.c:276
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
-#: g10/g10.c:274
+#: g10/g10.c:277
 msgid "do not write comment packets"
 msgstr "jangan menulis komentar paket"
 
-#: g10/g10.c:275
+#: g10/g10.c:278
 msgid "(default is 1)"
 msgstr "(baku adalah 1)"
 
-#: g10/g10.c:276
+#: g10/g10.c:279
 msgid "(default is 3)"
 msgstr "(baku adalah 3)"
 
-#: g10/g10.c:278
+#: g10/g10.c:281
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: g10/g10.c:279
+#: g10/g10.c:282
 msgid "emulate the mode described in RFC1991"
 msgstr "emulasikan mode seperti dalam RFC1991"
 
-#: g10/g10.c:280
+#: g10/g10.c:283
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "set seluruh pilihan paket, cipher dan digest ke OpenPGP"
 
-#: g10/g10.c:281
+#: g10/g10.c:284
 msgid "|N|use passphrase mode N"
 msgstr "|N|gunakan passphrase mode N"
 
-#: g10/g10.c:283
+#: g10/g10.c:286
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma digest pesan NAMA untuk passphrase"
 
-#: g10/g10.c:285
+#: g10/g10.c:288
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
 
-#: g10/g10.c:286
+#: g10/g10.c:289
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMA|gunakan algoritma cipher NAMA"
 
-#: g10/g10.c:287
+#: g10/g10.c:290
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
 
-#: g10/g10.c:288
+#: g10/g10.c:291
 msgid "|N|use compress algorithm N"
 msgstr "|N|gunakan algoritma kompresi N"
 
-#: g10/g10.c:289
+#: g10/g10.c:292
 msgid "throw keyid field of encrypted packets"
 msgstr "buang field keyid paket terenkripsi"
 
-#: g10/g10.c:290
+#: g10/g10.c:293
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAMA=NILAI|gunakan notasi data ini"
 
-#: g10/g10.c:292
+#: g10/g10.c:295
 msgid ""
 "@\n"
 "Examples:\n"
@@ -612,15 +617,15 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/g10.c:380
+#: g10/g10.c:383
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Silakan laporkan kesalahan ke <[email protected]>.\n"
 
-#: g10/g10.c:384
+#: g10/g10.c:387
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/g10.c:387
+#: g10/g10.c:390
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -630,7 +635,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/g10.c:392
+#: g10/g10.c:397
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -638,182 +643,182 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/g10.c:470
+#: g10/g10.c:476
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/g10.c:523
+#: g10/g10.c:529
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/g10.c:662
+#: g10/g10.c:668
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: g10/g10.c:666
+#: g10/g10.c:672
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: g10/g10.c:673
+#: g10/g10.c:679
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/g10.c:855
+#: g10/g10.c:861
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/g10.c:910 g10/g10.c:919
+#: g10/g10.c:917 g10/g10.c:926
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/g10.c:912
+#: g10/g10.c:919
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/g10.c:915
+#: g10/g10.c:922
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/g10.c:934 g10/g10.c:946
+#: g10/g10.c:941 g10/g10.c:953
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:940 g10/g10.c:952
+#: g10/g10.c:947 g10/g10.c:959
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:956
+#: g10/g10.c:963
 msgid "the given policy URL is invalid\n"
 msgstr "kebijakan URL yang diberikan tidak valid\n"
 
-#: g10/g10.c:959
+#: g10/g10.c:966
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "algoritma kompresi harus di antara %d..%d\n"
 
-#: g10/g10.c:961
+#: g10/g10.c:968
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/g10.c:963
+#: g10/g10.c:970
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/g10.c:965
+#: g10/g10.c:972
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth harus di antara 1 hingga 255\n"
 
-#: g10/g10.c:968
+#: g10/g10.c:975
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/g10.c:972
+#: g10/g10.c:979
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
 
-#: g10/g10.c:1049
+#: g10/g10.c:1056
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/g10.c:1055
+#: g10/g10.c:1062
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/g10.c:1062
+#: g10/g10.c:1069
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/g10.c:1070
+#: g10/g10.c:1077
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/g10.c:1083
+#: g10/g10.c:1090
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/g10.c:1096
+#: g10/g10.c:1103
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:1110
+#: g10/g10.c:1117
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/g10.c:1127
+#: g10/g10.c:1134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/g10.c:1135
+#: g10/g10.c:1142
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/g10.c:1143
+#: g10/g10.c:1150
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/g10.c:1151
+#: g10/g10.c:1158
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/g10.c:1167
+#: g10/g10.c:1174
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-user"
 
-#: g10/g10.c:1170
+#: g10/g10.c:1177
 msgid "--delete-key user-id"
 msgstr "--delete-key id-user"
 
-#: g10/encode.c:260 g10/g10.c:1207 g10/sign.c:366
+#: g10/encode.c:260 g10/g10.c:1214 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "tidak dapat membuka %s: %s\n"
 
-#: g10/g10.c:1222
+#: g10/g10.c:1229
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/g10.c:1273
+#: g10/g10.c:1280
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/g10.c:1281
+#: g10/g10.c:1288
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/g10.c:1349
+#: g10/g10.c:1356
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/g10.c:1430
+#: g10/g10.c:1437
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/g10.c:1434
+#: g10/g10.c:1441
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1437 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1444 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1613
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "karakter pertama nama notasi harus huruf atau garis bawah\n"
 
-#: g10/g10.c:1612
+#: g10/g10.c:1619
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -821,11 +826,11 @@ msgstr ""
 "nama notasi terdiri hanya dari huruf, digit, titik atau garis bawah dan "
 "diakhiri dengan sebuah '='\n"
 
-#: g10/g10.c:1618
+#: g10/g10.c:1625
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "titik dalam nama notasi harus diapit oleh karakter lain\n"
 
-#: g10/g10.c:1626
+#: g10/g10.c:1633
 msgid "a notation value must not use any control characters\n"
 msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
@@ -888,16 +893,16 @@ msgstr "eof prematur (dalam Trailer)\n"
 msgid "error in trailer line\n"
 msgstr "kesalahan dalam garis trailer\n"
 
-#: g10/armor.c:1007
+#: g10/armor.c:1012
 msgid "no valid OpenPGP data found.\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/armor.c:1012
+#: g10/armor.c:1017
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armor tidak valid: baris melebihi %d karakter\n"
 
-#: g10/armor.c:1016
+#: g10/armor.c:1021
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1106,12 +1111,12 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "        Tidak pasti signature milik pemilik.\n"
 
-#: g10/pkclist.c:700 g10/pkclist.c:722 g10/pkclist.c:847 g10/pkclist.c:892
+#: g10/pkclist.c:700 g10/pkclist.c:722 g10/pkclist.c:848 g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: dilewati: %s\n"
 
-#: g10/pkclist.c:708 g10/pkclist.c:874
+#: g10/pkclist.c:708 g10/pkclist.c:875
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: dilewati: kunci publik telah ada\n"
@@ -1134,83 +1139,83 @@ msgstr "Tidak ada ID user tersebut.\n"
 msgid "skipped: public key already set as default recipient\n"
 msgstr "dilewati: kunci publik telah diset sebagai penerima baku\n"
 
-#: g10/pkclist.c:784
+#: g10/pkclist.c:785
 msgid "Public key is disabled.\n"
 msgstr "Kunci publik dimatikan.\n"
 
-#: g10/pkclist.c:791
+#: g10/pkclist.c:792
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "dilewati: kunci publik telah diset dengan --encrypt-to\n"
 
-#: g10/pkclist.c:822
+#: g10/pkclist.c:823
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/pkclist.c:855
+#: g10/pkclist.c:856
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: kesalahan memeriksa kunci: %s\n"
 
-#: g10/pkclist.c:860
+#: g10/pkclist.c:861
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: dilewati: kunci publik dimatikan\n"
 
-#: g10/pkclist.c:898
+#: g10/pkclist.c:899
 msgid "no valid addressees\n"
 msgstr "tidak ada alamat yang valid\n"
 
-#: g10/keygen.c:122
+#: g10/keygen.c:123
 msgid "writing self signature\n"
 msgstr "menulis self signature\n"
 
-#: g10/keygen.c:160
+#: g10/keygen.c:161
 msgid "writing key binding signature\n"
 msgstr "menulis key binding signature\n"
 
-#: g10/keygen.c:386
+#: g10/keygen.c:387
 msgid "Please select what kind of key you want:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/keygen.c:388
+#: g10/keygen.c:389
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:389
+#: g10/keygen.c:390
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "  (%d) DSA (hanya menandai)\n"
 
-#: g10/keygen.c:391
+#: g10/keygen.c:392
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:392
+#: g10/keygen.c:393
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "  (%d) ElGamal (tandai dan enkripsi)\n"
 
-#: g10/keygen.c:394
+#: g10/keygen.c:395
 #, c-format
 msgid "   (%d) ElGamal in a v3 packet\n"
 msgstr "  (%d) ElGamal dalam paket v3\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:400
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
-#: g10/keygen.c:409
+#: g10/keygen.c:410
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "Anda ingin membuat kunci sign dan enkripsi? "
 
-#: g10/keygen.c:430
+#: g10/keygen.c:431
 msgid "Invalid selection.\n"
 msgstr "Pilihan yang tidak valid.\n"
 
-#: g10/keygen.c:442
+#: g10/keygen.c:443
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1223,15 +1228,15 @@ msgstr ""
 "       keysize default adalah 1024 bit\n"
 " keysize tertinggi dianjurkan 2048 bit\n"
 
-#: g10/keygen.c:449
+#: g10/keygen.c:450
 msgid "What keysize do you want? (1024) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/keygen.c:454
+#: g10/keygen.c:455
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "DSA hanya membolehkan keysize dari 512 hingga 1024\n"
 
-#: g10/keygen.c:456
+#: g10/keygen.c:457
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
 
@@ -1243,12 +1248,12 @@ msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\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:467
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "keysize terlalu besar; %d adalah nilai tertinggi yang diijinkan.\n"
 
-#: g10/keygen.c:471
+#: g10/keygen.c:472
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1256,11 +1261,11 @@ msgstr ""
 "Keysize lebih besar dari 2048 tidak dianjurkan karena\n"
 "komputasi akan sangat lama!\n"
 
-#: g10/keygen.c:474
+#: g10/keygen.c:475
 msgid "Are you sure that you want this keysize? "
 msgstr "Apakah anda yakin memerlukan keysize ini? "
 
-#: g10/keygen.c:475
+#: g10/keygen.c:476
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1268,21 +1273,21 @@ msgstr ""
 "Oke, tetapi ingat bahwa radiasi monitor dan keyboard anda juga sangat mudah "
 "diserang!\n"
 
-#: g10/keygen.c:483
+#: g10/keygen.c:484
 msgid "Do you really need such a large keysize? "
 msgstr "Apakah anda perlu keysize berukuran besar tersebut? "
 
-#: g10/keygen.c:489
+#: g10/keygen.c:490
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#: g10/keygen.c:492 g10/keygen.c:496
+#: g10/keygen.c:493 g10/keygen.c:497
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:509
+#: g10/keygen.c:510
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1298,35 +1303,35 @@ msgstr ""
 "     <n>m = kunci berakhir dalam n bulan\n"
 "     <n>y = kunci berakhir dalam n tahun\n"
 
-#: g10/keygen.c:526
+#: g10/keygen.c:527
 msgid "Key is valid for? (0) "
 msgstr "Kunci valid untuk? (0) "
 
-#: g10/keygen.c:547
+#: g10/keygen.c:548
 msgid "invalid value\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:553
 msgid "Key does not expire at all\n"
 msgstr "Kunci tidak pernah berakhir\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:558
+#: g10/keygen.c:559
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Kunci berakhir pada %s\n"
 
-#: g10/keygen.c:561
+#: g10/keygen.c:562
 msgid ""
-"Your system can't display dates beyond 2036.\n"
+"Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:566
+#: g10/keygen.c:567
 msgid "Is this correct (y/n)? "
 msgstr "Benar (y/t)? "
 
-#: g10/keygen.c:609
+#: g10/keygen.c:610
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1341,44 +1346,44 @@ msgstr ""
 "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
 "  \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 
-#: g10/keygen.c:620
+#: g10/keygen.c:621
 msgid "Real name: "
 msgstr "Nama sebenarnya: "
 
-#: g10/keygen.c:624
+#: g10/keygen.c:625
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: g10/keygen.c:626
+#: g10/keygen.c:627
 msgid "Name may not start with a digit\n"
 msgstr "Nama tidak boleh dimulai dengan digit\n"
 
-#: g10/keygen.c:628
+#: g10/keygen.c:629
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nama harus berukuran minimum 5 karakter\n"
 
-#: g10/keygen.c:636
+#: g10/keygen.c:637
 msgid "Email address: "
 msgstr "Alamat email: "
 
-#: g10/keygen.c:647
+#: g10/keygen.c:648
 msgid "Not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/keygen.c:655
+#: g10/keygen.c:656
 msgid "Comment: "
 msgstr "Komentar: "
 
-#: g10/keygen.c:661
+#: g10/keygen.c:662
 msgid "Invalid character in comment\n"
 msgstr "Karakter tidak valid dalam komentar\n"
 
-#: g10/keygen.c:683
+#: g10/keygen.c:684
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Anda menggunakan set karakter `%s'.\n"
 
-#: g10/keygen.c:689
+#: g10/keygen.c:690
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1388,15 +1393,15 @@ msgstr ""
 "Anda memilih USER-ID ini:\n"
 "   \"%s\"\n"
 
-#: g10/keygen.c:692
+#: g10/keygen.c:693
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:702
+#: g10/keygen.c:703
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
 
-#: g10/keygen.c:754
+#: g10/keygen.c:755
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1404,11 +1409,11 @@ msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keyedit.c:456 g10/keygen.c:762
+#: g10/keyedit.c:456 g10/keygen.c:763
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "passphrase tidak diulang dengan benar; coba lagi.\n"
 
-#: g10/keygen.c:768
+#: g10/keygen.c:769
 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"
@@ -1420,7 +1425,7 @@ msgstr ""
 "saat,\n"
 "menggunakan program ini dengan pilihan \"--edit-key\".\n"
 
-#: g10/keygen.c:789
+#: g10/keygen.c:790
 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"
@@ -1432,33 +1437,33 @@ msgstr ""
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:859
+#: g10/keygen.c:860
 msgid "Key generation can only be used in interactive mode\n"
 msgstr "Pembuatan kunci hanya dapat digunakan dalam mode interaktif\n"
 
-#: g10/keygen.c:867
+#: g10/keygen.c:868
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Keypair DSA akan memiliki 1024 bit.\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:874
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:883
+#: g10/keygen.c:884
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "menulis sertifikat publik ke `%s'\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:885
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "menulis sertifikat rahasia ke `%s'\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:962
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:964
 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"
@@ -1467,31 +1472,31 @@ msgstr ""
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuktujuan ini.\n"
 
-#: g10/keygen.c:977 g10/keygen.c:1076
+#: g10/keygen.c:978 g10/keygen.c:1077
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:1021 g10/sig-check.c:312 g10/sign.c:105
+#: g10/keygen.c:1022 g10/sig-check.c:312 g10/sign.c:105
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/keygen.c:1023 g10/sig-check.c:314 g10/sign.c:107
+#: g10/keygen.c:1024 g10/sig-check.c:314 g10/sign.c:107
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/keygen.c:1054
+#: g10/keygen.c:1055
 msgid "Really create? "
 msgstr "Ingin diciptakan? "
 
-#: g10/encode.c:91 g10/openfile.c:161 g10/openfile.c:270 g10/tdbio.c:468
-#: g10/tdbio.c:529
+#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: tidak dapat dibuka: %s\n"
@@ -1658,7 +1663,7 @@ msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
 msgid "no default public keyring\n"
 msgstr "tidak ada keyring publik baku\n"
 
-#: g10/import.c:420 g10/openfile.c:213 g10/sign.c:268 g10/sign.c:580
+#: g10/import.c:420 g10/openfile.c:220 g10/sign.c:268 g10/sign.c:580
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
@@ -1786,17 +1791,17 @@ msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "kunci %08lX: subkey binding tidak valid\n"
 
-#: g10/import.c:799
+#: g10/import.c:800
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "kunci %08lX: menerima ID user yang tidak self-signed "
 
-#: g10/import.c:828
+#: g10/import.c:829
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "kunci %08lX: melewati ID user "
 
-#: g10/import.c:851
+#: g10/import.c:852
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "kunci %08lX: melewati subkey\n"
@@ -1805,32 +1810,32 @@ msgstr "kunci %08lX: melewati subkey\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:876
+#: g10/import.c:877
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "kunci %08lX: signature tidak dapat diekpor (kelas %02x) - dilewati\n"
 
-#: g10/import.c:885
+#: g10/import.c:886
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan di tempat yang salah - dilewati\n"
 
-#: g10/import.c:893
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - dilewati\n"
 
-#: g10/import.c:993
+#: g10/import.c:994
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
 
-#: g10/import.c:1044
+#: g10/import.c:1045
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "kunci %08lX: penambahan sertifikat pembatalan\n"
 
-#: g10/import.c:1158 g10/import.c:1211
+#: g10/import.c:1159 g10/import.c:1212
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "kunci %08lX: salinan kita tidak memiliki self-signature\n"
@@ -2439,43 +2444,43 @@ msgstr "Notasi: "
 msgid "Policy: "
 msgstr "Kebijakan: "
 
-#: g10/mainproc.c:1035
+#: g10/mainproc.c:1037
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak optimal\n"
 
-#: g10/mainproc.c:1041
+#: g10/mainproc.c:1043
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signature membuat %.*s menggunakan kunci %s ID %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1067 g10/mainproc.c:1078
+#: g10/mainproc.c:1069 g10/mainproc.c:1080
 msgid "BAD signature from \""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1068 g10/mainproc.c:1079
+#: g10/mainproc.c:1070 g10/mainproc.c:1081
 msgid "Good signature from \""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1070
+#: g10/mainproc.c:1072
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1126
+#: g10/mainproc.c:1128
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1189
 #, fuzzy, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature tidak dikenal"
 
-#: g10/mainproc.c:1226
+#: g10/mainproc.c:1228
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
 
-#: g10/mainproc.c:1231
+#: g10/mainproc.c:1233
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
@@ -2658,137 +2663,127 @@ msgstr "tidak dapat menangani baris teks lebih dari %d karakter\n"
 msgid "input line longer than %d characters\n"
 msgstr "baris input lebih dari %d karakter\n"
 
-#: g10/tdbio.c:121 g10/tdbio.c:1637
+#: g10/tdbio.c:116 g10/tdbio.c:1623
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek gagal: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1644
+#: g10/tdbio.c:122 g10/tdbio.c:1630
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: gagal menulis (n=%d): %s\n"
 
-#: g10/tdbio.c:237
+#: g10/tdbio.c:232
 msgid "trustdb transaction too large\n"
 msgstr "transaksi trustdb terlalu besar\n"
 
-#: g10/tdbio.c:429
+#: g10/tdbio.c:424
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: tidak dapat diakses: %s\n"
 
-#: g10/ringedit.c:298 g10/tdbio.c:445
-#, c-format
-msgid "%s: can't create directory: %s\n"
-msgstr "%s: tidak dapat membuat direktori: %s\n"
-
-#: g10/ringedit.c:304 g10/tdbio.c:448
-#, c-format
-msgid "%s: directory created\n"
-msgstr "%s: direktori tercipta\n"
-
-#: g10/tdbio.c:452
+#: g10/tdbio.c:438
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: direktori tidak ada!\n"
 
-#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1350 g10/tdbio.c:458
+#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1335 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: tidak dapat membuat: %s\n"
 
-#: g10/tdbio.c:473 g10/tdbio.c:522
+#: g10/tdbio.c:459 g10/tdbio.c:508
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: tidak dapat membuat lock\n"
 
-#: g10/tdbio.c:487
+#: g10/tdbio.c:473
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: gagal membuat catatan versi: %s"
 
-#: g10/tdbio.c:491
+#: g10/tdbio.c:477
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: tercipta trustdb tidak valid\n"
 
-#: g10/tdbio.c:494
+#: g10/tdbio.c:480
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: tercipta trustdb\n"
 
-#: g10/tdbio.c:531
+#: g10/tdbio.c:517
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb tidak valid\n"
 
-#: g10/tdbio.c:564
+#: g10/tdbio.c:550
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: gagal membuat hashtable: %s\n"
 
-#: g10/tdbio.c:572
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: kesalahan memperbaharui catatan versi: %s\n"
 
-#: g10/tdbio.c:588 g10/tdbio.c:627 g10/tdbio.c:649 g10/tdbio.c:679
-#: g10/tdbio.c:704 g10/tdbio.c:1570 g10/tdbio.c:1597
+#: g10/tdbio.c:574 g10/tdbio.c:613 g10/tdbio.c:635 g10/tdbio.c:665
+#: g10/tdbio.c:690 g10/tdbio.c:1556 g10/tdbio.c:1583
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: kesalahan membaca catatan versi: %s\n"
 
-#: g10/tdbio.c:601 g10/tdbio.c:660
+#: g10/tdbio.c:587 g10/tdbio.c:646
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: kesalahan menulis catatan versi: %s\n"
 
-#: g10/tdbio.c:1249
+#: g10/tdbio.c:1235
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek gagal: %s\n"
 
-#: g10/tdbio.c:1257
+#: g10/tdbio.c:1243
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: gagal membaca (n=%d): %s\n"
 
-#: g10/tdbio.c:1278
+#: g10/tdbio.c:1264
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: bukan file trustdb\n"
 
-#: g10/tdbio.c:1294
+#: g10/tdbio.c:1280
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: catatan versi dengan recnum %lu\n"
 
-#: g10/tdbio.c:1299
+#: g10/tdbio.c:1285
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi file %d tidak valid\n"
 
-#: g10/tdbio.c:1603
+#: g10/tdbio.c:1589
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: g10/tdbio.c:1611
+#: g10/tdbio.c:1597
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: kesalahan menulis dir record: %s\n"
 
-#: g10/tdbio.c:1621
+#: g10/tdbio.c:1607
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: gagal mengosongkan record: %s\n"
 
-#: g10/tdbio.c:1651
+#: g10/tdbio.c:1637
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: gagal menambahkan record: %s\n"
 
-#: g10/tdbio.c:1762
+#: g10/tdbio.c:1748
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "trustdb terkorupsi; silakan jalankan \"gpg --fix-trustdb\".\n"
 
@@ -3013,65 +3008,65 @@ msgstr "%lu kunci dilewati\n"
 msgid "\t%lu keys updated\n"
 msgstr "%lu kunci diperbaharui\n"
 
-#: g10/trustdb.c:2139
+#: g10/trustdb.c:2143
 msgid "Ooops, no keys\n"
 msgstr "Ooops, tanpa kunci\n"
 
-#: g10/trustdb.c:2143
+#: g10/trustdb.c:2147
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, tanpa ID user\n"
 
-#: g10/trustdb.c:2301
+#: g10/trustdb.c:2305
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: gagal mencari di record: %s\n"
 
-#: g10/trustdb.c:2310
+#: g10/trustdb.c:2314
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "kunci %08lX: gagal menyisipkan record trust: %s\n"
 
-#: g10/trustdb.c:2314
+#: g10/trustdb.c:2318
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "kunci %08lX.%lu: menyisipkan ke trustdb\n"
 
-#: g10/trustdb.c:2322
+#: g10/trustdb.c:2326
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr "kunci %08lX.%lu: tercipta di masa datang (masalah waktu atau jam)\n"
 
-#: g10/trustdb.c:2336
+#: g10/trustdb.c:2340
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "kunci %08lX.%lu: berakhir pada %s\n"
 
-#: g10/trustdb.c:2344
+#: g10/trustdb.c:2348
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "kunci %08lX.%lu: gagal periksa trust: %s\n"
 
-#: g10/trustdb.c:2495
+#: g10/trustdb.c:2499
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "user '%s' tidak ditemukan: %s\n"
 
-#: g10/trustdb.c:2497
+#: g10/trustdb.c:2501
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "masalah menemukan '%s' dalam trustdb: %s\n"
 
-#: g10/trustdb.c:2500
+#: g10/trustdb.c:2504
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "pemakai '%s' tidak ada di trustdb - menyisipkan\n"
 
-#: g10/trustdb.c:2503
+#: g10/trustdb.c:2507
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "gagal menaruh '%s' ke dalam trustdb: %s\n"
 
-#: g10/trustdb.c:2689 g10/trustdb.c:2719
+#: g10/trustdb.c:2693 g10/trustdb.c:2723
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "PERINGATAN: belum dapat menangani record pref panjang\n"
 
@@ -3087,31 +3082,31 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: g10/ringedit.c:318
+#: g10/ringedit.c:303
 #, c-format
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: tidak dapat membuat keyring: %s\n"
 
-#: g10/ringedit.c:335 g10/ringedit.c:1355
+#: g10/ringedit.c:320 g10/ringedit.c:1340
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: keyring tercipta\n"
 
-#: g10/ringedit.c:1532
+#: g10/ringedit.c:1517
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "PERINGATAN: terdapat 2 file dengan informasi penting.\n"
 
-#: g10/ringedit.c:1533
+#: g10/ringedit.c:1518
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s adalah yang tidak berubah\n"
 
-#: g10/ringedit.c:1534
+#: g10/ringedit.c:1519
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s adalah yang baru\n"
 
-#: g10/ringedit.c:1535
+#: g10/ringedit.c:1520
 msgid "Please fix this possible security flaw\n"
 msgstr "Silakan perbaikan kemungkinan lubang keamanan\n"
 
@@ -3136,38 +3131,52 @@ msgstr ""
 "untuk signature!\n"
 
 #. do not overwrite
-#: g10/openfile.c:72
+#: g10/openfile.c:79
 #, c-format
 msgid "File `%s' exists. "
 msgstr "File `%s' ada. "
 
-#: g10/openfile.c:74
+#: g10/openfile.c:81
 msgid "Overwrite (y/N)? "
 msgstr "Ditimpa (y/T)? "
 
-#: g10/openfile.c:102
+#: g10/openfile.c:109
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: suffix tidak dikenal\n"
 
-#: g10/openfile.c:124
+#: g10/openfile.c:131
 msgid "Enter new filename"
 msgstr "Masukkan nama file baru"
 
-#: g10/openfile.c:165
+#: g10/openfile.c:172
 msgid "writing to stdout\n"
 msgstr "menulis ke stdout\n"
 
-#: g10/openfile.c:243
+#: g10/openfile.c:250
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "mengasumsikan data bertanda dalam `%s'\n"
 
-#: g10/openfile.c:293
+#: g10/openfile.c:300
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: file pilihan baru tercipta\n"
 
+#: g10/openfile.c:313
+#, c-format
+msgid "%s: can't create directory: %s\n"
+msgstr "%s: tidak dapat membuat direktori: %s\n"
+
+#: g10/openfile.c:316
+#, c-format
+msgid "%s: directory created\n"
+msgstr "%s: direktori tercipta\n"
+
+#: g10/openfile.c:318
+msgid "you have to start GnuPG again, so it can read the new options file\n"
+msgstr ""
+
 #: g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
diff --git a/po/it.po b/po/it.po
index 9f2c9e360..1ecacfc61 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-11-22 11:18+0100\n"
+"POT-Creation-Date: 1999-12-04 14:36+0100\n"
 "PO-Revision-Date: 1999-09-09 15:51+02:00\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -287,7 +287,7 @@ msgstr ""
 "altra cosa per dare all'OS la possibilit� di raccogliere altra entropia!\n"
 "(Servono altri %d byte)\n"
 
-#: g10/g10.c:188
+#: g10/g10.c:189
 msgid ""
 "@Commands:\n"
 " "
@@ -295,135 +295,140 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/g10.c:190
+#: g10/g10.c:191
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/g10.c:191
+#: g10/g10.c:192
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/g10.c:192
+#: g10/g10.c:193
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/g10.c:193
+#: g10/g10.c:194
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/g10.c:194
+#: g10/g10.c:195
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/g10.c:195
+#: g10/g10.c:196
 msgid "store only"
 msgstr "immagazzina soltanto"
 
-#: g10/g10.c:196
+#: g10/g10.c:197
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/g10.c:197
+#: g10/g10.c:198
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:199
+#: g10/g10.c:200
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/g10.c:201
+#: g10/g10.c:202
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/g10.c:202
+#: g10/g10.c:203
 msgid "check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/g10.c:203
+#: g10/g10.c:204
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/g10.c:204
+#: g10/g10.c:205
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/g10.c:205
+#: g10/g10.c:206
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/g10.c:206
+#: g10/g10.c:207
 msgid "remove key from the public keyring"
 msgstr "rimuove una chiave dal portachiavi pubblico"
 
-#: g10/g10.c:207
+#: g10/g10.c:209
+#, fuzzy
+msgid "remove key from the secret keyring"
+msgstr "rimuove una chiave dal portachiavi pubblico"
+
+#: g10/g10.c:210
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/g10.c:208
+#: g10/g10.c:211
 msgid "sign a key locally"
 msgstr "firma localmente una chiave"
 
-#: g10/g10.c:209
+#: g10/g10.c:212
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/g10.c:210
+#: g10/g10.c:213
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/g10.c:211
+#: g10/g10.c:214
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/g10.c:212
+#: g10/g10.c:215
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/g10.c:213
+#: g10/g10.c:216
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/g10.c:216
+#: g10/g10.c:219
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/g10.c:218
+#: g10/g10.c:221
 msgid "list only the sequence of packets"
 msgstr "elenca solo la sequenza dei pacchetti"
 
-#: g10/g10.c:220
+#: g10/g10.c:223
 msgid "export the ownertrust values"
 msgstr "esporta i valori di fiducia"
 
-#: g10/g10.c:222
+#: g10/g10.c:225
 msgid "import ownertrust values"
 msgstr "importa i valori di fiducia"
 
-#: g10/g10.c:224
+#: g10/g10.c:227
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/g10.c:226
+#: g10/g10.c:229
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMI]|controlla il database della fiducia"
 
-#: g10/g10.c:227
+#: g10/g10.c:230
 msgid "fix a corrupted trust database"
 msgstr "ripara un database della fiducia rovinato"
 
-#: g10/g10.c:228
+#: g10/g10.c:231
 msgid "De-Armor a file or stdin"
 msgstr "rimuovi l'armatura a un file o a stdin"
 
-#: g10/g10.c:230
+#: g10/g10.c:233
 msgid "En-Armor a file or stdin"
 msgstr "crea l'armatura a un file o a stdin"
 
-#: g10/g10.c:232
+#: g10/g10.c:235
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/g10.c:236
+#: g10/g10.c:239
 msgid ""
 "@\n"
 "Options:\n"
@@ -433,170 +438,170 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/g10.c:238
+#: g10/g10.c:241
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/g10.c:240
+#: g10/g10.c:243
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/g10.c:243
+#: g10/g10.c:246
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: g10/g10.c:245
+#: g10/g10.c:248
 msgid "use the default key as default recipient"
 msgstr "usa la chiave predefinita come destinatario predefinito"
 
-#: g10/g10.c:249
+#: g10/g10.c:252
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/g10.c:250
+#: g10/g10.c:253
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/g10.c:252
+#: g10/g10.c:255
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/g10.c:253
+#: g10/g10.c:256
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/g10.c:254
+#: g10/g10.c:257
 msgid "verbose"
 msgstr "prolisso"
 
-#: g10/g10.c:255
+#: g10/g10.c:258
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: g10/g10.c:256
+#: g10/g10.c:259
 msgid "don't use the terminal at all"
 msgstr "non usa per niente il terminale"
 
-#: g10/g10.c:257
+#: g10/g10.c:260
 msgid "force v3 signatures"
 msgstr "forza l'uso di firme v3"
 
-#: g10/g10.c:258
+#: g10/g10.c:261
 msgid "always use a MDC for encryption"
 msgstr "usa sempre un MDC per cifrare"
 
-#: g10/g10.c:259
+#: g10/g10.c:262
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:261
+#: g10/g10.c:264
 msgid "batch mode: never ask"
 msgstr "modo batch: non fa domande"
 
-#: g10/g10.c:262
+#: g10/g10.c:265
 msgid "assume yes on most questions"
 msgstr "assumi \"s�\" per quasi tutte le domande"
 
-#: g10/g10.c:263
+#: g10/g10.c:266
 msgid "assume no on most questions"
 msgstr "assumi \"no\" per quasi tutte le domande"
 
-#: g10/g10.c:264
+#: g10/g10.c:267
 msgid "add this keyring to the list of keyrings"
 msgstr "aggiungi questo portachiavi alla lista"
 
-#: g10/g10.c:265
+#: g10/g10.c:268
 msgid "add this secret keyring to the list"
 msgstr "aggiungi questo portachiavi segreto alla lista"
 
-#: g10/g10.c:266
+#: g10/g10.c:269
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usa NOME come chiave segreta predefinita"
 
-#: g10/g10.c:267
+#: g10/g10.c:270
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|cerca le chiavi in questo keyserver"
 
-#: g10/g10.c:268
+#: g10/g10.c:271
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOME|imposta il set di caratteri del terminale NOME"
 
-#: g10/g10.c:269
+#: g10/g10.c:272
 msgid "read options from file"
 msgstr "leggi le opzioni dal file"
 
-#: g10/g10.c:271
+#: g10/g10.c:274
 msgid "set debugging flags"
 msgstr "imposta i flag di debugging"
 
-#: g10/g10.c:272
+#: g10/g10.c:275
 msgid "enable full debugging"
 msgstr "abilita il debugging completo"
 
-#: g10/g10.c:273
+#: g10/g10.c:276
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato su questo FD"
 
-#: g10/g10.c:274
+#: g10/g10.c:277
 msgid "do not write comment packets"
 msgstr "non scrivere pacchetti di commento"
 
-#: g10/g10.c:275
+#: g10/g10.c:278
 msgid "(default is 1)"
 msgstr "(predefinito � 1)"
 
-#: g10/g10.c:276
+#: g10/g10.c:279
 msgid "(default is 3)"
 msgstr "(predefinito � 3)"
 
-#: g10/g10.c:278
+#: g10/g10.c:281
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: g10/g10.c:279
+#: g10/g10.c:282
 msgid "emulate the mode described in RFC1991"
 msgstr "emula il modo descritto in RFC 1991"
 
-#: g10/g10.c:280
+#: g10/g10.c:283
 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:281
+#: g10/g10.c:284
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa il modo N per la passphrase"
 
-#: g10/g10.c:283
+#: g10/g10.c:286
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOME|usa l'algoritmo di message digest NOME per le passphrase"
 
-#: g10/g10.c:285
+#: g10/g10.c:288
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
 
-#: g10/g10.c:286
+#: g10/g10.c:289
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di cifratura NOME"
 
-#: g10/g10.c:287
+#: g10/g10.c:290
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di message digest NOME"
 
-#: g10/g10.c:288
+#: g10/g10.c:291
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritmo di compressione N"
 
-#: g10/g10.c:289
+#: g10/g10.c:292
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina il campo keyid dei pacchetti cifrati"
 
-#: g10/g10.c:290
+#: g10/g10.c:293
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALORE|usa questi dati per una nota"
 
-#: g10/g10.c:292
+#: g10/g10.c:295
 msgid ""
 "@\n"
 "Examples:\n"
@@ -616,15 +621,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/g10.c:380
+#: g10/g10.c:383
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: g10/g10.c:384
+#: g10/g10.c:387
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/g10.c:387
+#: g10/g10.c:390
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -634,7 +639,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/g10.c:392
+#: g10/g10.c:397
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -642,184 +647,184 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/g10.c:470
+#: g10/g10.c:476
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/g10.c:523
+#: g10/g10.c:529
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/g10.c:662
+#: g10/g10.c:668
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/g10.c:666
+#: g10/g10.c:672
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/g10.c:673
+#: g10/g10.c:679
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/g10.c:855
+#: g10/g10.c:861
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/g10.c:910 g10/g10.c:919
+#: g10/g10.c:917 g10/g10.c:926
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/g10.c:912
+#: g10/g10.c:919
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/g10.c:915
+#: g10/g10.c:922
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/g10.c:934 g10/g10.c:946
+#: g10/g10.c:941 g10/g10.c:953
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/g10.c:940 g10/g10.c:952
+#: g10/g10.c:947 g10/g10.c:959
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:956
+#: g10/g10.c:963
 msgid "the given policy URL is invalid\n"
 msgstr "L'URL della policy indicato non � valido\n"
 
-#: g10/g10.c:959
+#: g10/g10.c:966
 #, 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:961
+#: g10/g10.c:968
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/g10.c:963
+#: g10/g10.c:970
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/g10.c:965
+#: g10/g10.c:972
 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:968
+#: g10/g10.c:975
 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:972
+#: g10/g10.c:979
 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:1049
+#: g10/g10.c:1056
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/g10.c:1055
+#: g10/g10.c:1062
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/g10.c:1062
+#: g10/g10.c:1069
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:1070
+#: g10/g10.c:1077
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/g10.c:1083
+#: g10/g10.c:1090
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/g10.c:1096
+#: g10/g10.c:1103
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:1110
+#: g10/g10.c:1117
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/g10.c:1127
+#: g10/g10.c:1134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/g10.c:1135
+#: g10/g10.c:1142
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:1143
+#: g10/g10.c:1150
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:1151
+#: g10/g10.c:1158
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/g10.c:1167
+#: g10/g10.c:1174
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key user-id"
 
-#: g10/g10.c:1170
+#: g10/g10.c:1177
 msgid "--delete-key user-id"
 msgstr "--delete-key user-id"
 
-#: g10/encode.c:260 g10/g10.c:1207 g10/sign.c:366
+#: g10/encode.c:260 g10/g10.c:1214 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/g10.c:1222
+#: g10/g10.c:1229
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/g10.c:1273
+#: g10/g10.c:1280
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1281
+#: g10/g10.c:1288
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1349
+#: g10/g10.c:1356
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/g10.c:1430
+#: g10/g10.c:1437
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/g10.c:1434
+#: g10/g10.c:1441
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1437 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1444 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1613
 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:1612
+#: g10/g10.c:1619
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -827,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:1618
+#: g10/g10.c:1625
 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:1626
+#: g10/g10.c:1633
 msgid "a notation value must not use any control characters\n"
 msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 
@@ -894,16 +899,16 @@ msgstr "eof prematura (nella coda)\n"
 msgid "error in trailer line\n"
 msgstr "errore nella riga della coda\n"
 
-#: g10/armor.c:1007
+#: g10/armor.c:1012
 msgid "no valid OpenPGP data found.\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/armor.c:1012
+#: g10/armor.c:1017
 #, 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:1016
+#: g10/armor.c:1021
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1111,12 +1116,12 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Non � sicuro che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:700 g10/pkclist.c:722 g10/pkclist.c:847 g10/pkclist.c:892
+#: g10/pkclist.c:700 g10/pkclist.c:722 g10/pkclist.c:848 g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: saltata: %s\n"
 
-#: g10/pkclist.c:708 g10/pkclist.c:874
+#: g10/pkclist.c:708 g10/pkclist.c:875
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: saltato: chiave pubblica gi� presente\n"
@@ -1141,83 +1146,83 @@ msgstr "User ID inesistente.\n"
 msgid "skipped: public key already set as default recipient\n"
 msgstr "saltato: chiave pubblica gi� impostata come destinatario predefinito\n"
 
-#: g10/pkclist.c:784
+#: g10/pkclist.c:785
 msgid "Public key is disabled.\n"
 msgstr "La chiave pubblica � disabilitata.\n"
 
-#: g10/pkclist.c:791
+#: g10/pkclist.c:792
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "saltato: chiave pubblica gi� impostata con --encrypt-to\n"
 
-#: g10/pkclist.c:822
+#: g10/pkclist.c:823
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: g10/pkclist.c:855
+#: g10/pkclist.c:856
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: errore nel controllare la chiave: %s\n"
 
-#: g10/pkclist.c:860
+#: g10/pkclist.c:861
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: saltato: chiave pubblica disabilitata\n"
 
-#: g10/pkclist.c:898
+#: g10/pkclist.c:899
 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:387
 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:389
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (default)\n"
 
-#: g10/keygen.c:389
+#: g10/keygen.c:390
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (firma solo)\n"
 
-#: g10/keygen.c:391
+#: g10/keygen.c:392
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:392
+#: g10/keygen.c:393
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (firma e cifra)\n"
 
-#: g10/keygen.c:394
+#: g10/keygen.c:395
 #, 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:400
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
-#: g10/keygen.c:409
+#: g10/keygen.c:410
 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:431
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
-#: g10/keygen.c:442
+#: g10/keygen.c:443
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1230,15 +1235,15 @@ msgstr ""
 "          la dimensione predefinita � 1024 bit\n"
 "  la dimensione massima consigliata � 2048 bit\n"
 
-#: g10/keygen.c:449
+#: g10/keygen.c:450
 msgid "What keysize do you want? (1024) "
 msgstr "Di che dimensioni vuoi la chiave? (1024) "
 
-#: g10/keygen.c:454
+#: g10/keygen.c:455
 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:457
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "la chiave � troppo corta; 768 � il minimo valore permesso.\n"
 
@@ -1250,12 +1255,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:467
 #, 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:472
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1263,11 +1268,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:475
 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:476
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1275,21 +1280,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:484
 msgid "Do you really need such a large keysize? "
 msgstr "Ti serve davvero una chiave cos� lunga? "
 
-#: g10/keygen.c:489
+#: g10/keygen.c:490
 #, 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:493 g10/keygen.c:497
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:509
+#: g10/keygen.c:510
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1305,35 +1310,35 @@ 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:527
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:547
+#: g10/keygen.c:548
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:553
 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:559
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La chiave scadr� il %s\n"
 
-#: g10/keygen.c:561
+#: g10/keygen.c:562
 msgid ""
-"Your system can't display dates beyond 2036.\n"
+"Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:566
+#: g10/keygen.c:567
 msgid "Is this correct (y/n)? "
 msgstr "� giusto (s/n)? "
 
-#: g10/keygen.c:609
+#: g10/keygen.c:610
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1349,44 +1354,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:620
+#: g10/keygen.c:621
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:624
+#: g10/keygen.c:625
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:626
+#: g10/keygen.c:627
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non pu� iniziare con una cifra\n"
 
-#: g10/keygen.c:628
+#: g10/keygen.c:629
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:636
+#: g10/keygen.c:637
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:647
+#: g10/keygen.c:648
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non � valido\n"
 
-#: g10/keygen.c:655
+#: g10/keygen.c:656
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:661
+#: g10/keygen.c:662
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:683
+#: g10/keygen.c:684
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Stai usando il set di caratteri `%s'.\n"
 
-#: g10/keygen.c:689
+#: g10/keygen.c:690
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1397,15 +1402,15 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:692
+#: g10/keygen.c:693
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:702
+#: g10/keygen.c:703
 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:754
+#: g10/keygen.c:755
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1413,11 +1418,11 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:456 g10/keygen.c:762
+#: g10/keyedit.c:456 g10/keygen.c:763
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "passphrase non ripetuta correttamente; riprova.\n"
 
-#: g10/keygen.c:768
+#: g10/keygen.c:769
 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"
@@ -1429,7 +1434,7 @@ msgstr ""
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:789
+#: g10/keygen.c:790
 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"
@@ -1441,33 +1446,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:859
+#: g10/keygen.c:860
 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:867
+#: g10/keygen.c:868
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La coppia DSA avr� 1024 bit.\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:874
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:883
+#: g10/keygen.c:884
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "scrittura del certificato pubblico in `%s'\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:885
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "scrittura del certificato segreto in `%s'\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:962
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:964
 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"
@@ -1476,12 +1481,12 @@ msgstr ""
 "il comando \"--edit-key\" per generare una chiave secondaria per questo "
 "scopo.\n"
 
-#: g10/keygen.c:977 g10/keygen.c:1076
+#: g10/keygen.c:978 g10/keygen.c:1077
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:1021 g10/sig-check.c:312 g10/sign.c:105
+#: g10/keygen.c:1022 g10/sig-check.c:312 g10/sign.c:105
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1489,7 +1494,7 @@ msgstr ""
 "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:1023 g10/sig-check.c:314 g10/sign.c:107
+#: g10/keygen.c:1024 g10/sig-check.c:314 g10/sign.c:107
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1497,12 +1502,12 @@ msgstr ""
 "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:1054
+#: g10/keygen.c:1055
 msgid "Really create? "
 msgstr "Crea davvero? "
 
-#: g10/encode.c:91 g10/openfile.c:161 g10/openfile.c:270 g10/tdbio.c:468
-#: g10/tdbio.c:529
+#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: impossibile aprire: %s\n"
@@ -1669,7 +1674,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:420 g10/openfile.c:213 g10/sign.c:268 g10/sign.c:580
+#: g10/import.c:420 g10/openfile.c:220 g10/sign.c:268 g10/sign.c:580
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
@@ -1797,17 +1802,17 @@ msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n"
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chiave %08lX: legame con la subchiave non valido:\n"
 
-#: g10/import.c:799
+#: g10/import.c:800
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "chiave %08lX: accettato l'user ID non autofirmato '"
 
-#: g10/import.c:828
+#: g10/import.c:829
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chiave %08lX: saltato l'user ID '"
 
-#: g10/import.c:851
+#: g10/import.c:852
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chiave %08lX: saltata la subchiave\n"
@@ -1816,32 +1821,32 @@ msgstr "chiave %08lX: saltata la subchiave\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:876
+#: g10/import.c:877
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "chiave %08lX: firma non esportabile (classe %02x) - saltata\n"
 
-#: g10/import.c:885
+#: g10/import.c:886
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltato\n"
 
-#: g10/import.c:893
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - saltato\n"
 
-#: g10/import.c:993
+#: g10/import.c:994
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
 
-#: g10/import.c:1044
+#: g10/import.c:1045
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chiave %08lX: certificato di revoca aggiunto\n"
 
-#: g10/import.c:1158 g10/import.c:1211
+#: g10/import.c:1159 g10/import.c:1212
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "chiave %08lX: la nostra copia non ha autofirma\n"
@@ -2453,43 +2458,43 @@ msgstr "Nota: "
 msgid "Policy: "
 msgstr "Policy: "
 
-#: g10/mainproc.c:1035
+#: g10/mainproc.c:1037
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
-#: g10/mainproc.c:1041
+#: g10/mainproc.c:1043
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Firma fatta %.*s usando la chiave %s con ID %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1067 g10/mainproc.c:1078
+#: g10/mainproc.c:1069 g10/mainproc.c:1080
 msgid "BAD signature from \""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:1068 g10/mainproc.c:1079
+#: g10/mainproc.c:1070 g10/mainproc.c:1081
 msgid "Good signature from \""
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1070
+#: g10/mainproc.c:1072
 msgid "                aka \""
 msgstr "    anche noto come \""
 
-#: g10/mainproc.c:1126
+#: g10/mainproc.c:1128
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1189
 #, fuzzy, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "classe della firma sconosciuta"
 
-#: g10/mainproc.c:1226
+#: g10/mainproc.c:1228
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/mainproc.c:1231
+#: g10/mainproc.c:1233
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
@@ -2677,137 +2682,127 @@ msgstr "impossibile gestire linee di testo pi� lunghe di %d caratteri\n"
 msgid "input line longer than %d characters\n"
 msgstr "linea di input pi� lunga di %d caratteri\n"
 
-#: g10/tdbio.c:121 g10/tdbio.c:1637
+#: g10/tdbio.c:116 g10/tdbio.c:1623
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek fallita: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1644
+#: g10/tdbio.c:122 g10/tdbio.c:1630
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: scrittura fallita (n=%d): %s\n"
 
-#: g10/tdbio.c:237
+#: g10/tdbio.c:232
 msgid "trustdb transaction too large\n"
 msgstr "transazione del trustdb troppo grande\n"
 
-#: g10/tdbio.c:429
+#: g10/tdbio.c:424
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: impossibile acedere a: %s\n"
 
-#: g10/ringedit.c:298 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
-#, c-format
-msgid "%s: directory created\n"
-msgstr "%s: directory creata\n"
-
-#: g10/tdbio.c:452
+#: g10/tdbio.c:438
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: la directory non esiste!\n"
 
-#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1350 g10/tdbio.c:458
+#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1335 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: impossibile creare: %s\n"
 
-#: g10/tdbio.c:473 g10/tdbio.c:522
+#: g10/tdbio.c:459 g10/tdbio.c:508
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: impossibile creare il lock\n"
 
-#: g10/tdbio.c:487
+#: g10/tdbio.c:473
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: creazione del record della versione fallita: %s"
 
-#: g10/tdbio.c:491
+#: g10/tdbio.c:477
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: � stato creato un trustdb non valido\n"
 
-#: g10/tdbio.c:494
+#: g10/tdbio.c:480
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: creato il trustdb\n"
 
-#: g10/tdbio.c:531
+#: g10/tdbio.c:517
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb non valido\n"
 
-#: g10/tdbio.c:564
+#: g10/tdbio.c:550
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: creazione della tabella hash fallita: %s\n"
 
-#: g10/tdbio.c:572
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: errore durante l'aggiornamento del record di versione: %s\n"
 
-#: g10/tdbio.c:588 g10/tdbio.c:627 g10/tdbio.c:649 g10/tdbio.c:679
-#: g10/tdbio.c:704 g10/tdbio.c:1570 g10/tdbio.c:1597
+#: g10/tdbio.c:574 g10/tdbio.c:613 g10/tdbio.c:635 g10/tdbio.c:665
+#: g10/tdbio.c:690 g10/tdbio.c:1556 g10/tdbio.c:1583
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: errore durante la lettura del record di versione: %s\n"
 
-#: g10/tdbio.c:601 g10/tdbio.c:660
+#: g10/tdbio.c:587 g10/tdbio.c:646
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: errore durante la scrittura del record di versione: %s\n"
 
-#: g10/tdbio.c:1249
+#: g10/tdbio.c:1235
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek fallita: %s\n"
 
-#: g10/tdbio.c:1257
+#: g10/tdbio.c:1243
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: g10/tdbio.c:1278
+#: g10/tdbio.c:1264
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: non � un file di trustdb\n"
 
-#: g10/tdbio.c:1294
+#: g10/tdbio.c:1280
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: record di versione con recnum %lu\n"
 
-#: g10/tdbio.c:1299
+#: g10/tdbio.c:1285
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versione %d del file non valida\n"
 
-#: g10/tdbio.c:1603
+#: g10/tdbio.c:1589
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: errore durante la lettura del record libero: %s\n"
 
-#: g10/tdbio.c:1611
+#: g10/tdbio.c:1597
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: errore durante la scrittura del dir record: %s\n"
 
-#: g10/tdbio.c:1621
+#: g10/tdbio.c:1607
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: azzeramento di un record fallito: %s\n"
 
-#: g10/tdbio.c:1651
+#: g10/tdbio.c:1637
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: accodatura a un record fallita: %s\n"
 
-#: g10/tdbio.c:1762
+#: g10/tdbio.c:1748
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "Il trustdb � danneggiato; eseguire \"gpg --fix-trust-db\".\n"
 
@@ -3034,67 +3029,67 @@ msgstr "\t%lu chiavi saltate\n"
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu chiavi aggiornate\n"
 
-#: g10/trustdb.c:2139
+#: g10/trustdb.c:2143
 msgid "Ooops, no keys\n"
 msgstr "Ooops, mancano le chiavi\n"
 
-#: g10/trustdb.c:2143
+#: g10/trustdb.c:2147
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, mancano gli user ID\n"
 
-#: g10/trustdb.c:2301
+#: g10/trustdb.c:2305
 #, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "check_trust: ricerca del dir record fallita: %s\n"
 
-#: g10/trustdb.c:2310
+#: g10/trustdb.c:2314
 #, 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:2314
+#: g10/trustdb.c:2318
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "chiave %08lX.%lu: inserita nel trustdb\n"
 
-#: g10/trustdb.c:2322
+#: g10/trustdb.c:2326
 #, 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:2336
+#: g10/trustdb.c:2340
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "chiave %08lX.%lu: scaduta il %s\n"
 
-#: g10/trustdb.c:2344
+#: g10/trustdb.c:2348
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "chiave %08lX.%lu: controllo della fiducia fallito: %s\n"
 
-#: g10/trustdb.c:2495
+#: g10/trustdb.c:2499
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "utente `%s' non trovato: %s\n"
 
-#: g10/trustdb.c:2497
+#: g10/trustdb.c:2501
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problema cercando `%s' nel trustdb: %s\n"
 
-#: g10/trustdb.c:2500
+#: g10/trustdb.c:2504
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "l'utente `%s' non � nel trustdb - viene inserito\n"
 
-#: g10/trustdb.c:2503
+#: g10/trustdb.c:2507
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "impossibile mettere `%s' nel trustdb: %s\n"
 
-#: g10/trustdb.c:2689 g10/trustdb.c:2719
+#: g10/trustdb.c:2693 g10/trustdb.c:2723
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "ATTENZIONE: non � ancora possibile gestire record pref lunghi\n"
 
@@ -3110,31 +3105,31 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: g10/ringedit.c:318
+#: g10/ringedit.c:303
 #, 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:320 g10/ringedit.c:1340
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: portachiavi creato\n"
 
-#: g10/ringedit.c:1532
+#: g10/ringedit.c:1517
 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:1518
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � quello non modificato\n"
 
-#: g10/ringedit.c:1534
+#: g10/ringedit.c:1519
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � quello nuovo\n"
 
-#: g10/ringedit.c:1535
+#: g10/ringedit.c:1520
 msgid "Please fix this possible security flaw\n"
 msgstr "Per favore risolvete questo possibile problema di sicurezza\n"
 
@@ -3159,38 +3154,52 @@ msgstr ""
 "le firme!\n"
 
 #. do not overwrite
-#: g10/openfile.c:72
+#: g10/openfile.c:79
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Il file `%s' esiste. "
 
-#: g10/openfile.c:74
+#: g10/openfile.c:81
 msgid "Overwrite (y/N)? "
 msgstr "Sovrascrivo (s/N)? "
 
-#: g10/openfile.c:102
+#: g10/openfile.c:109
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: suffisso sconosciuto\n"
 
-#: g10/openfile.c:124
+#: g10/openfile.c:131
 msgid "Enter new filename"
 msgstr "Inserire il nuovo nome del file"
 
-#: g10/openfile.c:165
+#: g10/openfile.c:172
 msgid "writing to stdout\n"
 msgstr "scrivo su stdout\n"
 
-#: g10/openfile.c:243
+#: g10/openfile.c:250
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "suppongo che i dati firmati siano in `%s'\n"
 
-#: g10/openfile.c:293
+#: g10/openfile.c:300
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: creato un nuovo file delle opzioni\n"
 
+#: g10/openfile.c:313
+#, c-format
+msgid "%s: can't create directory: %s\n"
+msgstr "%s: impossibile creare la directory: %s\n"
+
+#: g10/openfile.c:316
+#, c-format
+msgid "%s: directory created\n"
+msgstr "%s: directory creata\n"
+
+#: g10/openfile.c:318
+msgid "you have to start GnuPG again, so it can read the new options file\n"
+msgstr ""
+
 #: g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
diff --git a/po/pl.po b/po/pl.po
index e10233d97..f770817dd 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.0\n"
-"POT-Creation-Date: 1999-11-22 11:18+0100\n"
+"POT-Creation-Date: 1999-12-04 14:36+0100\n"
 "PO-Revision-Date: 1999-10-02 21:35+02:00\n"
 "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -298,7 +298,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:188
+#: g10/g10.c:189
 msgid ""
 "@Commands:\n"
 " "
@@ -306,135 +306,140 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/g10.c:190
+#: g10/g10.c:191
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: g10/g10.c:191
+#: g10/g10.c:192
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu na czytelnym dokumencie"
 
-#: g10/g10.c:192
+#: g10/g10.c:193
 msgid "make a detached signature"
 msgstr "sporz�dzenie podpisu oddzielonego od dokumentu"
 
-#: g10/g10.c:193
+#: g10/g10.c:194
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/g10.c:194
+#: g10/g10.c:195
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/g10.c:195
+#: g10/g10.c:196
 msgid "store only"
 msgstr "tylko zapis do pliku"
 
-#: g10/g10.c:196
+#: g10/g10.c:197
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lnie)"
 
-#: g10/g10.c:197
+#: g10/g10.c:198
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/g10.c:199
+#: g10/g10.c:200
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/g10.c:201
+#: g10/g10.c:202
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpis�w"
 
-#: g10/g10.c:202
+#: g10/g10.c:203
 msgid "check key signatures"
 msgstr "sprawdzenie podpis�w kluczy"
 
-#: g10/g10.c:203
+#: g10/g10.c:204
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/g10.c:204
+#: g10/g10.c:205
 msgid "list secret keys"
 msgstr "lista kluczy tajnych"
 
-#: g10/g10.c:205
+#: g10/g10.c:206
 msgid "generate a new key pair"
 msgstr "generacja nowej pary klucza"
 
-#: g10/g10.c:206
+#: g10/g10.c:207
 msgid "remove key from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: g10/g10.c:207
+#: g10/g10.c:209
+#, fuzzy
+msgid "remove key from the secret keyring"
+msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
+
+#: g10/g10.c:210
 msgid "sign a key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/g10.c:208
+#: g10/g10.c:211
 msgid "sign a key locally"
 msgstr "z�o�enie lokalnego podpisu na kluczu"
 
-#: g10/g10.c:209
+#: g10/g10.c:212
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/g10.c:210
+#: g10/g10.c:213
 msgid "generate a revocation certificate"
 msgstr "tworzenie certyfikatu uniewa�nienia klucza"
 
-#: g10/g10.c:211
+#: g10/g10.c:214
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/g10.c:212
+#: g10/g10.c:215
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/g10.c:213
+#: g10/g10.c:216
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/g10.c:216
+#: g10/g10.c:219
 msgid "import/merge keys"
 msgstr "import/do��czanie kluczy"
 
-#: g10/g10.c:218
+#: g10/g10.c:221
 msgid "list only the sequence of packets"
 msgstr "wypisane sekwencji pakiet�w"
 
-#: g10/g10.c:220
+#: g10/g10.c:223
 msgid "export the ownertrust values"
 msgstr "eksport warto�ci zaufania"
 
-#: g10/g10.c:222
+#: g10/g10.c:225
 msgid "import ownertrust values"
 msgstr "wczytanie warto��i zaufania"
 
-#: g10/g10.c:224
+#: g10/g10.c:227
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/g10.c:226
+#: g10/g10.c:229
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAZWY]|sprawdzenie bazy zaufania"
 
-#: g10/g10.c:227
+#: g10/g10.c:230
 msgid "fix a corrupted trust database"
 msgstr "naprawa uszkodzonej bazy zaufania"
 
-#: g10/g10.c:228
+#: g10/g10.c:231
 msgid "De-Armor a file or stdin"
 msgstr "zdj�cie opakowania ASCII pliku lub potoku"
 
-#: g10/g10.c:230
+#: g10/g10.c:233
 msgid "En-Armor a file or stdin"
 msgstr "opakowanie ASCII pliku lub potoku"
 
-#: g10/g10.c:232
+#: g10/g10.c:235
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/g10.c:236
+#: g10/g10.c:239
 msgid ""
 "@\n"
 "Options:\n"
@@ -444,168 +449,168 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/g10.c:238
+#: g10/g10.c:241
 msgid "create ascii armored output"
 msgstr "plik wynikowy b�dzie w opakowaniu ASCII"
 
-#: g10/g10.c:240
+#: g10/g10.c:243
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla adresata NAZWA"
 
-#: g10/g10.c:243
+#: g10/g10.c:246
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego adresata"
 
-#: g10/g10.c:245
+#: g10/g10.c:248
 msgid "use the default key as default recipient"
 msgstr "domy�lny klucz jest domy�lnym adresatem"
 
-#: g10/g10.c:249
+#: g10/g10.c:252
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/g10.c:250
+#: g10/g10.c:253
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - brak)"
 
-#: g10/g10.c:252
+#: g10/g10.c:255
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/g10.c:253
+#: g10/g10.c:256
 msgid "use as output file"
 msgstr "plik wyj�ciowy"
 
-#: g10/g10.c:254
+#: g10/g10.c:257
 msgid "verbose"
 msgstr "z informacjami dodatkowymi"
 
-#: g10/g10.c:255
+#: g10/g10.c:258
 msgid "be somewhat more quiet"
 msgstr "mniej komunikat�ww"
 
-#: g10/g10.c:256
+#: g10/g10.c:259
 msgid "don't use the terminal at all"
 msgstr "bez odwo�a� do terminala"
 
-#: g10/g10.c:257
+#: g10/g10.c:260
 msgid "force v3 signatures"
 msgstr "wymuszenie trzeciej wersji formatu podpis�w"
 
-#: g10/g10.c:258
+#: g10/g10.c:261
 msgid "always use a MDC for encryption"
 msgstr "do szyfrowania b�dzie u�ywany MDC"
 
-#: g10/g10.c:259
+#: g10/g10.c:262
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:261
+#: g10/g10.c:264
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: �adnych pyta�"
 
-#: g10/g10.c:262
+#: g10/g10.c:265
 msgid "assume yes on most questions"
 msgstr "automatyczna odpowied� tak na wi�kszo�� pyta�"
 
-#: g10/g10.c:263
+#: g10/g10.c:266
 msgid "assume no on most questions"
 msgstr "automatyczna odpowied� nie na wi�kszo�� pyta�"
 
-#: g10/g10.c:264
+#: g10/g10.c:267
 msgid "add this keyring to the list of keyrings"
 msgstr "doda� zbi�r kluczy do listy u�ywanych"
 
-#: g10/g10.c:265
+#: g10/g10.c:268
 msgid "add this secret keyring to the list"
 msgstr "doda� zbi�r kluczy tajnych do listy"
 
-#: g10/g10.c:266
+#: g10/g10.c:269
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego klucza tajnego"
 
-#: g10/g10.c:267
+#: g10/g10.c:270
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|serwer kluczy w kt�rym b�d� poszukiwane"
 
-#: g10/g10.c:268
+#: g10/g10.c:271
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAZWA|zestaw znak�w terminala NAZWA"
 
-#: g10/g10.c:269
+#: g10/g10.c:272
 msgid "read options from file"
 msgstr "wczytanie opcji z pliku"
 
-#: g10/g10.c:271
+#: g10/g10.c:274
 msgid "set debugging flags"
 msgstr "ustawienie opcji �ledzenia wykonania programu"
 
-#: g10/g10.c:272
+#: g10/g10.c:275
 msgid "enable full debugging"
 msgstr "w��czenie pe�nego �ledzenia programu"
 
-#: g10/g10.c:273
+#: g10/g10.c:276
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapisa� opis stanu do FD"
 
-#: g10/g10.c:274
+#: g10/g10.c:277
 msgid "do not write comment packets"
 msgstr "nie zapisywa� pakiet�w z komentarzem"
 
-#: g10/g10.c:275
+#: g10/g10.c:278
 msgid "(default is 1)"
 msgstr "(domy�lnie 1)"
 
-#: g10/g10.c:276
+#: g10/g10.c:279
 msgid "(default is 3)"
 msgstr "(domy�lnie 3)"
 
-#: g10/g10.c:278
+#: g10/g10.c:281
 msgid "|FILE|load extension module FILE"
 msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
 
-#: g10/g10.c:279
+#: g10/g10.c:282
 msgid "emulate the mode described in RFC1991"
 msgstr "emulacja trybu opisanego w RFC1991"
 
-#: g10/g10.c:280
+#: g10/g10.c:283
 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:281
+#: g10/g10.c:284
 msgid "|N|use passphrase mode N"
 msgstr "|N|N-ty tryb wprowadzania wyra�enia przej�ciowego"
 
-#: g10/g10.c:283
+#: g10/g10.c:286
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|ALG|algorytm obliczania skr�t�w wiadomo�ci ALG"
 
-#: g10/g10.c:285
+#: g10/g10.c:288
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|ALG|algorytmu szyfruj�cy ALG dla has�a"
 
-#: g10/g10.c:286
+#: g10/g10.c:289
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|algorytm szyfruj�cy NAZWA"
 
-#: g10/g10.c:287
+#: g10/g10.c:290
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|algorytm obliczania skr�t�w wiadomo�ci NAZWA"
 
-#: g10/g10.c:288
+#: g10/g10.c:291
 msgid "|N|use compress algorithm N"
 msgstr "|N|algorytm kompresji N"
 
-#: g10/g10.c:289
+#: g10/g10.c:292
 msgid "throw keyid field of encrypted packets"
 msgstr "usuni�cie identyfikator�w kluczy z pakiet�w"
 
-#: g10/g10.c:290
+#: g10/g10.c:293
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAZWA=TRE��|adnotacje"
 
-#: g10/g10.c:292
+#: g10/g10.c:295
 msgid ""
 "@\n"
 "Examples:\n"
@@ -626,15 +631,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/g10.c:380
+#: g10/g10.c:383
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: g10/g10.c:384
+#: g10/g10.c:387
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/g10.c:387
+#: g10/g10.c:390
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -644,7 +649,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/g10.c:392
+#: g10/g10.c:397
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -652,182 +657,182 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/g10.c:470
+#: g10/g10.c:476
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/g10.c:523
+#: g10/g10.c:529
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/g10.c:662
+#: g10/g10.c:668
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji '%s'\n"
 
-#: g10/g10.c:666
+#: g10/g10.c:672
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji '%s': %s\n"
 
-#: g10/g10.c:673
+#: g10/g10.c:679
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z '%s'\n"
 
-#: g10/g10.c:855
+#: g10/g10.c:861
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/g10.c:910 g10/g10.c:919
+#: g10/g10.c:917 g10/g10.c:926
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/g10.c:912
+#: g10/g10.c:919
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s jest niedozwolony z %s!\n"
 
-#: g10/g10.c:915
+#: g10/g10.c:922
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu z %s!\n"
 
-#: g10/g10.c:934 g10/g10.c:946
+#: g10/g10.c:941 g10/g10.c:953
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/g10.c:940 g10/g10.c:952
+#: g10/g10.c:947 g10/g10.c:959
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm geenracji skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/g10.c:956
+#: g10/g10.c:963
 msgid "the given policy URL is invalid\n"
 msgstr "podany URL regulaminu jest niepoprawny\n"
 
-#: g10/g10.c:959
+#: g10/g10.c:966
 #, 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:961
+#: g10/g10.c:968
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/g10.c:963
+#: g10/g10.c:970
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/g10.c:965
+#: g10/g10.c:972
 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:968
+#: g10/g10.c:975
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/g10.c:972
+#: g10/g10.c:979
 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:1049
+#: g10/g10.c:1056
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1055
+#: g10/g10.c:1062
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/g10.c:1062
+#: g10/g10.c:1069
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:1070
+#: g10/g10.c:1077
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/g10.c:1083
+#: g10/g10.c:1090
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/g10.c:1096
+#: g10/g10.c:1103
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:1110
+#: g10/g10.c:1117
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]"
 
-#: g10/g10.c:1127
+#: g10/g10.c:1134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/g10.c:1135
+#: g10/g10.c:1142
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/g10.c:1143
+#: g10/g10.c:1150
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/g10.c:1151
+#: g10/g10.c:1158
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/g10.c:1167
+#: g10/g10.c:1174
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key nazwa u�ytkownika"
 
-#: g10/g10.c:1170
+#: g10/g10.c:1177
 msgid "--delete-key user-id"
 msgstr "--delete-key nazwa u�ytkownika"
 
-#: g10/encode.c:260 g10/g10.c:1207 g10/sign.c:366
+#: g10/encode.c:260 g10/g10.c:1214 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "nie mo�na otworzy� %s: %s\n"
 
-#: g10/g10.c:1222
+#: g10/g10.c:1229
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
 
-#: g10/g10.c:1273
+#: g10/g10.c:1280
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "usuni�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1281
+#: g10/g10.c:1288
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1349
+#: g10/g10.c:1356
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu '%s'\n"
 
-#: g10/g10.c:1430
+#: g10/g10.c:1437
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/g10.c:1434
+#: g10/g10.c:1441
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1437 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1444 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mo�na otworzy� '%s'\n"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1613
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "adnotacja musi zaczyna� si� od litery lub podkre�lenia\n"
 
-#: g10/g10.c:1612
+#: g10/g10.c:1619
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -835,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:1618
+#: g10/g10.c:1625
 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:1626
+#: g10/g10.c:1633
 msgid "a notation value must not use any control characters\n"
 msgstr "warto�� adnotacji nie mo�e zawiera� znak�w steruj�cych\n"
 
@@ -902,16 +907,16 @@ msgstr "przedwczesny koniec pliku (w zako�czeniu)\n"
 msgid "error in trailer line\n"
 msgstr "b��d w linii ko�cz�cej\n"
 
-#: g10/armor.c:1007
+#: g10/armor.c:1012
 msgid "no valid OpenPGP data found.\n"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: g10/armor.c:1012
+#: g10/armor.c:1017
 #, 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:1016
+#: g10/armor.c:1021
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1124,12 +1129,12 @@ msgstr ""
 "             Nie ma pewno�ci �e ten podpis zosta� z�o�nony przez "
 "w�a�ciciela.\n"
 
-#: g10/pkclist.c:700 g10/pkclist.c:722 g10/pkclist.c:847 g10/pkclist.c:892
+#: g10/pkclist.c:700 g10/pkclist.c:722 g10/pkclist.c:848 g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: pomini�ty: %s\n"
 
-#: g10/pkclist.c:708 g10/pkclist.c:874
+#: g10/pkclist.c:708 g10/pkclist.c:875
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: pomini�ty: klucz publiczny ju� znajduje si� w bazie\n"
@@ -1154,84 +1159,84 @@ msgstr "Brak takiego identyfikatora u�ytkownika.\n"
 msgid "skipped: public key already set as default recipient\n"
 msgstr "pomini�ty: klucz publiczny ju� jest domy�lnym adresatem\n"
 
-#: g10/pkclist.c:784
+#: g10/pkclist.c:785
 msgid "Public key is disabled.\n"
 msgstr "Klucz publiczny wy��czony z uzycia.\n"
 
-#: g10/pkclist.c:791
+#: g10/pkclist.c:792
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "pomini�ty: klucz publiczny ju� wybrany w --encrypt-to\n"
 
-#: g10/pkclist.c:822
+#: g10/pkclist.c:823
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "nieznany domy�lny adresat '%s'\n"
 
-#: g10/pkclist.c:855
+#: g10/pkclist.c:856
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: b��d podczas sprawdzania klucza: %s\n"
 
-#: g10/pkclist.c:860
+#: g10/pkclist.c:861
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: pomini�ty: klucz publiczny wy��czony z u�ycia\n"
 
-#: g10/pkclist.c:898
+#: g10/pkclist.c:899
 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:387
 msgid "Please select what kind of key you want:\n"
 msgstr "Prosz� wybra� rodzaj klucza:\n"
 
-#: g10/keygen.c:388
+#: g10/keygen.c:389
 #, 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:390
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:391
+#: g10/keygen.c:392
 #, 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:393
 #, 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:395
 #, 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:400
 msgid "Your selection? "
 msgstr "Tw�j wyb�r? "
 
-#: g10/keygen.c:409
+#: g10/keygen.c:410
 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:431
 msgid "Invalid selection.\n"
 msgstr "Niew�a�ciwy wyb�r.\n"
 
-#: g10/keygen.c:442
+#: g10/keygen.c:443
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1244,15 +1249,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:450
 msgid "What keysize do you want? (1024) "
 msgstr "Jakiej d�ugo�ci klucz wygenerowa�? (1024) "
 
-#: g10/keygen.c:454
+#: g10/keygen.c:455
 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:457
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "D�ugo�� klucza zbyt ma�a; minimalna dopuszczona wynosi 768 bit�w.\n"
 
@@ -1264,12 +1269,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:467
 #, 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:472
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1277,11 +1282,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:475
 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:476
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1289,21 +1294,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:484
 msgid "Do you really need such a large keysize? "
 msgstr "Czy naprawd� potrzebujesz takiego d�ugiego klucza? "
 
-#: g10/keygen.c:489
+#: g10/keygen.c:490
 #, 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:493 g10/keygen.c:497
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�glono do %u bit�w\n"
 
-#: g10/keygen.c:509
+#: g10/keygen.c:510
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1319,35 +1324,35 @@ 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:527
 msgid "Key is valid for? (0) "
 msgstr "Okres wa�no�ci klucza ? (0) "
 
-#: g10/keygen.c:547
+#: g10/keygen.c:548
 msgid "invalid value\n"
 msgstr "niepoprawna warto��\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:553
 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:559
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Data wa�no�ci klucza: %s\n"
 
-#: g10/keygen.c:561
+#: g10/keygen.c:562
 msgid ""
-"Your system can't display dates beyond 2036.\n"
+"Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:566
+#: g10/keygen.c:567
 msgid "Is this correct (y/n)? "
 msgstr "Dane poprawne (t/n)? "
 
-#: g10/keygen.c:609
+#: g10/keygen.c:610
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1363,44 +1368,44 @@ msgstr ""
 "    \"Tadeusz �ele�ski (Boy) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:620
+#: g10/keygen.c:621
 msgid "Real name: "
 msgstr "Imi� i nazwisko: "
 
-#: g10/keygen.c:624
+#: g10/keygen.c:625
 msgid "Invalid character in name\n"
 msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:626
+#: g10/keygen.c:627
 msgid "Name may not start with a digit\n"
 msgstr "Imi� lub nazwisko nie mo�e zaczyna� si� od cyfry\n"
 
-#: g10/keygen.c:628
+#: g10/keygen.c:629
 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:636
+#: g10/keygen.c:637
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:647
+#: g10/keygen.c:648
 msgid "Not a valid email address\n"
 msgstr "to nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:655
+#: g10/keygen.c:656
 msgid "Comment: "
 msgstr "Komentarz: "
 
-#: g10/keygen.c:661
+#: g10/keygen.c:662
 msgid "Invalid character in comment\n"
 msgstr "Niew�a�ciwy znak w komentarzu\n"
 
-#: g10/keygen.c:683
+#: g10/keygen.c:684
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "U�ywasz zestawu znak�w %s.\n"
 
-#: g10/keygen.c:689
+#: g10/keygen.c:690
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1411,31 +1416,31 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:692
+#: g10/keygen.c:693
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:702
+#: g10/keygen.c:703
 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:754
+#: g10/keygen.c:755
 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:762
+#: g10/keyedit.c:456 g10/keygen.c:763
 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:768
+#: g10/keygen.c:769
 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"
@@ -1447,7 +1452,7 @@ msgstr ""
 "i opcji \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:789
+#: g10/keygen.c:790
 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"
@@ -1461,33 +1466,33 @@ msgstr ""
 "generator liczb losowych ma mo�liwo�� zebrania odpowiedniej ilo�ci entropii. "
 "\n"
 
-#: g10/keygen.c:859
+#: g10/keygen.c:860
 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:867
+#: g10/keygen.c:868
 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:873
+#: g10/keygen.c:874
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza zosta�a anulowana.\n"
 
-#: g10/keygen.c:883
+#: g10/keygen.c:884
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "zapis certyfikatu publicznego w '%s'\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:885
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "zapis certyfikatu prywatnego w '%s'\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:962
 msgid "public and secret key created and signed.\n"
 msgstr "prywatny i publiczny klucz zosta� stworzony i podpisany.\n"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:964
 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"
@@ -1495,12 +1500,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:977 g10/keygen.c:1076
+#: g10/keygen.c:978 g10/keygen.c:1077
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/keygen.c:1021 g10/sig-check.c:312 g10/sign.c:105
+#: g10/keygen.c:1022 g10/sig-check.c:312 g10/sign.c:105
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1508,7 +1513,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:1023 g10/sig-check.c:314 g10/sign.c:107
+#: g10/keygen.c:1024 g10/sig-check.c:314 g10/sign.c:107
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1516,12 +1521,12 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:1054
+#: g10/keygen.c:1055
 msgid "Really create? "
 msgstr "Na pewno generowa�? "
 
-#: g10/encode.c:91 g10/openfile.c:161 g10/openfile.c:270 g10/tdbio.c:468
-#: g10/tdbio.c:529
+#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: nie mo�na otworzy�: %s\n"
@@ -1688,7 +1693,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:420 g10/openfile.c:213 g10/sign.c:268 g10/sign.c:580
+#: g10/import.c:420 g10/openfile.c:220 g10/sign.c:268 g10/sign.c:580
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
@@ -1819,17 +1824,17 @@ msgstr "klucz %08lX: brak podklucza do dowi�zania\n"
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "klucz %08lX: niepoprawne dowi�zanie podklucza\n"
 
-#: g10/import.c:799
+#: g10/import.c:800
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "klucz %08lX: przyj�to identyfikator nie podpisany nim samym '"
 
-#: g10/import.c:828
+#: g10/import.c:829
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "klucz %08lX: pomini�to identyfikator u�ytkownika '"
 
-#: g10/import.c:851
+#: g10/import.c:852
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "klucz %08lX: podklucz pomini�ty\n"
@@ -1838,34 +1843,34 @@ msgstr "klucz %08lX: podklucz pomini�ty\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:876
+#: g10/import.c:877
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "klucz %08lX: podpis nieeksportowalny (klasa %02x) - pomini�ty\n"
 
-#: g10/import.c:885
+#: g10/import.c:886
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "klucz %08lX: certyfikat uniewa�nienia umieszczony w niew�a�ciwym \n"
 "miejscu - zosta� pomini�ty\n"
 
-#: g10/import.c:893
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "klucz %08lX: niepoprawny certyfikat uniewa�nienia: %s - pomini�ty\n"
 
-#: g10/import.c:993
+#: g10/import.c:994
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "key %08lX: powt�rzony identyfikator u�ytkownika - do��czony\n"
 
-#: g10/import.c:1044
+#: g10/import.c:1045
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "klucz %08lX: dodany certyfikat uniewa�nienia\n"
 
-#: g10/import.c:1158 g10/import.c:1211
+#: g10/import.c:1159 g10/import.c:1212
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "klucz %08lX: dost�pna kopia nie jest podpisana ni� sam�\n"
@@ -2478,11 +2483,11 @@ msgstr "Adnotacja:"
 msgid "Policy: "
 msgstr "Regulamin:"
 
-#: g10/mainproc.c:1035
+#: g10/mainproc.c:1037
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
 
-#: g10/mainproc.c:1041
+#: g10/mainproc.c:1043
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
@@ -2490,33 +2495,33 @@ msgstr ""
 "z u�yciem klucza o identyfikatorze %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1067 g10/mainproc.c:1078
+#: g10/mainproc.c:1069 g10/mainproc.c:1080
 msgid "BAD signature from \""
 msgstr "NIEPOPRAWNY podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1068 g10/mainproc.c:1079
+#: g10/mainproc.c:1070 g10/mainproc.c:1081
 msgid "Good signature from \""
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1070
+#: g10/mainproc.c:1072
 msgid "                aka \""
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1126
+#: g10/mainproc.c:1128
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie mo�na sprawdzi� podpisu: %s\n"
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1189
 #, fuzzy, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "nieznana klasa podpisu"
 
-#: g10/mainproc.c:1226
+#: g10/mainproc.c:1228
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:1231
+#: g10/mainproc.c:1233
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
@@ -2709,137 +2714,127 @@ msgstr "nie mo�na obs�u�y� linii tekstu d�u�szej ni� %d znak�w\n"
 msgid "input line longer than %d characters\n"
 msgstr "linia d�u�sza ni� %d znak�w\n"
 
-#: g10/tdbio.c:121 g10/tdbio.c:1637
+#: g10/tdbio.c:116 g10/tdbio.c:1623
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "baza zaufania, wpis %lu: lseek() nie powiod�a si�: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1644
+#: g10/tdbio.c:122 g10/tdbio.c:1630
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "baza zaufania, wpis %lu: zapis nie powi�d� si� (n=%d): %s\n"
 
-#: g10/tdbio.c:237
+#: g10/tdbio.c:232
 msgid "trustdb transaction too large\n"
 msgstr "zbyt du�e zlecenie dla bazy zaufania\n"
 
-#: g10/tdbio.c:429
+#: g10/tdbio.c:424
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: dost�p niemo�liwy: %s\n"
 
-#: g10/ringedit.c:298 g10/tdbio.c:445
-#, c-format
-msgid "%s: can't create directory: %s\n"
-msgstr "%s: nie mo�na utworzy� katalogu: %s\n"
-
-#: g10/ringedit.c:304 g10/tdbio.c:448
-#, c-format
-msgid "%s: directory created\n"
-msgstr "%s: katalog utworzony\n"
-
-#: g10/tdbio.c:452
+#: g10/tdbio.c:438
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalog nie istnieje!\n"
 
-#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1350 g10/tdbio.c:458
+#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1335 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: nie mo�na utworzy�: %s\n"
 
-#: g10/tdbio.c:473 g10/tdbio.c:522
+#: g10/tdbio.c:459 g10/tdbio.c:508
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: nie mo�na utworzy� blokady\n"
 
-#: g10/tdbio.c:487
+#: g10/tdbio.c:473
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: utworzenie zapisu o wersji nie powiod�o si�: %s"
 
-#: g10/tdbio.c:491
+#: g10/tdbio.c:477
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: utworzono niepoprawny plik bazy zaufania\n"
 
-#: g10/tdbio.c:494
+#: g10/tdbio.c:480
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: baza zaufania utworzona\n"
 
-#: g10/tdbio.c:531
+#: g10/tdbio.c:517
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: niepoprawny plik bazy zaufania\n"
 
-#: g10/tdbio.c:564
+#: g10/tdbio.c:550
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: tworzenie tablicy skr�t�w nie powiod�o si�: %s\n"
 
-#: g10/tdbio.c:572
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: b��d przy uaktualnianiu numeru wersji: %s\n"
 
-#: g10/tdbio.c:588 g10/tdbio.c:627 g10/tdbio.c:649 g10/tdbio.c:679
-#: g10/tdbio.c:704 g10/tdbio.c:1570 g10/tdbio.c:1597
+#: g10/tdbio.c:574 g10/tdbio.c:613 g10/tdbio.c:635 g10/tdbio.c:665
+#: g10/tdbio.c:690 g10/tdbio.c:1556 g10/tdbio.c:1583
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: b��d odczytu numeru wersji: %s\n"
 
-#: g10/tdbio.c:601 g10/tdbio.c:660
+#: g10/tdbio.c:587 g10/tdbio.c:646
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: b��d zapisu numeru wersji: %s\n"
 
-#: g10/tdbio.c:1249
+#: g10/tdbio.c:1235
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "baza zaufania: procedura lseek() zawiod�a: %s\n"
 
-#: g10/tdbio.c:1257
+#: g10/tdbio.c:1243
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "baza zaufania: procedura read() (n=%d) zawiod�a: %s\n"
 
-#: g10/tdbio.c:1278
+#: g10/tdbio.c:1264
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: to nie jest plik bazy zaufania\n"
 
-#: g10/tdbio.c:1294
+#: g10/tdbio.c:1280
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: wpis wersji z numerem %lu\n"
 
-#: g10/tdbio.c:1299
+#: g10/tdbio.c:1285
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: niew�a�ciwa wersja pliku %d\n"
 
-#: g10/tdbio.c:1603
+#: g10/tdbio.c:1589
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: b��d odczytu wolnego wpisu: %s\n"
 
-#: g10/tdbio.c:1611
+#: g10/tdbio.c:1597
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: b��d zapisu wpisu katalogowego: %s\n"
 
-#: g10/tdbio.c:1621
+#: g10/tdbio.c:1607
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: zerowanie rekordu nie powiod�o si�: %s\n"
 
-#: g10/tdbio.c:1651
+#: g10/tdbio.c:1637
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: dopisanie rekordu nie powiod�o si�: %s\n"
 
-#: g10/tdbio.c:1762
+#: g10/tdbio.c:1748
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "Baza zaufania jest uszkodzona; prosz� uruchomi� \"gpgm --fix-trust-db\".\n"
@@ -3066,67 +3061,67 @@ msgstr "\t%lu kluczy pomini�tych\n"
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu kluczy uaktualnionych\n"
 
-#: g10/trustdb.c:2139
+#: g10/trustdb.c:2143
 msgid "Ooops, no keys\n"
 msgstr "Oops, brak kluczy\n"
 
-#: g10/trustdb.c:2143
+#: g10/trustdb.c:2147
 msgid "Ooops, no user IDs\n"
 msgstr "Oops, brak identyfikator�w u�ytkownik�w\n"
 
-#: g10/trustdb.c:2301
+#: g10/trustdb.c:2305
 #, 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:2310
+#: g10/trustdb.c:2314
 #, 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:2314
+#: g10/trustdb.c:2318
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "Klucz %08lX.%lu: wprowadzony do bazy zaufania\n"
 
-#: g10/trustdb.c:2322
+#: g10/trustdb.c:2326
 #, 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:2336
+#: g10/trustdb.c:2340
 #, 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:2344
+#: g10/trustdb.c:2348
 #, 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:2495
+#: g10/trustdb.c:2499
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "u�ytkownik '%s' nie odnaleziony: %s\n"
 
-#: g10/trustdb.c:2497
+#: g10/trustdb.c:2501
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problem podczas szukania '%s' w bazie zaufania: %s\n"
 
-#: g10/trustdb.c:2500
+#: g10/trustdb.c:2504
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "brak u�ytkownika '%s' w bazie zaufania - dodano\n"
 
-#: g10/trustdb.c:2503
+#: g10/trustdb.c:2507
 #, 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:2689 g10/trustdb.c:2719
+#: g10/trustdb.c:2693 g10/trustdb.c:2723
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "OSTRZE�ENIE: d�ugie wpisy ustawie� jeszcze nie s� obs�ugiwane.\n"
 
@@ -3142,31 +3137,31 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: g10/ringedit.c:318
+#: g10/ringedit.c:303
 #, 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:320 g10/ringedit.c:1340
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: zbi�r kluczy utworzony\n"
 
-#: g10/ringedit.c:1532
+#: g10/ringedit.c:1517
 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:1518
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s pozosta� bez zmian\n"
 
-#: g10/ringedit.c:1534
+#: g10/ringedit.c:1519
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s zosta� utworzony\n"
 
-#: g10/ringedit.c:1535
+#: g10/ringedit.c:1520
 msgid "Please fix this possible security flaw\n"
 msgstr "Prosz� usun�� to naruszenie zasad bezpiecze�stwa\n"
 
@@ -3191,38 +3186,52 @@ msgstr ""
 "podpisy sk�adane tym kluczem nie zapewniaj� bezpiecze�stwa!\n"
 
 #. do not overwrite
-#: g10/openfile.c:72
+#: g10/openfile.c:79
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Plik '%s' ju� istnieje. "
 
-#: g10/openfile.c:74
+#: g10/openfile.c:81
 msgid "Overwrite (y/N)? "
 msgstr "Nadpisa� (t/N)? "
 
-#: g10/openfile.c:102
+#: g10/openfile.c:109
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: nieznana ko�c�wka\n"
 
-#: g10/openfile.c:124
+#: g10/openfile.c:131
 msgid "Enter new filename"
 msgstr "Nazwa pliku"
 
-#: g10/openfile.c:165
+#: g10/openfile.c:172
 msgid "writing to stdout\n"
 msgstr "zapisywanie na wyj�cie standardowe\n"
 
-#: g10/openfile.c:243
+#: g10/openfile.c:250
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "przyj�to obecno�� podpisanych danych w '%s'\n"
 
-#: g10/openfile.c:293
+#: g10/openfile.c:300
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: stworzono nowy plik ustawie�\n"
 
+#: g10/openfile.c:313
+#, c-format
+msgid "%s: can't create directory: %s\n"
+msgstr "%s: nie mo�na utworzy� katalogu: %s\n"
+
+#: g10/openfile.c:316
+#, c-format
+msgid "%s: directory created\n"
+msgstr "%s: katalog utworzony\n"
+
+#: g10/openfile.c:318
+msgid "you have to start GnuPG again, so it can read the new options file\n"
+msgstr ""
+
 #: g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c7e167038..2f6c381d1 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-11-22 11:18+0100\n"
+"POT-Creation-Date: 1999-12-04 14:36+0100\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-20 23:46:36-0200\n"
 "From: Thiago Jung Bauermann <[email protected]>\n"
@@ -294,7 +294,7 @@ msgstr ""
 "para que o sistema possa coletar mais entropia!\n"
 "(S�o necess�rios mais %d bytes)\n"
 
-#: g10/g10.c:188
+#: g10/g10.c:189
 msgid ""
 "@Commands:\n"
 " "
@@ -302,140 +302,145 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:190
+#: g10/g10.c:191
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: g10/g10.c:191
+#: g10/g10.c:192
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:192
+#: g10/g10.c:193
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:193
+#: g10/g10.c:194
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/g10.c:194
+#: g10/g10.c:195
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "sim�trica"
 
-#: g10/g10.c:195
+#: g10/g10.c:196
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/g10.c:196
+#: g10/g10.c:197
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padr�o)"
 
-#: g10/g10.c:197
+#: g10/g10.c:198
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:199
+#: g10/g10.c:200
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:201
+#: g10/g10.c:202
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:202
+#: g10/g10.c:203
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:203
+#: g10/g10.c:204
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/g10.c:204
+#: g10/g10.c:205
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:205
+#: g10/g10.c:206
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:206
+#: g10/g10.c:207
 msgid "remove key from the public keyring"
 msgstr "remover a chave do chaveiro p�blico"
 
-#: g10/g10.c:207
+#: g10/g10.c:209
+#, fuzzy
+msgid "remove key from the secret keyring"
+msgstr "remover a chave do chaveiro p�blico"
+
+#: g10/g10.c:210
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:208
+#: g10/g10.c:211
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:209
+#: g10/g10.c:212
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:210
+#: g10/g10.c:213
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/g10.c:211
+#: g10/g10.c:214
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:212
+#: g10/g10.c:215
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:213
+#: g10/g10.c:216
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:216
+#: g10/g10.c:219
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:218
+#: g10/g10.c:221
 msgid "list only the sequence of packets"
 msgstr "listar apenas as seq��ncias de pacotes"
 
 # ownertrust ???
-#: g10/g10.c:220
+#: g10/g10.c:223
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confian�a"
 
-#: g10/g10.c:222
+#: g10/g10.c:225
 msgid "import ownertrust values"
 msgstr "importar os valores de confian�a"
 
-#: g10/g10.c:224
+#: g10/g10.c:227
 msgid "update the trust database"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/g10.c:226
+#: g10/g10.c:229
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMES]|verificar o banco de dados de confiabilidade"
 
-#: g10/g10.c:227
+#: g10/g10.c:230
 msgid "fix a corrupted trust database"
 msgstr ""
 "consertar um banco de dados de confiabilidade\n"
 "danificado"
 
-#: g10/g10.c:228
+#: g10/g10.c:231
 msgid "De-Armor a file or stdin"
 msgstr "retirar a armadura de um arquivo ou de \"stdin\""
 
-#: g10/g10.c:230
+#: g10/g10.c:233
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um arquivo ou \"stdin\""
 
-#: g10/g10.c:232
+#: g10/g10.c:235
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:236
+#: g10/g10.c:239
 msgid ""
 "@\n"
 "Options:\n"
@@ -445,185 +450,185 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/g10.c:238
+#: g10/g10.c:241
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/g10.c:240
+#: g10/g10.c:243
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/g10.c:243
+#: g10/g10.c:246
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: g10/g10.c:245
+#: g10/g10.c:248
 msgid "use the default key as default recipient"
 msgstr "usar a chave padr�o como destinat�rio padr�o"
 
-#: g10/g10.c:249
+#: g10/g10.c:252
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usu�rio para\n"
 "assinar ou descriptografar"
 
-#: g10/g10.c:250
+#: g10/g10.c:253
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desabilita)"
 
-#: g10/g10.c:252
+#: g10/g10.c:255
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/g10.c:253
+#: g10/g10.c:256
 msgid "use as output file"
 msgstr "usar como arquivo de sa�da"
 
-#: g10/g10.c:254
+#: g10/g10.c:257
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:255
+#: g10/g10.c:258
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:256
+#: g10/g10.c:259
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/g10.c:257
+#: g10/g10.c:260
 msgid "force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: g10/g10.c:258
+#: g10/g10.c:261
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para criptografar"
 
-#: g10/g10.c:259
+#: g10/g10.c:262
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:261
+#: g10/g10.c:264
 msgid "batch mode: never ask"
 msgstr "modo n�o-interativo: nunca perguntar"
 
-#: g10/g10.c:262
+#: g10/g10.c:265
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:263
+#: g10/g10.c:266
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: g10/g10.c:264
+#: g10/g10.c:267
 msgid "add this keyring to the list of keyrings"
 msgstr "adicionar este chaveiro � lista de chaveiros"
 
-#: g10/g10.c:265
+#: g10/g10.c:268
 msgid "add this secret keyring to the list"
 msgstr "adicionar este chaveiro secreto � lista"
 
-#: g10/g10.c:266
+#: g10/g10.c:269
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta padr�o"
 
-#: g10/g10.c:267
+#: g10/g10.c:270
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: g10/g10.c:268
+#: g10/g10.c:271
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/g10.c:269
+#: g10/g10.c:272
 msgid "read options from file"
 msgstr "ler op��es do arquivo"
 
-#: g10/g10.c:271
+#: g10/g10.c:274
 msgid "set debugging flags"
 msgstr "definir par�metros de depura��o"
 
-#: g10/g10.c:272
+#: g10/g10.c:275
 msgid "enable full debugging"
 msgstr "habilitar depura��o completa"
 
-#: g10/g10.c:273
+#: g10/g10.c:276
 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:274
+#: g10/g10.c:277
 msgid "do not write comment packets"
 msgstr "n�o escrever pacotes de coment�rio"
 
-#: g10/g10.c:275
+#: g10/g10.c:278
 msgid "(default is 1)"
 msgstr "(o padr�o � 1)"
 
-#: g10/g10.c:276
+#: g10/g10.c:279
 msgid "(default is 3)"
 msgstr "(o padr�o � 3)"
 
-#: g10/g10.c:278
+#: g10/g10.c:281
 msgid "|FILE|load extension module FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: g10/g10.c:279
+#: g10/g10.c:282
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/g10.c:280
+#: g10/g10.c:283
 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:281
+#: g10/g10.c:284
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar frase secreta modo N"
 
-#: g10/g10.c:283
+#: g10/g10.c:286
 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:285
+#: g10/g10.c:288
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:286
+#: g10/g10.c:289
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:287
+#: g10/g10.c:290
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:288
+#: g10/g10.c:291
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: g10/g10.c:289
+#: g10/g10.c:292
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "eliminar o campo keyid dos pacotes\n"
 "criptografados"
 
-#: g10/g10.c:290
+#: g10/g10.c:293
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALOR|usar estes dados de nota��o"
 
-#: g10/g10.c:292
+#: g10/g10.c:295
 msgid ""
 "@\n"
 "Examples:\n"
@@ -643,15 +648,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:380
+#: g10/g10.c:383
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:384
+#: g10/g10.c:387
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/g10.c:387
+#: g10/g10.c:390
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -661,7 +666,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/g10.c:392
+#: g10/g10.c:397
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -669,185 +674,185 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:470
+#: g10/g10.c:476
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:523
+#: g10/g10.c:529
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/g10.c:662
+#: g10/g10.c:668
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/g10.c:666
+#: g10/g10.c:672
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: g10/g10.c:673
+#: g10/g10.c:679
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/g10.c:855
+#: g10/g10.c:861
 #, 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:910 g10/g10.c:919
+#: g10/g10.c:917 g10/g10.c:926
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/g10.c:912
+#: g10/g10.c:919
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:915
+#: g10/g10.c:922
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:934 g10/g10.c:946
+#: g10/g10.c:941 g10/g10.c:953
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/g10.c:940 g10/g10.c:952
+#: g10/g10.c:947 g10/g10.c:959
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:956
+#: g10/g10.c:963
 msgid "the given policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:959
+#: g10/g10.c:966
 #, 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:961
+#: g10/g10.c:968
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:963
+#: g10/g10.c:970
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:965
+#: g10/g10.c:972
 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:968
+#: g10/g10.c:975
 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:972
+#: g10/g10.c:979
 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:1049
+#: g10/g10.c:1056
 #, 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:1055
+#: g10/g10.c:1062
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/g10.c:1062
+#: g10/g10.c:1069
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:1070
+#: g10/g10.c:1077
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1083
+#: g10/g10.c:1090
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/g10.c:1096
+#: g10/g10.c:1103
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1110
+#: g10/g10.c:1117
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/g10.c:1127
+#: g10/g10.c:1134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1135
+#: g10/g10.c:1142
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:1143
+#: g10/g10.c:1150
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/g10.c:1151
+#: g10/g10.c:1158
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/g10.c:1167
+#: g10/g10.c:1174
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-usu�rio"
 
-#: g10/g10.c:1170
+#: g10/g10.c:1177
 msgid "--delete-key user-id"
 msgstr "--delete-key id-usu�rio"
 
-#: g10/encode.c:260 g10/g10.c:1207 g10/sign.c:366
+#: g10/encode.c:260 g10/g10.c:1214 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/g10.c:1222
+#: g10/g10.c:1229
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usu�rio] [chaveiro]"
 
-#: g10/g10.c:1273
+#: g10/g10.c:1280
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1281
+#: g10/g10.c:1288
 #, 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:1349
+#: g10/g10.c:1356
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/g10.c:1430
+#: g10/g10.c:1437
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/g10.c:1434
+#: g10/g10.c:1441
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1437 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1444 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1613
 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:1612
+#: g10/g10.c:1619
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -855,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:1618
+#: g10/g10.c:1625
 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:1626
+#: g10/g10.c:1633
 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"
 
@@ -923,16 +928,16 @@ msgstr "fim de arquivo prematuro (no \"Trailer\")\n"
 msgid "error in trailer line\n"
 msgstr "erro na linha \"trailer\"\n"
 
-#: g10/armor.c:1007
+#: g10/armor.c:1012
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/armor.c:1012
+#: g10/armor.c:1017
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inv�lida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1016
+#: g10/armor.c:1021
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1141,12 +1146,12 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         N�o se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:700 g10/pkclist.c:722 g10/pkclist.c:847 g10/pkclist.c:892
+#: g10/pkclist.c:700 g10/pkclist.c:722 g10/pkclist.c:848 g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:708 g10/pkclist.c:874
+#: g10/pkclist.c:708 g10/pkclist.c:875
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
@@ -1171,84 +1176,84 @@ msgstr "Identificador de usu�rio inexistente.\n"
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorado: chave p�blica j� marcada como destinat�rio padr�o\n"
 
-#: g10/pkclist.c:784
+#: g10/pkclist.c:785
 msgid "Public key is disabled.\n"
 msgstr "A chave p�blica est� desativada.\n"
 
-#: g10/pkclist.c:791
+#: g10/pkclist.c:792
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "ignorado: chave p�blica j� marcada com --encrypt-to\n"
 
-#: g10/pkclist.c:822
+#: g10/pkclist.c:823
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: g10/pkclist.c:855
+#: g10/pkclist.c:856
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: erro na verifica��o da chave: %s\n"
 
-#: g10/pkclist.c:860
+#: g10/pkclist.c:861
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave p�blica est� desativada\n"
 
-#: g10/pkclist.c:898
+#: g10/pkclist.c:899
 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:387
 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:389
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA e ElGamal (padr�o)\n"
 
-#: g10/keygen.c:389
+#: g10/keygen.c:390
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:391
+#: g10/keygen.c:392
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:392
+#: g10/keygen.c:393
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e criptografia)\n"
 
-#: g10/keygen.c:394
+#: g10/keygen.c:395
 #, 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:400
 msgid "Your selection? "
 msgstr "Sua op��o? "
 
-#: g10/keygen.c:409
+#: g10/keygen.c:410
 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:431
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/keygen.c:442
+#: g10/keygen.c:443
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1261,15 +1266,15 @@ msgstr ""
 "              tamanho padr�o � 1024 bits\n"
 "     tamanho m�ximo sugerido � 2048 bits\n"
 
-#: g10/keygen.c:449
+#: g10/keygen.c:450
 msgid "What keysize do you want? (1024) "
 msgstr "Que tamanho de chave voc� quer? (1024) "
 
-#: g10/keygen.c:454
+#: g10/keygen.c:455
 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:457
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
 
@@ -1281,12 +1286,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:467
 #, 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:472
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1294,11 +1299,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:475
 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:476
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1306,21 +1311,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:484
 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:490
 #, 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:493 g10/keygen.c:497
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:509
+#: g10/keygen.c:510
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1336,35 +1341,35 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:526
+#: g10/keygen.c:527
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:547
+#: g10/keygen.c:548
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:553
 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:559
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:561
+#: g10/keygen.c:562
 msgid ""
-"Your system can't display dates beyond 2036.\n"
+"Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:566
+#: g10/keygen.c:567
 msgid "Is this correct (y/n)? "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:609
+#: g10/keygen.c:610
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1380,44 +1385,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:620
+#: g10/keygen.c:621
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:624
+#: g10/keygen.c:625
 msgid "Invalid character in name\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:626
+#: g10/keygen.c:627
 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:628
+#: g10/keygen.c:629
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:636
+#: g10/keygen.c:637
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:647
+#: g10/keygen.c:648
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:655
+#: g10/keygen.c:656
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:661
+#: g10/keygen.c:662
 msgid "Invalid character in comment\n"
 msgstr "Caractere inv�lido no coment�rio\n"
 
-#: g10/keygen.c:683
+#: g10/keygen.c:684
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:689
+#: g10/keygen.c:690
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1428,15 +1433,15 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:692
+#: g10/keygen.c:693
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:702
+#: g10/keygen.c:703
 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:754
+#: g10/keygen.c:755
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1444,11 +1449,11 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keyedit.c:456 g10/keygen.c:762
+#: g10/keyedit.c:456 g10/keygen.c:763
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keygen.c:768
+#: g10/keygen.c:769
 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"
@@ -1460,7 +1465,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:789
+#: g10/keygen.c:790
 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"
@@ -1472,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:859
+#: g10/keygen.c:860
 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:867
+#: g10/keygen.c:868
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:874
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:883
+#: g10/keygen.c:884
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:885
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:962
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:964
 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"
@@ -1506,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:977 g10/keygen.c:1076
+#: g10/keygen.c:978 g10/keygen.c:1077
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:1021 g10/sig-check.c:312 g10/sign.c:105
+#: g10/keygen.c:1022 g10/sig-check.c:312 g10/sign.c:105
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1519,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:1023 g10/sig-check.c:314 g10/sign.c:107
+#: g10/keygen.c:1024 g10/sig-check.c:314 g10/sign.c:107
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1527,12 +1532,12 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:1054
+#: g10/keygen.c:1055
 msgid "Really create? "
 msgstr "Realmente criar? "
 
-#: g10/encode.c:91 g10/openfile.c:161 g10/openfile.c:270 g10/tdbio.c:468
-#: g10/tdbio.c:529
+#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: imposs�vel abrir: %s\n"
@@ -1699,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:420 g10/openfile.c:213 g10/sign.c:268 g10/sign.c:580
+#: g10/import.c:420 g10/openfile.c:220 g10/sign.c:268 g10/sign.c:580
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
@@ -1827,17 +1832,17 @@ msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:799
+#: g10/import.c:800
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "chave %08lX: aceito ID de usu�rio sem auto-assinatura '"
 
-#: g10/import.c:828
+#: g10/import.c:829
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chave %08lX: ignorado ID de usu�rio '"
 
-#: g10/import.c:851
+#: g10/import.c:852
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
@@ -1846,32 +1851,32 @@ msgstr "chave %08lX: subchave ignorada\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:876
+#: g10/import.c:877
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:885
+#: g10/import.c:886
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
 
-#: g10/import.c:893
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorada\n"
 
-#: g10/import.c:993
+#: g10/import.c:994
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de usu�rio duplicado - unido\n"
 
-#: g10/import.c:1044
+#: g10/import.c:1045
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/import.c:1158 g10/import.c:1211
+#: g10/import.c:1159 g10/import.c:1212
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "chave %08lX: nossa c�pia n�o tem auto-assinatura\n"
@@ -2486,43 +2491,43 @@ msgstr "Nota��o: "
 msgid "Policy: "
 msgstr "Pol�tica: "
 
-#: g10/mainproc.c:1035
+#: g10/mainproc.c:1037
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1041
+#: g10/mainproc.c:1043
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1067 g10/mainproc.c:1078
+#: g10/mainproc.c:1069 g10/mainproc.c:1080
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRETA de \""
 
-#: g10/mainproc.c:1068 g10/mainproc.c:1079
+#: g10/mainproc.c:1070 g10/mainproc.c:1081
 msgid "Good signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1070
+#: g10/mainproc.c:1072
 msgid "                aka \""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1126
+#: g10/mainproc.c:1128
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1189
 #, fuzzy, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "classe de assinatura desconhecida"
 
-#: g10/mainproc.c:1226
+#: g10/mainproc.c:1228
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1231
+#: g10/mainproc.c:1233
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -2707,137 +2712,127 @@ msgstr "imposs�vel manipular linhas de texto maiores que %d caracteres\n"
 msgid "input line longer than %d characters\n"
 msgstr "linha de entrada maior que %d caracteres\n"
 
-#: g10/tdbio.c:121 g10/tdbio.c:1637
+#: g10/tdbio.c:116 g10/tdbio.c:1623
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "banco de dados de confiabilidade rec %lu: lseek falhou: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1644
+#: g10/tdbio.c:122 g10/tdbio.c:1630
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "banco de dados de confiabilidade rec %lu: escrita falhou (n=%d): %s\n"
 
-#: g10/tdbio.c:237
+#: g10/tdbio.c:232
 msgid "trustdb transaction too large\n"
 msgstr "transa��o de banco de dados de confiabilidade muito grande\n"
 
-#: g10/tdbio.c:429
+#: g10/tdbio.c:424
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: imposs�vel acessar: %s\n"
 
-#: g10/ringedit.c:298 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
-#, c-format
-msgid "%s: directory created\n"
-msgstr "%s: diret�rio criado\n"
-
-#: g10/tdbio.c:452
+#: g10/tdbio.c:438
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diret�rio inexistente!\n"
 
-#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1350 g10/tdbio.c:458
+#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1335 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: imposs�vel criar: %s\n"
 
-#: g10/tdbio.c:473 g10/tdbio.c:522
+#: g10/tdbio.c:459 g10/tdbio.c:508
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: imposs�vel criar trava\n"
 
-#: g10/tdbio.c:487
+#: g10/tdbio.c:473
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: falha ao criar registro de vers�o: %s"
 
-#: g10/tdbio.c:491
+#: g10/tdbio.c:477
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: banco de dados de confiabilidade inv�lido criado\n"
 
-#: g10/tdbio.c:494
+#: g10/tdbio.c:480
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: banco de dados de confiabilidade criado\n"
 
-#: g10/tdbio.c:531
+#: g10/tdbio.c:517
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: banco de dados de confiabilidade inv�lido\n"
 
-#: g10/tdbio.c:564
+#: g10/tdbio.c:550
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: g10/tdbio.c:572
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro atualizando registro de vers�o: %s\n"
 
-#: g10/tdbio.c:588 g10/tdbio.c:627 g10/tdbio.c:649 g10/tdbio.c:679
-#: g10/tdbio.c:704 g10/tdbio.c:1570 g10/tdbio.c:1597
+#: g10/tdbio.c:574 g10/tdbio.c:613 g10/tdbio.c:635 g10/tdbio.c:665
+#: g10/tdbio.c:690 g10/tdbio.c:1556 g10/tdbio.c:1583
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro lendo registro de vers�o: %s\n"
 
-#: g10/tdbio.c:601 g10/tdbio.c:660
+#: g10/tdbio.c:587 g10/tdbio.c:646
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro escrevendo registro de vers�o: %s\n"
 
-#: g10/tdbio.c:1249
+#: g10/tdbio.c:1235
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "banco de dados de confiabilidade: lseek falhou: %s\n"
 
-#: g10/tdbio.c:1257
+#: g10/tdbio.c:1243
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "banco de dados de confiabilidade: leitura falhou (n=%d): %s\n"
 
-#: g10/tdbio.c:1278
+#: g10/tdbio.c:1264
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/tdbio.c:1294
+#: g10/tdbio.c:1280
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registro de vers�o com recnum %lu\n"
 
-#: g10/tdbio.c:1299
+#: g10/tdbio.c:1285
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vers�o de arquivo inv�lida %d\n"
 
-#: g10/tdbio.c:1603
+#: g10/tdbio.c:1589
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro lendo registro livre: %s\n"
 
-#: g10/tdbio.c:1611
+#: g10/tdbio.c:1597
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro escrevendo registro de diret�rio: %s\n"
 
-#: g10/tdbio.c:1621
+#: g10/tdbio.c:1607
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: falha ao zerar um registro: %s\n"
 
-#: g10/tdbio.c:1651
+#: g10/tdbio.c:1637
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: falha ao anexar um registro: %s\n"
 
-#: g10/tdbio.c:1762
+#: g10/tdbio.c:1748
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "O banco de dados de confiabilidade est� danificado; por favor rode\n"
@@ -3065,67 +3060,67 @@ msgstr "\t%lu chaves ignoradas\n"
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu chaves atualizadas\n"
 
-#: g10/trustdb.c:2139
+#: g10/trustdb.c:2143
 msgid "Ooops, no keys\n"
 msgstr "Ooops, nenhuma chave\n"
 
-#: g10/trustdb.c:2143
+#: g10/trustdb.c:2147
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, nenhum ID de usu�rio\n"
 
-#: g10/trustdb.c:2301
+#: g10/trustdb.c:2305
 #, 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:2310
+#: g10/trustdb.c:2314
 #, 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:2314
+#: g10/trustdb.c:2318
 #, 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:2322
+#: g10/trustdb.c:2326
 #, 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:2336
+#: g10/trustdb.c:2340
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "chave %08lX.%lu: expirou em %s\n"
 
-#: g10/trustdb.c:2344
+#: g10/trustdb.c:2348
 #, 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:2495
+#: g10/trustdb.c:2499
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/trustdb.c:2497
+#: g10/trustdb.c:2501
 #, 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:2500
+#: g10/trustdb.c:2504
 #, 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:2503
+#: g10/trustdb.c:2507
 #, 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:2689 g10/trustdb.c:2719
+#: g10/trustdb.c:2693 g10/trustdb.c:2723
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "AVISO: ainda � imposs�vel manipular registros de prefer�ncias longos\n"
 
@@ -3141,31 +3136,31 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr "linha %u muito longa ou sem LF\n"
 
-#: g10/ringedit.c:318
+#: g10/ringedit.c:303
 #, 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:320 g10/ringedit.c:1340
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro criado\n"
 
-#: g10/ringedit.c:1532
+#: g10/ringedit.c:1517
 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:1518
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o n�o modificado\n"
 
-#: g10/ringedit.c:1534
+#: g10/ringedit.c:1519
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/ringedit.c:1535
+#: g10/ringedit.c:1520
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte este poss�vel furo de seguran�a\n"
 
@@ -3190,38 +3185,52 @@ msgstr ""
 "para assinaturas!\n"
 
 #. do not overwrite
-#: g10/openfile.c:72
+#: g10/openfile.c:79
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Arquivo `%s' j� existe. "
 
-#: g10/openfile.c:74
+#: g10/openfile.c:81
 msgid "Overwrite (y/N)? "
 msgstr "Sobrescrever (s/N)? "
 
-#: g10/openfile.c:102
+#: g10/openfile.c:109
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufixo desconhecido\n"
 
-#: g10/openfile.c:124
+#: g10/openfile.c:131
 msgid "Enter new filename"
 msgstr "Digite novo nome de arquivo"
 
-#: g10/openfile.c:165
+#: g10/openfile.c:172
 msgid "writing to stdout\n"
 msgstr "escrevendo em \"stdout\"\n"
 
-#: g10/openfile.c:243
+#: g10/openfile.c:250
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "assumindo dados assinados em `%s'\n"
 
-#: g10/openfile.c:293
+#: g10/openfile.c:300
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
+#: g10/openfile.c:313
+#, c-format
+msgid "%s: can't create directory: %s\n"
+msgstr "%s: imposs�vel criar diret�rio: %s\n"
+
+#: g10/openfile.c:316
+#, c-format
+msgid "%s: directory created\n"
+msgstr "%s: diret�rio criado\n"
+
+#: g10/openfile.c:318
+msgid "you have to start GnuPG again, so it can read the new options file\n"
+msgstr ""
+
 #: g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 0d3ec2ffd..52131e84a 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-11-22 11:18+0100\n"
+"POT-Creation-Date: 1999-12-04 14:36+0100\n"
 "PO-Revision-Date: 1999-09-09 20:28+0000\n"
 "Last-Translator: Pedro Morais <[email protected]>\n"
 "Language-Team: pt\n"
@@ -288,7 +288,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:188
+#: g10/g10.c:189
 msgid ""
 "@Commands:\n"
 " "
@@ -296,136 +296,141 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:190
+#: g10/g10.c:191
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: g10/g10.c:191
+#: g10/g10.c:192
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:192
+#: g10/g10.c:193
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:193
+#: g10/g10.c:194
 msgid "encrypt data"
 msgstr "encriptar dados"
 
-#: g10/g10.c:194
+#: g10/g10.c:195
 msgid "encryption only with symmetric cipher"
 msgstr "encriptar apenas com cifra sim�trica"
 
-#: g10/g10.c:195
+#: g10/g10.c:196
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/g10.c:196
+#: g10/g10.c:197
 msgid "decrypt data (default)"
 msgstr "desencriptar dados (ac��o por omiss�o)"
 
-#: g10/g10.c:197
+#: g10/g10.c:198
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:199
+#: g10/g10.c:200
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:201
+#: g10/g10.c:202
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:202
+#: g10/g10.c:203
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:203
+#: g10/g10.c:204
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/g10.c:204
+#: g10/g10.c:205
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:205
+#: g10/g10.c:206
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:206
+#: g10/g10.c:207
 msgid "remove key from the public keyring"
 msgstr "remover a chave do porta-chaves p�blico"
 
-#: g10/g10.c:207
+#: g10/g10.c:209
+#, fuzzy
+msgid "remove key from the secret keyring"
+msgstr "remover a chave do porta-chaves p�blico"
+
+#: g10/g10.c:210
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:208
+#: g10/g10.c:211
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:209
+#: g10/g10.c:212
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:210
+#: g10/g10.c:213
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/g10.c:211
+#: g10/g10.c:214
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:212
+#: g10/g10.c:215
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:213
+#: g10/g10.c:216
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:216
+#: g10/g10.c:219
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:218
+#: g10/g10.c:221
 msgid "list only the sequence of packets"
 msgstr "listar apenas as sequ�ncias de pacotes"
 
 # ownertrust ???
-#: g10/g10.c:220
+#: g10/g10.c:223
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confian�a"
 
-#: g10/g10.c:222
+#: g10/g10.c:225
 msgid "import ownertrust values"
 msgstr "importar os valores de confian�a"
 
-#: g10/g10.c:224
+#: g10/g10.c:227
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confian�a"
 
-#: g10/g10.c:226
+#: g10/g10.c:229
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMES]|verificar a base de dados de confian�a"
 
-#: g10/g10.c:227
+#: g10/g10.c:230
 msgid "fix a corrupted trust database"
 msgstr "consertar uma base de dados de confian�a"
 
-#: g10/g10.c:228
+#: g10/g10.c:231
 msgid "De-Armor a file or stdin"
 msgstr "retirar armadura de um ficheiro ou do \"stdin\""
 
-#: g10/g10.c:230
+#: g10/g10.c:233
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um ficheiro ou \"stdin\""
 
-#: g10/g10.c:232
+#: g10/g10.c:235
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:236
+#: g10/g10.c:239
 msgid ""
 "@\n"
 "Options:\n"
@@ -435,185 +440,185 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/g10.c:238
+#: g10/g10.c:241
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/g10.c:240
+#: g10/g10.c:243
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|encriptar para NOME"
 
-#: g10/g10.c:243
+#: g10/g10.c:246
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: g10/g10.c:245
+#: g10/g10.c:248
 msgid "use the default key as default recipient"
 msgstr "usar a chave padr�o como destinat�rio padr�o"
 
-#: g10/g10.c:249
+#: g10/g10.c:252
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou desencriptar"
 
-#: g10/g10.c:250
+#: g10/g10.c:253
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desactiva)"
 
-#: g10/g10.c:252
+#: g10/g10.c:255
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/g10.c:253
+#: g10/g10.c:256
 msgid "use as output file"
 msgstr "usar como ficheiro de sa�da"
 
-#: g10/g10.c:254
+#: g10/g10.c:257
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:255
+#: g10/g10.c:258
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:256
+#: g10/g10.c:259
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/g10.c:257
+#: g10/g10.c:260
 msgid "force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: g10/g10.c:258
+#: g10/g10.c:261
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para encriptar"
 
-#: g10/g10.c:259
+#: g10/g10.c:262
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:261
+#: g10/g10.c:264
 msgid "batch mode: never ask"
 msgstr "modo n�o-interactivo: nunca perguntar"
 
-#: g10/g10.c:262
+#: g10/g10.c:265
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:263
+#: g10/g10.c:266
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: g10/g10.c:264
+#: g10/g10.c:267
 msgid "add this keyring to the list of keyrings"
 msgstr ""
 "adicionar este porta-chaves\n"
 "� lista de porta-chaves"
 
-#: g10/g10.c:265
+#: g10/g10.c:268
 msgid "add this secret keyring to the list"
 msgstr "adicionar este porta-chaves secreto � lista"
 
-#: g10/g10.c:266
+#: g10/g10.c:269
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta por omiss�o"
 
-#: g10/g10.c:267
+#: g10/g10.c:270
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: g10/g10.c:268
+#: g10/g10.c:271
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/g10.c:269
+#: g10/g10.c:272
 msgid "read options from file"
 msgstr "ler op��es do ficheiro"
 
-#: g10/g10.c:271
+#: g10/g10.c:274
 msgid "set debugging flags"
 msgstr "definir par�metros de depura��o"
 
-#: g10/g10.c:272
+#: g10/g10.c:275
 msgid "enable full debugging"
 msgstr "habilitar depura��o completa"
 
-#: g10/g10.c:273
+#: g10/g10.c:276
 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:274
+#: g10/g10.c:277
 msgid "do not write comment packets"
 msgstr "n�o escrever pacotes de coment�rio"
 
-#: g10/g10.c:275
+#: g10/g10.c:278
 msgid "(default is 1)"
 msgstr "(por omiss�o 1)"
 
-#: g10/g10.c:276
+#: g10/g10.c:279
 msgid "(default is 3)"
 msgstr "(por omiss�o 3)"
 
-#: g10/g10.c:278
+#: g10/g10.c:281
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: g10/g10.c:279
+#: g10/g10.c:282
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/g10.c:280
+#: g10/g10.c:283
 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:281
+#: g10/g10.c:284
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar mode de frase secreta N"
 
-#: g10/g10.c:283
+#: g10/g10.c:286
 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:285
+#: g10/g10.c:288
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:286
+#: g10/g10.c:289
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:287
+#: g10/g10.c:290
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:288
+#: g10/g10.c:291
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: g10/g10.c:289
+#: g10/g10.c:292
 msgid "throw keyid field of encrypted packets"
 msgstr "eliminar campo keyid dos pacotes encriptados"
 
-#: g10/g10.c:290
+#: g10/g10.c:293
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALOR|usar estes dados de nota��o"
 
-#: g10/g10.c:292
+#: g10/g10.c:295
 msgid ""
 "@\n"
 "Examples:\n"
@@ -633,15 +638,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:380
+#: g10/g10.c:383
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:384
+#: g10/g10.c:387
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/g10.c:387
+#: g10/g10.c:390
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -651,7 +656,7 @@ msgstr ""
 "assina, verifica, encripta ou desencripta\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/g10.c:392
+#: g10/g10.c:397
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -659,185 +664,185 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:470
+#: g10/g10.c:476
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:523
+#: g10/g10.c:529
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/g10.c:662
+#: g10/g10.c:668
 #, 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:666
+#: g10/g10.c:672
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: g10/g10.c:673
+#: g10/g10.c:679
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/g10.c:855
+#: g10/g10.c:861
 #, 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:910 g10/g10.c:919
+#: g10/g10.c:917 g10/g10.c:926
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/g10.c:912
+#: g10/g10.c:919
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:915
+#: g10/g10.c:922
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:934 g10/g10.c:946
+#: g10/g10.c:941 g10/g10.c:953
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado n�o � v�lido\n"
 
-#: g10/g10.c:940 g10/g10.c:952
+#: g10/g10.c:947 g10/g10.c:959
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:956
+#: g10/g10.c:963
 msgid "the given policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:959
+#: g10/g10.c:966
 #, 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:961
+#: g10/g10.c:968
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:963
+#: g10/g10.c:970
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:965
+#: g10/g10.c:972
 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:968
+#: g10/g10.c:975
 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:972
+#: g10/g10.c:979
 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:1049
+#: g10/g10.c:1056
 #, 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:1055
+#: g10/g10.c:1062
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/g10.c:1062
+#: g10/g10.c:1069
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:1070
+#: g10/g10.c:1077
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1083
+#: g10/g10.c:1090
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/g10.c:1096
+#: g10/g10.c:1103
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1110
+#: g10/g10.c:1117
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/g10.c:1127
+#: g10/g10.c:1134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1135
+#: g10/g10.c:1142
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/g10.c:1143
+#: g10/g10.c:1150
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/g10.c:1151
+#: g10/g10.c:1158
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/g10.c:1167
+#: g10/g10.c:1174
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-utilizador"
 
-#: g10/g10.c:1170
+#: g10/g10.c:1177
 msgid "--delete-key user-id"
 msgstr "--delete-key id-utilizador"
 
-#: g10/encode.c:260 g10/g10.c:1207 g10/sign.c:366
+#: g10/encode.c:260 g10/g10.c:1214 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/g10.c:1222
+#: g10/g10.c:1229
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/g10.c:1273
+#: g10/g10.c:1280
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1281
+#: g10/g10.c:1288
 #, 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:1349
+#: g10/g10.c:1356
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/g10.c:1430
+#: g10/g10.c:1437
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/g10.c:1434
+#: g10/g10.c:1441
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1437 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1444 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1613
 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:1612
+#: g10/g10.c:1619
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -845,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:1618
+#: g10/g10.c:1625
 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:1626
+#: g10/g10.c:1633
 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"
 
@@ -913,16 +918,16 @@ msgstr "fim de ficheiro prematuro (no \"Trailer\")\n"
 msgid "error in trailer line\n"
 msgstr "erro na linha \"trailer\"\n"
 
-#: g10/armor.c:1007
+#: g10/armor.c:1012
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/armor.c:1012
+#: g10/armor.c:1017
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inv�lida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1016
+#: g10/armor.c:1021
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1131,12 +1136,12 @@ msgstr ""
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         N�o se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:700 g10/pkclist.c:722 g10/pkclist.c:847 g10/pkclist.c:892
+#: g10/pkclist.c:700 g10/pkclist.c:722 g10/pkclist.c:848 g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:708 g10/pkclist.c:874
+#: g10/pkclist.c:708 g10/pkclist.c:875
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
@@ -1161,84 +1166,84 @@ msgstr "Identificador de utilizador inexistente.\n"
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorado: chave p�blica j� colocada como destinat�rio por omiss�o\n"
 
-#: g10/pkclist.c:784
+#: g10/pkclist.c:785
 msgid "Public key is disabled.\n"
 msgstr "A chave p�blica est� desativada.\n"
 
-#: g10/pkclist.c:791
+#: g10/pkclist.c:792
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr "ignorado: a chave p�blica j� colocada com --encrypt-to\n"
 
-#: g10/pkclist.c:822
+#: g10/pkclist.c:823
 #, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: g10/pkclist.c:855
+#: g10/pkclist.c:856
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: erro na verifica��o da chave: %s\n"
 
-#: g10/pkclist.c:860
+#: g10/pkclist.c:861
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave p�blica est� desactivada\n"
 
-#: g10/pkclist.c:898
+#: g10/pkclist.c:899
 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:387
 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:389
 #, 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:390
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:391
+#: g10/keygen.c:392
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas encrip��o)\n"
 
-#: g10/keygen.c:392
+#: g10/keygen.c:393
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (assinatura e encripta��o)\n"
 
-#: g10/keygen.c:394
+#: g10/keygen.c:395
 #, c-format
 msgid "   (%d) ElGamal in a v3 packet\n"
 msgstr "   (%d) ElGamal num pacote v3\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:400
 msgid "Your selection? "
 msgstr "Op��o? "
 
-#: g10/keygen.c:409
+#: g10/keygen.c:410
 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:431
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/keygen.c:442
+#: g10/keygen.c:443
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1251,15 +1256,15 @@ msgstr ""
 "         tamanho por omiss�o � 1024 bits\n"
 "     tamanho m�ximo sugerido � 2048 bits\n"
 
-#: g10/keygen.c:449
+#: g10/keygen.c:450
 msgid "What keysize do you want? (1024) "
 msgstr "Qual o tamanho de chave desejado? (1024) "
 
-#: g10/keygen.c:454
+#: g10/keygen.c:455
 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:457
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
 
@@ -1271,12 +1276,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:467
 #, 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:472
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1284,11 +1289,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:475
 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:476
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1296,21 +1301,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:484
 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:490
 #, 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:493 g10/keygen.c:497
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:509
+#: g10/keygen.c:510
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1326,35 +1331,35 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:526
+#: g10/keygen.c:527
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:547
+#: g10/keygen.c:548
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:553
 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:559
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:561
+#: g10/keygen.c:562
 msgid ""
-"Your system can't display dates beyond 2036.\n"
+"Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:566
+#: g10/keygen.c:567
 msgid "Is this correct (y/n)? "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:609
+#: g10/keygen.c:610
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1371,44 +1376,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:620
+#: g10/keygen.c:621
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:624
+#: g10/keygen.c:625
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido no nome\n"
 
-#: g10/keygen.c:626
+#: g10/keygen.c:627
 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:628
+#: g10/keygen.c:629
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:636
+#: g10/keygen.c:637
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:647
+#: g10/keygen.c:648
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:655
+#: g10/keygen.c:656
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:661
+#: g10/keygen.c:662
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido no coment�rio\n"
 
-#: g10/keygen.c:683
+#: g10/keygen.c:684
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:689
+#: g10/keygen.c:690
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1419,15 +1424,15 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:692
+#: g10/keygen.c:693
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:702
+#: g10/keygen.c:703
 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:754
+#: g10/keygen.c:755
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1435,11 +1440,11 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keyedit.c:456 g10/keygen.c:762
+#: g10/keyedit.c:456 g10/keygen.c:763
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keygen.c:768
+#: g10/keygen.c:769
 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 +1456,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:789
+#: g10/keygen.c:790
 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 +1468,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:859
+#: g10/keygen.c:860
 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:867
+#: g10/keygen.c:868
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:874
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:883
+#: g10/keygen.c:884
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:885
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:962
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:964
 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 +1502,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:977 g10/keygen.c:1076
+#: g10/keygen.c:978 g10/keygen.c:1077
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:1021 g10/sig-check.c:312 g10/sign.c:105
+#: g10/keygen.c:1022 g10/sig-check.c:312 g10/sign.c:105
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1510,7 +1515,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:1023 g10/sig-check.c:314 g10/sign.c:107
+#: g10/keygen.c:1024 g10/sig-check.c:314 g10/sign.c:107
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1518,12 +1523,12 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:1054
+#: g10/keygen.c:1055
 msgid "Really create? "
 msgstr "Realmente criar? "
 
-#: g10/encode.c:91 g10/openfile.c:161 g10/openfile.c:270 g10/tdbio.c:468
-#: g10/tdbio.c:529
+#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: imposs�vel abrir: %s\n"
@@ -1690,7 +1695,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:420 g10/openfile.c:213 g10/sign.c:268 g10/sign.c:580
+#: g10/import.c:420 g10/openfile.c:220 g10/sign.c:268 g10/sign.c:580
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "a escrever para `%s'\n"
@@ -1818,17 +1823,17 @@ msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:799
+#: g10/import.c:800
 #, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '"
 
-#: g10/import.c:828
+#: g10/import.c:829
 #, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "chave %08lX: ignorado ID de utilizador '"
 
-#: g10/import.c:851
+#: g10/import.c:852
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
@@ -1837,32 +1842,32 @@ msgstr "chave %08lX: subchave ignorada\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:876
+#: g10/import.c:877
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:885
+#: g10/import.c:886
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorado\n"
 
-#: g10/import.c:893
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorado\n"
 
-#: g10/import.c:993
+#: g10/import.c:994
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
 
-#: g10/import.c:1044
+#: g10/import.c:1045
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/import.c:1158 g10/import.c:1211
+#: g10/import.c:1159 g10/import.c:1212
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "chave %08lX: a nossa c�pia n�o tem auto-assinatura\n"
@@ -2474,43 +2479,43 @@ msgstr "Nota��o: "
 msgid "Policy: "
 msgstr "Pol�tica: "
 
-#: g10/mainproc.c:1035
+#: g10/mainproc.c:1037
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1041
+#: g10/mainproc.c:1043
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1067 g10/mainproc.c:1078
+#: g10/mainproc.c:1069 g10/mainproc.c:1080
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1068 g10/mainproc.c:1079
+#: g10/mainproc.c:1070 g10/mainproc.c:1081
 msgid "Good signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1070
+#: g10/mainproc.c:1072
 msgid "                aka \""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1126
+#: g10/mainproc.c:1128
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1189
 #, fuzzy, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "classe de assinatura desconhecida"
 
-#: g10/mainproc.c:1226
+#: g10/mainproc.c:1228
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1231
+#: g10/mainproc.c:1233
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -2695,137 +2700,127 @@ msgstr "imposs�vel manipular linhas de texto maiores que %d caracteres\n"
 msgid "input line longer than %d characters\n"
 msgstr "linha de entrada maior que %d caracteres\n"
 
-#: g10/tdbio.c:121 g10/tdbio.c:1637
+#: g10/tdbio.c:116 g10/tdbio.c:1623
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "base de dados de confian�a rec %lu: lseek falhou: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1644
+#: g10/tdbio.c:122 g10/tdbio.c:1630
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "base de dados de confian�a rec %lu: escrita falhou (n=%d): %s\n"
 
-#: g10/tdbio.c:237
+#: g10/tdbio.c:232
 msgid "trustdb transaction too large\n"
 msgstr "transa��o de base de dados de confian�a muito grande\n"
 
-#: g10/tdbio.c:429
+#: g10/tdbio.c:424
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: imposs�vel aceder: %s\n"
 
-#: g10/ringedit.c:298 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
-#, c-format
-msgid "%s: directory created\n"
-msgstr "%s: directoria criada\n"
-
-#: g10/tdbio.c:452
+#: g10/tdbio.c:438
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diretoria inexistente!\n"
 
-#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1350 g10/tdbio.c:458
+#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1335 g10/tdbio.c:444
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: imposs�vel criar: %s\n"
 
-#: g10/tdbio.c:473 g10/tdbio.c:522
+#: g10/tdbio.c:459 g10/tdbio.c:508
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: imposs�vel criar tranca\n"
 
-#: g10/tdbio.c:487
+#: g10/tdbio.c:473
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: falha ao criar registo de vers�o: %s"
 
-#: g10/tdbio.c:491
+#: g10/tdbio.c:477
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: base de dados de confian�a inv�lida criada\n"
 
-#: g10/tdbio.c:494
+#: g10/tdbio.c:480
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: base de dados de confian�a criada\n"
 
-#: g10/tdbio.c:531
+#: g10/tdbio.c:517
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de dados de confian�a inv�lida\n"
 
-#: g10/tdbio.c:564
+#: g10/tdbio.c:550
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: g10/tdbio.c:572
+#: g10/tdbio.c:558
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro a actualizar registo de vers�o: %s\n"
 
-#: g10/tdbio.c:588 g10/tdbio.c:627 g10/tdbio.c:649 g10/tdbio.c:679
-#: g10/tdbio.c:704 g10/tdbio.c:1570 g10/tdbio.c:1597
+#: g10/tdbio.c:574 g10/tdbio.c:613 g10/tdbio.c:635 g10/tdbio.c:665
+#: g10/tdbio.c:690 g10/tdbio.c:1556 g10/tdbio.c:1583
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro ao ler registo de vers�o: %s\n"
 
-#: g10/tdbio.c:601 g10/tdbio.c:660
+#: g10/tdbio.c:587 g10/tdbio.c:646
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro ao escrever registo de vers�o: %s\n"
 
-#: g10/tdbio.c:1249
+#: g10/tdbio.c:1235
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de dados de confian�a: lseek falhou: %s\n"
 
-#: g10/tdbio.c:1257
+#: g10/tdbio.c:1243
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de dados de confian�a: leitura falhou (n=%d): %s\n"
 
-#: g10/tdbio.c:1278
+#: g10/tdbio.c:1264
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: n�o � um base de dados de confian�a\n"
 
-#: g10/tdbio.c:1294
+#: g10/tdbio.c:1280
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registo de vers�o com recnum %lu\n"
 
-#: g10/tdbio.c:1299
+#: g10/tdbio.c:1285
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/tdbio.c:1603
+#: g10/tdbio.c:1589
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: g10/tdbio.c:1611
+#: g10/tdbio.c:1597
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro ao escrever registo de diret�rio: %s\n"
 
-#: g10/tdbio.c:1621
+#: g10/tdbio.c:1607
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: falha ao zerar um registo: %s\n"
 
-#: g10/tdbio.c:1651
+#: g10/tdbio.c:1637
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: falha ao anexar um registo: %s\n"
 
-#: g10/tdbio.c:1762
+#: g10/tdbio.c:1748
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 "A base de dados de confian�a est� danificada; por favor execute\n"
@@ -3052,67 +3047,67 @@ msgstr "\t%lu chaves ignoradas\n"
 msgid "\t%lu keys updated\n"
 msgstr "\t%lu chaves actualizadas\n"
 
-#: g10/trustdb.c:2139
+#: g10/trustdb.c:2143
 msgid "Ooops, no keys\n"
 msgstr "Ooops, nenhuma chave\n"
 
-#: g10/trustdb.c:2143
+#: g10/trustdb.c:2147
 msgid "Ooops, no user IDs\n"
 msgstr "Ooops, nenhum ID de utilizador\n"
 
-#: g10/trustdb.c:2301
+#: g10/trustdb.c:2305
 #, 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:2310
+#: g10/trustdb.c:2314
 #, 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:2314
+#: g10/trustdb.c:2318
 #, 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:2322
+#: g10/trustdb.c:2326
 #, 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:2336
+#: g10/trustdb.c:2340
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "chave %08lX.%lu: expirou em %s\n"
 
-#: g10/trustdb.c:2344
+#: g10/trustdb.c:2348
 #, 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:2495
+#: g10/trustdb.c:2499
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "utilizador `%s' n�o encontrado: %s\n"
 
-#: g10/trustdb.c:2497
+#: g10/trustdb.c:2501
 #, 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:2500
+#: g10/trustdb.c:2504
 #, 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:2503
+#: g10/trustdb.c:2507
 #, 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:2689 g10/trustdb.c:2719
+#: g10/trustdb.c:2693 g10/trustdb.c:2723
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "AVISO: ainda � imposs�vel manipular registos de prefer�ncias longos\n"
 
@@ -3128,31 +3123,31 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: g10/ringedit.c:318
+#: g10/ringedit.c:303
 #, 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:320 g10/ringedit.c:1340
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: porta-chaves criado\n"
 
-#: g10/ringedit.c:1532
+#: g10/ringedit.c:1517
 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:1518
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o n�o modificado\n"
 
-#: g10/ringedit.c:1534
+#: g10/ringedit.c:1519
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/ringedit.c:1535
+#: g10/ringedit.c:1520
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte esta poss�vel falha de seguran�a\n"
 
@@ -3176,38 +3171,52 @@ msgstr ""
 "para assinaturas!\n"
 
 #. do not overwrite
-#: g10/openfile.c:72
+#: g10/openfile.c:79
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Arquivo `%s' j� existe. "
 
-#: g10/openfile.c:74
+#: g10/openfile.c:81
 msgid "Overwrite (y/N)? "
 msgstr "Escrever por cima (s/N)? "
 
-#: g10/openfile.c:102
+#: g10/openfile.c:109
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufixo desconhecido\n"
 
-#: g10/openfile.c:124
+#: g10/openfile.c:131
 msgid "Enter new filename"
 msgstr "Digite novo nome de ficheiro"
 
-#: g10/openfile.c:165
+#: g10/openfile.c:172
 msgid "writing to stdout\n"
 msgstr "a escrever em \"stdout\"\n"
 
-#: g10/openfile.c:243
+#: g10/openfile.c:250
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "a assumir dados assinados em `%s'\n"
 
-#: g10/openfile.c:293
+#: g10/openfile.c:300
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: novo ficheiro de op��es criado\n"
 
+#: g10/openfile.c:313
+#, c-format
+msgid "%s: can't create directory: %s\n"
+msgstr "%s: imposs�vel criar directoria: %s\n"
+
+#: g10/openfile.c:316
+#, c-format
+msgid "%s: directory created\n"
+msgstr "%s: directoria criada\n"
+
+#: g10/openfile.c:318
+msgid "you have to start GnuPG again, so it can read the new options file\n"
+msgstr ""
+
 #: g10/encr-data.c:66
 #, c-format
 msgid "%s encrypted data\n"
diff --git a/po/ru.po b/po/ru.po
index b7f440073..0d0baaf85 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-11-22 11:18+0100\n"
+"POT-Creation-Date: 1999-12-04 14:36+0100\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-01-26 22:08:36+0100\n"
 "From: Gregory Steuck <[email protected]>\n"
@@ -343,7 +343,7 @@ msgstr ""
 "������������ ��������� ������. ����������, ��������� ���-������, �����\n"
 "�� ����� ������� �������������� ��������� �����! (����� ��� %d ����)\n"
 
-#: g10/g10.c:188
+#: g10/g10.c:189
 msgid ""
 "@Commands:\n"
 " "
@@ -351,142 +351,147 @@ msgstr ""
 "@�������:\n"
 " "
 
-#: g10/g10.c:190
+#: g10/g10.c:191
 #, fuzzy
 msgid "|[file]|make a signature"
 msgstr "|[����]|������� �������"
 
-#: g10/g10.c:191
+#: g10/g10.c:192
 #, fuzzy
 msgid "|[file]|make a clear text signature"
 msgstr "|[����]|������� ��������� �������"
 
-#: g10/g10.c:192
+#: g10/g10.c:193
 msgid "make a detached signature"
 msgstr "������� ��������� �������"
 
-#: g10/g10.c:193
+#: g10/g10.c:194
 msgid "encrypt data"
 msgstr "����������� ������"
 
-#: g10/g10.c:194
+#: g10/g10.c:195
 msgid "encryption only with symmetric cipher"
 msgstr "����������� ������������ ����������"
 
-#: g10/g10.c:195
+#: g10/g10.c:196
 msgid "store only"
 msgstr "������ ���������"
 
-#: g10/g10.c:196
+#: g10/g10.c:197
 msgid "decrypt data (default)"
 msgstr "������������ ������ (�� ���������)"
 
-#: g10/g10.c:197
+#: g10/g10.c:198
 msgid "verify a signature"
 msgstr "��������� �������"
 
-#: g10/g10.c:199
+#: g10/g10.c:200
 msgid "list keys"
 msgstr "������ ������"
 
-#: g10/g10.c:201
+#: g10/g10.c:202
 msgid "list keys and signatures"
 msgstr "������ ������ � ��������"
 
-#: g10/g10.c:202
+#: g10/g10.c:203
 msgid "check key signatures"
 msgstr "��������� ������� �� �����"
 
-#: g10/g10.c:203
+#: g10/g10.c:204
 msgid "list keys and fingerprints"
 msgstr "������ ������ � �� \"����������� �������\""
 
-#: g10/g10.c:204
+#: g10/g10.c:205
 msgid "list secret keys"
 msgstr "������ ��������� ������"
 
-#: g10/g10.c:205
+#: g10/g10.c:206
 msgid "generate a new key pair"
 msgstr "������������� ����� ���� ������ (�������� � ���������)"
 
-#: g10/g10.c:206
+#: g10/g10.c:207
 msgid "remove key from the public keyring"
 msgstr "������� ���� �� ������"
 
-#: g10/g10.c:207
+#: g10/g10.c:209
+#, fuzzy
+msgid "remove key from the secret keyring"
+msgstr "������� ���� �� ������"
+
+#: g10/g10.c:210
 #, fuzzy
 msgid "sign a key"
 msgstr "��������� ����"
 
-#: g10/g10.c:208
+#: g10/g10.c:211
 #, fuzzy
 msgid "sign a key locally"
 msgstr "��������� ����"
 
-#: g10/g10.c:209
+#: g10/g10.c:212
 msgid "sign or edit a key"
 msgstr "��������� ��� ������������� ����"
 
-#: g10/g10.c:210
+#: g10/g10.c:213
 msgid "generate a revocation certificate"
 msgstr "������������� ���������� ����������"
 
-#: g10/g10.c:211
+#: g10/g10.c:214
 msgid "export keys"
 msgstr "�������������� �����"
 
-#: g10/g10.c:212
+#: g10/g10.c:215
 msgid "export keys to a key server"
 msgstr ""
 
-#: g10/g10.c:213
+#: g10/g10.c:216
 msgid "import keys from a key server"
 msgstr ""
 
-#: g10/g10.c:216
+#: g10/g10.c:219
 msgid "import/merge keys"
 msgstr "�������������/�������� �����"
 
-#: g10/g10.c:218
+#: g10/g10.c:221
 msgid "list only the sequence of packets"
 msgstr "���������� ������ ������������������ �������"
 
-#: g10/g10.c:220
+#: g10/g10.c:223
 #, fuzzy
 msgid "export the ownertrust values"
 msgstr "�������������� ��������� �������\n"
 
-#: g10/g10.c:222
+#: g10/g10.c:225
 #, fuzzy
 msgid "import ownertrust values"
 msgstr "������������� ��������� �������\n"
 
-#: g10/g10.c:224
+#: g10/g10.c:227
 #, fuzzy
 msgid "update the trust database"
 msgstr "|[�����]|��������� ���� ������ �������"
 
-#: g10/g10.c:226
+#: g10/g10.c:229
 msgid "|[NAMES]|check the trust database"
 msgstr "|[�����]|��������� ���� ������ �������"
 
-#: g10/g10.c:227
+#: g10/g10.c:230
 msgid "fix a corrupted trust database"
 msgstr "��������� ����������� ���� ������ �������"
 
-#: g10/g10.c:228
+#: g10/g10.c:231
 msgid "De-Armor a file or stdin"
 msgstr "������������ stdin ��� ���� �� ASCII-�������������"
 
-#: g10/g10.c:230
+#: g10/g10.c:233
 msgid "En-Armor a file or stdin"
 msgstr "������������ stdin ��� ���� � ASCII-�������������"
 
-#: g10/g10.c:232
+#: g10/g10.c:235
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|���������� �������� ���������"
 
-#: g10/g10.c:236
+#: g10/g10.c:239
 msgid ""
 "@\n"
 "Options:\n"
@@ -496,178 +501,178 @@ msgstr ""
 "���������:\n"
 " "
 
-#: g10/g10.c:238
+#: g10/g10.c:241
 msgid "create ascii armored output"
 msgstr "����� � ASCII-�������������"
 
-#: g10/g10.c:240
+#: g10/g10.c:243
 #, fuzzy
 msgid "|NAME|encrypt for NAME"
 msgstr "|���|������������ ������������ ���������� ���"
 
-#: g10/g10.c:243
+#: g10/g10.c:246
 #, fuzzy
 msgid "|NAME|use NAME as default recipient"
 msgstr "|���|������������ ��� � �������� ���������� ����� �� ���������"
 
-#: g10/g10.c:245
+#: g10/g10.c:248
 msgid "use the default key as default recipient"
 msgstr ""
 
-#: g10/g10.c:249
+#: g10/g10.c:252
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "������������ ��������� ������������� ������������ ��� ������� ��� �����������"
 
-#: g10/g10.c:250
+#: g10/g10.c:253
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|���������� ������� ������ (0 - �� �������)"
 
-#: g10/g10.c:252
+#: g10/g10.c:255
 msgid "use canonical text mode"
 msgstr "������������ ������������ ��������� �����"
 
-#: g10/g10.c:253
+#: g10/g10.c:256
 msgid "use as output file"
 msgstr "������������ � �������� ��������� �����"
 
-#: g10/g10.c:254
+#: g10/g10.c:257
 msgid "verbose"
 msgstr "������������"
 
-#: g10/g10.c:255
+#: g10/g10.c:258
 msgid "be somewhat more quiet"
 msgstr ""
 
-#: g10/g10.c:256
+#: g10/g10.c:259
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: g10/g10.c:257
+#: g10/g10.c:260
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "��������� ������� �� �����"
 
-#: g10/g10.c:258
+#: g10/g10.c:261
 #, fuzzy
 msgid "always use a MDC for encryption"
 msgstr "������������ ��������� ������������� ������������ ��� ����������"
 
-#: g10/g10.c:259
+#: g10/g10.c:262
 msgid "do not make any changes"
 msgstr "Keine wirklichen �nderungen durchf�hren"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:261
+#: g10/g10.c:264
 msgid "batch mode: never ask"
 msgstr "�������� �����: ������ �� ����������"
 
-#: g10/g10.c:262
+#: g10/g10.c:265
 msgid "assume yes on most questions"
 msgstr "�������� \"��\" �� ����������� ��������"
 
-#: g10/g10.c:263
+#: g10/g10.c:266
 msgid "assume no on most questions"
 msgstr "�������� \"���\" �� ����������� ��������"
 
-#: g10/g10.c:264
+#: g10/g10.c:267
 msgid "add this keyring to the list of keyrings"
 msgstr "�������� ��� ������ � ������ ������ ������"
 
-#: g10/g10.c:265
+#: g10/g10.c:268
 msgid "add this secret keyring to the list"
 msgstr "�������� ��� ��������� ������ � ������ ������ ������"
 
-#: g10/g10.c:266
+#: g10/g10.c:269
 msgid "|NAME|use NAME as default secret key"
 msgstr "|���|������������ ��� � �������� ���������� ����� �� ���������"
 
-#: g10/g10.c:267
+#: g10/g10.c:270
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: g10/g10.c:268
+#: g10/g10.c:271
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|���|������������ ������������ ���������� ���"
 
-#: g10/g10.c:269
+#: g10/g10.c:272
 msgid "read options from file"
 msgstr "������ ��������� �� �����"
 
-#: g10/g10.c:271
+#: g10/g10.c:274
 msgid "set debugging flags"
 msgstr "���������� ���������� �����"
 
-#: g10/g10.c:272
+#: g10/g10.c:275
 msgid "enable full debugging"
 msgstr "��������� ��� �������"
 
-#: g10/g10.c:273
+#: g10/g10.c:276
 msgid "|FD|write status info to this FD"
 msgstr "|FD| ���������� ���������� � ��������� � ���������� (FD)"
 
-#: g10/g10.c:274
+#: g10/g10.c:277
 msgid "do not write comment packets"
 msgstr "�� ������ ������ � �������������"
 
-#: g10/g10.c:275
+#: g10/g10.c:278
 msgid "(default is 1)"
 msgstr "(�� ��������� 1)"
 
-#: g10/g10.c:276
+#: g10/g10.c:279
 msgid "(default is 3)"
 msgstr "(�� ��������� 3)"
 
-#: g10/g10.c:278
+#: g10/g10.c:281
 #, fuzzy
 msgid "|FILE|load extension module FILE"
 msgstr "|����|��������� ���� � ������������ ��������"
 
-#: g10/g10.c:279
+#: g10/g10.c:282
 msgid "emulate the mode described in RFC1991"
 msgstr "����������� ����� ��������� � RFC1991"
 
-#: g10/g10.c:280
+#: g10/g10.c:283
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:281
+#: g10/g10.c:284
 #, fuzzy
 msgid "|N|use passphrase mode N"
 msgstr "|N|������������ �������� ����� ������ N\n"
 
-#: g10/g10.c:283
+#: g10/g10.c:286
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|���|������������ ���-�������� ��� ��� �������� ����"
 
-#: g10/g10.c:285
+#: g10/g10.c:288
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|���|������������ ������������ ���������� ��� ��� �������� ����"
 
-#: g10/g10.c:286
+#: g10/g10.c:289
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|���|������������ ������������ ���������� ���"
 
-#: g10/g10.c:287
+#: g10/g10.c:290
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|���|������������ ���-�������� ���"
 
-#: g10/g10.c:288
+#: g10/g10.c:291
 msgid "|N|use compress algorithm N"
 msgstr "|N|������������ �������� ������ N"
 
-#: g10/g10.c:289
+#: g10/g10.c:292
 msgid "throw keyid field of encrypted packets"
 msgstr "����������� ���� keyid � ������������� �������"
 
-#: g10/g10.c:290
+#: g10/g10.c:293
 msgid "|NAME=VALUE|use this notation data"
 msgstr ""
 
-#: g10/g10.c:292
+#: g10/g10.c:295
 #, fuzzy
 msgid ""
 "@\n"
@@ -688,17 +693,17 @@ msgstr ""
 " --list-keys [names]        �������� ������ ������\n"
 " --fingerprint [names]      �������� \"��������� �������\" ������\n"
 
-#: g10/g10.c:380
+#: g10/g10.c:383
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "����������, ����������� ��������� �� ������� �� ������ "
 "<[email protected]>.\n"
 
-#: g10/g10.c:384
+#: g10/g10.c:387
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�������������: gpg [���������] [�����] (-h ��� ������)"
 
-#: g10/g10.c:387
+#: g10/g10.c:390
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -708,7 +713,7 @@ msgstr ""
 "�����������, ��������� �������, ������� ��� ��������������\n"
 "����� ������ ������� �� ������� ������\n"
 
-#: g10/g10.c:392
+#: g10/g10.c:397
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -716,198 +721,198 @@ msgstr ""
 "\n"
 "�������������� ���������:\n"
 
-#: g10/g10.c:470
+#: g10/g10.c:476
 msgid "usage: gpg [options] "
 msgstr "�������������: gpg [���������] "
 
-#: g10/g10.c:523
+#: g10/g10.c:529
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Kommandos\n"
 
-#: g10/g10.c:662
+#: g10/g10.c:668
 #, fuzzy, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "���������: ���� ���������� �� ��������� `%s' �����������\n"
 
-#: g10/g10.c:666
+#: g10/g10.c:672
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���� ���������� `%s': %s\n"
 
-#: g10/g10.c:673
+#: g10/g10.c:679
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� ��������� �� `%s'\n"
 
-#: g10/g10.c:855
+#: g10/g10.c:861
 #, fuzzy, c-format
 msgid "%s is not a valid character set\n"
 msgstr "������������ ������ � �����������.\n"
 
-#: g10/g10.c:910 g10/g10.c:919
+#: g10/g10.c:917 g10/g10.c:926
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/g10.c:912
+#: g10/g10.c:919
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr ""
 
-#: g10/g10.c:915
+#: g10/g10.c:922
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr ""
 
-#: g10/g10.c:934 g10/g10.c:946
+#: g10/g10.c:941 g10/g10.c:953
 msgid "selected cipher algorithm is invalid\n"
 msgstr "������ ������������ �������� ����������\n"
 
-#: g10/g10.c:940 g10/g10.c:952
+#: g10/g10.c:947 g10/g10.c:959
 msgid "selected digest algorithm is invalid\n"
 msgstr "������ ������������ ��������-��������\n"
 
-#: g10/g10.c:956
+#: g10/g10.c:963
 msgid "the given policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:959
+#: g10/g10.c:966
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "�������� �������� ����� ����� �������� �� %d �� %d\n"
 
-#: g10/g10.c:961
+#: g10/g10.c:968
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ ���� ������ 0\n"
 
-#: g10/g10.c:963
+#: g10/g10.c:970
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ ���� ������ 1\n"
 
-#: g10/g10.c:965
+#: g10/g10.c:972
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:968
+#: g10/g10.c:975
 #, fuzzy
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "���������: ������� S2K ����� (0) ����� �� �������������\n"
 
-#: g10/g10.c:972
+#: g10/g10.c:979
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "������������ ����� S2K: ������ ���� 0, 1 ��� 3\n"
 
-#: g10/g10.c:1049
+#: g10/g10.c:1056
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "������ ������������� ���� ������ �������: %s\n"
 
-#: g10/g10.c:1055
+#: g10/g10.c:1062
 msgid "--store [filename]"
 msgstr "--store [��� �����]"
 
-#: g10/g10.c:1062
+#: g10/g10.c:1069
 msgid "--symmetric [filename]"
 msgstr "--symmetric [��� �����]"
 
-#: g10/g10.c:1070
+#: g10/g10.c:1077
 msgid "--encrypt [filename]"
 msgstr "--encrypt [��� �����]"
 
-#: g10/g10.c:1083
+#: g10/g10.c:1090
 msgid "--sign [filename]"
 msgstr "--sign [��� �����]"
 
-#: g10/g10.c:1096
+#: g10/g10.c:1103
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [��� �����]"
 
-#: g10/g10.c:1110
+#: g10/g10.c:1117
 msgid "--clearsign [filename]"
 msgstr "--clearsign [��� �����]"
 
-#: g10/g10.c:1127
+#: g10/g10.c:1134
 msgid "--decrypt [filename]"
 msgstr "--decrypt [��� �����]"
 
-#: g10/g10.c:1135
+#: g10/g10.c:1142
 msgid "--sign-key user-id"
 msgstr ""
 
-#: g10/g10.c:1143
+#: g10/g10.c:1150
 #, fuzzy
 msgid "--lsign-key user-id"
 msgstr "--delete-key ���-������������"
 
-#: g10/g10.c:1151
+#: g10/g10.c:1158
 #, fuzzy
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key ���-������������"
 
-#: g10/g10.c:1167
+#: g10/g10.c:1174
 #, fuzzy
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key ���-������������"
 
-#: g10/g10.c:1170
+#: g10/g10.c:1177
 #, fuzzy
 msgid "--delete-key user-id"
 msgstr "--delete-key ���-������������"
 
-#: g10/encode.c:260 g10/g10.c:1207 g10/sign.c:366
+#: g10/encode.c:260 g10/g10.c:1214 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "���������� ������� ���� `%s': %s\n"
 
-#: g10/g10.c:1222
+#: g10/g10.c:1229
 #, fuzzy
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [������������� ������������] [������ ������]"
 
-#: g10/g10.c:1273
+#: g10/g10.c:1280
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "������ �������������: %s\n"
 
-#: g10/g10.c:1281
+#: g10/g10.c:1288
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "������ �����������: %s\n"
 
-#: g10/g10.c:1349
+#: g10/g10.c:1356
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "������������ ���-�������� `%s'\n"
 
-#: g10/g10.c:1430
+#: g10/g10.c:1437
 msgid "[filename]"
 msgstr "[��� �����]"
 
-#: g10/g10.c:1434
+#: g10/g10.c:1441
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/decrypt.c:59 g10/g10.c:1437 g10/verify.c:68 g10/verify.c:113
+#: g10/decrypt.c:59 g10/g10.c:1444 g10/verify.c:68 g10/verify.c:113
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "���������� ������� ���� `%s'\n"
 
-#: g10/g10.c:1606
+#: g10/g10.c:1613
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 
-#: g10/g10.c:1612
+#: g10/g10.c:1619
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1618
+#: g10/g10.c:1625
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1626
+#: g10/g10.c:1633
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
@@ -973,17 +978,17 @@ msgstr "����������� ����� ����� (� ������)\n"
 msgid "error in trailer line\n"
 msgstr "������ � ����������� ������\n"
 
-#: g10/armor.c:1007
+#: g10/armor.c:1012
 #, fuzzy
 msgid "no valid OpenPGP data found.\n"
 msgstr "�� ������� ���������� RFC1991 ��� OpenPGP ������.\n"
 
-#: g10/armor.c:1012
+#: g10/armor.c:1017
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr ""
 
-#: g10/armor.c:1016
+#: g10/armor.c:1021
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1189,12 +1194,12 @@ msgstr "��������: ���� ���� �� ������� ���������� ����������� ���������!\n"
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "          ��� �����������, ��� ������� ����������� ���������.\n"
 
-#: g10/pkclist.c:700 g10/pkclist.c:722 g10/pkclist.c:847 g10/pkclist.c:892
+#: g10/pkclist.c:700 g10/pkclist.c:722 g10/pkclist.c:848 g10/pkclist.c:893
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ��������: %s\n"
 
-#: g10/pkclist.c:708 g10/pkclist.c:874
+#: g10/pkclist.c:708 g10/pkclist.c:875
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr ""
@@ -1220,85 +1225,85 @@ msgstr "��� ������ �������������� ������������.\n"
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 
-#: g10/pkclist.c:784
+#: g10/pkclist.c:785
 #, fuzzy
 msgid "Public key is disabled.\n"
 msgstr "�������� ���� �� ������"
 
-#: g10/pkclist.c:791
+#: g10/pkclist.c:792
 msgid "skipped: public key already set with --encrypt-to\n"
 msgstr ""
 
-#: g10/pkclist.c:822
+#: g10/pkclist.c:823
 #, fuzzy, c-format
 msgid "unknown default recipient `%s'\n"
 msgstr "���������: ���� ���������� �� ��������� `%s' �����������\n"
 
-#: g10/pkclist.c:855
+#: g10/pkclist.c:856
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: ������ ��� �������� �����: %s\n"
 
-#: g10/pkclist.c:860
+#: g10/pkclist.c:861
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr ""
 
-#: g10/pkclist.c:898
+#: g10/pkclist.c:899
 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:387
 msgid "Please select what kind of key you want:\n"
 msgstr "�������� �������� ��� �����:\n"
 
-#: g10/keygen.c:388
+#: g10/keygen.c:389
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) DSA � ElGamal (�� ���������)\n"
 
-#: g10/keygen.c:389
+#: g10/keygen.c:390
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (������ �������)\n"
 
-#: g10/keygen.c:391
+#: g10/keygen.c:392
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (������ ����������)\n"
 
-#: g10/keygen.c:392
+#: g10/keygen.c:393
 #, c-format
 msgid "   (%d) ElGamal (sign and encrypt)\n"
 msgstr "   (%d) ElGamal (������� � ����������)\n"
 
-#: g10/keygen.c:394
+#: g10/keygen.c:395
 #, c-format
 msgid "   (%d) ElGamal in a v3 packet\n"
 msgstr "   (%d) ElGamal � v3-������\n"
 
-#: g10/keygen.c:399
+#: g10/keygen.c:400
 msgid "Your selection? "
 msgstr "��� �����? "
 
-#: g10/keygen.c:409
+#: g10/keygen.c:410
 #, fuzzy
 msgid "Do you really want to create a sign and encrypt key? "
 msgstr "�� ������������� ������ ������� ��������� �����? "
 
-#: g10/keygen.c:430
+#: g10/keygen.c:431
 msgid "Invalid selection.\n"
 msgstr "������������ �����.\n"
 
-#: g10/keygen.c:442
+#: g10/keygen.c:443
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -1311,15 +1316,15 @@ msgstr ""
 "               ����� ����� �� ���������: 1024 ����\n"
 " ������������ ������������� ����� �����: 2048 ���\n"
 
-#: g10/keygen.c:449
+#: g10/keygen.c:450
 msgid "What keysize do you want? (1024) "
 msgstr "������ ������� ���� �� �������? (1024)"
 
-#: g10/keygen.c:454
+#: g10/keygen.c:455
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "���������� ������ DSA ������ - �� 512 �� 1024 ���\n"
 
-#: g10/keygen.c:456
+#: g10/keygen.c:457
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "������� ��������� ����� �����, ���������� �������� - 768.\n"
 
@@ -1331,12 +1336,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:467
 #, fuzzy, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
 msgstr "������� ��������� ����� �����, ���������� �������� - 768.\n"
 
-#: g10/keygen.c:471
+#: g10/keygen.c:472
 #, fuzzy
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
@@ -1345,11 +1350,11 @@ msgstr ""
 "����� ������ ������ 2048 �� �������������, ������ ��� ������������������ "
 "����� ����� �������!\n"
 
-#: g10/keygen.c:474
+#: g10/keygen.c:475
 msgid "Are you sure that you want this keysize? "
 msgstr "�� ������������� ������ ���� ����� �����? "
 
-#: g10/keygen.c:475
+#: g10/keygen.c:476
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1357,21 +1362,21 @@ msgstr ""
 "��, ������ �� ���������, ��� ��������� ����� ���������� � �������� ����\n"
 "������ ��� �������� ��� ����.\n"
 
-#: g10/keygen.c:483
+#: g10/keygen.c:484
 msgid "Do you really need such a large keysize? "
 msgstr "��� ������������� ����� ����� ������� ����? "
 
-#: g10/keygen.c:489
+#: g10/keygen.c:490
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "����������� ���� ����� ����� %u ���\n"
 
-#: g10/keygen.c:492 g10/keygen.c:496
+#: g10/keygen.c:493 g10/keygen.c:497
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "��������� �� %u ���\n"
 
-#: g10/keygen.c:509
+#: g10/keygen.c:510
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1387,35 +1392,35 @@ msgstr ""
 "      <n>m = ���� �������� ����� n �������\n"
 "      <n>y = ���� �������� ����� n ���\n"
 
-#: g10/keygen.c:526
+#: g10/keygen.c:527
 msgid "Key is valid for? (0) "
 msgstr "���� ������������ � �������? (0) "
 
-#: g10/keygen.c:547
+#: g10/keygen.c:548
 msgid "invalid value\n"
 msgstr "������������ ��������.\n"
 
-#: g10/keygen.c:552
+#: g10/keygen.c:553
 msgid "Key does not expire at all\n"
 msgstr "���������� ����.\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:558
+#: g10/keygen.c:559
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "���� ��������� �� %s\n"
 
-#: g10/keygen.c:561
+#: g10/keygen.c:562
 msgid ""
-"Your system can't display dates beyond 2036.\n"
+"Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:566
+#: g10/keygen.c:567
 msgid "Is this correct (y/n)? "
 msgstr "��� �����? (y/n) "
 
-#: g10/keygen.c:609
+#: g10/keygen.c:610
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1431,44 +1436,44 @@ msgstr ""
 "    \"Vasya Pupkin (KRUTOI) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:620
+#: g10/keygen.c:621
 msgid "Real name: "
 msgstr "���� ��� (\"��� �������\"): "
 
-#: g10/keygen.c:624
+#: g10/keygen.c:625
 msgid "Invalid character in name\n"
 msgstr "������������ ������ � �����\n"
 
-#: g10/keygen.c:626
+#: g10/keygen.c:627
 msgid "Name may not start with a digit\n"
 msgstr "������ ��� �� ����� ���������� � �����.\n"
 
-#: g10/keygen.c:628
+#: g10/keygen.c:629
 msgid "Name must be at least 5 characters long\n"
 msgstr "������ ��� ������ �������� �� ����� ��� �� 5�� ��������.\n"
 
-#: g10/keygen.c:636
+#: g10/keygen.c:637
 msgid "Email address: "
 msgstr "E-Mail: "
 
-#: g10/keygen.c:647
+#: g10/keygen.c:648
 msgid "Not a valid email address\n"
 msgstr "������������ E-Mail\n"
 
-#: g10/keygen.c:655
+#: g10/keygen.c:656
 msgid "Comment: "
 msgstr "�����������: "
 
-#: g10/keygen.c:661
+#: g10/keygen.c:662
 msgid "Invalid character in comment\n"
 msgstr "������������ ������ � �����������.\n"
 
-#: g10/keygen.c:683
+#: g10/keygen.c:684
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:689
+#: g10/keygen.c:690
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1479,16 +1484,16 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:692
+#: g10/keygen.c:693
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:702
+#: g10/keygen.c:703
 #, 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:754
+#: g10/keygen.c:755
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1496,11 +1501,11 @@ msgstr ""
 "��� ������ ������ ����� ����� �������� �����.\n"
 "\n"
 
-#: g10/keyedit.c:456 g10/keygen.c:762
+#: g10/keyedit.c:456 g10/keygen.c:763
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "�������� ����� �� ���� ��������������, ���������� �����.\n"
 
-#: g10/keygen.c:768
+#: g10/keygen.c:769
 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"
@@ -1512,7 +1517,7 @@ msgstr ""
 "�����, �������� ��� ��������� � ���������� \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:789
+#: g10/keygen.c:790
 #, fuzzy
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
@@ -1525,34 +1530,34 @@ msgstr ""
 "��������� ������� ��� �������� ����������). ��� ���� ���������� ���������\n"
 "����� ����������� ������� ���������� ��������.\n"
 
-#: g10/keygen.c:859
+#: g10/keygen.c:860
 msgid "Key generation can only be used in interactive mode\n"
 msgstr "��������� ����� ����� ���� ��������� ������ � ������������� ������.\n"
 
-#: g10/keygen.c:867
+#: g10/keygen.c:868
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "�������� ���� DSA ����� ����� ����� 1024 ����.\n"
 
-#: g10/keygen.c:873
+#: g10/keygen.c:874
 #, fuzzy
 msgid "Key generation canceled.\n"
 msgstr "��������� ����� ��������: %s\n"
 
-#: g10/keygen.c:883
+#: g10/keygen.c:884
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "�������� ���������� ������������ � `%s'\n"
 
-#: g10/keygen.c:884
+#: g10/keygen.c:885
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "��������� ���������� ������������ � `%s'\n"
 
-#: g10/keygen.c:961
+#: g10/keygen.c:962
 msgid "public and secret key created and signed.\n"
 msgstr "�������� � ��������� ����� ������� � ���������.\n"
 
-#: g10/keygen.c:963
+#: g10/keygen.c:964
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -1563,12 +1568,12 @@ msgstr ""
 "���������������\n"
 "����� ��� ����������.\n"
 
-#: g10/keygen.c:977 g10/keygen.c:1076
+#: g10/keygen.c:978 g10/keygen.c:1077
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "��������� ����� �� �������: %s\n"
 
-#: g10/keygen.c:1021 g10/sig-check.c:312 g10/sign.c:105
+#: g10/keygen.c:1022 g10/sig-check.c:312 g10/sign.c:105
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1576,7 +1581,7 @@ msgstr ""
 "�������� ���� ������������ � ������� (����������� ������� ��� ����������� "
 "����������� ����)\n"
 
-#: g10/keygen.c:1023 g10/sig-check.c:314 g10/sign.c:107
+#: g10/keygen.c:1024 g10/sig-check.c:314 g10/sign.c:107
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1584,13 +1589,13 @@ msgstr ""
 "�������� ���� ������������ � ������� (����������� ������� ��� ����������� "
 "����������� ����)\n"
 
-#: g10/keygen.c:1054
+#: g10/keygen.c:1055
 #, fuzzy
 msgid "Really create? "
 msgstr "������������� �������? "
 
-#: g10/encode.c:91 g10/openfile.c:161 g10/openfile.c:270 g10/tdbio.c:468
-#: g10/tdbio.c:529
+#: g10/encode.c:91 g10/openfile.c:168 g10/openfile.c:277 g10/tdbio.c:454
+#: g10/tdbio.c:515
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: ���������� �������: %s\n"
@@ -1760,7 +1765,7 @@ msgstr "���� %08lX: �������� ���� �� ������: %s\n"
 msgid "no default public keyring\n"
 msgstr "��� ������ �������� ������ �� ���������\n"
 
-#: g10/import.c:420 g10/openfile.c:213 g10/sign.c:268 g10/sign.c:580
+#: g10/import.c:420 g10/openfile.c:220 g10/sign.c:268 g10/sign.c:580
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "������������ � `%s'\n"
@@ -1888,17 +1893,17 @@ msgstr "���� %08lX: ��� �������������� ������������\n"
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "���� %08lX: ��� ���������� ��������������� �������������\n"
 
-#: g10/import.c:799
+#: g10/import.c:800
 #, fuzzy, c-format
 msgid "key %08lX: accepted non self-signed user ID '"
 msgstr "���� %08lX: �������� ������������� ������������ '"
 
-#: g10/import.c:828
+#: g10/import.c:829
 #, fuzzy, c-format
 msgid "key %08lX: skipped user ID '"
 msgstr "���� %08lX: �������� ������������� ������������ '"
 
-#: g10/import.c:851
+#: g10/import.c:852
 #, fuzzy, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "���� %08lX: 1 ����� ���-����\n"
@@ -1907,32 +1912,32 @@ msgstr "���� %08lX: 1 ����� ���-����\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:876
+#: g10/import.c:877
 #, fuzzy, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "���� %08lX: ���������� ���������� � ������������ ����� - ��������\n"
 
-#: g10/import.c:885
+#: g10/import.c:886
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "���� %08lX: ���������� ���������� � ������������ ����� - ��������\n"
 
-#: g10/import.c:893
+#: g10/import.c:894
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "���� %08lX: ������������ ���������� ����������: %s - ��������\n"
 
-#: g10/import.c:993
+#: g10/import.c:994
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1044
+#: g10/import.c:1045
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "���� %08lX: ���������� ���������� ��������\n"
 
-#: g10/import.c:1158 g10/import.c:1211
+#: g10/import.c:1159 g10/import.c:1212
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "���� %08lX: ���� ����� �� ����� ����-�������\n"
@@ -2595,43 +2600,43 @@ msgstr ""
 msgid "Policy: "
 msgstr ""
 
-#: g10/mainproc.c:1035
+#: g10/mainproc.c:1037
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1041
+#: g10/mainproc.c:1043
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "������� ������� %.*s, ��������� %s ���� %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1067 g10/mainproc.c:1078
+#: g10/mainproc.c:1069 g10/mainproc.c:1080
 msgid "BAD signature from \""
 msgstr "������ ������� �� \""
 
-#: g10/mainproc.c:1068 g10/mainproc.c:1079
+#: g10/mainproc.c:1070 g10/mainproc.c:1081
 msgid "Good signature from \""
 msgstr "������� ������� �� \""
 
-#: g10/mainproc.c:1070
+#: g10/mainproc.c:1072
 msgid "                aka \""
 msgstr ""
 
-#: g10/mainproc.c:1126
+#: g10/mainproc.c:1128
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "���������� ��������� �������: %s\n"
 
-#: g10/mainproc.c:1187
+#: g10/mainproc.c:1189
 #, fuzzy, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "������� ������������ ����"
 
-#: g10/mainproc.c:1226
+#: g10/mainproc.c:1228
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:1231
+#: g10/mainproc.c:1233
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -2819,137 +2824,127 @@ msgstr ""
 msgid "input line longer than %d characters\n"
 msgstr ""
 
-#: g10/tdbio.c:121 g10/tdbio.c:1637
+#: g10/tdbio.c:116 g10/tdbio.c:1623
 #, fuzzy, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "���������� ������� �� �������: %s\n"
 
-#: g10/tdbio.c:127 g10/tdbio.c:1644
+#: g10/tdbio.c:122 g10/tdbio.c:1630
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:237
+#: g10/tdbio.c:232
 msgid "trustdb transaction too large\n"
 msgstr ""
 
-#: g10/tdbio.c:429
+#: g10/tdbio.c:424
 #, fuzzy, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/ringedit.c:298 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
-#, fuzzy, c-format
-msgid "%s: directory created\n"
-msgstr "%s: ���������� �������: %s\n"
-
-#: g10/tdbio.c:452
+#: g10/tdbio.c:438
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1350 g10/tdbio.c:458
+#: g10/openfile.c:216 g10/openfile.c:284 g10/ringedit.c:1335 g10/tdbio.c:444
 #, fuzzy, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/tdbio.c:473 g10/tdbio.c:522
+#: g10/tdbio.c:459 g10/tdbio.c:508
 #, fuzzy, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/tdbio.c:487
+#: g10/tdbio.c:473
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr ""
 
-#: g10/tdbio.c:491
+#: g10/tdbio.c:477
 #, fuzzy, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/tdbio.c:494
+#: g10/tdbio.c:480
 #, fuzzy, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/tdbio.c:531
+#: g10/tdbio.c:517
 #, fuzzy, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "���������� ���� ������ ������� �� �������: %s\n"
 
-#: g10/tdbio.c:564
+#: g10/tdbio.c:550
 #, fuzzy, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/tdbio.c:572
+#: g10/tdbio.c:558
 #, fuzzy, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/tdbio.c:588 g10/tdbio.c:627 g10/tdbio.c:649 g10/tdbio.c:679
-#: g10/tdbio.c:704 g10/tdbio.c:1570 g10/tdbio.c:1597
+#: g10/tdbio.c:574 g10/tdbio.c:613 g10/tdbio.c:635 g10/tdbio.c:665
+#: g10/tdbio.c:690 g10/tdbio.c:1556 g10/tdbio.c:1583
 #, fuzzy, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/tdbio.c:601 g10/tdbio.c:660
+#: g10/tdbio.c:587 g10/tdbio.c:646
 #, fuzzy, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/tdbio.c:1249
+#: g10/tdbio.c:1235
 #, fuzzy, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "���������� ������� �� �������: %s\n"
 
-#: g10/tdbio.c:1257
+#: g10/tdbio.c:1243
 #, fuzzy, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "���������� ���� ������ ������� �� �������: %s\n"
 
-#: g10/tdbio.c:1278
+#: g10/tdbio.c:1264
 #, fuzzy, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "���������� ���� ������ ������� �� �������: %s\n"
 
-#: g10/tdbio.c:1294
+#: g10/tdbio.c:1280
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr ""
 
-#: g10/tdbio.c:1299
+#: g10/tdbio.c:1285
 #, fuzzy, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "������������ ������ ��������� �������\n"
 
-#: g10/tdbio.c:1603
+#: g10/tdbio.c:1589
 #, fuzzy, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/tdbio.c:1611
+#: g10/tdbio.c:1597
 #, fuzzy, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/tdbio.c:1621
+#: g10/tdbio.c:1607
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1651
+#: g10/tdbio.c:1637
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1762
+#: g10/tdbio.c:1748
 #, fuzzy
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "���� ������ ������� ���������: ��������� \"gpgm --fix-trust-db\".\n"
@@ -3183,67 +3178,67 @@ msgstr "%s: ��������: %s\n"
 msgid "\t%lu keys updated\n"
 msgstr ""
 
-#: g10/trustdb.c:2139
+#: g10/trustdb.c:2143
 msgid "Ooops, no keys\n"
 msgstr ""
 
-#: g10/trustdb.c:2143
+#: g10/trustdb.c:2147
 #, fuzzy
 msgid "Ooops, no user IDs\n"
 msgstr "������ ������ � ��������������� �������������"
 
-#: g10/trustdb.c:2301
+#: g10/trustdb.c:2305
 #, fuzzy, c-format
 msgid "check_trust: search dir record failed: %s\n"
 msgstr "���� %08lX.%lu: ������� ������������� ������ �� �������: %s\n"
 
-#: g10/trustdb.c:2310
+#: g10/trustdb.c:2314
 #, fuzzy, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "���� %08lX.%lu: ������� ������������� ������ �� �������: %s\n"
 
-#: g10/trustdb.c:2314
+#: g10/trustdb.c:2318
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "���� %08lX.%lu: �������� � ���� ������ �������\n"
 
-#: g10/trustdb.c:2322
+#: g10/trustdb.c:2326
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "���� %08lX.%lu: ������������ � ������� (����������� ����������� ����)\n"
 
-#: g10/trustdb.c:2336
+#: g10/trustdb.c:2340
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "���� %08lX.%lu: ���� �������� ����� %s\n"
 
-#: g10/trustdb.c:2344
+#: g10/trustdb.c:2348
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "���� %08lX.%lu: �������� ������� �� �������: %s\n"
 
-#: g10/trustdb.c:2495
+#: g10/trustdb.c:2499
 #, fuzzy, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "%s: ������������ �� ������\n"
 
-#: g10/trustdb.c:2497
+#: g10/trustdb.c:2501
 #, fuzzy, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "������ ������������� ���� ������ �������: %s\n"
 
-#: g10/trustdb.c:2500
+#: g10/trustdb.c:2504
 #, fuzzy, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "���������� ���� ������ ������� �� �������: %s\n"
 
-#: g10/trustdb.c:2503
+#: g10/trustdb.c:2507
 #, fuzzy, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "������ ������������� ���� ������ �������: %s\n"
 
-#: g10/trustdb.c:2689 g10/trustdb.c:2719
+#: g10/trustdb.c:2693 g10/trustdb.c:2723
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr ""
 
@@ -3259,31 +3254,31 @@ msgstr ""
 msgid "input line %u too long or missing LF\n"
 msgstr ""
 
-#: g10/ringedit.c:318
+#: g10/ringedit.c:303
 #, 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:320 g10/ringedit.c:1340
 #, fuzzy, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/ringedit.c:1532
+#: g10/ringedit.c:1517
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/ringedit.c:1533
+#: g10/ringedit.c:1518
 #, fuzzy, c-format
 msgid "%s is the unchanged one\n"
 msgstr "����������� ������������ ��������� ����"
 
-#: g10/ringedit.c:1534
+#: g10/ringedit.c:1519
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/ringedit.c:1535
+#: g10/ringedit.c:1520
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
@@ -3304,40 +3299,54 @@ msgid ""
 msgstr "���� ElGamal ����, ��������� PGP, �� ������� ��� �������� ��������!\n"
 
 #. do not overwrite
-#: g10/openfile.c:72
+#: g10/openfile.c:79
 #, c-format
 msgid "File `%s' exists. "
 msgstr "���� `%s' ����������. "
 
-#: g10/openfile.c:74
+#: g10/openfile.c:81
 msgid "Overwrite (y/N)? "
 msgstr "���������� (y/N)? "
 
-#: g10/openfile.c:102
+#: g10/openfile.c:109
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr ""
 
-#: g10/openfile.c:124
+#: g10/openfile.c:131
 #, fuzzy
 msgid "Enter new filename"
 msgstr "--store [��� �����]"
 
-#: g10/openfile.c:165
+#: g10/openfile.c:172
 #, fuzzy
 msgid "writing to stdout\n"
 msgstr "������������ � `%s'\n"
 
-#: g10/openfile.c:243
+#: g10/openfile.c:250
 #, fuzzy, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "���������� ������� ����������� ������ `%s' .\n"
 
-#: g10/openfile.c:293
+#: g10/openfile.c:300
 #, c-format
 msgid "%s: new options file created\n"
 msgstr ""
 
+#: g10/openfile.c:313
+#, fuzzy, c-format
+msgid "%s: can't create directory: %s\n"
+msgstr "%s: ���������� �������: %s\n"
+
+#: g10/openfile.c:316
+#, fuzzy, c-format
+msgid "%s: directory created\n"
+msgstr "%s: ���������� �������: %s\n"
+
+#: g10/openfile.c:318
+msgid "you have to start GnuPG again, so it can read the new options file\n"
+msgstr ""
+
 #: g10/encr-data.c:66
 #, fuzzy, c-format
 msgid "%s encrypted data\n"
author	Werner Koch <[email protected]>	1999-12-04 14:36:34 +0000
committer	Werner Koch <[email protected]>	1999-12-04 14:36:34 +0000
commit	5553cc985e174248a60e50530db6815d3f7751c0 (patch)
tree	d46dac5638347a00af1889f8b2e959c75b5a472f
parent	See ChangeLog: Sat Dec 4 12:30:28 CET 1999 Werner Koch (diff)
download	gnupg-5553cc985e174248a60e50530db6815d3f7751c0.tar.gz gnupg-5553cc985e174248a60e50530db6815d3f7751c0.zip