See ChangeLog: Thu Sep 23 09:52:58 CEST 1999 Werner Koch

20 files changed, 1772 insertions, 1493 deletions

diff --git a/doc/ChangeLog b/doc/ChangeLog
new file mode 100644
index 000000000..6c5adae51
--- /dev/null
+++ b/doc/ChangeLog
@@ -0,0 +1,42 @@
+Thu Sep 23 09:52:58 CEST 1999  Werner Koch  <[email protected]>
+
+	* README.W32: New.
+
+Mon Sep  6 19:59:08 CEST 1999  Werner Koch  <[email protected]>
+
+
+	* Makefile.am (SUBDIRS): New subdir gph for the manual.
+
+Thu Jul 22 20:03:03 CEST 1999  Werner Koch  <[email protected]>
+
+
+	* gpg.sgml (--always-trust): Added.
+
+Wed Jul 14 19:42:08 CEST 1999  Werner Koch  <[email protected]>
+
+
+	* Makefile.am: Create a dummy man page if docbook-to-man is missing.
+
+Wed Jun 16 20:16:21 CEST 1999  Werner Koch  <[email protected]>
+
+
+	* gpg1.pod: Removed.
+	* gpg.sgml: New. Replaces the pod file
+	* Makefile.am: Add rule to make a man file from sgml
+
+Tue Jun 15 12:21:08 CEST 1999  Werner Koch  <[email protected]>
+
+
+	* Makefile.in.in: Use DESTDIR.
+
+Mon May 31 19:41:10 CEST 1999  Werner Koch  <[email protected]>
+
+	* gpg.1pod: Enhanced the Bugs section (Michael).
+
+Wed Feb 10 17:15:39 CET 1999  Werner Koch  <[email protected]>
+
+
+	* gpg.1pod: Spelling and grammar corrections (John A. Martin)
+	* FAQ: Ditto.
+	* DETAILS: Ditto.
+
diff --git a/doc/Makefile.am b/doc/Makefile.am
index ae5cdb506..e4e135b44 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,7 +2,7 @@
 
 SUBDIRS = gph
 
-EXTRA_DIST = DETAILS gpg.sgml gpg.1 FAQ HACKING OpenPGP
+EXTRA_DIST = DETAILS gpg.sgml gpg.1 FAQ HACKING OpenPGP  README.W32
 
 man_MANS = gpg.1
 
diff --git a/doc/README.W32 b/doc/README.W32
new file mode 100644
index 000000000..c3d6fd890
--- /dev/null
+++ b/doc/README.W32
@@ -0,0 +1,102 @@
+This is an alpha release of GnuPG for MS-Windows and WNT.
+The random number generator should now work but has not undergone
+a thorough testing, so we won't say anything about the quality of
+the generated key and Suggest that you don't use this version with
+your production secret keys!  It is however okay to verify signatures
+or encrypt files using this version.
+
+PLEASE READ THE FOLLOWING PARAGRAPH CAREFULLY:
+
+If you have a bug report, please post it to the mailing list
+<[email protected]>.  Please don't send me private mail
+regarding this version of GnuPG; I am already spending too much
+time on answering the same and same questions over and over.
+I can improve GnuPG much faster if I don't have to answer
+questions in private mail.  You can post to the mailing list
+without prior subscribing (but please request to CC you if you want
+to get an answer).
+
+
+Installation instructions:
+--------------------------
+ 1. Unpack the ZIP archive (alright, you already did this)
+ 2. Copy "gpg.exe" to some place where you usually store your
+    binaries.
+ 3. Create a directory "c:\gnupg" (or any other as you like)
+ 4. Copy the file "entropy.dll" to this directory.
+ 5. If you did not use the default directory "c:\gnupg", you
+    should put a line:
+    "set GNUPGHOME=c:\my_gnupg_directory"
+    into your autoexec.bat or wherever you setup the environment
+    variables. The create a file named "options" in this
+    directory with the contents:
+    "entropy-dll-name c:/my_gnupg_directory/entropy.dll"
+    (Please notice that you have to use a normal slash and not
+     a backslash here)
+ 6. Enter "gpg" and see what happens
+ 7. Read the file README and the online HOWTOs
+
+
+Internationalization support:
+-----------------------------
+  1. Decide where to store the translation files.  Here we assume
+     the directory "c:/gnu/share"
+  2. Set an environment Variable:
+     "set MINGW32_NLS_DIR=c:/gnu/share"
+  3. Select which language to use.  If you want the French translation,
+     copy the file "fr.mo" to "c:/gnu/share/gnupg.mo".
+  4. Done.
+
+Currently we only support the Codepages 437, 850 und Latin1.  If you have
+problems, either delete the gnupg.mo file or don't set the environment
+variable
+
+
+
+How to build it from the source:
+--------------------------------
+This version has been build with the Mingw32/CPD kit using the latest
+stable version of GnuPG.
+
+First get the source:  It is available at
+
+  ftp://ftp.gnupg.org/pub/gcrypt/gnupg/gnupg-1.0.n.tar.gz
+
+or for snapshots (with a letter appended to the version number)
+
+  ftp://ftp.gnupg.org/pub/gcrypt/devel/gnupg-1.0.nx.tar.gz
+
+this is the same source as for the Unix version.
+
+To build it, you need the MingW32/CPD kit, which is available at
+
+  ftp://ftp.openit.de/pub/cpd/mingw32-cpd-0.1.tar.gz
+
+I will probably upload a new version, as the current is known to have some
+problems.  After you have installed this environment, you should be
+able to do this:
+
+ $ ./configure --target=i386--mingw32
+ $ make
+ $ i386--mingw32-strip g10/gpg
+ $ cp g10/gpg  /some_windows_drive/gpg.exe
+
+And everything hopefully works.
+
+It is currently not possible to build the entropy DLL with the MingW32/CPD
+because it is still lacking C++ support.  But I am working on it.
+However the source is available at
+
+  ftp://ftp.gnupg.org/pub/gcrypt/contrib/winseed.zip
+
+follow the instructions to build it (if you have a MS tool chain).
+
+
+
+Don't forget that MS-Windows ist just a temporary workaround until
+you can switch to a GNU system ;-)
+
+Be the source always with you.
+
+    Werner
+
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 089ab1d59..7d3ccbc75 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,5 +1,10 @@
-Wed Sep 22 10:14:17 CEST 1999  Werner Koch  <[email protected]>
+Thu Sep 23 09:52:58 CEST 1999  Werner Koch  <[email protected]>
+
+	* verify.c (print_file_status): New.
+	(verify_one_file): Moved status print to th new fnc. Add error status.
+	* status.c, status.h (STATUS_FILE_ERROR): New
 
+Wed Sep 22 10:14:17 CEST 1999  Werner Koch  <[email protected]>
 
 	* openfile.c (make_outfile_name): Use case-insenstive compare for
 	DOS systems.  Add ".pgp" to the list of know extensions.
diff --git a/g10/status.c b/g10/status.c
index c8d750944..fb9931d21 100644
--- a/g10/status.c
+++ b/g10/status.c
@@ -119,6 +119,7 @@ write_status_text ( int no, const char *text)
       case STATUS_IMPORT_RES	 : s = "IMPORT_RES\n"; break;
       case STATUS_FILE_START	 : s = "FILE_START\n"; break;
       case STATUS_FILE_DONE	 : s = "FILE_DONE\n"; break;
+      case STATUS_FILE_ERROR	 : s = "FILE_ERROR\n"; break;
       default: s = "?\n"; break;
     }
 
diff --git a/g10/status.h b/g10/status.h
index 2365dbdf5..612cfdbcb 100644
--- a/g10/status.h
+++ b/g10/status.h
@@ -67,6 +67,7 @@
 #define STATUS_IMPORT_RES	37
 #define STATUS_FILE_START	38
 #define STATUS_FILE_DONE	39
+#define STATUS_FILE_ERROR	40
 
 
 /*-- status.c --*/
diff --git a/g10/verify.c b/g10/verify.c
index 37a0caeb6..680fed0ff 100644
--- a/g10/verify.c
+++ b/g10/verify.c
@@ -84,6 +84,17 @@ verify_signatures( int nfiles, char **files )
     return rc;
 }
 
+
+static void
+print_file_status( int status, const char *name, int what )
+{
+    char *p = m_alloc(strlen(name)+10);
+    sprintf(p, "%d %s", what, name );
+    write_status_text( status, p );
+    m_free(p);
+}
+
+
 static int
 verify_one_file( const char *name )
 {
@@ -91,15 +102,10 @@ verify_one_file( const char *name )
     armor_filter_context_t afx;
     int rc;
 
-
-    {
-	char *p = m_alloc(strlen(name)+10);
-	sprintf(p, "1 %s", name );
-	write_status_text( STATUS_FILE_START, p );
-	m_free(p);
-    }
+    print_file_status( STATUS_FILE_START, name, 1 );
     fp = iobuf_open(name);
     if( !fp ) {
+	print_file_status( STATUS_FILE_ERROR, name, 1 );
 	log_error(_("can't open `%s'\n"), print_fname_stdin(name));
 	return G10ERR_OPEN_FILE;
     }
diff --git a/mpi/ChangeLog b/mpi/ChangeLog
index d6cf6e3ee..bc9fa0835 100644
--- a/mpi/ChangeLog
+++ b/mpi/ChangeLog
@@ -1,6 +1,5 @@
 Mon Aug 30 20:38:33 CEST 1999  Werner Koch  <[email protected]>
 
-
 	* config.links: Add case label for DJGPP
 
 Wed Jul 14 19:42:08 CEST 1999  Werner Koch  <[email protected]>
diff --git a/po/ChangeLog b/po/ChangeLog
index 2dc5c674b..1123807e1 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+Thu Sep 23 06:26:28 1999  Werner Koch  ([email protected])
+
+	* fr.po: Updated by Ga�l.
+
 Sat Sep 18 11:49:51 1999  Werner Koch  ([email protected])
 
 	* id.po: New. Done by Tedi Heriyanto.
diff --git a/po/de.po b/po/de.po
index f3b5ce330..9ef433b95 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,7 +3,7 @@
 # Walter Koch <[email protected]>, 1998.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-09-05 19:21+0200\n"
+"POT-Creation-Date: 1999-09-23 08:53+0200\n"
 "PO-Revision-Date: 1999-09-04 22:36+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -17,11 +17,11 @@ msgstr "Warnung: Sensible Daten k�nnten auf Platte ausgelagert werden.\n"
 
 # "  Um dies zu vermeiden, kann das Programm suid(root) installiert werden.\n"
 # "  Bitte wenden Sie sich hierzu an den Systemadministrator.\n"
-#: util/secmem.c:275
+#: util/secmem.c:281
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "Vorgang ist ohne sicheren Hauptspeicher nicht m�glich\n"
 
-#: util/secmem.c:276
+#: util/secmem.c:282
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 "(m�glicherweise haben Sie das falsche Programm f�r diese Aufgabe benutzt)\n"
@@ -282,7 +282,7 @@ msgstr ""
 "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n"
 "(Es werden noch %d Byte ben�tigt.)\n"
 
-#: g10/g10.c:185
+#: g10/g10.c:187
 msgid ""
 "@Commands:\n"
 " "
@@ -290,135 +290,135 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: g10/g10.c:187
+#: g10/g10.c:189
 msgid "|[file]|make a signature"
 msgstr "|[Datei]|Eine Unterschrift erzeugen"
 
-#: g10/g10.c:188
+#: g10/g10.c:190
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/g10.c:189
+#: g10/g10.c:191
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/g10.c:190
+#: g10/g10.c:192
 msgid "encrypt data"
 msgstr "Daten verschl�sseln"
 
-#: g10/g10.c:191
+#: g10/g10.c:193
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschl�sseln"
 
-#: g10/g10.c:192
+#: g10/g10.c:194
 msgid "store only"
 msgstr "Nur speichern"
 
-#: g10/g10.c:193
+#: g10/g10.c:195
 msgid "decrypt data (default)"
 msgstr "Daten entschl�sseln (Voreinstellung)"
 
-#: g10/g10.c:194
+#: g10/g10.c:196
 msgid "verify a signature"
 msgstr "Signatur pr�fen"
 
-#: g10/g10.c:195
+#: g10/g10.c:198
 msgid "list keys"
 msgstr "Liste der Schl�ssel"
 
-#: g10/g10.c:197
+#: g10/g10.c:200
 msgid "list keys and signatures"
 msgstr "Liste der Schl�ssel und ihrer Signaturen"
 
-#: g10/g10.c:198
+#: g10/g10.c:201
 msgid "check key signatures"
 msgstr "Signaturen der Schl�ssel pr�fen"
 
-#: g10/g10.c:199
+#: g10/g10.c:202
 msgid "list keys and fingerprints"
 msgstr "Liste der Schl�ssel und ihrer \"Fingerabdr�cke\""
 
-#: g10/g10.c:200
+#: g10/g10.c:203
 msgid "list secret keys"
 msgstr "Liste der geheimen Schl�ssel"
 
-#: g10/g10.c:201
+#: g10/g10.c:204
 msgid "generate a new key pair"
 msgstr "Ein neues Schl�sselpaar erzeugen"
 
-#: g10/g10.c:202
+#: g10/g10.c:205
 msgid "remove key from the public keyring"
 msgstr "Schl�ssel entfernen"
 
-#: g10/g10.c:203
+#: g10/g10.c:206
 msgid "sign a key"
 msgstr "Schl�ssel signieren"
 
-#: g10/g10.c:204
+#: g10/g10.c:207
 msgid "sign a key locally"
 msgstr "Schl�ssel nur auf diesem Rechner signieren"
 
-#: g10/g10.c:205
+#: g10/g10.c:208
 msgid "sign or edit a key"
 msgstr "Unterschreiben o. Bearbeiten eines Schl�ssels"
 
-#: g10/g10.c:206
+#: g10/g10.c:209
 msgid "generate a revocation certificate"
 msgstr "Ein Schl�sselwiderruf-Zertifikat erzeugen"
 
-#: g10/g10.c:207
+#: g10/g10.c:210
 msgid "export keys"
 msgstr "Schl�ssel exportieren"
 
-#: g10/g10.c:208
+#: g10/g10.c:211
 msgid "export keys to a key server"
 msgstr "Schl�ssel zu einem Schl�.server exportieren"
 
-#: g10/g10.c:209
+#: g10/g10.c:212
 msgid "import keys from a key server"
 msgstr "Schl�ssel von einem Schl�.server importieren"
 
-#: g10/g10.c:212
+#: g10/g10.c:215
 msgid "import/merge keys"
 msgstr "Schl�ssel importieren/kombinieren"
 
-#: g10/g10.c:214
+#: g10/g10.c:217
 msgid "list only the sequence of packets"
 msgstr "Lediglich Struktur der Datenpakete anzeigen"
 
-#: g10/g10.c:216
+#: g10/g10.c:219
 msgid "export the ownertrust values"
 msgstr "Exportieren der \"Owner trust\" Werte"
 
-#: g10/g10.c:218
+#: g10/g10.c:221
 msgid "import ownertrust values"
 msgstr "Importieren der \"Owner trust\" Werte"
 
-#: g10/g10.c:220
+#: g10/g10.c:223
 msgid "update the trust database"
 msgstr "�ndern der \"Trust\"-Datenbank"
 
-#: g10/g10.c:222
+#: g10/g10.c:225
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMEN]|�berpr�fen der \"Trust\"-Datenbank"
 
-#: g10/g10.c:223
+#: g10/g10.c:226
 msgid "fix a corrupted trust database"
 msgstr "Reparieren einer besch�digten \"Trust\"-Datenb."
 
-#: g10/g10.c:224
+#: g10/g10.c:227
 msgid "De-Armor a file or stdin"
 msgstr "Datei oder stdin von der ASCII-H�lle befreien"
 
-#: g10/g10.c:225
+#: g10/g10.c:229
 msgid "En-Armor a file or stdin"
 msgstr "Datei oder stdin in eine ASCII-H�lle einpacken"
 
-#: g10/g10.c:226
+#: g10/g10.c:231
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests f�r die Dateien ausgeben"
 
-#: g10/g10.c:230
+#: g10/g10.c:235
 msgid ""
 "@\n"
 "Options:\n"
@@ -428,172 +428,172 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/g10.c:232
+#: g10/g10.c:237
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-H�lle versehen"
 
-#: g10/g10.c:233
+#: g10/g10.c:239
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschl�sseln f�r NAME"
 
-#: g10/g10.c:236
+#: g10/g10.c:242
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|NAME als voreingestellten Empf�nger benutzen"
 
-#: g10/g10.c:238
+#: g10/g10.c:244
 msgid "use the default key as default recipient"
 msgstr ""
 "Den Standardschl�ssel als voreingestellten\n"
 "Empf�nger benutzen"
 
-#: g10/g10.c:242
+#: g10/g10.c:248
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/g10.c:243
+#: g10/g10.c:249
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/g10.c:245
+#: g10/g10.c:251
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/g10.c:246
+#: g10/g10.c:252
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/g10.c:247
+#: g10/g10.c:253
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: g10/g10.c:248
+#: g10/g10.c:254
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
-#: g10/g10.c:249
+#: g10/g10.c:255
 msgid "don't use the terminal at all"
 msgstr "das Terminal gar nicht benutzen"
 
-#: g10/g10.c:250
+#: g10/g10.c:256
 msgid "force v3 signatures"
 msgstr "v3 Signaturen erzwingen"
 
-#: g10/g10.c:251
+#: g10/g10.c:257
 msgid "always use a MDC for encryption"
 msgstr "Beim Verschl�sseln ein Siegel (MDC) verwenden"
 
-#: g10/g10.c:252
+#: g10/g10.c:258
 msgid "do not make any changes"
 msgstr "Keine wirklichen �nderungen durchf�hren"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:254
+#: g10/g10.c:260
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: g10/g10.c:255
+#: g10/g10.c:261
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: g10/g10.c:256
+#: g10/g10.c:262
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: g10/g10.c:257
+#: g10/g10.c:263
 msgid "add this keyring to the list of keyrings"
 msgstr "Als �ffentlichen Schl�sselbund mitbenutzen"
 
-#: g10/g10.c:258
+#: g10/g10.c:264
 msgid "add this secret keyring to the list"
 msgstr "Als geheimen Schl�sselbund mitbenutzen"
 
-#: g10/g10.c:259
+#: g10/g10.c:265
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten Schl�ssel benutzen"
 
-#: g10/g10.c:260
+#: g10/g10.c:266
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|Schl�ssel bei diesem Server nachschlagen"
 
-#: g10/g10.c:261
+#: g10/g10.c:267
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|Terminalzeichensatz NAME benutzen"
 
-#: g10/g10.c:262
+#: g10/g10.c:268
 msgid "read options from file"
 msgstr "Optionen aus der Datei lesen"
 
-#: g10/g10.c:264
+#: g10/g10.c:270
 msgid "set debugging flags"
 msgstr "Debug-Flags einschalten"
 
-#: g10/g10.c:265
+#: g10/g10.c:271
 msgid "enable full debugging"
 msgstr "Alle Debug-Flags einschalten"
 
-#: g10/g10.c:266
+#: g10/g10.c:272
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
-#: g10/g10.c:267
+#: g10/g10.c:273
 msgid "do not write comment packets"
 msgstr "Keine Kommentarpakete schreiben"
 
-#: g10/g10.c:268
+#: g10/g10.c:274
 msgid "(default is 1)"
 msgstr "Ben�tigte Vollvertrauen (Voreinstellung 1)"
 
-#: g10/g10.c:269
+#: g10/g10.c:275
 msgid "(default is 3)"
 msgstr "Ben�tigte Teilvertrauen (Voreinstellung 3)"
 
-#: g10/g10.c:271
+#: g10/g10.c:277
 msgid "|FILE|load extension module FILE"
 msgstr "|DATEI|Erweiterungsmodul DATEI laden"
 
-#: g10/g10.c:272
+#: g10/g10.c:278
 msgid "emulate the mode described in RFC1991"
 msgstr "Den in RFC1991 beschriebenen Modus nachahmen"
 
-#: g10/g10.c:273
+#: g10/g10.c:279
 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:274
+#: g10/g10.c:280
 msgid "|N|use passphrase mode N"
 msgstr "|N|Verwenden des Mantra-Modus N"
 
-#: g10/g10.c:276
+#: g10/g10.c:282
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|Hashverfahren NAME f�r Mantras benutzen"
 
-#: g10/g10.c:278
+#: g10/g10.c:284
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|Verschl�.verfahren NAME f�r Mantras benutzen"
 
-#: g10/g10.c:279
+#: g10/g10.c:285
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Verschl�.verfahren NAME benutzen"
 
-#: g10/g10.c:280
+#: g10/g10.c:286
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Hashverfahren NAME benutzen"
 
-#: g10/g10.c:281
+#: g10/g10.c:287
 msgid "|N|use compress algorithm N"
 msgstr "|N|Komprimierverfahren N benutzen"
 
-#: g10/g10.c:282
+#: g10/g10.c:288
 msgid "throw keyid field of encrypted packets"
 msgstr "Entferne Empf�nger-ID verschl�sselter Pakete"
 
-#: g10/g10.c:283
+#: g10/g10.c:289
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=WERT|verwende diese \"notation\"-Daten"
 
-#: g10/g10.c:285
+#: g10/g10.c:291
 msgid ""
 "@\n"
 "Examples:\n"
@@ -613,17 +613,17 @@ msgstr ""
 " --list-keys [Namen]        Schl�ssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdr�cke\" anzeigen\n"
 
-#: g10/g10.c:370
+#: g10/g10.c:378
 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:374
+#: g10/g10.c:382
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
 
-#: g10/g10.c:377
+#: g10/g10.c:385
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -633,7 +633,7 @@ msgstr ""
 "Signieren, pr�fen, verschl�sseln, entschl�sseln\n"
 "Die voreingestellte Operation ist abh�ngig von den Eingabedaten\n"
 
-#: g10/g10.c:382
+#: g10/g10.c:390
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -641,184 +641,184 @@ msgstr ""
 "\n"
 "Unterst�tzte Verfahren:\n"
 
-#: g10/g10.c:456
+#: g10/g10.c:468
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/g10.c:509
+#: g10/g10.c:521
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/g10.c:644
+#: g10/g10.c:656
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/g10.c:648
+#: g10/g10.c:660
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:667
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:835
+#: g10/g10.c:848
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ist kein g�ltiger Zeichensatz.\n"
 
-#: g10/g10.c:892 g10/g10.c:901
+#: g10/g10.c:912 g10/g10.c:921
 #, 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:894
+#: g10/g10.c:914
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/g10.c:897
+#: g10/g10.c:917
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/g10.c:916 g10/g10.c:928
+#: g10/g10.c:936 g10/g10.c:948
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgew�hlte Verschl�sslungsverfahren ist ung�ltig\n"
 
-#: g10/g10.c:922 g10/g10.c:934
+#: g10/g10.c:942 g10/g10.c:954
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:938
+#: g10/g10.c:958
 msgid "the given policy URL is invalid\n"
 msgstr "Die angegebene URL f�r Richtlinien ist ung�ltig\n"
 
-#: g10/g10.c:941
+#: g10/g10.c:961
 #, 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:943
+#: g10/g10.c:963
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m�ssen gr��er als 0 sein\n"
 
-#: g10/g10.c:945
+#: g10/g10.c:965
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed m�ssen gr��er als 1 sein\n"
 
-#: g10/g10.c:947
+#: g10/g10.c:967
 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:950
+#: g10/g10.c:970
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:954
+#: g10/g10.c:974
 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:1031
+#: g10/g10.c:1051
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:1037
+#: g10/g10.c:1057
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:1044
+#: g10/g10.c:1064
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:1052
+#: g10/g10.c:1072
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:1065
+#: g10/g10.c:1085
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:1078
+#: g10/g10.c:1098
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:1092
+#: g10/g10.c:1112
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:1104
+#: g10/g10.c:1129
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:1112
+#: g10/g10.c:1137
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/g10.c:1120
+#: g10/g10.c:1145
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/g10.c:1128
+#: g10/g10.c:1153
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/g10.c:1144
+#: g10/g10.c:1169
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key User-ID"
 
-#: g10/g10.c:1147
+#: g10/g10.c:1172
 msgid "--delete-key user-id"
 msgstr "--delete-key User-ID"
 
-#: g10/encode.c:259 g10/g10.c:1171 g10/sign.c:366
+#: g10/encode.c:259 g10/g10.c:1196 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:1182
+#: g10/g10.c:1207
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schl�sselbund]"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1268
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1251
+#: g10/g10.c:1276
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1319
+#: g10/g10.c:1344
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ung�ltiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:1400
+#: g10/g10.c:1425
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:1404
+#: g10/g10.c:1429
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1407 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1432 g10/verify.c:67 g10/verify.c:109
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht ge�ffnet werden\n"
 
-#: g10/g10.c:1576
+#: g10/g10.c:1601
 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:1582
+#: g10/g10.c:1607
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -826,12 +826,12 @@ msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und mu� mit einem '=' enden\n"
 
-#: g10/g10.c:1588
+#: g10/g10.c:1613
 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:1596
+#: g10/g10.c:1621
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
@@ -1512,7 +1512,7 @@ msgstr ""
 msgid "Really create? "
 msgstr "Wirklich erzeugen? "
 
-#: g10/encode.c:91 g10/openfile.c:156 g10/openfile.c:246 g10/tdbio.c:468
+#: g10/encode.c:91 g10/openfile.c:161 g10/openfile.c:270 g10/tdbio.c:468
 #: g10/tdbio.c:529
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1681,7 +1681,7 @@ msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel nicht gefunden: %s\n"
 msgid "no default public keyring\n"
 msgstr "Kein voreingestellter �ffentlicher Schl�sselbund\n"
 
-#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:580
+#: g10/import.c:399 g10/openfile.c:213 g10/sign.c:268 g10/sign.c:580
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
@@ -1856,7 +1856,7 @@ msgstr "Schl�ssel %08lX: Doppelte User-ID entdeckt - zusammengef�hrt\n"
 msgid "key %08lX: revocation certificate added\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat hinzugef�gt\n"
 
-#: g10/import.c:1128 g10/import.c:1183
+#: g10/import.c:1128 g10/import.c:1181
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "Schl�ssel %08lX: Unsere Kopie hat keine Eigenbeglaubigung\n"
@@ -2437,74 +2437,74 @@ msgstr "kein geheimer Schl�ssel zur Entschl�sselung vorhanden\n"
 msgid "public key decryption failed: %s\n"
 msgstr "Entschl�sselung mit �ffentlichem Schl�ssel fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:330
+#: g10/mainproc.c:332
 msgid "decryption okay\n"
 msgstr "Enschl�sselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:335
+#: g10/mainproc.c:337
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Warnung: Verschl�sselte Botschaft ist manipuliert worden!\n"
 
-#: g10/mainproc.c:340
+#: g10/mainproc.c:342
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Enschl�sselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:358
+#: g10/mainproc.c:360
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 "Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:360
+#: g10/mainproc.c:362
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Urspr�nglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:587 g10/mainproc.c:596
+#: g10/mainproc.c:589 g10/mainproc.c:598
 msgid "WARNING: invalid notation data found\n"
 msgstr "WARNUNG: Ung�ltige \"Notation\"-Daten gefunden\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:601
 msgid "Notation: "
 msgstr "\"Notation\": "
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:608
 msgid "Policy: "
 msgstr "Richtlinie: "
 
-#: g10/mainproc.c:1025
+#: g10/mainproc.c:1027
 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:1031
+#: g10/mainproc.c:1033
 #, 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:1057 g10/mainproc.c:1068
+#: g10/mainproc.c:1059 g10/mainproc.c:1070
 msgid "BAD signature from \""
 msgstr "FALSCHE Unterschrift von \""
 
-#: g10/mainproc.c:1058 g10/mainproc.c:1069
+#: g10/mainproc.c:1060 g10/mainproc.c:1071
 msgid "Good signature from \""
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:1060
+#: g10/mainproc.c:1062
 msgid "                aka \""
 msgstr "                    alias \""
 
-#: g10/mainproc.c:1115
+#: g10/mainproc.c:1117
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht gepr�ft werden: %s\n"
 
-#: g10/mainproc.c:1212
+#: g10/mainproc.c:1214
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1219
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ung�ltiges root-Paket in proc_tree() entdeckt\n"
 
@@ -2726,7 +2726,7 @@ msgstr "%s: Verzeichnis erzeugt\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: Verzeichnis existiert nicht!\n"
 
-#: g10/openfile.c:182 g10/openfile.c:253 g10/ringedit.c:1348 g10/tdbio.c:458
+#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1348 g10/tdbio.c:458
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: kann nicht erzeugt werden: %s\n"
@@ -3112,6 +3112,11 @@ msgstr "konnte '%s' nicht in die 'Trust'-Datenbank hineintun: %s\n"
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "WARNUNG: Lange 'Pref'-Records k�nnen noch nicht benutzt werden\n"
 
+#: g10/verify.c:143
+#, c-format
+msgid "input line %u too long or missing LF\n"
+msgstr ""
+
 #: g10/ringedit.c:318
 #, c-format
 msgid "%s: can't create keyring: %s\n"
@@ -3161,34 +3166,34 @@ msgstr ""
 "ist f�r Signaturen NICHT sicher genug!\n"
 
 #. do not overwrite
-#: g10/openfile.c:65
+#: g10/openfile.c:72
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Datei '%s' existiert bereits. "
 
-#: g10/openfile.c:67
+#: g10/openfile.c:74
 msgid "Overwrite (y/N)? "
 msgstr "�berschreiben (j/N)? "
 
-#: g10/openfile.c:97
+#: g10/openfile.c:102
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: unbekannte Dateinamenerweiterung\n"
 
-#: g10/openfile.c:119
+#: g10/openfile.c:124
 msgid "Enter new filename"
 msgstr "Neuen Dateinamen eingeben"
 
-#: g10/openfile.c:160
+#: g10/openfile.c:165
 msgid "writing to stdout\n"
 msgstr "Schreiben auf die Standardausgabe\n"
 
-#: g10/openfile.c:219
+#: g10/openfile.c:243
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "die unterzeichneten Daten sind wohl in '%s'\n"
 
-#: g10/openfile.c:269
+#: g10/openfile.c:293
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: neue Optionendatei erstellt\n"
diff --git a/po/es_ES.po b/po/es_ES.po
index 04ab34bf8..ae36da292 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@
 # GPG version: 0.9.7
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-09-05 19:21+0200\n"
+"POT-Creation-Date: 1999-09-23 08:53+0200\n"
 "PO-Revision-Date: 1999-06-06 18:33+0200\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-13 10:49:25+0100\n"
@@ -26,11 +26,11 @@ msgstr ""
 msgid "Warning: using insecure memory!\n"
 msgstr "ATENCI�N: �se est� usando memoria insegura!\n"
 
-#: util/secmem.c:275
+#: util/secmem.c:281
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operaci�n imposible sin memoria segura inicializada\n"
 
-#: util/secmem.c:276
+#: util/secmem.c:282
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 
@@ -291,7 +291,7 @@ msgstr ""
 "otro trabajo para que el sistema pueda recolectar m�s entrop�a\n"
 "(se necesitan %d bytes m�s).\n"
 
-#: g10/g10.c:185
+#: g10/g10.c:187
 msgid ""
 "@Commands:\n"
 " "
@@ -299,138 +299,138 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:187
+#: g10/g10.c:189
 msgid "|[file]|make a signature"
 msgstr "|[file]|hace una firma"
 
-#: g10/g10.c:188
+#: g10/g10.c:190
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|hace una firma en texto claro"
 
-#: g10/g10.c:189
+#: g10/g10.c:191
 msgid "make a detached signature"
 msgstr "hace una firma separada"
 
-#: g10/g10.c:190
+#: g10/g10.c:192
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/g10.c:191
+#: g10/g10.c:193
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/g10.c:192
+#: g10/g10.c:194
 msgid "store only"
 msgstr "s�lo almacenar"
 
-#: g10/g10.c:193
+#: g10/g10.c:195
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/g10.c:194
+#: g10/g10.c:196
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:195
+#: g10/g10.c:198
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/g10.c:197
+#: g10/g10.c:200
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/g10.c:198
+#: g10/g10.c:201
 msgid "check key signatures"
 msgstr "comprueba las firmas de las claves"
 
-#: g10/g10.c:199
+#: g10/g10.c:202
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/g10.c:200
+#: g10/g10.c:203
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/g10.c:201
+#: g10/g10.c:204
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/g10.c:202
+#: g10/g10.c:205
 msgid "remove key from the public keyring"
 msgstr "elimina la clave del anillo p�blico"
 
-#: g10/g10.c:203
+#: g10/g10.c:206
 #, fuzzy
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/g10.c:204
+#: g10/g10.c:207
 #, fuzzy
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/g10.c:205
+#: g10/g10.c:208
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/g10.c:206
+#: g10/g10.c:209
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocaci�n"
 
-#: g10/g10.c:207
+#: g10/g10.c:210
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/g10.c:208
+#: g10/g10.c:211
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/g10.c:209
+#: g10/g10.c:212
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/g10.c:212
+#: g10/g10.c:215
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/g10.c:214
+#: g10/g10.c:217
 msgid "list only the sequence of packets"
 msgstr "lista s�lo la secuencia de paquetes"
 
-#: g10/g10.c:216
+#: g10/g10.c:219
 msgid "export the ownertrust values"
 msgstr "exporta los valores de confianza"
 
-#: g10/g10.c:218
+#: g10/g10.c:221
 msgid "import ownertrust values"
 msgstr "importa los valores de confianza"
 
-#: g10/g10.c:220
+#: g10/g10.c:223
 #, fuzzy
 msgid "update the trust database"
 msgstr "|[NOMBRES]|actualiza la base de datos de confianza"
 
-#: g10/g10.c:222
+#: g10/g10.c:225
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMBRES]|comprueba la base de datos de confianza"
 
-#: g10/g10.c:223
+#: g10/g10.c:226
 msgid "fix a corrupted trust database"
 msgstr "arregla una base de datos de confianza da�ada"
 
-#: g10/g10.c:224
+#: g10/g10.c:227
 msgid "De-Armor a file or stdin"
 msgstr "quita la armadura de un fichero o stdin"
 
-#: g10/g10.c:225
+#: g10/g10.c:229
 msgid "En-Armor a file or stdin"
 msgstr "crea la armadura a un fichero o stdin"
 
-#: g10/g10.c:226
+#: g10/g10.c:231
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime res�menes de mensaje"
 
-#: g10/g10.c:230
+#: g10/g10.c:235
 msgid ""
 "@\n"
 "Options:\n"
@@ -440,173 +440,173 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/g10.c:232
+#: g10/g10.c:237
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/g10.c:233
+#: g10/g10.c:239
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/g10.c:236
+#: g10/g10.c:242
 #, fuzzy
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
-#: g10/g10.c:238
+#: g10/g10.c:244
 msgid "use the default key as default recipient"
 msgstr ""
 
-#: g10/g10.c:242
+#: g10/g10.c:248
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/g10.c:243
+#: g10/g10.c:249
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|establece nivel de compresi�n N (0 no comprime)"
 
-#: g10/g10.c:245
+#: g10/g10.c:251
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/g10.c:246
+#: g10/g10.c:252
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/g10.c:247
+#: g10/g10.c:253
 msgid "verbose"
 msgstr "prolijo"
 
-#: g10/g10.c:248
+#: g10/g10.c:254
 msgid "be somewhat more quiet"
 msgstr "algo m�s discreto"
 
-#: g10/g10.c:249
+#: g10/g10.c:255
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: g10/g10.c:250
+#: g10/g10.c:256
 msgid "force v3 signatures"
 msgstr "fuerza firmas v3"
 
-#: g10/g10.c:251
+#: g10/g10.c:257
 msgid "always use a MDC for encryption"
 msgstr "siempre usa un MCD para cifrar"
 
-#: g10/g10.c:252
+#: g10/g10.c:258
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:254
+#: g10/g10.c:260
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
-#: g10/g10.c:255
+#: g10/g10.c:261
 msgid "assume yes on most questions"
 msgstr "asume \"s�\" en casi todas las preguntas"
 
-#: g10/g10.c:256
+#: g10/g10.c:262
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: g10/g10.c:257
+#: g10/g10.c:263
 msgid "add this keyring to the list of keyrings"
 msgstr "a�ade este anillo a la lista de anillos"
 
-#: g10/g10.c:258
+#: g10/g10.c:264
 msgid "add this secret keyring to the list"
 msgstr "a�ade este anillo secreto a la lista"
 
-#: g10/g10.c:259
+#: g10/g10.c:265
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
-#: g10/g10.c:260
+#: g10/g10.c:266
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVIDOR|usa este servidor de claves"
 
-#: g10/g10.c:261
+#: g10/g10.c:267
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
 
-#: g10/g10.c:262
+#: g10/g10.c:268
 msgid "read options from file"
 msgstr "lee opciones del fichero"
 
-#: g10/g10.c:264
+#: g10/g10.c:270
 msgid "set debugging flags"
 msgstr "establece los par�metros de depuraci�n"
 
-#: g10/g10.c:265
+#: g10/g10.c:271
 msgid "enable full debugging"
 msgstr "habilita depuraci�n completa"
 
-#: g10/g10.c:266
+#: g10/g10.c:272
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe informaci�n de estado en descriptor DF"
 
-#: g10/g10.c:267
+#: g10/g10.c:273
 msgid "do not write comment packets"
 msgstr "no escribe paquetes de comentario"
 
-#: g10/g10.c:268
+#: g10/g10.c:274
 msgid "(default is 1)"
 msgstr "(por defecto es 1)"
 
-#: g10/g10.c:269
+#: g10/g10.c:275
 msgid "(default is 3)"
 msgstr "(por defecto es 3)"
 
-#: g10/g10.c:271
+#: g10/g10.c:277
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
 
-#: g10/g10.c:272
+#: g10/g10.c:278
 msgid "emulate the mode described in RFC1991"
 msgstr "emula el modo descrito en la RFC1991"
 
-#: g10/g10.c:273
+#: g10/g10.c:279
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:274
+#: g10/g10.c:280
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa modo de contrase�a N"
 
-#: g10/g10.c:276
+#: g10/g10.c:282
 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:278
+#: g10/g10.c:284
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las\n"
 "contrase�as"
 
-#: g10/g10.c:279
+#: g10/g10.c:285
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
 
-#: g10/g10.c:280
+#: g10/g10.c:286
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: g10/g10.c:281
+#: g10/g10.c:287
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa el algoritmo de compresi�n N"
 
-#: g10/g10.c:282
+#: g10/g10.c:288
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina el campo keyid de los paquetes cifrados"
 
-#: g10/g10.c:283
+#: g10/g10.c:289
 msgid "|NAME=VALUE|use this notation data"
 msgstr ""
 
-#: g10/g10.c:285
+#: g10/g10.c:291
 msgid ""
 "@\n"
 "Examples:\n"
@@ -626,15 +626,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/g10.c:370
+#: g10/g10.c:378
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
-#: g10/g10.c:374
+#: g10/g10.c:382
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/g10.c:377
+#: g10/g10.c:385
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -644,7 +644,7 @@ msgstr ""
 "Firma, comprueba, cifra o descifra.\n"
 "La operaci�n por defecto depende del tipo de datos de entrada.\n"
 
-#: g10/g10.c:382
+#: g10/g10.c:390
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -652,197 +652,197 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/g10.c:456
+#: g10/g10.c:468
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/g10.c:509
+#: g10/g10.c:521
 msgid "conflicting commands\n"
 msgstr "comandos incompatibles\n"
 
-#: g10/g10.c:644
+#: g10/g10.c:656
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/g10.c:648
+#: g10/g10.c:660
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:667
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/g10.c:835
+#: g10/g10.c:848
 #, 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:892 g10/g10.c:901
+#: g10/g10.c:912 g10/g10.c:921
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/g10.c:894
+#: g10/g10.c:914
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr ""
 
-#: g10/g10.c:897
+#: g10/g10.c:917
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr ""
 
-#: g10/g10.c:916 g10/g10.c:928
+#: g10/g10.c:936 g10/g10.c:948
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado no es v�lido\n"
 
-#: g10/g10.c:922 g10/g10.c:934
+#: g10/g10.c:942 g10/g10.c:954
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no es v�lido\n"
 
-#: g10/g10.c:938
+#: g10/g10.c:958
 msgid "the given policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:941
+#: g10/g10.c:961
 #, 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:943
+#: g10/g10.c:963
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/g10.c:945
+#: g10/g10.c:965
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/g10.c:947
+#: g10/g10.c:967
 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:950
+#: g10/g10.c:970
 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:954
+#: g10/g10.c:974
 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:1031
+#: g10/g10.c:1051
 #, 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:1037
+#: g10/g10.c:1057
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/g10.c:1044
+#: g10/g10.c:1064
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:1052
+#: g10/g10.c:1072
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/g10.c:1065
+#: g10/g10.c:1085
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/g10.c:1078
+#: g10/g10.c:1098
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:1092
+#: g10/g10.c:1112
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/g10.c:1104
+#: g10/g10.c:1129
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/g10.c:1112
+#: g10/g10.c:1137
 msgid "--sign-key user-id"
 msgstr ""
 
-#: g10/g10.c:1120
+#: g10/g10.c:1145
 #, fuzzy
 msgid "--lsign-key user-id"
 msgstr "--delete-key nombre_usuario"
 
-#: g10/g10.c:1128
+#: g10/g10.c:1153
 #, fuzzy
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nombre_usuario [comandos]"
 
-#: g10/g10.c:1144
+#: g10/g10.c:1169
 #, fuzzy
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key nombre_usuario"
 
-#: g10/g10.c:1147
+#: g10/g10.c:1172
 #, fuzzy
 msgid "--delete-key user-id"
 msgstr "--delete-key nombre_usuario"
 
-#: g10/encode.c:259 g10/g10.c:1171 g10/sign.c:366
+#: g10/encode.c:259 g10/g10.c:1196 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1207
 #, fuzzy
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id_usuario] [anillo]"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1268
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:1251
+#: g10/g10.c:1276
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:1319
+#: g10/g10.c:1344
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n no v�lido `%s'\n"
 
-#: g10/g10.c:1400
+#: g10/g10.c:1425
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
-#: g10/g10.c:1404
+#: g10/g10.c:1429
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1407 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1432 g10/verify.c:67 g10/verify.c:109
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no puede abrirse `%s'\n"
 
-#: g10/g10.c:1576
+#: g10/g10.c:1601
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 
-#: g10/g10.c:1582
+#: g10/g10.c:1607
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1588
+#: g10/g10.c:1613
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1596
+#: g10/g10.c:1621
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
@@ -1519,7 +1519,7 @@ msgstr ""
 msgid "Really create? "
 msgstr "�Crear de verdad? "
 
-#: g10/encode.c:91 g10/openfile.c:156 g10/openfile.c:246 g10/tdbio.c:468
+#: g10/encode.c:91 g10/openfile.c:161 g10/openfile.c:270 g10/tdbio.c:468
 #: g10/tdbio.c:529
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1689,7 +1689,7 @@ msgstr "clave %08lX: clave p�blica no encontrada: %s\n"
 msgid "no default public keyring\n"
 msgstr "no hay anillo p�blico por defecto\n"
 
-#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:580
+#: g10/import.c:399 g10/openfile.c:213 g10/sign.c:268 g10/sign.c:580
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
@@ -1862,7 +1862,7 @@ msgstr "clave %08lX: detectado usuario duplicado - fusionada\n"
 msgid "key %08lX: revocation certificate added\n"
 msgstr "clave %08lX: certificado de revocaci�n a�adido\n"
 
-#: g10/import.c:1128 g10/import.c:1183
+#: g10/import.c:1128 g10/import.c:1181
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "clave %08lX: nuestra copia no tiene autofirma\n"
@@ -2463,73 +2463,73 @@ msgstr "Clave secreta no disponible"
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave p�blica fallido: %s\n"
 
-#: g10/mainproc.c:330
+#: g10/mainproc.c:332
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:335
+#: g10/mainproc.c:337
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCI�N: �el mensaje cifrado ha sido manipulado!\n"
 
-#: g10/mainproc.c:340
+#: g10/mainproc.c:342
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:358
+#: g10/mainproc.c:360
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitente solicit� \"s�lo-para-tus-ojos\"\n"
 
-#: g10/mainproc.c:360
+#: g10/mainproc.c:362
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:587 g10/mainproc.c:596
+#: g10/mainproc.c:589 g10/mainproc.c:598
 #, fuzzy
 msgid "WARNING: invalid notation data found\n"
 msgstr "no se han encontrados datos OpenPGP v�lidos\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:601
 msgid "Notation: "
 msgstr ""
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:608
 msgid "Policy: "
 msgstr ""
 
-#: g10/mainproc.c:1025
+#: g10/mainproc.c:1027
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificaci�n de la firma\n"
 
-#: g10/mainproc.c:1031
+#: g10/mainproc.c:1033
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Firma creada %.*s usando identificativo de clave %s %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1057 g10/mainproc.c:1068
+#: g10/mainproc.c:1059 g10/mainproc.c:1070
 msgid "BAD signature from \""
 msgstr "Firma INCORRECTA de \""
 
-#: g10/mainproc.c:1058 g10/mainproc.c:1069
+#: g10/mainproc.c:1060 g10/mainproc.c:1071
 msgid "Good signature from \""
 msgstr "Firma correcta de \""
 
-#: g10/mainproc.c:1060
+#: g10/mainproc.c:1062
 msgid "                aka \""
 msgstr "tambi�n conocido como \""
 
-#: g10/mainproc.c:1115
+#: g10/mainproc.c:1117
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:1212
+#: g10/mainproc.c:1214
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1219
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z no v�lido detectado en proc_tree()\n"
 
@@ -2745,7 +2745,7 @@ msgstr "%s: directorio creado\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: �el directorio no existe!\n"
 
-#: g10/openfile.c:182 g10/openfile.c:253 g10/ringedit.c:1348 g10/tdbio.c:458
+#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1348 g10/tdbio.c:458
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: no puede crearse: %s\n"
@@ -3132,6 +3132,11 @@ msgstr "fallo al poner '%s' en la tabla de confianza: %s\n"
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "ATENC�ON: todav�a no puedo tratar registros de preferencias largos\n"
 
+#: g10/verify.c:143
+#, c-format
+msgid "input line %u too long or missing LF\n"
+msgstr ""
+
 #: g10/ringedit.c:318
 #, c-format
 msgid "%s: can't create keyring: %s\n"
@@ -3179,35 +3184,35 @@ msgstr ""
 "para las firmas\n"
 
 #. do not overwrite
-#: g10/openfile.c:65
+#: g10/openfile.c:72
 #, c-format
 msgid "File `%s' exists. "
 msgstr "El fichero `%s' ya existe. "
 
-#: g10/openfile.c:67
+#: g10/openfile.c:74
 msgid "Overwrite (y/N)? "
 msgstr "�Sobreescribir (s/N)? "
 
-#: g10/openfile.c:97
+#: g10/openfile.c:102
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr ""
 
-#: g10/openfile.c:119
+#: g10/openfile.c:124
 #, fuzzy
 msgid "Enter new filename"
 msgstr "--store [nombre_fichero]"
 
-#: g10/openfile.c:160
+#: g10/openfile.c:165
 msgid "writing to stdout\n"
 msgstr "escribiendo en stdout\n"
 
-#: g10/openfile.c:219
+#: g10/openfile.c:243
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "asumiendo que hay datos firmados en `%s'\n"
 
-#: g10/openfile.c:269
+#: g10/openfile.c:293
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: se ha creado un nuevo fichero de opciones\n"
diff --git a/po/fr.po b/po/fr.po
index 44b3776a2..f43b22d70 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,11 +2,14 @@
 # Copyright (C) 1998, 1999 Free Software Foundation, Inc.
 # Ga�l Qu�ri <[email protected]>, 1998.
 #
+# La version la plus r�cente peut �tre trouv�e � :
+# Latest version can be found at :
+# <http://www.multimania.com/gqueri/gnupg/po.html>
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0\n"
-"POT-Creation-Date: 1999-09-05 19:21+0200\n"
-"PO-Revision-Date: 1999-09-03 18:07+0200\n"
+"POT-Creation-Date: 1999-09-23 08:53+0200\n"
+"PO-Revision-Date: 1999-09-15 23:44+0200\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -17,13 +20,13 @@ msgstr ""
 msgid "Warning: using insecure memory!\n"
 msgstr "Attention : utilisation de la m�moire non s�re !\n"
 
-#: util/secmem.c:275
+#: util/secmem.c:281
 msgid "operation is not possible without initialized secure memory\n"
 msgstr ""
 "l'op�ration n'est pas possible tant que la m�moire s�re n'est pas\n"
 "initialis�e\n"
 
-#: util/secmem.c:276
+#: util/secmem.c:282
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(vous avez peut-�tre utilis� le mauvais programme pour cette tache)\n"
 
@@ -101,7 +104,7 @@ msgstr "algorithme de chiffrement inconnu"
 
 #: util/errors.c:66
 msgid "can't open the keyring"
-msgstr "ne peut ouvrir le porte-cl�s"
+msgstr "impossible d'ouvrir le porte-cl�s"
 
 #: util/errors.c:67
 msgid "invalid packet"
@@ -157,11 +160,11 @@ msgstr "mot de passe invalide"
 
 #: util/errors.c:80
 msgid "unimplemented pubkey algorithm"
-msgstr "algorithme � cl� publique non impl�ment�"
+msgstr "algorithme � cl� publique non implant�"
 
 #: util/errors.c:81
 msgid "unimplemented cipher algorithm"
-msgstr "algorithme de chiffrement non impl�ment�"
+msgstr "algorithme de chiffrement non implant�"
 
 #: util/errors.c:82
 msgid "unknown signature class"
@@ -283,7 +286,7 @@ msgstr ""
 "Il n'y a pas assez d'octets al�atoires disponibles. Faites autre chose\n"
 "pour que l'OS puisse amasser plus d'entropie ! (il faut %d octets de plus)\n"
 
-#: g10/g10.c:185
+#: g10/g10.c:187
 msgid ""
 "@Commands:\n"
 " "
@@ -291,136 +294,136 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: g10/g10.c:187
+#: g10/g10.c:189
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/g10.c:188
+#: g10/g10.c:190
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/g10.c:189
+#: g10/g10.c:191
 msgid "make a detached signature"
 msgstr "faire une signature d�tach�e"
 
-#: g10/g10.c:190
+#: g10/g10.c:192
 msgid "encrypt data"
 msgstr "chiffrer les donn�es"
 
-#: g10/g10.c:191
+#: g10/g10.c:193
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement sym�trique seulement"
 
-#: g10/g10.c:192
+#: g10/g10.c:194
 msgid "store only"
 msgstr "pas d'action"
 
-#: g10/g10.c:193
+#: g10/g10.c:195
 msgid "decrypt data (default)"
 msgstr "d�chiffrer les donn�es (d�faut)"
 
-#: g10/g10.c:194
+#: g10/g10.c:196
 msgid "verify a signature"
 msgstr "v�rifier une signature"
 
-#: g10/g10.c:195
+#: g10/g10.c:198
 msgid "list keys"
 msgstr "lister les cl�s"
 
-#: g10/g10.c:197
+#: g10/g10.c:200
 msgid "list keys and signatures"
 msgstr "lister les cl�s et les signatures"
 
-#: g10/g10.c:198
+#: g10/g10.c:201
 msgid "check key signatures"
 msgstr "v�rifier les signatures des cl�s"
 
-#: g10/g10.c:199
+#: g10/g10.c:202
 msgid "list keys and fingerprints"
 msgstr "lister les cl�s et les empreintes"
 
-#: g10/g10.c:200
+#: g10/g10.c:203
 msgid "list secret keys"
 msgstr "lister les cl�s secr�tes"
 
-#: g10/g10.c:201
+#: g10/g10.c:204
 msgid "generate a new key pair"
 msgstr "g�n�rer une nouvelle paire de cl�s"
 
-#: g10/g10.c:202
+#: g10/g10.c:205
 msgid "remove key from the public keyring"
 msgstr "enlever la cl� du porte-cl�s public"
 
-#: g10/g10.c:203
+#: g10/g10.c:206
 msgid "sign a key"
 msgstr "signer une cl�"
 
-#: g10/g10.c:204
+#: g10/g10.c:207
 msgid "sign a key locally"
 msgstr "signer une cl� localement"
 
-#: g10/g10.c:205
+#: g10/g10.c:208
 msgid "sign or edit a key"
 msgstr "signer ou �diter une cl�"
 
-#: g10/g10.c:206
+#: g10/g10.c:209
 msgid "generate a revocation certificate"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: g10/g10.c:207
+#: g10/g10.c:210
 msgid "export keys"
 msgstr "exporter les cl�s"
 
-#: g10/g10.c:208
+#: g10/g10.c:211
 msgid "export keys to a key server"
 msgstr "exporter les cl�s vers un serveur de cl�s"
 
-#: g10/g10.c:209
+#: g10/g10.c:212
 msgid "import keys from a key server"
 msgstr "importer les cl�s d'un serveur de cl�s"
 
-#: g10/g10.c:212
+#: g10/g10.c:215
 msgid "import/merge keys"
 msgstr "importer/fusionner les cl�s"
 
-#: g10/g10.c:214
+#: g10/g10.c:217
 msgid "list only the sequence of packets"
 msgstr "ne lister que les paquets"
 
-#: g10/g10.c:216
+#: g10/g10.c:219
 msgid "export the ownertrust values"
 msgstr "exporter les indices de confiance"
 
-#: g10/g10.c:218
+#: g10/g10.c:221
 msgid "import ownertrust values"
 msgstr "importer les indices de confiance"
 
 #
-#: g10/g10.c:220
+#: g10/g10.c:223
 msgid "update the trust database"
 msgstr "mettre la base de confiance � jour"
 
-#: g10/g10.c:222
+#: g10/g10.c:225
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMS]|v�rifier la base de confiance"
 
-#: g10/g10.c:223
+#: g10/g10.c:226
 msgid "fix a corrupted trust database"
 msgstr "r�parer une base de confiance corrompue"
 
-#: g10/g10.c:224
+#: g10/g10.c:227
 msgid "De-Armor a file or stdin"
 msgstr "Enlever l'armure d'un fichier ou de stdin"
 
-#: g10/g10.c:225
+#: g10/g10.c:229
 msgid "En-Armor a file or stdin"
 msgstr "Mettre une armure � un fichier ou � stdin"
 
-#: g10/g10.c:226
+#: g10/g10.c:231
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/g10.c:230
+#: g10/g10.c:235
 msgid ""
 "@\n"
 "Options:\n"
@@ -430,169 +433,169 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/g10.c:232
+#: g10/g10.c:237
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: g10/g10.c:233
+#: g10/g10.c:239
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/g10.c:236
+#: g10/g10.c:242
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOM|utiliser NOM comme r�cipient par d�faut"
 
-#: g10/g10.c:238
+#: g10/g10.c:244
 msgid "use the default key as default recipient"
 msgstr "utiliser la cl� par d�f. comme r�cipient"
 
-#: g10/g10.c:242
+#: g10/g10.c:248
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou d�chiffrer"
 
-#: g10/g10.c:243
+#: g10/g10.c:249
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 d�sactive)"
 
-#: g10/g10.c:245
+#: g10/g10.c:251
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/g10.c:246
+#: g10/g10.c:252
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/g10.c:247
+#: g10/g10.c:253
 msgid "verbose"
 msgstr "bavard"
 
-#: g10/g10.c:248
+#: g10/g10.c:254
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: g10/g10.c:249
+#: g10/g10.c:255
 msgid "don't use the terminal at all"
 msgstr "ne pas utiliser du tout le terminal"
 
 #
-#: g10/g10.c:250
+#: g10/g10.c:256
 msgid "force v3 signatures"
 msgstr "forcer les signatures en v3"
 
-#: g10/g10.c:251
+#: g10/g10.c:257
 msgid "always use a MDC for encryption"
 msgstr "toujours utiliser un sceau pour le chiffrement"
 
-#: g10/g10.c:252
+#: g10/g10.c:258
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:254
+#: g10/g10.c:260
 msgid "batch mode: never ask"
 msgstr "mode automatique : ne jamais rien demander"
 
-#: g10/g10.c:255
+#: g10/g10.c:261
 msgid "assume yes on most questions"
 msgstr "r�pondre oui � la plupart des questions"
 
-#: g10/g10.c:256
+#: g10/g10.c:262
 msgid "assume no on most questions"
 msgstr "r�pondre non � la plupart des questions"
 
-#: g10/g10.c:257
+#: g10/g10.c:263
 msgid "add this keyring to the list of keyrings"
 msgstr "ajouter ce porte-cl�s � la liste"
 
-#: g10/g10.c:258
+#: g10/g10.c:264
 msgid "add this secret keyring to the list"
 msgstr "ajouter ce porte-cl�s secret � la liste"
 
-#: g10/g10.c:259
+#: g10/g10.c:265
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|utiliser NOM comme cl� secr�te par d�faut"
 
-#: g10/g10.c:260
+#: g10/g10.c:266
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|H�TE|utiliser ce serveur pour chercher des cl�s"
 
-#: g10/g10.c:261
+#: g10/g10.c:267
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|le terminal utilise la table de caract�res NOM"
 
-#: g10/g10.c:262
+#: g10/g10.c:268
 msgid "read options from file"
 msgstr "lire les options du fichier"
 
-#: g10/g10.c:264
+#: g10/g10.c:270
 msgid "set debugging flags"
 msgstr "choisir les attributs de d�boguage"
 
-#: g10/g10.c:265
+#: g10/g10.c:271
 msgid "enable full debugging"
 msgstr "permettre un d�boguage complet"
 
-#: g10/g10.c:266
+#: g10/g10.c:272
 msgid "|FD|write status info to this FD"
 msgstr "|FD|�crire l'�tat sur ce descripteur"
 
-#: g10/g10.c:267
+#: g10/g10.c:273
 msgid "do not write comment packets"
 msgstr "ne pas �crire de paquets de commentaire"
 
-#: g10/g10.c:268
+#: g10/g10.c:274
 msgid "(default is 1)"
 msgstr "nombre de signatures compl�tes requises (1)"
 
-#: g10/g10.c:269
+#: g10/g10.c:275
 msgid "(default is 3)"
 msgstr "nombre de signatures marginales requises (3)"
 
-#: g10/g10.c:271
+#: g10/g10.c:277
 msgid "|FILE|load extension module FILE"
 msgstr "|FICH|charger le module d'extension FICH"
 
-#: g10/g10.c:272
+#: g10/g10.c:278
 msgid "emulate the mode described in RFC1991"
 msgstr "imiter le mode d�crit dans la RFC1991"
 
-#: g10/g10.c:273
+#: g10/g10.c:279
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "utiliser le comportement d�fini par OpenPGP"
 
-#: g10/g10.c:274
+#: g10/g10.c:280
 msgid "|N|use passphrase mode N"
 msgstr "|N|coder les mots de passe suivant le mode N"
 
-#: g10/g10.c:276
+#: g10/g10.c:282
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le hachage NOM pour les mots de passe"
 
-#: g10/g10.c:278
+#: g10/g10.c:284
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe"
 
-#: g10/g10.c:279
+#: g10/g10.c:285
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
 
-#: g10/g10.c:280
+#: g10/g10.c:286
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|utiliser la fonction de hachage NOM"
 
-#: g10/g10.c:281
+#: g10/g10.c:287
 msgid "|N|use compress algorithm N"
 msgstr "|N|utiliser l'algorithme de compression N"
 
-#: g10/g10.c:282
+#: g10/g10.c:288
 msgid "throw keyid field of encrypted packets"
 msgstr "supprimer l'ident. des paquets chiffr�s"
 
-#: g10/g10.c:283
+#: g10/g10.c:289
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOM=VALEUR|utiliser ces donn�es de notation"
 
-#: g10/g10.c:285
+#: g10/g10.c:291
 msgid ""
 "@\n"
 "Examples:\n"
@@ -612,25 +615,25 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les cl�s\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/g10.c:370
+#: g10/g10.c:378
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Rapporter toutes anomalies � <[email protected]>.\n"
 
-#: g10/g10.c:374
+#: g10/g10.c:382
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/g10.c:377
+#: g10/g10.c:385
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
 "default operation depends on the input data\n"
 msgstr ""
 "Syntaxe: gpg [options] [fichiers]\n"
-"signer, v�rifier, chiffer ou d�chiffrer\n"
+"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:382
+#: g10/g10.c:390
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -638,184 +641,184 @@ msgstr ""
 "\n"
 "Algorithmes support�s :\n"
 
-#: g10/g10.c:456
+#: g10/g10.c:468
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/g10.c:509
+#: g10/g10.c:521
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/g10.c:644
+#: g10/g10.c:656
 #, 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:648
+#: g10/g10.c:660
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s' : %s\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:667
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/g10.c:835
+#: g10/g10.c:848
 #, 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:892 g10/g10.c:901
+#: g10/g10.c:912 g10/g10.c:921
 #, 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:894
+#: g10/g10.c:914
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/g10.c:897
+#: g10/g10.c:917
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/g10.c:916 g10/g10.c:928
+#: g10/g10.c:936 g10/g10.c:948
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/g10.c:922 g10/g10.c:934
+#: g10/g10.c:942 g10/g10.c:954
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/g10.c:938
+#: g10/g10.c:958
 msgid "the given policy URL is invalid\n"
 msgstr "l'URL de politique donn�e est invalide\n"
 
-#: g10/g10.c:941
+#: g10/g10.c:961
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "l'algorithme de compression doit faire partie de l'�chelle %d..%d\n"
 
-#: g10/g10.c:943
+#: g10/g10.c:963
 msgid "completes-needed must be greater than 0\n"
 msgstr "� completes-needed � doit �tre sup�rieur � 0\n"
 
-#: g10/g10.c:945
+#: g10/g10.c:965
 msgid "marginals-needed must be greater than 1\n"
 msgstr "� marginals-needed � doit �tre sup�rieur � 1\n"
 
-#: g10/g10.c:947
+#: g10/g10.c:967
 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:950
+#: g10/g10.c:970
 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:954
+#: g10/g10.c:974
 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:1031
+#: g10/g10.c:1051
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
-msgstr "n'a pas pu initialiser la base de confiance : %s\n"
+msgstr "impossible d'initialiser la base de confiance : %s\n"
 
-#: g10/g10.c:1037
+#: g10/g10.c:1057
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/g10.c:1044
+#: g10/g10.c:1064
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/g10.c:1052
+#: g10/g10.c:1072
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/g10.c:1065
+#: g10/g10.c:1085
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/g10.c:1078
+#: g10/g10.c:1098
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:1092
+#: g10/g10.c:1112
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/g10.c:1104
+#: g10/g10.c:1129
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/g10.c:1112
+#: g10/g10.c:1137
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/g10.c:1120
+#: g10/g10.c:1145
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/g10.c:1128
+#: g10/g10.c:1153
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/g10.c:1144
+#: g10/g10.c:1169
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key utilisateur"
 
-#: g10/g10.c:1147
+#: g10/g10.c:1172
 msgid "--delete-key user-id"
 msgstr "--delete-key utilisateur"
 
-#: g10/encode.c:259 g10/g10.c:1171 g10/sign.c:366
+#: g10/encode.c:259 g10/g10.c:1196 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
-msgstr "ne peut ouvrir %s: %s\n"
+msgstr "impossible d'ouvrir %s: %s\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1207
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1268
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "suppression d'armure non r�ussie : %s\n"
 
-#: g10/g10.c:1251
+#: g10/g10.c:1276
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "construction d'armure non r�ussie : %s \n"
 
-#: g10/g10.c:1319
+#: g10/g10.c:1344
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/g10.c:1400
+#: g10/g10.c:1425
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/g10.c:1404
+#: g10/g10.c:1429
 msgid "Go ahead and type your message ...\n"
 msgstr "Continuez et tapez votre message...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1407 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1432 g10/verify.c:67 g10/verify.c:109
 #, c-format
 msgid "can't open `%s'\n"
-msgstr "ne peut ouvrir `%s'\n"
+msgstr "impossible d'ouvrir `%s'\n"
 
-#: g10/g10.c:1576
+#: g10/g10.c:1601
 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:1582
+#: g10/g10.c:1607
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -824,13 +827,13 @@ msgstr ""
 "des points ou des traits de soulignement et doit se terminer par un signe "
 "�gal\n"
 
-#: g10/g10.c:1588
+#: g10/g10.c:1613
 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:1596
+#: g10/g10.c:1621
 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"
 
@@ -979,8 +982,8 @@ msgid ""
 "can assign some missing owner trust values.\n"
 "\n"
 msgstr ""
-"N'a pas pu trouver un chemin de confiance valide jusqu'� la cl�. Voyons si\n"
-"nous ne pouvons pas assigner quelques indices de confiance manquants.\n"
+"Impossible de trouver un chemin de confiance valide jusqu'� la cl�. Voyons\n"
+"si nous ne pouvons pas assigner quelques indices de confiance manquants.\n"
 
 #: g10/pkclist.c:329
 msgid ""
@@ -1502,11 +1505,11 @@ msgstr ""
 msgid "Really create? "
 msgstr "Cr�er vraiment ? "
 
-#: g10/encode.c:91 g10/openfile.c:156 g10/openfile.c:246 g10/tdbio.c:468
+#: g10/encode.c:91 g10/openfile.c:161 g10/openfile.c:270 g10/tdbio.c:468
 #: g10/tdbio.c:529
 #, c-format
 msgid "%s: can't open: %s\n"
-msgstr "%s : ne peut ouvrir : %s\n"
+msgstr "%s : impossible d'ouvrir : %s\n"
 
 #: g10/encode.c:113
 #, c-format
@@ -1672,7 +1675,7 @@ msgstr "cl� %08lX : cl� publique pas trouv�e: %s\n"
 msgid "no default public keyring\n"
 msgstr "pas de porte-cl�s public par d�faut\n"
 
-#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:580
+#: g10/import.c:399 g10/openfile.c:213 g10/sign.c:268 g10/sign.c:580
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�criture de `%s'\n"
@@ -1680,7 +1683,7 @@ msgstr "�criture de `%s'\n"
 #: g10/import.c:402 g10/import.c:460 g10/import.c:569 g10/import.c:670
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
-msgstr "ne peut verrouiller le porte-cl�s `%s' : %s\n"
+msgstr "impossible de verrouiller le porte-cl�s `%s' : %s\n"
 
 #: g10/import.c:405 g10/import.c:463 g10/import.c:572 g10/import.c:673
 #, c-format
@@ -1700,12 +1703,12 @@ msgstr "cl� %08lX : ne ressemble pas � notre copie\n"
 #: g10/import.c:436 g10/import.c:629
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
-msgstr "cl� %08lX : ne peut trouver le bloc de cl�s original : %s\n"
+msgstr "cl� %08lX : impossible de trouver le bloc de cl�s original : %s\n"
 
 #: g10/import.c:442 g10/import.c:635
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
-msgstr "cl� %08lX : ne peut lire le bloc de cl�s original : %s\n"
+msgstr "cl� %08lX : impossible de lire le bloc de cl�s original : %s\n"
 
 #: g10/import.c:469
 #, c-format
@@ -1762,8 +1765,8 @@ msgstr "cl� %08lX : cl� secr�te pas trouv�e: %s\n"
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
-"cl� %08lX : pas de cl� publique - ne peut appliquer le certificat de\n"
-"r�vocation\n"
+"cl� %08lX : pas de cl� publique - le certificat de r�vocation ne peut\n"
+"�tre appliqu�\n"
 
 #: g10/import.c:646
 #, c-format
@@ -1844,7 +1847,7 @@ msgstr "cl� %08lX: nom d'utilisateur doublon fusionn�\n"
 msgid "key %08lX: revocation certificate added\n"
 msgstr "cl� %08lX : certificat de r�vocation ajout�\n"
 
-#: g10/import.c:1128 g10/import.c:1183
+#: g10/import.c:1128 g10/import.c:1181
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "cl� %08lX : notre copie n'a pas d'auto-signature\n"
@@ -1946,7 +1949,7 @@ msgstr "La cl� est prot�g�e.\n"
 #: g10/keyedit.c:443
 #, c-format
 msgid "Can't edit this key: %s\n"
-msgstr "Ne peut �diter cette cl� : %s\n"
+msgstr "Impossible d'�diter cette cl� : %s\n"
 
 #: g10/keyedit.c:448
 msgid ""
@@ -2366,28 +2369,22 @@ msgstr "G�n�rer un certificat de r�vocation pour cette signature ? (o/N)"
 
 #. FIXME: detect duplicates here
 #: g10/keyedit.c:1740
-#, fuzzy
 msgid "You have signed these user IDs:\n"
-msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
+msgstr "Vous avez sign� ces noms d'utilisateurs :\n"
 
 #: g10/keyedit.c:1754 g10/keyedit.c:1789
-#, fuzzy, c-format
+#, c-format
 msgid "   signed by %08lX at %s\n"
-msgstr ""
-" �\n"
-"sign� avec votre cl� %08lX � %s\n"
+msgstr "   sign� par %08lX � %s\n"
 
 #: g10/keyedit.c:1759
-#, fuzzy, c-format
+#, c-format
 msgid "   revoked by %08lX at %s\n"
-msgstr ""
-" �\n"
-"sign� avec votre cl� %08lX � %s\n"
+msgstr "   r�voqu� par %08lX � %s\n"
 
 #: g10/keyedit.c:1779
-#, fuzzy
 msgid "You are about to revoke these signatures:\n"
-msgstr "Voulez-vous vraiment r�voquer les cl�s s�lectionn�es ? "
+msgstr "Vous �tes sur le point de r�voquer ces signatures:\n"
 
 #: g10/keyedit.c:1797
 msgid "Really create the revocation certificates? (y/N)"
@@ -2425,79 +2422,79 @@ msgstr "aucune cl� secr�te n'est disponible pour le d�chiffrement\n"
 msgid "public key decryption failed: %s\n"
 msgstr "le d�chiffrement de la cl� publique a �chou� : %s\n"
 
-#: g10/mainproc.c:330
+#: g10/mainproc.c:332
 msgid "decryption okay\n"
 msgstr "le d�chiffrement a r�ussi\n"
 
-#: g10/mainproc.c:335
+#: g10/mainproc.c:337
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENTION: le message chiffr� a �t� manipul� !\n"
 
-#: g10/mainproc.c:340
+#: g10/mainproc.c:342
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "le d�chiffrement a �chou� : %s\n"
 
-#: g10/mainproc.c:358
+#: g10/mainproc.c:360
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTE : l'exp�diteur a demand� � pour vos yeux seulement �\n"
 
-#: g10/mainproc.c:360
+#: g10/mainproc.c:362
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original : '%.*s'\n"
 
-#: g10/mainproc.c:587 g10/mainproc.c:596
+#: g10/mainproc.c:589 g10/mainproc.c:598
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENTION : des donn�es de notation invalides ont �t� d�tect�es\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:601
 msgid "Notation: "
 msgstr "Notation : "
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:608
 msgid "Policy: "
 msgstr "Politique : "
 
-#: g10/mainproc.c:1025
+#: g10/mainproc.c:1027
 msgid "signature verification suppressed\n"
 msgstr "v�rification de signature supprim�e\n"
 
-#: g10/mainproc.c:1031
+#: g10/mainproc.c:1033
 #, 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:1057 g10/mainproc.c:1068
+#: g10/mainproc.c:1059 g10/mainproc.c:1070
 msgid "BAD signature from \""
 msgstr "MAUVAISE signature de \""
 
-#: g10/mainproc.c:1058 g10/mainproc.c:1069
+#: g10/mainproc.c:1060 g10/mainproc.c:1071
 msgid "Good signature from \""
 msgstr "Bonne signature de \""
 
-#: g10/mainproc.c:1060
+#: g10/mainproc.c:1062
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1115
+#: g10/mainproc.c:1117
 #, c-format
 msgid "Can't check signature: %s\n"
-msgstr "Ne peut v�rifier la signature : %s\n"
+msgstr "Impossible de v�rifier la signature : %s\n"
 
-#: g10/mainproc.c:1212
+#: g10/mainproc.c:1214
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1219
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
 
 #: g10/misc.c:94
 #, c-format
 msgid "can't disable core dumps: %s\n"
-msgstr "ne peut emp�cher la g�n�ration de fichiers core : %s\n"
+msgstr "impossible d'emp�cher la g�n�ration de fichiers core : %s\n"
 
 #: g10/misc.c:97
 msgid "WARNING: program may create a core file!\n"
@@ -2524,7 +2521,7 @@ msgstr ""
 #: g10/parse-packet.c:113
 #, c-format
 msgid "can't handle public key algorithm %d\n"
-msgstr "ne peut g�rer l'algorithme � cl� publique %d\n"
+msgstr "impossible de g�rer l'algorithme � cl� publique %d\n"
 
 #: g10/parse-packet.c:939
 #, c-format
@@ -2580,7 +2577,7 @@ msgstr "lecture de l'entr�e standard...\n"
 #: g10/plaintext.c:379
 #, c-format
 msgid "can't open signed data `%s'\n"
-msgstr "ne peut ouvir les donn�es sign�es `%s'\n"
+msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
 
 #: g10/pubkey-enc.c:79
 #, c-format
@@ -2655,7 +2652,7 @@ msgstr "Signature %s de : %s\n"
 #: g10/sign.c:263 g10/sign.c:575
 #, c-format
 msgid "can't create %s: %s\n"
-msgstr "ne peut cr�er %s : %s\n"
+msgstr "impossible de cr�er %s : %s\n"
 
 #: g10/sign.c:361
 msgid "signing:"
@@ -2669,7 +2666,7 @@ msgstr "ATTENTION : `%s' est un fichier vide\n"
 #: g10/textfilter.c:128
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
-msgstr "ne peut pas traiter les ligne plus longues que %d caract�res\n"
+msgstr "impossible de traiter les lignes plus longues que %d caract�res\n"
 
 #: g10/textfilter.c:197
 #, c-format
@@ -2695,12 +2692,12 @@ msgstr "transaction de base de confiance trop volumineuse\n"
 #: g10/tdbio.c:429
 #, c-format
 msgid "%s: can't access: %s\n"
-msgstr "%s : ne peut acc�der : %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 : ne peut cr�er le r�pertoire : %s\n"
+msgstr "%s : impossible de cr�er le r�pertoire : %s\n"
 
 #: g10/ringedit.c:304 g10/tdbio.c:448
 #, c-format
@@ -2712,20 +2709,20 @@ msgstr "%s : r�pertoire cr��\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s : le r�pertoire n'existe pas !\n"
 
-#: g10/openfile.c:182 g10/openfile.c:253 g10/ringedit.c:1348 g10/tdbio.c:458
+#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1348 g10/tdbio.c:458
 #, c-format
 msgid "%s: can't create: %s\n"
-msgstr "%s : ne peut cr�er : %s\n"
+msgstr "%s : impossible de cr�er : %s\n"
 
 #: g10/tdbio.c:473 g10/tdbio.c:522
 #, c-format
 msgid "%s: can't create lock\n"
-msgstr "%s : ne peut cr�er de verrouillage\n"
+msgstr "%s : impossible de cr�er de verrouillage\n"
 
 #: g10/tdbio.c:487
 #, c-format
 msgid "%s: failed to create version record: %s"
-msgstr "%s : n'a pas pu cr�er un enregistrement de version : %s"
+msgstr "%s : impossible de cr�er un enregistrement de version : %s"
 
 #: g10/tdbio.c:491
 #, c-format
@@ -2809,7 +2806,7 @@ msgstr "%s : n'a pu mettre un enregistrement � z�ro : %s\n"
 #: g10/tdbio.c:1649
 #, c-format
 msgid "%s: failed to append a record: %s\n"
-msgstr "%s : n'a pas pu ajouter un enregistrement : %s\n"
+msgstr "%s : impossible d'ajouter un enregistrement : %s\n"
 
 #: g10/tdbio.c:1760
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
@@ -2882,7 +2879,7 @@ msgstr "cl� %08lX : les cl�s secr�te et publique ne correspondent pas\n"
 #: g10/trustdb.c:485
 #, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
-msgstr "cl� %08lX : ne peut �tre mise dans la base de confiance\n"
+msgstr "cl� %08lX : impossible de la mettre dans la base de confiance\n"
 
 #: g10/trustdb.c:491
 #, c-format
@@ -3097,7 +3094,7 @@ msgstr "l'utilisateur '%s' n'est pas dans la base de confiance - insertion\n"
 #: g10/trustdb.c:2370
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
-msgstr "n'a pas pu ins�rer '%s' dans la base de confiance : %s\n"
+msgstr "impossible d'ins�rer '%s' dans la base de confiance : %s\n"
 
 #: g10/trustdb.c:2556 g10/trustdb.c:2586
 msgid "WARNING: can't yet handle long pref records\n"
@@ -3105,10 +3102,15 @@ msgstr ""
 "ATTENTION : les enregistrements de pr�f�rences longs ne sont pas encore\n"
 "support�s\n"
 
+#: g10/verify.c:143
+#, c-format
+msgid "input line %u too long or missing LF\n"
+msgstr ""
+
 #: g10/ringedit.c:318
 #, c-format
 msgid "%s: can't create keyring: %s\n"
-msgstr "%s : ne peut cr�er le porte-cl�s : %s\n"
+msgstr "%s : impossible de cr�er le porte-cl�s : %s\n"
 
 #: g10/ringedit.c:335 g10/ringedit.c:1353
 #, c-format
@@ -3155,34 +3157,34 @@ msgstr ""
 "s�re pour les signatures !\n"
 
 #. do not overwrite
-#: g10/openfile.c:65
+#: g10/openfile.c:72
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Le fichier `%s' existe. "
 
-#: g10/openfile.c:67
+#: g10/openfile.c:74
 msgid "Overwrite (y/N)? "
 msgstr "R��crire (o/N)? "
 
-#: g10/openfile.c:97
+#: g10/openfile.c:102
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s : suffixe inconnu\n"
 
-#: g10/openfile.c:119
+#: g10/openfile.c:124
 msgid "Enter new filename"
 msgstr "Entrez le nouveau nom de fichier"
 
-#: g10/openfile.c:160
+#: g10/openfile.c:165
 msgid "writing to stdout\n"
 msgstr "�criture vers la sortie standard\n"
 
-#: g10/openfile.c:219
+#: g10/openfile.c:243
 #, 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:269
+#: g10/openfile.c:293
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s : nouveau fichier d'options cr��\n"
@@ -3212,31 +3214,28 @@ msgstr "cl� faible g�n�r�e - nouvel essai\n"
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
-"ne peut �viter une cl� faible pour le chiffrement sym�trique :\n"
+"impossible d'�viter une cl� faible pour le chiffrement sym�trique :\n"
 "%d essais ont eu lieu !\n"
 
 #: g10/delkey.c:93
-#, fuzzy
 msgid "there is a secret key for this public key!\n"
-msgstr "enlever la cl� du porte-cl�s public"
+msgstr "il y a une cl� secr�te pour cette cl� publique !\n"
 
 #: g10/delkey.c:95
 msgid "use option \"--delete-secret-key\" to delete it first.\n"
-msgstr ""
+msgstr "utiliser l'option � --delete-secret-key � pour l'effacer d'abord.\n"
 
 #: g10/delkey.c:111
-#, fuzzy
 msgid "can't do that in batchmode without \"--yes\"\n"
-msgstr "impossible de faire cela en mode automatique\n"
+msgstr "impossible de faire cela en mode automatique sans � --yes �\n"
 
 #: g10/delkey.c:133
-#, fuzzy
 msgid "Delete this key from the keyring? "
-msgstr "enlever la cl� du porte-cl�s public"
+msgstr "Enlever cette cl� du porte-cl�s ? "
 
 #: g10/delkey.c:141
 msgid "This is a secret key! - really delete? "
-msgstr ""
+msgstr "C'est une cl� secr�te - faut-il vraiment l'effacer ? "
 
 #: g10/helptext.c:47
 msgid ""
@@ -3298,7 +3297,7 @@ msgstr ""
 "servir aux signatures ; elles sont en fait identiques mais certains\n"
 "param�tres doivent �tre sp�cialement choisis pour que la cl� g�n�re des\n"
 "signatures s�res : ce programme est capable de le faire mais les autres\n"
-"impl�mentations de OpenPGP ne sont pas oblig�es d'accepter cette forme de\n"
+"implantations de OpenPGP ne sont pas oblig�es d'accepter cette forme de\n"
 "cl�.\n"
 "\n"
 "La premi�re cl� (cl� principale) doit toujours �tre capable de signer ;\n"
@@ -3452,8 +3451,8 @@ msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
 msgstr ""
-"Entrez le nouveau nom de fichier. Si vous tapez simplement ENTR�E lefichier "
-"par d�faut (indiqu� entre crochets) sera utilis�."
+"Entrez le nouveau nom de fichier. Si vous tapez simplement ENTR�E le\n"
+"fichier par d�faut (indiqu� entre crochets) sera utilis�."
 
 #: g10/helptext.c:237
 msgid "No help available"
diff --git a/po/id.po b/po/id.po
index 870cd927a..5e7e04037 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-09-05 19:21+0200\n"
+"POT-Creation-Date: 1999-09-23 08:53+0200\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"
@@ -17,11 +17,11 @@ msgstr ""
 msgid "Warning: using insecure memory!\n"
 msgstr "Peringatan: menggunakan memori yang tidak aman!\n"
 
-#: util/secmem.c:275
+#: util/secmem.c:281
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operasi tidak mungkin tanpa menginisialisasi memori yang aman\n"
 
-#: util/secmem.c:276
+#: util/secmem.c:282
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 
@@ -280,7 +280,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:185
+#: g10/g10.c:187
 msgid ""
 "@Commands:\n"
 " "
@@ -288,135 +288,135 @@ msgstr ""
 "@Perintah:\n"
 "  "
 
-#: g10/g10.c:187
+#: g10/g10.c:189
 msgid "|[file]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: g10/g10.c:188
+#: g10/g10.c:190
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/g10.c:189
+#: g10/g10.c:191
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/g10.c:190
+#: g10/g10.c:192
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/g10.c:191
+#: g10/g10.c:193
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/g10.c:192
+#: g10/g10.c:194
 msgid "store only"
 msgstr "hanya disimpan"
 
-#: g10/g10.c:193
+#: g10/g10.c:195
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/g10.c:194
+#: g10/g10.c:196
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/g10.c:195
+#: g10/g10.c:198
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/g10.c:197
+#: g10/g10.c:200
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/g10.c:198
+#: g10/g10.c:201
 msgid "check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/g10.c:199
+#: g10/g10.c:202
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/g10.c:200
+#: g10/g10.c:203
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/g10.c:201
+#: g10/g10.c:204
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/g10.c:202
+#: g10/g10.c:205
 msgid "remove key from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/g10.c:203
+#: g10/g10.c:206
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/g10.c:204
+#: g10/g10.c:207
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/g10.c:205
+#: g10/g10.c:208
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/g10.c:206
+#: g10/g10.c:209
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/g10.c:207
+#: g10/g10.c:210
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/g10.c:208
+#: g10/g10.c:211
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke server kunci"
 
-#: g10/g10.c:209
+#: g10/g10.c:212
 msgid "import keys from a key server"
 msgstr "impor kunci dari server kunci"
 
-#: g10/g10.c:212
+#: g10/g10.c:215
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/g10.c:214
+#: g10/g10.c:217
 msgid "list only the sequence of packets"
 msgstr "tampilkan hanya urutan paket"
 
-#: g10/g10.c:216
+#: g10/g10.c:219
 msgid "export the ownertrust values"
 msgstr "ekspor nilai ownertrust"
 
-#: g10/g10.c:218
+#: g10/g10.c:221
 msgid "import ownertrust values"
 msgstr "import nilai ownertrust"
 
-#: g10/g10.c:220
+#: g10/g10.c:223
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/g10.c:222
+#: g10/g10.c:225
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMA]|periksa database trust"
 
-#: g10/g10.c:223
+#: g10/g10.c:226
 msgid "fix a corrupted trust database"
 msgstr "perbaiki database trust yang terkorupsi"
 
-#: g10/g10.c:224
+#: g10/g10.c:227
 msgid "De-Armor a file or stdin"
 msgstr "De-Armor file atau stdin"
 
-#: g10/g10.c:225
+#: g10/g10.c:229
 msgid "En-Armor a file or stdin"
 msgstr "En-Armor file atau stdin"
 
-#: g10/g10.c:226
+#: g10/g10.c:231
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/g10.c:230
+#: g10/g10.c:235
 msgid ""
 "@\n"
 "Options:\n"
@@ -426,168 +426,168 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: g10/g10.c:232
+#: g10/g10.c:237
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/g10.c:233
+#: g10/g10.c:239
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/g10.c:236
+#: g10/g10.c:242
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: g10/g10.c:238
+#: g10/g10.c:244
 msgid "use the default key as default recipient"
 msgstr "gunakan kunci baku sebagai penerima baku"
 
-#: g10/g10.c:242
+#: g10/g10.c:248
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai atau dekripsi"
 
-#: g10/g10.c:243
+#: g10/g10.c:249
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/g10.c:245
+#: g10/g10.c:251
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/g10.c:246
+#: g10/g10.c:252
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/g10.c:247
+#: g10/g10.c:253
 msgid "verbose"
 msgstr "detil"
 
-#: g10/g10.c:248
+#: g10/g10.c:254
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: g10/g10.c:249
+#: g10/g10.c:255
 msgid "don't use the terminal at all"
 msgstr "jangan menggunakan terminal"
 
-#: g10/g10.c:250
+#: g10/g10.c:256
 msgid "force v3 signatures"
 msgstr "paksa signature v3"
 
-#: g10/g10.c:251
+#: g10/g10.c:257
 msgid "always use a MDC for encryption"
 msgstr "selalu gunakan MDC untuk enkripsi"
 
-#: g10/g10.c:252
+#: g10/g10.c:258
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:254
+#: g10/g10.c:260
 msgid "batch mode: never ask"
 msgstr "mode batch: tanpa tanya"
 
-#: g10/g10.c:255
+#: g10/g10.c:261
 msgid "assume yes on most questions"
 msgstr "asumsikan ya untuk seluruh pertanyaan"
 
-#: g10/g10.c:256
+#: g10/g10.c:262
 msgid "assume no on most questions"
 msgstr "asumsikan tidak untuk seluruh pertanyaan"
 
-#: g10/g10.c:257
+#: g10/g10.c:263
 msgid "add this keyring to the list of keyrings"
 msgstr "tambah keyring ini ke daftar keyring"
 
-#: g10/g10.c:258
+#: g10/g10.c:264
 msgid "add this secret keyring to the list"
 msgstr "tambah keyring rahasia ini ke daftar"
 
-#: g10/g10.c:259
+#: g10/g10.c:265
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: g10/g10.c:260
+#: g10/g10.c:266
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|gunakan sebagai server kunci untuk melihat kunci"
 
-#: g10/g10.c:261
+#: g10/g10.c:267
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMA|set charset terminal ke NAMA"
 
-#: g10/g10.c:262
+#: g10/g10.c:268
 msgid "read options from file"
 msgstr "baca pilihan dari file"
 
-#: g10/g10.c:264
+#: g10/g10.c:270
 msgid "set debugging flags"
 msgstr "set flag debugging"
 
-#: g10/g10.c:265
+#: g10/g10.c:271
 msgid "enable full debugging"
 msgstr "aktifkan full debugging"
 
-#: g10/g10.c:266
+#: g10/g10.c:272
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
-#: g10/g10.c:267
+#: g10/g10.c:273
 msgid "do not write comment packets"
 msgstr "jangan menulis komentar paket"
 
-#: g10/g10.c:268
+#: g10/g10.c:274
 msgid "(default is 1)"
 msgstr "(baku adalah 1)"
 
-#: g10/g10.c:269
+#: g10/g10.c:275
 msgid "(default is 3)"
 msgstr "(baku adalah 3)"
 
-#: g10/g10.c:271
+#: g10/g10.c:277
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: g10/g10.c:272
+#: g10/g10.c:278
 msgid "emulate the mode described in RFC1991"
 msgstr "emulasikan mode seperti dalam RFC1991"
 
-#: g10/g10.c:273
+#: g10/g10.c:279
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "set seluruh pilihan paket, cipher dan digest ke OpenPGP"
 
-#: g10/g10.c:274
+#: g10/g10.c:280
 msgid "|N|use passphrase mode N"
 msgstr "|N|gunakan passphrase mode N"
 
-#: g10/g10.c:276
+#: g10/g10.c:282
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma digest pesan NAMA untuk passphrase"
 
-#: g10/g10.c:278
+#: g10/g10.c:284
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
 
-#: g10/g10.c:279
+#: g10/g10.c:285
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMA|gunakan algoritma cipher NAMA"
 
-#: g10/g10.c:280
+#: g10/g10.c:286
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
 
-#: g10/g10.c:281
+#: g10/g10.c:287
 msgid "|N|use compress algorithm N"
 msgstr "|N|gunakan algoritma kompresi N"
 
-#: g10/g10.c:282
+#: g10/g10.c:288
 msgid "throw keyid field of encrypted packets"
 msgstr "buang field keyid paket terenkripsi"
 
-#: g10/g10.c:283
+#: g10/g10.c:289
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAMA=NILAI|gunakan notasi data ini"
 
-#: g10/g10.c:285
+#: g10/g10.c:291
 msgid ""
 "@\n"
 "Examples:\n"
@@ -607,15 +607,15 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/g10.c:370
+#: g10/g10.c:378
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Silakan laporkan kesalahan ke <[email protected]>.\n"
 
-#: g10/g10.c:374
+#: g10/g10.c:382
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/g10.c:377
+#: g10/g10.c:385
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -625,198 +625,202 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/g10.c:382
+#: g10/g10.c:390
 msgid ""
 "\n"
 "Supported algorithms:\n"
-msgstr "\nAlgoritma yang didukung:\n"
+msgstr ""
+"\n"
+"Algoritma yang didukung:\n"
 
-#: g10/g10.c:456
+#: g10/g10.c:468
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/g10.c:509
+#: g10/g10.c:521
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/g10.c:644
+#: g10/g10.c:656
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: g10/g10.c:648
+#: g10/g10.c:660
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:667
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/g10.c:835
+#: g10/g10.c:848
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/g10.c:892 g10/g10.c:901
+#: g10/g10.c:912 g10/g10.c:921
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/g10.c:894
+#: g10/g10.c:914
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/g10.c:897
+#: g10/g10.c:917
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/g10.c:916 g10/g10.c:928
+#: g10/g10.c:936 g10/g10.c:948
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:922 g10/g10.c:934
+#: g10/g10.c:942 g10/g10.c:954
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:938
+#: g10/g10.c:958
 msgid "the given policy URL is invalid\n"
 msgstr "kebijakan URL yang diberikan tidak valid\n"
 
-#: g10/g10.c:941
+#: g10/g10.c:961
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "algoritma kompresi harus di antara %d..%d\n"
 
-#: g10/g10.c:943
+#: g10/g10.c:963
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/g10.c:945
+#: g10/g10.c:965
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/g10.c:947
+#: g10/g10.c:967
 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:950
+#: g10/g10.c:970
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/g10.c:954
+#: g10/g10.c:974
 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:1031
+#: g10/g10.c:1051
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/g10.c:1037
+#: g10/g10.c:1057
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/g10.c:1044
+#: g10/g10.c:1064
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/g10.c:1052
+#: g10/g10.c:1072
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/g10.c:1065
+#: g10/g10.c:1085
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/g10.c:1078
+#: g10/g10.c:1098
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:1092
+#: g10/g10.c:1112
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/g10.c:1104
+#: g10/g10.c:1129
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/g10.c:1112
+#: g10/g10.c:1137
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/g10.c:1120
+#: g10/g10.c:1145
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/g10.c:1128
+#: g10/g10.c:1153
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/g10.c:1144
+#: g10/g10.c:1169
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-user"
 
-#: g10/g10.c:1147
+#: g10/g10.c:1172
 msgid "--delete-key user-id"
 msgstr "--delete-key id-user"
 
-#: g10/encode.c:259 g10/g10.c:1171 g10/sign.c:366
+#: g10/encode.c:259 g10/g10.c:1196 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "tidak dapat membuka %s: %s\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1207
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1268
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/g10.c:1251
+#: g10/g10.c:1276
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/g10.c:1319
+#: g10/g10.c:1344
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/g10.c:1400
+#: g10/g10.c:1425
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/g10.c:1404
+#: g10/g10.c:1429
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1407 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1432 g10/verify.c:67 g10/verify.c:109
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/g10.c:1576
+#: g10/g10.c:1601
 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:1582
+#: g10/g10.c:1607
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
-msgstr "nama notasi terdiri hanya dari huruf, digit, titik atau garis bawah dan diakhiri dengan sebuah '='\n"
+msgstr ""
+"nama notasi terdiri hanya dari huruf, digit, titik atau garis bawah dan "
+"diakhiri dengan sebuah '='\n"
 
-#: g10/g10.c:1588
+#: g10/g10.c:1613
 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:1596
+#: g10/g10.c:1621
 msgid "a notation value must not use any control characters\n"
 msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
@@ -891,7 +895,9 @@ msgstr "armor tidak valid: baris melebihi %d karakter\n"
 #: g10/armor.c:1009
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
-msgstr "karakter dapat dicetak dalam armor - mungkin kesalahan pada MTA telah dipakai\n"
+msgstr ""
+"karakter dapat dicetak dalam armor - mungkin kesalahan pada MTA telah "
+"dipakai\n"
 
 #. Translators: this shoud fit into 24 bytes to that the fingerprint
 #. * data is properly aligned with the user ID
@@ -968,19 +974,25 @@ msgstr ""
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
-msgstr "Tidak ditemukan jalur ke salah satu kunci.\n\n"
+msgstr ""
+"Tidak ditemukan jalur ke salah satu kunci.\n"
+"\n"
 
 #: g10/pkclist.c:331
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
-msgstr "Tidak ditemukan sertifikat dengan trust tak terdefinisi.\n\n"
+msgstr ""
+"Tidak ditemukan sertifikat dengan trust tak terdefinisi.\n"
+"\n"
 
 #: g10/pkclist.c:333
 msgid ""
 "No trust values changed.\n"
 "\n"
-msgstr "Tidak ada perubahan nilai trust.\n\n"
+msgstr ""
+"Tidak ada perubahan nilai trust.\n"
+"\n"
 
 #: g10/pkclist.c:350
 #, c-format
@@ -1036,7 +1048,8 @@ msgid ""
 "\n"
 msgstr ""
 "Tidak pasti bahwa kunci milik pemiliknya.\n"
-"Jika anda benar-benar tahu apa yang sedang anda lakukan, anda boleh menjawab\n"
+"Jika anda benar-benar tahu apa yang sedang anda lakukan, anda boleh "
+"menjawab\n"
 "pertanyaan berikut dengan ya\n"
 
 #: g10/pkclist.c:484 g10/pkclist.c:507
@@ -1061,7 +1074,8 @@ msgstr "Catatan: Kunci ini telah berakhir!\n"
 
 #: g10/pkclist.c:562
 msgid "WARNING: This key is not certified with a trusted signature!\n"
-msgstr "PERINGATAN: Kunci ini tidak disertifikasi dengan sig yang terpercaya!\n"
+msgstr ""
+"PERINGATAN: Kunci ini tidak disertifikasi dengan sig yang terpercaya!\n"
 
 #: g10/pkclist.c:564
 msgid ""
@@ -1079,7 +1093,9 @@ msgstr "        Signature mungkin palsu.\n"
 #: g10/pkclist.c:589
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
-msgstr "PERINGATAN: Kunci ini tidak disertifikasi dengan signature terpercaya yang cukup!\n"
+msgstr ""
+"PERINGATAN: Kunci ini tidak disertifikasi dengan signature terpercaya yang "
+"cukup!\n"
 
 #: g10/pkclist.c:592
 msgid "         It is not certain that the signature belongs to the owner.\n"
@@ -1243,7 +1259,9 @@ msgstr "Apakah anda yakin memerlukan keysize ini? "
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
-msgstr "Oke, tetapi ingat bahwa radiasi monitor dan keyboard anda juga sangat mudah diserang!\n"
+msgstr ""
+"Oke, tetapi ingat bahwa radiasi monitor dan keyboard anda juga sangat mudah "
+"diserang!\n"
 
 #: g10/keygen.c:483
 msgid "Do you really need such a large keysize? "
@@ -1307,7 +1325,8 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Anda perlu sebuah User-ID untuk mengidentifikasi kunci anda; software membuat \n"
+"Anda perlu sebuah User-ID untuk mengidentifikasi kunci anda; software "
+"membuat \n"
 "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
 "  \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 
@@ -1370,7 +1389,9 @@ msgstr "Ganti (N)ama, (K)omentar, (E)mail atau (O)ke/(Q)uit? "
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
-msgstr "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n\n"
+msgstr ""
+"Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
+"\n"
 
 #: g10/keyedit.c:456 g10/keygen.c:759
 msgid "passphrase not correctly repeated; try again.\n"
@@ -1384,7 +1405,8 @@ msgid ""
 "\n"
 msgstr ""
 "Anda tidak ingin sebuah passphrase - ini mungkin ide yang buruk!\n"
-"Namun saya akan tetap lakukan. Anda dapat merubah passphrase anda setiap saat,\n"
+"Namun saya akan tetap lakukan. Anda dapat merubah passphrase anda setiap "
+"saat,\n"
 "menggunakan program ini dengan pilihan \"--edit-key\".\n"
 
 #: g10/keygen.c:786
@@ -1431,7 +1453,8 @@ msgid ""
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
 msgstr ""
 "Perhatikan bahwa kunci ini tidak dapat digunakan untuk enkripsi. Anda \n"
-"mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua untuktujuan ini.\n"
+"mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
+"untuktujuan ini.\n"
 
 #: g10/keygen.c:974 g10/keygen.c:1073
 #, c-format
@@ -1442,19 +1465,21 @@ msgstr "Pembuatan kunci gagal: %s\n"
 #, 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"
+msgstr ""
+"kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
 #: g10/keygen.c:1020 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"
+msgstr ""
+"kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
 #: g10/keygen.c:1051
 msgid "Really create? "
 msgstr "Ingin diciptakan? "
 
-#: g10/encode.c:91 g10/openfile.c:156 g10/openfile.c:246 g10/tdbio.c:468
+#: g10/encode.c:91 g10/openfile.c:161 g10/openfile.c:270 g10/tdbio.c:468
 #: g10/tdbio.c:529
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1622,7 +1647,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:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:580
+#: g10/import.c:399 g10/openfile.c:213 g10/sign.c:268 g10/sign.c:580
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
@@ -1711,7 +1736,9 @@ msgstr "kunci %08lX: kunci rahasia tidak ditemukan: %s\n"
 #: g10/import.c:615
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
-msgstr "kunci %08lX: tidak ada kunci publik - tidak dapat mengaplikasikan sertifikat pembatalan\n"
+msgstr ""
+"kunci %08lX: tidak ada kunci publik - tidak dapat mengaplikasikan sertifikat "
+"pembatalan\n"
 
 #: g10/import.c:646
 #, c-format
@@ -1792,7 +1819,7 @@ msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
 msgid "key %08lX: revocation certificate added\n"
 msgstr "kunci %08lX: penambahan sertifikat pembatalan\n"
 
-#: g10/import.c:1128 g10/import.c:1183
+#: g10/import.c:1128 g10/import.c:1181
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "kunci %08lX: salinan kita tidak memiliki self-signature\n"
@@ -1870,7 +1897,9 @@ msgstr ""
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
-msgstr "Signature akan ditandai sebagai tidak dapat diekspor.\n\n"
+msgstr ""
+"Signature akan ditandai sebagai tidak dapat diekspor.\n"
+"\n"
 
 #: g10/keyedit.c:344
 msgid "Really sign? "
@@ -1898,13 +1927,17 @@ msgstr "Tidak dapat mengedit kunci ini: %s\n"
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
-msgstr "Masukkan passphrase baru untuk kunci rahasia ini.\n\n"
+msgstr ""
+"Masukkan passphrase baru untuk kunci rahasia ini.\n"
+"\n"
 
 #: g10/keyedit.c:460
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
-msgstr "Anda tidak ingin passphrase - bukan ide yang baik!\n\n"
+msgstr ""
+"Anda tidak ingin passphrase - bukan ide yang baik!\n"
+"\n"
 
 #: g10/keyedit.c:463
 msgid "Do you really want to do this? "
@@ -2357,72 +2390,72 @@ msgstr "tidak tersedia kunci rahasia untuk dekripsi\n"
 msgid "public key decryption failed: %s\n"
 msgstr "gagal dekripsi kunci publik: %s\n"
 
-#: g10/mainproc.c:330
+#: g10/mainproc.c:332
 msgid "decryption okay\n"
 msgstr "dekripsi lancar\n"
 
-#: g10/mainproc.c:335
+#: g10/mainproc.c:337
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
 
-#: g10/mainproc.c:340
+#: g10/mainproc.c:342
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "gagal dekripsi: %s\n"
 
-#: g10/mainproc.c:358
+#: g10/mainproc.c:360
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:360
+#: g10/mainproc.c:362
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nama file asli='%.*s'\n"
 
-#: g10/mainproc.c:587 g10/mainproc.c:596
+#: g10/mainproc.c:589 g10/mainproc.c:598
 msgid "WARNING: invalid notation data found\n"
 msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:601
 msgid "Notation: "
 msgstr "Notasi: "
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:608
 msgid "Policy: "
 msgstr "Kebijakan: "
 
-#: g10/mainproc.c:1025
+#: g10/mainproc.c:1027
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak optimal\n"
 
-#: g10/mainproc.c:1031
+#: g10/mainproc.c:1033
 #, 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:1057 g10/mainproc.c:1068
+#: g10/mainproc.c:1059 g10/mainproc.c:1070
 msgid "BAD signature from \""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1058 g10/mainproc.c:1069
+#: g10/mainproc.c:1060 g10/mainproc.c:1071
 msgid "Good signature from \""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1060
+#: g10/mainproc.c:1062
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1115
+#: g10/mainproc.c:1117
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:1212
+#: g10/mainproc.c:1214
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1219
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
@@ -2443,11 +2476,14 @@ msgstr "Algoritma eksperimental sebaiknya tidak dipakai!\n"
 msgid ""
 "RSA keys are deprecated; please consider creating a new key and use this key "
 "in the future\n"
-msgstr "Kunci RSA didepresiasi; silakan membuat kunci baru dan menggunakannya di masa depan\n"
+msgstr ""
+"Kunci RSA didepresiasi; silakan membuat kunci baru dan menggunakannya di "
+"masa depan\n"
 
 #: g10/misc.c:241
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
-msgstr "algoritma cipher ini didepresiasi; silakan gunakan yang lebih standar!\n"
+msgstr ""
+"algoritma cipher ini didepresiasi; silakan gunakan yang lebih standar!\n"
 
 #: g10/parse-packet.c:113
 #, c-format
@@ -2546,7 +2582,8 @@ msgstr "mengasumsikan MDC buruk karena ada bit kritis tidak dikenal\n"
 #: g10/sig-check.c:295
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
-msgstr "ini adalah kunci ElGamal ciptaan PGP yang tidak aman untuk signature!\n"
+msgstr ""
+"ini adalah kunci ElGamal ciptaan PGP yang tidak aman untuk signature!\n"
 
 #: g10/sig-check.c:303
 #, c-format
@@ -2630,7 +2667,7 @@ msgstr "%s: direktori tercipta\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: direktori tidak ada!\n"
 
-#: g10/openfile.c:182 g10/openfile.c:253 g10/ringedit.c:1348 g10/tdbio.c:458
+#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1348 g10/tdbio.c:458
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: tidak dapat membuat: %s\n"
@@ -2850,7 +2887,8 @@ msgstr "Self-signature tidak valid"
 
 #: g10/trustdb.c:1060
 msgid "Valid user ID revocation skipped due to a newer self signature"
-msgstr "Pembatalan ID user valid dilewati karena ada self signature yang lebih baru"
+msgstr ""
+"Pembatalan ID user valid dilewati karena ada self signature yang lebih baru"
 
 #: g10/trustdb.c:1066
 msgid "Valid user ID revocation"
@@ -3007,6 +3045,11 @@ msgstr "gagal menaruh '%s' ke dalam trustdb: %s\n"
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "PERINGATAN: belum dapat menangani record pref panjang\n"
 
+#: g10/verify.c:143
+#, c-format
+msgid "input line %u too long or missing LF\n"
+msgstr ""
+
 #: g10/ringedit.c:318
 #, c-format
 msgid "%s: can't create keyring: %s\n"
@@ -3037,7 +3080,9 @@ msgstr "Silakan perbaikan kemungkinan lubang keamanan\n"
 
 #: g10/skclist.c:88 g10/skclist.c:125
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
-msgstr "kunci tidak dianggap sebagai tidak aman - tidak dapat digunakan dengan RNG palsu!\n"
+msgstr ""
+"kunci tidak dianggap sebagai tidak aman - tidak dapat digunakan dengan RNG "
+"palsu!\n"
 
 #: g10/skclist.c:113
 #, c-format
@@ -3049,37 +3094,39 @@ msgstr "melewati `%s': %s\n"
 msgid ""
 "skipped `%s': this is a PGP generated ElGamal key which is not secure for "
 "signatures!\n"
-msgstr "melewati `%s': ini adalah kunci ElGamal yang dihasilkan PGP yang tidak aman untuk signature!\n"
+msgstr ""
+"melewati `%s': ini adalah kunci ElGamal yang dihasilkan PGP yang tidak aman "
+"untuk signature!\n"
 
 #. do not overwrite
-#: g10/openfile.c:65
+#: g10/openfile.c:72
 #, c-format
 msgid "File `%s' exists. "
 msgstr "File `%s' ada. "
 
-#: g10/openfile.c:67
+#: g10/openfile.c:74
 msgid "Overwrite (y/N)? "
 msgstr "Ditimpa (y/T)? "
 
-#: g10/openfile.c:97
+#: g10/openfile.c:102
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: suffix tidak dikenal\n"
 
-#: g10/openfile.c:119
+#: g10/openfile.c:124
 msgid "Enter new filename"
 msgstr "Masukkan nama file baru"
 
-#: g10/openfile.c:160
+#: g10/openfile.c:165
 msgid "writing to stdout\n"
 msgstr "menulis ke stdout\n"
 
-#: g10/openfile.c:219
+#: g10/openfile.c:243
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "mengasumsikan data bertanda dalam `%s'\n"
 
-#: g10/openfile.c:269
+#: g10/openfile.c:293
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: file pilihan baru tercipta\n"
@@ -3097,7 +3144,8 @@ msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 #: g10/encr-data.c:85
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
-msgstr "PERINGATAN: pesan dienkripsi dengan kunci lemah dalam cipher simetrik.\n"
+msgstr ""
+"PERINGATAN: pesan dienkripsi dengan kunci lemah dalam cipher simetrik.\n"
 
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
@@ -3106,7 +3154,8 @@ msgstr "kunci lemah tercipta - mengulang\n"
 #: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
-msgstr "tidak dapat menghindari kunci lemah untuk cipher simetrik; mencoba %d kali!\n"
+msgstr ""
+"tidak dapat menghindari kunci lemah untuk cipher simetrik; mencoba %d kali!\n"
 
 #: g10/delkey.c:93
 msgid "there is a secret key for this public key!\n"
@@ -3134,8 +3183,10 @@ msgid ""
 "to any 3rd party.  We need it to implement the web-of-trust; it has nothing\n"
 "to do with the (implicitly created) web-of-certificates."
 msgstr ""
-"Terserah anda untuk memberi nilai baru di sini; nilai ini tidak akan diekspor\n"
-"ke pihak ketiga. Kami perlu untuk mengimplementasikan web-of-trust; tidak ada\n"
+"Terserah anda untuk memberi nilai baru di sini; nilai ini tidak akan "
+"diekspor\n"
+"ke pihak ketiga. Kami perlu untuk mengimplementasikan web-of-trust; tidak "
+"ada\n"
 "kaitan dengan (membuat secara implisit) web-of-certificates."
 
 #: g10/helptext.c:53
@@ -3271,7 +3322,8 @@ msgid ""
 "to delete this signature because it may be important to establish a\n"
 "trust connection to the key or another key certified by this key."
 msgstr ""
-"Ini adalah signature valid untuk kunci; anda normalnya tidak ingin menghapus\n"
+"Ini adalah signature valid untuk kunci; anda normalnya tidak ingin "
+"menghapus\n"
 "signature ini karena mungkin penting membangun koneksi trust ke kunci atau\n"
 "ke kunci tersertifikasi lain dengan kunci ini."
 
@@ -3291,7 +3343,8 @@ msgstr ""
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
-msgstr "Signature tidak valid. Masuk akal untuk menghapusnya dari keyring anda."
+msgstr ""
+"Signature tidak valid. Masuk akal untuk menghapusnya dari keyring anda."
 
 #: g10/helptext.c:193
 msgid ""
@@ -3317,10 +3370,12 @@ msgstr ""
 
 #: g10/helptext.c:209
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr "Silakan ulangi passphrase terakhir, sehingga anda yakin yang anda ketikkan."
+msgstr ""
+"Silakan ulangi passphrase terakhir, sehingga anda yakin yang anda ketikkan."
 
 #: g10/helptext.c:213
-msgid "Give the name fo the file to which the signature applies"
+#, fuzzy
+msgid "Give the name of the file to which the signature applies"
 msgstr "Beri nama file untuk mengaplikasikan signature"
 
 #: g10/helptext.c:218
diff --git a/po/it.po b/po/it.po
index 744110ff5..ee493041f 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-09-05 19:21+0200\n"
+"POT-Creation-Date: 1999-09-23 08:53+0200\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"
@@ -17,11 +17,11 @@ msgstr ""
 msgid "Warning: using insecure memory!\n"
 msgstr "Attenzione: si sta usando memoria insicura!\n"
 
-#: util/secmem.c:275
+#: util/secmem.c:281
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "l'operazione non � possibile senza memoria sicura inizializzata\n"
 
-#: util/secmem.c:276
+#: util/secmem.c:282
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 
@@ -282,7 +282,7 @@ msgstr ""
 "altra cosa per dare all'OS la possibilit� di raccogliere altra entropia!\n"
 "(Servono altri %d byte)\n"
 
-#: g10/g10.c:185
+#: g10/g10.c:187
 msgid ""
 "@Commands:\n"
 " "
@@ -290,135 +290,135 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/g10.c:187
+#: g10/g10.c:189
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/g10.c:188
+#: g10/g10.c:190
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/g10.c:189
+#: g10/g10.c:191
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/g10.c:190
+#: g10/g10.c:192
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/g10.c:191
+#: g10/g10.c:193
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/g10.c:192
+#: g10/g10.c:194
 msgid "store only"
 msgstr "immagazzina soltanto"
 
-#: g10/g10.c:193
+#: g10/g10.c:195
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/g10.c:194
+#: g10/g10.c:196
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:195
+#: g10/g10.c:198
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/g10.c:197
+#: g10/g10.c:200
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/g10.c:198
+#: g10/g10.c:201
 msgid "check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/g10.c:199
+#: g10/g10.c:202
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/g10.c:200
+#: g10/g10.c:203
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/g10.c:201
+#: g10/g10.c:204
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/g10.c:202
+#: g10/g10.c:205
 msgid "remove key from the public keyring"
 msgstr "rimuove una chiave dal portachiavi pubblico"
 
-#: g10/g10.c:203
+#: g10/g10.c:206
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/g10.c:204
+#: g10/g10.c:207
 msgid "sign a key locally"
 msgstr "firma localmente una chiave"
 
-#: g10/g10.c:205
+#: g10/g10.c:208
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/g10.c:206
+#: g10/g10.c:209
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/g10.c:207
+#: g10/g10.c:210
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/g10.c:208
+#: g10/g10.c:211
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/g10.c:209
+#: g10/g10.c:212
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/g10.c:212
+#: g10/g10.c:215
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/g10.c:214
+#: g10/g10.c:217
 msgid "list only the sequence of packets"
 msgstr "elenca solo la sequenza dei pacchetti"
 
-#: g10/g10.c:216
+#: g10/g10.c:219
 msgid "export the ownertrust values"
 msgstr "esporta i valori di fiducia"
 
-#: g10/g10.c:218
+#: g10/g10.c:221
 msgid "import ownertrust values"
 msgstr "importa i valori di fiducia"
 
-#: g10/g10.c:220
+#: g10/g10.c:223
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/g10.c:222
+#: g10/g10.c:225
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMI]|controlla il database della fiducia"
 
-#: g10/g10.c:223
+#: g10/g10.c:226
 msgid "fix a corrupted trust database"
 msgstr "ripara un database della fiducia rovinato"
 
-#: g10/g10.c:224
+#: g10/g10.c:227
 msgid "De-Armor a file or stdin"
 msgstr "rimuovi l'armatura a un file o a stdin"
 
-#: g10/g10.c:225
+#: g10/g10.c:229
 msgid "En-Armor a file or stdin"
 msgstr "crea l'armatura a un file o a stdin"
 
-#: g10/g10.c:226
+#: g10/g10.c:231
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/g10.c:230
+#: g10/g10.c:235
 msgid ""
 "@\n"
 "Options:\n"
@@ -428,170 +428,170 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/g10.c:232
+#: g10/g10.c:237
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/g10.c:233
+#: g10/g10.c:239
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/g10.c:236
+#: g10/g10.c:242
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: g10/g10.c:238
+#: g10/g10.c:244
 msgid "use the default key as default recipient"
 msgstr "usa la chiave predefinita come destinatario predefinito"
 
-#: g10/g10.c:242
+#: g10/g10.c:248
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/g10.c:243
+#: g10/g10.c:249
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/g10.c:245
+#: g10/g10.c:251
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/g10.c:246
+#: g10/g10.c:252
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/g10.c:247
+#: g10/g10.c:253
 msgid "verbose"
 msgstr "prolisso"
 
-#: g10/g10.c:248
+#: g10/g10.c:254
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: g10/g10.c:249
+#: g10/g10.c:255
 msgid "don't use the terminal at all"
 msgstr "non usa per niente il terminale"
 
-#: g10/g10.c:250
+#: g10/g10.c:256
 msgid "force v3 signatures"
 msgstr "forza l'uso di firme v3"
 
-#: g10/g10.c:251
+#: g10/g10.c:257
 msgid "always use a MDC for encryption"
 msgstr "usa sempre un MDC per cifrare"
 
-#: g10/g10.c:252
+#: g10/g10.c:258
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:254
+#: g10/g10.c:260
 msgid "batch mode: never ask"
 msgstr "modo batch: non fa domande"
 
-#: g10/g10.c:255
+#: g10/g10.c:261
 msgid "assume yes on most questions"
 msgstr "assumi \"s�\" per quasi tutte le domande"
 
-#: g10/g10.c:256
+#: g10/g10.c:262
 msgid "assume no on most questions"
 msgstr "assumi \"no\" per quasi tutte le domande"
 
-#: g10/g10.c:257
+#: g10/g10.c:263
 msgid "add this keyring to the list of keyrings"
 msgstr "aggiungi questo portachiavi alla lista"
 
-#: g10/g10.c:258
+#: g10/g10.c:264
 msgid "add this secret keyring to the list"
 msgstr "aggiungi questo portachiavi segreto alla lista"
 
-#: g10/g10.c:259
+#: g10/g10.c:265
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usa NOME come chiave segreta predefinita"
 
-#: g10/g10.c:260
+#: g10/g10.c:266
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|cerca le chiavi in questo keyserver"
 
-#: g10/g10.c:261
+#: g10/g10.c:267
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOME|imposta il set di caratteri del terminale NOME"
 
-#: g10/g10.c:262
+#: g10/g10.c:268
 msgid "read options from file"
 msgstr "leggi le opzioni dal file"
 
-#: g10/g10.c:264
+#: g10/g10.c:270
 msgid "set debugging flags"
 msgstr "imposta i flag di debugging"
 
-#: g10/g10.c:265
+#: g10/g10.c:271
 msgid "enable full debugging"
 msgstr "abilita il debugging completo"
 
-#: g10/g10.c:266
+#: g10/g10.c:272
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato su questo FD"
 
-#: g10/g10.c:267
+#: g10/g10.c:273
 msgid "do not write comment packets"
 msgstr "non scrivere pacchetti di commento"
 
-#: g10/g10.c:268
+#: g10/g10.c:274
 msgid "(default is 1)"
 msgstr "(predefinito � 1)"
 
-#: g10/g10.c:269
+#: g10/g10.c:275
 msgid "(default is 3)"
 msgstr "(predefinito � 3)"
 
-#: g10/g10.c:271
+#: g10/g10.c:277
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: g10/g10.c:272
+#: g10/g10.c:278
 msgid "emulate the mode described in RFC1991"
 msgstr "emula il modo descritto in RFC 1991"
 
-#: g10/g10.c:273
+#: g10/g10.c:279
 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:274
+#: g10/g10.c:280
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa il modo N per la passphrase"
 
-#: g10/g10.c:276
+#: g10/g10.c:282
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOME|usa l'algoritmo di message digest NOME per le passphrase"
 
-#: g10/g10.c:278
+#: g10/g10.c:284
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
 
-#: g10/g10.c:279
+#: g10/g10.c:285
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di cifratura NOME"
 
-#: g10/g10.c:280
+#: g10/g10.c:286
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di message digest NOME"
 
-#: g10/g10.c:281
+#: g10/g10.c:287
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritmo di compressione N"
 
-#: g10/g10.c:282
+#: g10/g10.c:288
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina il campo keyid dei pacchetti cifrati"
 
-#: g10/g10.c:283
+#: g10/g10.c:289
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALORE|usa questi dati per una nota"
 
-#: g10/g10.c:285
+#: g10/g10.c:291
 msgid ""
 "@\n"
 "Examples:\n"
@@ -611,15 +611,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/g10.c:370
+#: g10/g10.c:378
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: g10/g10.c:374
+#: g10/g10.c:382
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/g10.c:377
+#: g10/g10.c:385
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -629,7 +629,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/g10.c:382
+#: g10/g10.c:390
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -637,184 +637,184 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/g10.c:456
+#: g10/g10.c:468
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/g10.c:509
+#: g10/g10.c:521
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/g10.c:644
+#: g10/g10.c:656
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/g10.c:648
+#: g10/g10.c:660
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:667
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/g10.c:835
+#: g10/g10.c:848
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/g10.c:892 g10/g10.c:901
+#: g10/g10.c:912 g10/g10.c:921
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/g10.c:894
+#: g10/g10.c:914
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/g10.c:897
+#: g10/g10.c:917
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/g10.c:916 g10/g10.c:928
+#: g10/g10.c:936 g10/g10.c:948
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/g10.c:922 g10/g10.c:934
+#: g10/g10.c:942 g10/g10.c:954
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:938
+#: g10/g10.c:958
 msgid "the given policy URL is invalid\n"
 msgstr "L'URL della policy indicato non � valido\n"
 
-#: g10/g10.c:941
+#: g10/g10.c:961
 #, 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:943
+#: g10/g10.c:963
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/g10.c:945
+#: g10/g10.c:965
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/g10.c:947
+#: g10/g10.c:967
 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:950
+#: g10/g10.c:970
 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:954
+#: g10/g10.c:974
 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:1031
+#: g10/g10.c:1051
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/g10.c:1037
+#: g10/g10.c:1057
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/g10.c:1044
+#: g10/g10.c:1064
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:1052
+#: g10/g10.c:1072
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/g10.c:1065
+#: g10/g10.c:1085
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/g10.c:1078
+#: g10/g10.c:1098
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:1092
+#: g10/g10.c:1112
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/g10.c:1104
+#: g10/g10.c:1129
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/g10.c:1112
+#: g10/g10.c:1137
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:1120
+#: g10/g10.c:1145
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:1128
+#: g10/g10.c:1153
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/g10.c:1144
+#: g10/g10.c:1169
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key user-id"
 
-#: g10/g10.c:1147
+#: g10/g10.c:1172
 msgid "--delete-key user-id"
 msgstr "--delete-key user-id"
 
-#: g10/encode.c:259 g10/g10.c:1171 g10/sign.c:366
+#: g10/encode.c:259 g10/g10.c:1196 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1207
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1268
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1251
+#: g10/g10.c:1276
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1319
+#: g10/g10.c:1344
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/g10.c:1400
+#: g10/g10.c:1425
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/g10.c:1404
+#: g10/g10.c:1429
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1407 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1432 g10/verify.c:67 g10/verify.c:109
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/g10.c:1576
+#: g10/g10.c:1601
 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:1582
+#: g10/g10.c:1607
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -822,11 +822,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:1588
+#: g10/g10.c:1613
 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:1596
+#: g10/g10.c:1621
 msgid "a notation value must not use any control characters\n"
 msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 
@@ -1490,7 +1490,7 @@ msgstr ""
 msgid "Really create? "
 msgstr "Crea davvero? "
 
-#: g10/encode.c:91 g10/openfile.c:156 g10/openfile.c:246 g10/tdbio.c:468
+#: g10/encode.c:91 g10/openfile.c:161 g10/openfile.c:270 g10/tdbio.c:468
 #: g10/tdbio.c:529
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1658,7 +1658,7 @@ msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 msgid "no default public keyring\n"
 msgstr "nessun portachiavi pubblico predefinito\n"
 
-#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:580
+#: g10/import.c:399 g10/openfile.c:213 g10/sign.c:268 g10/sign.c:580
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
@@ -1830,7 +1830,7 @@ msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chiave %08lX: certificato di revoca aggiunto\n"
 
-#: g10/import.c:1128 g10/import.c:1183
+#: g10/import.c:1128 g10/import.c:1181
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "chiave %08lX: la nostra copia non ha autofirma\n"
@@ -2404,72 +2404,72 @@ msgstr "nessuna chiave disponibile per decifrare\n"
 msgid "public key decryption failed: %s\n"
 msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:330
+#: g10/mainproc.c:332
 msgid "decryption okay\n"
 msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:335
+#: g10/mainproc.c:337
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato � stato manipolato!\n"
 
-#: g10/mainproc.c:340
+#: g10/mainproc.c:342
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:358
+#: g10/mainproc.c:360
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
 
-#: g10/mainproc.c:360
+#: g10/mainproc.c:362
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:587 g10/mainproc.c:596
+#: g10/mainproc.c:589 g10/mainproc.c:598
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:601
 msgid "Notation: "
 msgstr "Nota: "
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:608
 msgid "Policy: "
 msgstr "Policy: "
 
-#: g10/mainproc.c:1025
+#: g10/mainproc.c:1027
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
-#: g10/mainproc.c:1031
+#: g10/mainproc.c:1033
 #, 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:1057 g10/mainproc.c:1068
+#: g10/mainproc.c:1059 g10/mainproc.c:1070
 msgid "BAD signature from \""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:1058 g10/mainproc.c:1069
+#: g10/mainproc.c:1060 g10/mainproc.c:1071
 msgid "Good signature from \""
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1060
+#: g10/mainproc.c:1062
 msgid "                aka \""
 msgstr "    anche noto come \""
 
-#: g10/mainproc.c:1115
+#: g10/mainproc.c:1117
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:1212
+#: g10/mainproc.c:1214
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1219
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
@@ -2686,7 +2686,7 @@ msgstr "%s: directory creata\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: la directory non esiste!\n"
 
-#: g10/openfile.c:182 g10/openfile.c:253 g10/ringedit.c:1348 g10/tdbio.c:458
+#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1348 g10/tdbio.c:458
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: impossibile creare: %s\n"
@@ -3068,6 +3068,11 @@ msgstr "impossibile mettere `%s' nel trustdb: %s\n"
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "ATTENZIONE: non � ancora possibile gestire record pref lunghi\n"
 
+#: g10/verify.c:143
+#, c-format
+msgid "input line %u too long or missing LF\n"
+msgstr ""
+
 #: g10/ringedit.c:318
 #, c-format
 msgid "%s: can't create keyring: %s\n"
@@ -3117,34 +3122,34 @@ msgstr ""
 "le firme!\n"
 
 #. do not overwrite
-#: g10/openfile.c:65
+#: g10/openfile.c:72
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Il file `%s' esiste. "
 
-#: g10/openfile.c:67
+#: g10/openfile.c:74
 msgid "Overwrite (y/N)? "
 msgstr "Sovrascrivo (s/N)? "
 
-#: g10/openfile.c:97
+#: g10/openfile.c:102
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: suffisso sconosciuto\n"
 
-#: g10/openfile.c:119
+#: g10/openfile.c:124
 msgid "Enter new filename"
 msgstr "Inserire il nuovo nome del file"
 
-#: g10/openfile.c:160
+#: g10/openfile.c:165
 msgid "writing to stdout\n"
 msgstr "scrivo su stdout\n"
 
-#: g10/openfile.c:219
+#: g10/openfile.c:243
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "suppongo che i dati firmati siano in `%s'\n"
 
-#: g10/openfile.c:269
+#: g10/openfile.c:293
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: creato un nuovo file delle opzioni\n"
@@ -3218,8 +3223,7 @@ msgstr "Se vuoi usare comunque questa chiave non fidata, rispondi \"si\"."
 #: g10/helptext.c:61
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
-msgstr ""
-"Inserisci l'user ID del destinatario a cui vuoi mandare il messaggio."
+msgstr "Inserisci l'user ID del destinatario a cui vuoi mandare il messaggio."
 
 #: g10/helptext.c:65
 msgid ""
@@ -3345,7 +3349,8 @@ msgid ""
 "to delete this signature because it may be important to establish a\n"
 "trust connection to the key or another key certified by this key."
 msgstr ""
-"Questa � una firma valida per la chiave. Normalmente non vorresti cancellare\n"
+"Questa � una firma valida per la chiave. Normalmente non vorresti "
+"cancellare\n"
 "questa firma perch� pu� essere importante per stabilire una connessione di\n"
 "fiducia alla chiave o a un'altra chiave certificata da questa chiave."
 
@@ -3420,4 +3425,3 @@ msgstr "Non � disponibile un aiuto"
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Non � disponibile un aiuto per `%s'"
-
diff --git a/po/pl.po b/po/pl.po
index 068834188..beb9df26c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-0.9.11\n"
-"POT-Creation-Date: 1999-09-05 19:21+0200\n"
+"POT-Creation-Date: 1999-09-23 08:53+0200\n"
 "PO-Revision-Date: 1999-09-07 10:59+02:00\n"
 "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -27,11 +27,11 @@ msgstr ""
 msgid "Warning: using insecure memory!\n"
 msgstr "Ostrze�enie: u�ywana pami�� nie jest pami�ci� bezpieczn�!\n"
 
-#: util/secmem.c:275
+#: util/secmem.c:281
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operacja niemo�liwa do wykonania bez dost�pnej pami�ci bezpiecznej\n"
 
-#: util/secmem.c:276
+#: util/secmem.c:282
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 
@@ -293,7 +293,7 @@ msgstr ""
 "Prosz� kontynuowa� inne dzia�ania aby system m�g� zebra� odpowiedni�\n"
 "ilo�� entropii do ich wygenerowania (brakuje %d bajt�w).\n"
 
-#: g10/g10.c:185
+#: g10/g10.c:187
 msgid ""
 "@Commands:\n"
 " "
@@ -301,135 +301,135 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/g10.c:187
+#: g10/g10.c:189
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: g10/g10.c:188
+#: g10/g10.c:190
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu na czytelnym dokumencie"
 
-#: g10/g10.c:189
+#: g10/g10.c:191
 msgid "make a detached signature"
 msgstr "sporz�dzenie podpisu oddzielonego od dokumentu"
 
-#: g10/g10.c:190
+#: g10/g10.c:192
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/g10.c:191
+#: g10/g10.c:193
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/g10.c:192
+#: g10/g10.c:194
 msgid "store only"
 msgstr "tylko zapis"
 
-#: g10/g10.c:193
+#: g10/g10.c:195
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lnie)"
 
-#: g10/g10.c:194
+#: g10/g10.c:196
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/g10.c:195
+#: g10/g10.c:198
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/g10.c:197
+#: g10/g10.c:200
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpis�w"
 
-#: g10/g10.c:198
+#: g10/g10.c:201
 msgid "check key signatures"
 msgstr "sprawdzenie podpis�w kluczy"
 
-#: g10/g10.c:199
+#: g10/g10.c:202
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/g10.c:200
+#: g10/g10.c:203
 msgid "list secret keys"
 msgstr "lista kluczy tajnych"
 
-#: g10/g10.c:201
+#: g10/g10.c:204
 msgid "generate a new key pair"
 msgstr "generacja nowej pary klucza"
 
-#: g10/g10.c:202
+#: g10/g10.c:205
 msgid "remove key from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: g10/g10.c:203
+#: g10/g10.c:206
 msgid "sign a key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/g10.c:204
+#: g10/g10.c:207
 msgid "sign a key locally"
 msgstr "z�o�enie lokalnego podpisu na kluczu"
 
-#: g10/g10.c:205
+#: g10/g10.c:208
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/g10.c:206
+#: g10/g10.c:209
 msgid "generate a revocation certificate"
 msgstr "generacja certyfikatu uniewa�nienia klucza"
 
-#: g10/g10.c:207
+#: g10/g10.c:210
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/g10.c:208
+#: g10/g10.c:211
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/g10.c:209
+#: g10/g10.c:212
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/g10.c:212
+#: g10/g10.c:215
 msgid "import/merge keys"
 msgstr "import/do��czenie kluczy"
 
-#: g10/g10.c:214
+#: g10/g10.c:217
 msgid "list only the sequence of packets"
 msgstr "wypisane sekwencji pakiet�w"
 
-#: g10/g10.c:216
+#: g10/g10.c:219
 msgid "export the ownertrust values"
 msgstr "eksport warto�ci zaufania"
 
-#: g10/g10.c:218
+#: g10/g10.c:221
 msgid "import ownertrust values"
 msgstr "wczytanie warto��i zaufania"
 
-#: g10/g10.c:220
+#: g10/g10.c:223
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/g10.c:222
+#: g10/g10.c:225
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAZWY]|sprawdzenie bazy zaufania"
 
-#: g10/g10.c:223
+#: g10/g10.c:226
 msgid "fix a corrupted trust database"
 msgstr "naprawa uszkodzonej Bazy Zaufania"
 
-#: g10/g10.c:224
+#: g10/g10.c:227
 msgid "De-Armor a file or stdin"
 msgstr "zdj�cie opakowania ASCII pliku lub potoku"
 
-#: g10/g10.c:225
+#: g10/g10.c:229
 msgid "En-Armor a file or stdin"
 msgstr "opakowanie ASCII pliku lub potoku"
 
-#: g10/g10.c:226
+#: g10/g10.c:231
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/g10.c:230
+#: g10/g10.c:235
 msgid ""
 "@\n"
 "Options:\n"
@@ -439,168 +439,168 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/g10.c:232
+#: g10/g10.c:237
 msgid "create ascii armored output"
 msgstr "plik wynikowy w opakowaniu ASCII"
 
-#: g10/g10.c:233
+#: g10/g10.c:239
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/g10.c:236
+#: g10/g10.c:242
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego adresata"
 
-#: g10/g10.c:238
+#: g10/g10.c:244
 msgid "use the default key as default recipient"
 msgstr "domy�lny klucz jest domy�lnym adresatem"
 
-#: g10/g10.c:242
+#: g10/g10.c:248
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/g10.c:243
+#: g10/g10.c:249
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - brak)"
 
-#: g10/g10.c:245
+#: g10/g10.c:251
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/g10.c:246
+#: g10/g10.c:252
 msgid "use as output file"
 msgstr "plik wyj�ciowy"
 
-#: g10/g10.c:247
+#: g10/g10.c:253
 msgid "verbose"
 msgstr "z informacjami dodatkowymi"
 
-#: g10/g10.c:248
+#: g10/g10.c:254
 msgid "be somewhat more quiet"
 msgstr "mniej komunikat�ww"
 
-#: g10/g10.c:249
+#: g10/g10.c:255
 msgid "don't use the terminal at all"
 msgstr "bez odwo�a� do terminala"
 
-#: g10/g10.c:250
+#: g10/g10.c:256
 msgid "force v3 signatures"
 msgstr "wymuszenie trzeciej wersji formatu podpis�w"
 
-#: g10/g10.c:251
+#: g10/g10.c:257
 msgid "always use a MDC for encryption"
 msgstr "do szyfrowania b�dzie u�ywany MDC"
 
-#: g10/g10.c:252
+#: g10/g10.c:258
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:254
+#: g10/g10.c:260
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: �adnych pyta�"
 
-#: g10/g10.c:255
+#: g10/g10.c:261
 msgid "assume yes on most questions"
 msgstr "automatyczna odpowied� tak na wi�kszo�� pyta�"
 
-#: g10/g10.c:256
+#: g10/g10.c:262
 msgid "assume no on most questions"
 msgstr "automatyczna odpowied� nie na wi�kszo�� pyta�"
 
-#: g10/g10.c:257
+#: g10/g10.c:263
 msgid "add this keyring to the list of keyrings"
 msgstr "doda� zbi�r kluczy do listy u�ywanych"
 
-#: g10/g10.c:258
+#: g10/g10.c:264
 msgid "add this secret keyring to the list"
 msgstr "doda� zbi�r kluczy tajnych do listy"
 
-#: g10/g10.c:259
+#: g10/g10.c:265
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego klucza tajnego"
 
-#: g10/g10.c:260
+#: g10/g10.c:266
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|serwer kluczy w kt�rym b�d� poszukiwane"
 
-#: g10/g10.c:261
+#: g10/g10.c:267
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAZWA|zestaw znak�w terminala NAZWA"
 
-#: g10/g10.c:262
+#: g10/g10.c:268
 msgid "read options from file"
 msgstr "wczytanie opcji z pliku"
 
-#: g10/g10.c:264
+#: g10/g10.c:270
 msgid "set debugging flags"
 msgstr "ustawienie opcji �ledzenia wykonania programu"
 
-#: g10/g10.c:265
+#: g10/g10.c:271
 msgid "enable full debugging"
 msgstr "umo�liwienie pe�nego �ledzenia programu"
 
-#: g10/g10.c:266
+#: g10/g10.c:272
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapisa� opis stanu do FD"
 
-#: g10/g10.c:267
+#: g10/g10.c:273
 msgid "do not write comment packets"
 msgstr "nie zapisywa� pakiet�w z komentarzem"
 
-#: g10/g10.c:268
+#: g10/g10.c:274
 msgid "(default is 1)"
 msgstr "(domy�lnie 1)"
 
-#: g10/g10.c:269
+#: g10/g10.c:275
 msgid "(default is 3)"
 msgstr "(domy�lnie 3)"
 
-#: g10/g10.c:271
+#: g10/g10.c:277
 msgid "|FILE|load extension module FILE"
 msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
 
-#: g10/g10.c:272
+#: g10/g10.c:278
 msgid "emulate the mode described in RFC1991"
 msgstr "emulacja trybu opisanego w RFC1991"
 
-#: g10/g10.c:273
+#: g10/g10.c:279
 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:274
+#: g10/g10.c:280
 msgid "|N|use passphrase mode N"
 msgstr "|N|N-ty tryb wprowadzania wyra�enia przej�ciowego"
 
-#: g10/g10.c:276
+#: g10/g10.c:282
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|ALG|algorytm obliczania skr�t�w wiadomo�ci ALG"
 
-#: g10/g10.c:278
+#: g10/g10.c:284
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|ALG|algorytmu szyfruj�cy ALG dla has�a"
 
-#: g10/g10.c:279
+#: g10/g10.c:285
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|algorytm szyfruj�cy NAZWA"
 
-#: g10/g10.c:280
+#: g10/g10.c:286
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|algorytm obliczania skr�t�w wiadomo�ci NAZWA"
 
-#: g10/g10.c:281
+#: g10/g10.c:287
 msgid "|N|use compress algorithm N"
 msgstr "|N|algorytm kompresji N"
 
-#: g10/g10.c:282
+#: g10/g10.c:288
 msgid "throw keyid field of encrypted packets"
 msgstr "usuni�cie identyfikator�w kluczy z pakiet�w"
 
-#: g10/g10.c:283
+#: g10/g10.c:289
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAZWA=TRE��|adnotacje"
 
-#: g10/g10.c:285
+#: g10/g10.c:291
 msgid ""
 "@\n"
 "Examples:\n"
@@ -621,15 +621,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/g10.c:370
+#: g10/g10.c:378
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: g10/g10.c:374
+#: g10/g10.c:382
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/g10.c:377
+#: g10/g10.c:385
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -639,7 +639,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/g10.c:382
+#: g10/g10.c:390
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -647,182 +647,182 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/g10.c:456
+#: g10/g10.c:468
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/g10.c:509
+#: g10/g10.c:521
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/g10.c:644
+#: g10/g10.c:656
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji '%s'\n"
 
-#: g10/g10.c:648
+#: g10/g10.c:660
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji '%s': %s\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:667
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z '%s'\n"
 
-#: g10/g10.c:835
+#: g10/g10.c:848
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/g10.c:892 g10/g10.c:901
+#: g10/g10.c:912 g10/g10.c:921
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/g10.c:894
+#: g10/g10.c:914
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s jest niedozwolony z %s!\n"
 
-#: g10/g10.c:897
+#: g10/g10.c:917
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu z %s!\n"
 
-#: g10/g10.c:916 g10/g10.c:928
+#: g10/g10.c:936 g10/g10.c:948
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/g10.c:922 g10/g10.c:934
+#: g10/g10.c:942 g10/g10.c:954
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm geenracji skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/g10.c:938
+#: g10/g10.c:958
 msgid "the given policy URL is invalid\n"
 msgstr "podany URL regulaminu jest niepoprawny\n"
 
-#: g10/g10.c:941
+#: g10/g10.c:961
 #, 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:943
+#: g10/g10.c:963
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/g10.c:945
+#: g10/g10.c:965
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/g10.c:947
+#: g10/g10.c:967
 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:950
+#: g10/g10.c:970
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/g10.c:954
+#: g10/g10.c:974
 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:1031
+#: g10/g10.c:1051
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1037
+#: g10/g10.c:1057
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/g10.c:1044
+#: g10/g10.c:1064
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:1052
+#: g10/g10.c:1072
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/g10.c:1065
+#: g10/g10.c:1085
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/g10.c:1078
+#: g10/g10.c:1098
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:1092
+#: g10/g10.c:1112
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/g10.c:1104
+#: g10/g10.c:1129
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/g10.c:1112
+#: g10/g10.c:1137
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/g10.c:1120
+#: g10/g10.c:1145
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/g10.c:1128
+#: g10/g10.c:1153
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/g10.c:1144
+#: g10/g10.c:1169
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key nazwa u�ytkownika"
 
-#: g10/g10.c:1147
+#: g10/g10.c:1172
 msgid "--delete-key user-id"
 msgstr "--delete-key nazwa u�ytkownika"
 
-#: g10/encode.c:259 g10/g10.c:1171 g10/sign.c:366
+#: g10/encode.c:259 g10/g10.c:1196 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "nie mo�na otworzy� %s: %s\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1207
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1268
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "usuni�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1251
+#: g10/g10.c:1276
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1319
+#: g10/g10.c:1344
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu '%s'\n"
 
-#: g10/g10.c:1400
+#: g10/g10.c:1425
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/g10.c:1404
+#: g10/g10.c:1429
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1407 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1432 g10/verify.c:67 g10/verify.c:109
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mo�na otworzy� '%s'\n"
 
-#: g10/g10.c:1576
+#: g10/g10.c:1601
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "adnotacja musi zaczyna� si� od podkre�lenia lub litery\n"
 
-#: g10/g10.c:1582
+#: g10/g10.c:1607
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -830,11 +830,11 @@ msgstr ""
 "nazwa adnotacji mo�e zawiera� tylko litery, cyfry, kropki,\n"
 "podkre�lenia, i musi ko�czy� si� '='\n"
 
-#: g10/g10.c:1588
+#: g10/g10.c:1613
 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:1596
+#: g10/g10.c:1621
 msgid "a notation value must not use any control characters\n"
 msgstr "warto�� adnotacji nie mo�e zawiera� znak�w steruj�cych\n"
 
@@ -1508,7 +1508,7 @@ msgstr ""
 msgid "Really create? "
 msgstr "Na pewno generowa�? "
 
-#: g10/encode.c:91 g10/openfile.c:156 g10/openfile.c:246 g10/tdbio.c:468
+#: g10/encode.c:91 g10/openfile.c:161 g10/openfile.c:270 g10/tdbio.c:468
 #: g10/tdbio.c:529
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1676,7 +1676,7 @@ msgstr "klucz %08lX: brak klucza publicznego: %s\n"
 msgid "no default public keyring\n"
 msgstr "brak domy�lnego zbioru kluczy publicznych\n"
 
-#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:580
+#: g10/import.c:399 g10/openfile.c:213 g10/sign.c:268 g10/sign.c:580
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
@@ -1853,7 +1853,7 @@ msgstr "key %08lX: powt�rzony identyfikator u�ytkownika - do��czony\n"
 msgid "key %08lX: revocation certificate added\n"
 msgstr "klucz %08lX: dodany certyfikat uniewa�nienia\n"
 
-#: g10/import.c:1128 g10/import.c:1183
+#: g10/import.c:1128 g10/import.c:1181
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "klucz %08lX: dost�pna kopia nie jest podpisana ni� sam�\n"
@@ -2434,45 +2434,45 @@ msgstr "odszyfrowuj�cy klucz tajny do jest niedost�pny\n"
 msgid "public key decryption failed: %s\n"
 msgstr "b��d odszyfrowywania kluczem publicznym: %s\n"
 
-#: g10/mainproc.c:330
+#: g10/mainproc.c:332
 msgid "decryption okay\n"
 msgstr "odszyfrowane poprawnie\n"
 
-#: g10/mainproc.c:335
+#: g10/mainproc.c:337
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "OSTRZE�ENIE: zaszyfrowana wiadomo�� by�a manipulowana!\n"
 
-#: g10/mainproc.c:340
+#: g10/mainproc.c:342
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:358
+#: g10/mainproc.c:360
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "UWAGA: nadawca zaznaczy� �e wiadomo�� nie powinna by� zapisywana\n"
 
-#: g10/mainproc.c:360
+#: g10/mainproc.c:362
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:587 g10/mainproc.c:596
+#: g10/mainproc.c:589 g10/mainproc.c:598
 msgid "WARNING: invalid notation data found\n"
 msgstr "OSTRZE�ENIE: niepoprawne dane w adnotacji\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:601
 msgid "Notation: "
 msgstr "Adnotacja:"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:608
 msgid "Policy: "
 msgstr "Regulamin:"
 
-#: g10/mainproc.c:1025
+#: g10/mainproc.c:1027
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
 
-#: g10/mainproc.c:1031
+#: g10/mainproc.c:1033
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
@@ -2480,28 +2480,28 @@ msgstr ""
 "z u�yciem klucza o identyfikatorze %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1057 g10/mainproc.c:1068
+#: g10/mainproc.c:1059 g10/mainproc.c:1070
 msgid "BAD signature from \""
 msgstr "NIEPOPRAWNY podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1058 g10/mainproc.c:1069
+#: g10/mainproc.c:1060 g10/mainproc.c:1071
 msgid "Good signature from \""
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1060
+#: g10/mainproc.c:1062
 msgid "                aka \""
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1115
+#: g10/mainproc.c:1117
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie mog� sprawdzi� podpisu: %s\n"
 
-#: g10/mainproc.c:1212
+#: g10/mainproc.c:1214
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1219
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
@@ -2721,7 +2721,7 @@ msgstr "%s: katalog utworzony\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalog nie istnieje!\n"
 
-#: g10/openfile.c:182 g10/openfile.c:253 g10/ringedit.c:1348 g10/tdbio.c:458
+#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1348 g10/tdbio.c:458
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: nie mog� utworzy�: %s\n"
@@ -3103,6 +3103,11 @@ msgstr "umieszczenie '%s' w Bazie Zaufania nie powiod�o si�: %s\n"
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "OSTRZE�ENIE: d�ugie wpisy ustawie� jeszcze nie s� obs�ugiwane.\n"
 
+#: g10/verify.c:143
+#, c-format
+msgid "input line %u too long or missing LF\n"
+msgstr ""
+
 #: g10/ringedit.c:318
 #, c-format
 msgid "%s: can't create keyring: %s\n"
@@ -3152,34 +3157,34 @@ msgstr ""
 "podpisy sk�adane tym kluczem nie zapewniaj� bezpiecze�stwa!\n"
 
 #. do not overwrite
-#: g10/openfile.c:65
+#: g10/openfile.c:72
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Plik '%s' ju� istnieje. "
 
-#: g10/openfile.c:67
+#: g10/openfile.c:74
 msgid "Overwrite (y/N)? "
 msgstr "Nadpisa� (t/N)? "
 
-#: g10/openfile.c:97
+#: g10/openfile.c:102
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: nieznana ko�c�wka\n"
 
-#: g10/openfile.c:119
+#: g10/openfile.c:124
 msgid "Enter new filename"
 msgstr "Nazwa pliku"
 
-#: g10/openfile.c:160
+#: g10/openfile.c:165
 msgid "writing to stdout\n"
 msgstr "zapisywanie na wyj�cie standardowe\n"
 
-#: g10/openfile.c:219
+#: g10/openfile.c:243
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "przyj�to obecno�� podpisanych danych w '%s'\n"
 
-#: g10/openfile.c:269
+#: g10/openfile.c:293
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: stworzono nowy plik ustawie�\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5d953207e..fb5ddac65 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-09-05 19:21+0200\n"
+"POT-Creation-Date: 1999-09-23 08:53+0200\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-20 23:46:36-0200\n"
 "From: Thiago Jung Bauermann <[email protected]>\n"
@@ -21,11 +21,11 @@ msgstr ""
 msgid "Warning: using insecure memory!\n"
 msgstr "Aviso: usando mem�ria insegura!\n"
 
-#: util/secmem.c:275
+#: util/secmem.c:281
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "a opera��o n�o � poss�vel sem mem�ria segura inicializada\n"
 
-#: util/secmem.c:276
+#: util/secmem.c:282
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 
@@ -289,7 +289,7 @@ msgstr ""
 "para que o sistema possa coletar mais entropia!\n"
 "(S�o necess�rios mais %d bytes)\n"
 
-#: g10/g10.c:185
+#: g10/g10.c:187
 msgid ""
 "@Commands:\n"
 " "
@@ -297,140 +297,140 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:187
+#: g10/g10.c:189
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: g10/g10.c:188
+#: g10/g10.c:190
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:189
+#: g10/g10.c:191
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:190
+#: g10/g10.c:192
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/g10.c:191
+#: g10/g10.c:193
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "sim�trica"
 
-#: g10/g10.c:192
+#: g10/g10.c:194
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/g10.c:193
+#: g10/g10.c:195
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padr�o)"
 
-#: g10/g10.c:194
+#: g10/g10.c:196
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:195
+#: g10/g10.c:198
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:197
+#: g10/g10.c:200
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:198
+#: g10/g10.c:201
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:199
+#: g10/g10.c:202
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/g10.c:200
+#: g10/g10.c:203
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:201
+#: g10/g10.c:204
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:202
+#: g10/g10.c:205
 msgid "remove key from the public keyring"
 msgstr "remover a chave do chaveiro p�blico"
 
-#: g10/g10.c:203
+#: g10/g10.c:206
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:204
+#: g10/g10.c:207
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:205
+#: g10/g10.c:208
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:206
+#: g10/g10.c:209
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/g10.c:207
+#: g10/g10.c:210
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:208
+#: g10/g10.c:211
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:209
+#: g10/g10.c:212
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:212
+#: g10/g10.c:215
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:214
+#: g10/g10.c:217
 msgid "list only the sequence of packets"
 msgstr "listar apenas as seq��ncias de pacotes"
 
 # ownertrust ???
-#: g10/g10.c:216
+#: g10/g10.c:219
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confian�a"
 
-#: g10/g10.c:218
+#: g10/g10.c:221
 msgid "import ownertrust values"
 msgstr "importar os valores de confian�a"
 
-#: g10/g10.c:220
+#: g10/g10.c:223
 msgid "update the trust database"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/g10.c:222
+#: g10/g10.c:225
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMES]|verificar o banco de dados de confiabilidade"
 
-#: g10/g10.c:223
+#: g10/g10.c:226
 msgid "fix a corrupted trust database"
 msgstr ""
 "consertar um banco de dados de confiabilidade\n"
 "danificado"
 
-#: g10/g10.c:224
+#: g10/g10.c:227
 msgid "De-Armor a file or stdin"
 msgstr "retirar a armadura de um arquivo ou de \"stdin\""
 
-#: g10/g10.c:225
+#: g10/g10.c:229
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um arquivo ou \"stdin\""
 
-#: g10/g10.c:226
+#: g10/g10.c:231
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:230
+#: g10/g10.c:235
 msgid ""
 "@\n"
 "Options:\n"
@@ -440,185 +440,185 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/g10.c:232
+#: g10/g10.c:237
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/g10.c:233
+#: g10/g10.c:239
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/g10.c:236
+#: g10/g10.c:242
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: g10/g10.c:238
+#: g10/g10.c:244
 msgid "use the default key as default recipient"
 msgstr "usar a chave padr�o como destinat�rio padr�o"
 
-#: g10/g10.c:242
+#: g10/g10.c:248
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usu�rio para\n"
 "assinar ou descriptografar"
 
-#: g10/g10.c:243
+#: g10/g10.c:249
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desabilita)"
 
-#: g10/g10.c:245
+#: g10/g10.c:251
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/g10.c:246
+#: g10/g10.c:252
 msgid "use as output file"
 msgstr "usar como arquivo de sa�da"
 
-#: g10/g10.c:247
+#: g10/g10.c:253
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:248
+#: g10/g10.c:254
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:249
+#: g10/g10.c:255
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/g10.c:250
+#: g10/g10.c:256
 msgid "force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: g10/g10.c:251
+#: g10/g10.c:257
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para criptografar"
 
-#: g10/g10.c:252
+#: g10/g10.c:258
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:254
+#: g10/g10.c:260
 msgid "batch mode: never ask"
 msgstr "modo n�o-interativo: nunca perguntar"
 
-#: g10/g10.c:255
+#: g10/g10.c:261
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:256
+#: g10/g10.c:262
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: g10/g10.c:257
+#: g10/g10.c:263
 msgid "add this keyring to the list of keyrings"
 msgstr "adicionar este chaveiro � lista de chaveiros"
 
-#: g10/g10.c:258
+#: g10/g10.c:264
 msgid "add this secret keyring to the list"
 msgstr "adicionar este chaveiro secreto � lista"
 
-#: g10/g10.c:259
+#: g10/g10.c:265
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta padr�o"
 
-#: g10/g10.c:260
+#: g10/g10.c:266
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: g10/g10.c:261
+#: g10/g10.c:267
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/g10.c:262
+#: g10/g10.c:268
 msgid "read options from file"
 msgstr "ler op��es do arquivo"
 
-#: g10/g10.c:264
+#: g10/g10.c:270
 msgid "set debugging flags"
 msgstr "definir par�metros de depura��o"
 
-#: g10/g10.c:265
+#: g10/g10.c:271
 msgid "enable full debugging"
 msgstr "habilitar depura��o completa"
 
-#: g10/g10.c:266
+#: g10/g10.c:272
 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:267
+#: g10/g10.c:273
 msgid "do not write comment packets"
 msgstr "n�o escrever pacotes de coment�rio"
 
-#: g10/g10.c:268
+#: g10/g10.c:274
 msgid "(default is 1)"
 msgstr "(o padr�o � 1)"
 
-#: g10/g10.c:269
+#: g10/g10.c:275
 msgid "(default is 3)"
 msgstr "(o padr�o � 3)"
 
-#: g10/g10.c:271
+#: g10/g10.c:277
 msgid "|FILE|load extension module FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: g10/g10.c:272
+#: g10/g10.c:278
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/g10.c:273
+#: g10/g10.c:279
 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:274
+#: g10/g10.c:280
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar frase secreta modo N"
 
-#: g10/g10.c:276
+#: g10/g10.c:282
 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:278
+#: g10/g10.c:284
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:279
+#: g10/g10.c:285
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:280
+#: g10/g10.c:286
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:281
+#: g10/g10.c:287
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: g10/g10.c:282
+#: g10/g10.c:288
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "eliminar o campo keyid dos pacotes\n"
 "criptografados"
 
-#: g10/g10.c:283
+#: g10/g10.c:289
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALOR|usar estes dados de nota��o"
 
-#: g10/g10.c:285
+#: g10/g10.c:291
 msgid ""
 "@\n"
 "Examples:\n"
@@ -638,15 +638,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:370
+#: g10/g10.c:378
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:374
+#: g10/g10.c:382
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/g10.c:377
+#: g10/g10.c:385
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -656,7 +656,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/g10.c:382
+#: g10/g10.c:390
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -664,185 +664,185 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:456
+#: g10/g10.c:468
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:509
+#: g10/g10.c:521
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/g10.c:644
+#: g10/g10.c:656
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/g10.c:648
+#: g10/g10.c:660
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:667
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/g10.c:835
+#: g10/g10.c:848
 #, 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:892 g10/g10.c:901
+#: g10/g10.c:912 g10/g10.c:921
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/g10.c:894
+#: g10/g10.c:914
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:897
+#: g10/g10.c:917
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:916 g10/g10.c:928
+#: g10/g10.c:936 g10/g10.c:948
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/g10.c:922 g10/g10.c:934
+#: g10/g10.c:942 g10/g10.c:954
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:938
+#: g10/g10.c:958
 msgid "the given policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:941
+#: g10/g10.c:961
 #, 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:943
+#: g10/g10.c:963
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:945
+#: g10/g10.c:965
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:947
+#: g10/g10.c:967
 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:950
+#: g10/g10.c:970
 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:954
+#: g10/g10.c:974
 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:1031
+#: g10/g10.c:1051
 #, 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:1037
+#: g10/g10.c:1057
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/g10.c:1044
+#: g10/g10.c:1064
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:1052
+#: g10/g10.c:1072
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1065
+#: g10/g10.c:1085
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/g10.c:1078
+#: g10/g10.c:1098
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1092
+#: g10/g10.c:1112
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/g10.c:1104
+#: g10/g10.c:1129
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1112
+#: g10/g10.c:1137
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:1120
+#: g10/g10.c:1145
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/g10.c:1128
+#: g10/g10.c:1153
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/g10.c:1144
+#: g10/g10.c:1169
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-usu�rio"
 
-#: g10/g10.c:1147
+#: g10/g10.c:1172
 msgid "--delete-key user-id"
 msgstr "--delete-key id-usu�rio"
 
-#: g10/encode.c:259 g10/g10.c:1171 g10/sign.c:366
+#: g10/encode.c:259 g10/g10.c:1196 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1207
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usu�rio] [chaveiro]"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1268
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1251
+#: g10/g10.c:1276
 #, 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:1319
+#: g10/g10.c:1344
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/g10.c:1400
+#: g10/g10.c:1425
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/g10.c:1404
+#: g10/g10.c:1429
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1407 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1432 g10/verify.c:67 g10/verify.c:109
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/g10.c:1576
+#: g10/g10.c:1601
 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:1582
+#: g10/g10.c:1607
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -850,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:1588
+#: g10/g10.c:1613
 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:1596
+#: g10/g10.c:1621
 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"
 
@@ -1522,7 +1522,7 @@ msgstr ""
 msgid "Really create? "
 msgstr "Realmente criar? "
 
-#: g10/encode.c:91 g10/openfile.c:156 g10/openfile.c:246 g10/tdbio.c:468
+#: g10/encode.c:91 g10/openfile.c:161 g10/openfile.c:270 g10/tdbio.c:468
 #: g10/tdbio.c:529
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1690,7 +1690,7 @@ msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 msgid "no default public keyring\n"
 msgstr "sem chaveiro p�blico padr�o\n"
 
-#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:580
+#: g10/import.c:399 g10/openfile.c:213 g10/sign.c:268 g10/sign.c:580
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
@@ -1862,7 +1862,7 @@ msgstr "chave %08lX: detectado ID de usu�rio duplicado - unido\n"
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/import.c:1128 g10/import.c:1183
+#: g10/import.c:1128 g10/import.c:1181
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "chave %08lX: nossa c�pia n�o tem auto-assinatura\n"
@@ -2445,72 +2445,72 @@ msgstr "nenhuma chave secreta para descriptografia dispon�vel\n"
 msgid "public key decryption failed: %s\n"
 msgstr "descriptografia de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:330
+#: g10/mainproc.c:332
 msgid "decryption okay\n"
 msgstr "descriptografia correta\n"
 
-#: g10/mainproc.c:335
+#: g10/mainproc.c:337
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem criptografada foi manipulada!\n"
 
-#: g10/mainproc.c:340
+#: g10/mainproc.c:342
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/mainproc.c:358
+#: g10/mainproc.c:360
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:360
+#: g10/mainproc.c:362
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome de arquivo original='%.*s'\n"
 
-#: g10/mainproc.c:587 g10/mainproc.c:596
+#: g10/mainproc.c:589 g10/mainproc.c:598
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:601
 msgid "Notation: "
 msgstr "Nota��o: "
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:608
 msgid "Policy: "
 msgstr "Pol�tica: "
 
-#: g10/mainproc.c:1025
+#: g10/mainproc.c:1027
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1031
+#: g10/mainproc.c:1033
 #, 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:1057 g10/mainproc.c:1068
+#: g10/mainproc.c:1059 g10/mainproc.c:1070
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRETA de \""
 
-#: g10/mainproc.c:1058 g10/mainproc.c:1069
+#: g10/mainproc.c:1060 g10/mainproc.c:1071
 msgid "Good signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1060
+#: g10/mainproc.c:1062
 msgid "                aka \""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1115
+#: g10/mainproc.c:1117
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1212
+#: g10/mainproc.c:1214
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1219
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -2724,7 +2724,7 @@ msgstr "%s: diret�rio criado\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diret�rio inexistente!\n"
 
-#: g10/openfile.c:182 g10/openfile.c:253 g10/ringedit.c:1348 g10/tdbio.c:458
+#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1348 g10/tdbio.c:458
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: imposs�vel criar: %s\n"
@@ -3107,6 +3107,11 @@ msgstr "falha ao colocar `%s' no banco de dados de confiabilidade: %s\n"
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "AVISO: ainda � imposs�vel manipular registros de prefer�ncias longos\n"
 
+#: g10/verify.c:143
+#, c-format
+msgid "input line %u too long or missing LF\n"
+msgstr ""
+
 #: g10/ringedit.c:318
 #, c-format
 msgid "%s: can't create keyring: %s\n"
@@ -3156,34 +3161,34 @@ msgstr ""
 "para assinaturas!\n"
 
 #. do not overwrite
-#: g10/openfile.c:65
+#: g10/openfile.c:72
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Arquivo `%s' j� existe. "
 
-#: g10/openfile.c:67
+#: g10/openfile.c:74
 msgid "Overwrite (y/N)? "
 msgstr "Sobrescrever (s/N)? "
 
-#: g10/openfile.c:97
+#: g10/openfile.c:102
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufixo desconhecido\n"
 
-#: g10/openfile.c:119
+#: g10/openfile.c:124
 msgid "Enter new filename"
 msgstr "Digite novo nome de arquivo"
 
-#: g10/openfile.c:160
+#: g10/openfile.c:165
 msgid "writing to stdout\n"
 msgstr "escrevendo em \"stdout\"\n"
 
-#: g10/openfile.c:219
+#: g10/openfile.c:243
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "assumindo dados assinados em `%s'\n"
 
-#: g10/openfile.c:269
+#: g10/openfile.c:293
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: novo arquivo de op��es criado\n"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 03d6e51cf..c3750050a 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,23 +7,23 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
-"POT-Creation-Date: 1999-09-05 19:21+0200\n"
+"POT-Creation-Date: 1999-09-23 08:53+0200\n"
 "PO-Revision-Date: 1999-09-09 20:28+0000\n"
 "Last-Translator: Pedro Morais <[email protected]>\n"
 "Language-Team: pt\n"
+"MIME-Version:\n"
 "Content-Type:\n"
 "Content-Transfer-Encoding:\n"
-"MIME-Version:\n"
 
 #: util/secmem.c:79
 msgid "Warning: using insecure memory!\n"
 msgstr "Aviso: a utilizar mem�ria insegura!\n"
 
-#: util/secmem.c:275
+#: util/secmem.c:281
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "a opera��o n�o � poss�vel sem mem�ria segura inicializada\n"
 
-#: util/secmem.c:276
+#: util/secmem.c:282
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 
@@ -283,7 +283,7 @@ msgstr ""
 "N�o h� bytes aleat�rios suficientes. Por favor, fa�a outro trabalho para\n"
 "que o sistema possa recolher mais entropia! (S�o necess�rios mais %d bytes)\n"
 
-#: g10/g10.c:185
+#: g10/g10.c:187
 msgid ""
 "@Commands:\n"
 " "
@@ -291,136 +291,136 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:187
+#: g10/g10.c:189
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: g10/g10.c:188
+#: g10/g10.c:190
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:189
+#: g10/g10.c:191
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:190
+#: g10/g10.c:192
 msgid "encrypt data"
 msgstr "encriptar dados"
 
-#: g10/g10.c:191
+#: g10/g10.c:193
 msgid "encryption only with symmetric cipher"
 msgstr "encriptar apenas com cifra sim�trica"
 
-#: g10/g10.c:192
+#: g10/g10.c:194
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/g10.c:193
+#: g10/g10.c:195
 msgid "decrypt data (default)"
 msgstr "desencriptar dados (ac��o por omiss�o)"
 
-#: g10/g10.c:194
+#: g10/g10.c:196
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:195
+#: g10/g10.c:198
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:197
+#: g10/g10.c:200
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:198
+#: g10/g10.c:201
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:199
+#: g10/g10.c:202
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/g10.c:200
+#: g10/g10.c:203
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:201
+#: g10/g10.c:204
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:202
+#: g10/g10.c:205
 msgid "remove key from the public keyring"
 msgstr "remover a chave do porta-chaves p�blico"
 
-#: g10/g10.c:203
+#: g10/g10.c:206
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:204
+#: g10/g10.c:207
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:205
+#: g10/g10.c:208
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:206
+#: g10/g10.c:209
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/g10.c:207
+#: g10/g10.c:210
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:208
+#: g10/g10.c:211
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:209
+#: g10/g10.c:212
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:212
+#: g10/g10.c:215
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:214
+#: g10/g10.c:217
 msgid "list only the sequence of packets"
 msgstr "listar apenas as sequ�ncias de pacotes"
 
 # ownertrust ???
-#: g10/g10.c:216
+#: g10/g10.c:219
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confian�a"
 
-#: g10/g10.c:218
+#: g10/g10.c:221
 msgid "import ownertrust values"
 msgstr "importar os valores de confian�a"
 
-#: g10/g10.c:220
+#: g10/g10.c:223
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confian�a"
 
-#: g10/g10.c:222
+#: g10/g10.c:225
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMES]|verificar a base de dados de confian�a"
 
-#: g10/g10.c:223
+#: g10/g10.c:226
 msgid "fix a corrupted trust database"
 msgstr "consertar uma base de dados de confian�a"
 
-#: g10/g10.c:224
+#: g10/g10.c:227
 msgid "De-Armor a file or stdin"
 msgstr "retirar armadura de um ficheiro ou do \"stdin\""
 
-#: g10/g10.c:225
+#: g10/g10.c:229
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um ficheiro ou \"stdin\""
 
-#: g10/g10.c:226
+#: g10/g10.c:231
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:230
+#: g10/g10.c:235
 msgid ""
 "@\n"
 "Options:\n"
@@ -430,184 +430,185 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/g10.c:232
+#: g10/g10.c:237
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/g10.c:233
+#: g10/g10.c:239
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|encriptar para NOME"
 
-#: g10/g10.c:236
+#: g10/g10.c:242
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: g10/g10.c:238
+#: g10/g10.c:244
 msgid "use the default key as default recipient"
 msgstr "usar a chave padr�o como destinat�rio padr�o"
 
-#: g10/g10.c:242
+#: g10/g10.c:248
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou desencriptar"
 
-#: g10/g10.c:243
+#: g10/g10.c:249
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desactiva)"
 
-#: g10/g10.c:245
+#: g10/g10.c:251
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/g10.c:246
+#: g10/g10.c:252
 msgid "use as output file"
 msgstr "usar como ficheiro de sa�da"
 
-#: g10/g10.c:247
+#: g10/g10.c:253
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:248
+#: g10/g10.c:254
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:249
+#: g10/g10.c:255
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/g10.c:250
+#: g10/g10.c:256
 msgid "force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: g10/g10.c:251
+#: g10/g10.c:257
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para encriptar"
 
-#: g10/g10.c:252
+#: g10/g10.c:258
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/g10.c:254
+#. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
+#: g10/g10.c:260
 msgid "batch mode: never ask"
 msgstr "modo n�o-interactivo: nunca perguntar"
 
-#: g10/g10.c:255
+#: g10/g10.c:261
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:256
+#: g10/g10.c:262
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: g10/g10.c:257
+#: g10/g10.c:263
 msgid "add this keyring to the list of keyrings"
-msgstr
+msgstr ""
 "adicionar este porta-chaves\n"
 "� lista de porta-chaves"
 
-#: g10/g10.c:258
+#: g10/g10.c:264
 msgid "add this secret keyring to the list"
 msgstr "adicionar este porta-chaves secreto � lista"
 
-#: g10/g10.c:259
+#: g10/g10.c:265
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta por omiss�o"
 
-#: g10/g10.c:260
+#: g10/g10.c:266
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: g10/g10.c:261
+#: g10/g10.c:267
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/g10.c:262
+#: g10/g10.c:268
 msgid "read options from file"
 msgstr "ler op��es do ficheiro"
 
-#: g10/g10.c:264
+#: g10/g10.c:270
 msgid "set debugging flags"
 msgstr "definir par�metros de depura��o"
 
-#: g10/g10.c:265
+#: g10/g10.c:271
 msgid "enable full debugging"
 msgstr "habilitar depura��o completa"
 
-#: g10/g10.c:266
+#: g10/g10.c:272
 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:267
+#: g10/g10.c:273
 msgid "do not write comment packets"
 msgstr "n�o escrever pacotes de coment�rio"
 
-#: g10/g10.c:268
+#: g10/g10.c:274
 msgid "(default is 1)"
 msgstr "(por omiss�o 1)"
 
-#: g10/g10.c:269
+#: g10/g10.c:275
 msgid "(default is 3)"
 msgstr "(por omiss�o 3)"
 
-#: g10/g10.c:271
+#: g10/g10.c:277
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: g10/g10.c:272
+#: g10/g10.c:278
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/g10.c:273
+#: g10/g10.c:279
 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:274
+#: g10/g10.c:280
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar mode de frase secreta N"
 
-#: g10/g10.c:276
+#: g10/g10.c:282
 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:278
+#: g10/g10.c:284
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:279
+#: g10/g10.c:285
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:280
+#: g10/g10.c:286
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:281
+#: g10/g10.c:287
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: g10/g10.c:282
+#: g10/g10.c:288
 msgid "throw keyid field of encrypted packets"
 msgstr "eliminar campo keyid dos pacotes encriptados"
 
-#: g10/g10.c:283
+#: g10/g10.c:289
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALOR|usar estes dados de nota��o"
 
-#: g10/g10.c:285
+#: g10/g10.c:291
 msgid ""
 "@\n"
 "Examples:\n"
@@ -627,15 +628,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:370
+#: g10/g10.c:378
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:374
+#: g10/g10.c:382
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/g10.c:377
+#: g10/g10.c:385
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -645,7 +646,7 @@ msgstr ""
 "assina, verifica, encripta ou desencripta\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/g10.c:382
+#: g10/g10.c:390
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -653,185 +654,185 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:456
+#: g10/g10.c:468
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:509
+#: g10/g10.c:521
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/g10.c:644
+#: g10/g10.c:656
 #, 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:648
+#: g10/g10.c:660
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:667
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/g10.c:835
+#: g10/g10.c:848
 #, 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:892 g10/g10.c:901
+#: g10/g10.c:912 g10/g10.c:921
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/g10.c:894
+#: g10/g10.c:914
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:897
+#: g10/g10.c:917
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:916 g10/g10.c:928
+#: g10/g10.c:936 g10/g10.c:948
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado n�o � v�lido\n"
 
-#: g10/g10.c:922 g10/g10.c:934
+#: g10/g10.c:942 g10/g10.c:954
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:938
+#: g10/g10.c:958
 msgid "the given policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:941
+#: g10/g10.c:961
 #, 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:943
+#: g10/g10.c:963
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:945
+#: g10/g10.c:965
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:947
+#: g10/g10.c:967
 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:950
+#: g10/g10.c:970
 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:954
+#: g10/g10.c:974
 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:1031
+#: g10/g10.c:1051
 #, 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:1037
+#: g10/g10.c:1057
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/g10.c:1044
+#: g10/g10.c:1064
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:1052
+#: g10/g10.c:1072
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1065
+#: g10/g10.c:1085
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/g10.c:1078
+#: g10/g10.c:1098
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1092
+#: g10/g10.c:1112
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/g10.c:1104
+#: g10/g10.c:1129
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1112
+#: g10/g10.c:1137
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/g10.c:1120
+#: g10/g10.c:1145
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/g10.c:1128
+#: g10/g10.c:1153
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/g10.c:1144
+#: g10/g10.c:1169
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-utilizador"
 
-#: g10/g10.c:1147
+#: g10/g10.c:1172
 msgid "--delete-key user-id"
 msgstr "--delete-key id-utilizador"
 
-#: g10/encode.c:259 g10/g10.c:1171 g10/sign.c:366
+#: g10/encode.c:259 g10/g10.c:1196 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1207
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1268
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1251
+#: g10/g10.c:1276
 #, 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:1319
+#: g10/g10.c:1344
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/g10.c:1400
+#: g10/g10.c:1425
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/g10.c:1404
+#: g10/g10.c:1429
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1407 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1432 g10/verify.c:67 g10/verify.c:109
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/g10.c:1576
+#: g10/g10.c:1601
 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:1582
+#: g10/g10.c:1607
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -839,12 +840,12 @@ msgstr ""
 "um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:1588
+#: g10/g10.c:1613
 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:1596
+#: g10/g10.c:1621
 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"
 
@@ -999,7 +1000,7 @@ msgstr ""
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
-msgstr
+msgstr ""
 "Nenhuma rota encontrada que leve a uma de nossas chaves.\n"
 "\n"
 
@@ -1257,6 +1258,14 @@ msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
 
+#. It is ridiculous and an annoyance to use larger key sizes!
+#. * GnuPG can handle much larger sizes; but it takes an eternity
+#. * to create such a key (but less than the time the Sirius
+#. * Computer Corporation needs to process one of the usual
+#. * complaints) and {de,en}cryption although needs some time.
+#. * 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
 #, c-format
 msgid "keysize too large; %d is largest value allowed.\n"
@@ -1279,8 +1288,8 @@ msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
 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"
+"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
 msgid "Do you really need such a large keysize? "
@@ -1344,7 +1353,8 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Voc� precisa de um identificador de utilizador para identificar sua chave; o\n"
+"Voc� precisa de um identificador de utilizador para identificar sua chave; "
+"o\n"
 "programa constr�i o identificador a partir do Nome Completo, Coment�rio e\n"
 "Endere�o Eletr�nico desta forma:\n"
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
@@ -1501,7 +1511,7 @@ msgstr ""
 msgid "Really create? "
 msgstr "Realmente criar? "
 
-#: g10/encode.c:91 g10/openfile.c:156 g10/openfile.c:246 g10/tdbio.c:468
+#: g10/encode.c:91 g10/openfile.c:161 g10/openfile.c:270 g10/tdbio.c:468
 #: g10/tdbio.c:529
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1669,7 +1679,7 @@ msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 msgid "no default public keyring\n"
 msgstr "sem porta-chaves p�blico padr�o\n"
 
-#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:580
+#: g10/import.c:399 g10/openfile.c:213 g10/sign.c:268 g10/sign.c:580
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "a escrever para `%s'\n"
@@ -1812,6 +1822,10 @@ msgstr "chave %08lX: ignorado ID de utilizador '"
 msgid "key %08lX: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
+#. here we violate the rfc a bit by still allowing
+#. * to import non-exportable signature when we have the
+#. * the secret key used to create this signature - it
+#. * seems that this makes sense
 #: g10/import.c:846
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
@@ -1837,7 +1851,7 @@ msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/import.c:1128 g10/import.c:1183
+#: g10/import.c:1128 g10/import.c:1181
 #, 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"
@@ -1891,6 +1905,8 @@ msgstr "1 ID de utilizador sem auto-assinatura v�lida detectado\n"
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d IDs de utilizadores sem auto-assinaturas v�lidas detectados\n"
 
+#. Fixme: see whether there is a revocation in which
+#. * case we should allow to sign it again.
 #: g10/keyedit.c:313
 #, c-format
 msgid "Already signed by key %08lX\n"
@@ -2179,6 +2195,8 @@ msgstr "activa uma chave"
 msgid "can't do that in batchmode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
+#. check that they match
+#. fixme: check that they both match
 #: g10/keyedit.c:652
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
@@ -2352,6 +2370,7 @@ msgstr ""
 msgid "Create a revocation certificate for this signature? (y/N)"
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
+#. FIXME: detect duplicates here
 #: g10/keyedit.c:1740
 msgid "You have signed these user IDs:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
@@ -2406,72 +2425,72 @@ msgstr "nenhuma chave secreta para desencripta��o dispon�vel\n"
 msgid "public key decryption failed: %s\n"
 msgstr "desencripta��o de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:330
+#: g10/mainproc.c:332
 msgid "decryption okay\n"
 msgstr "desencripta��o correcta\n"
 
-#: g10/mainproc.c:335
+#: g10/mainproc.c:337
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem encriptada foi manipulada!\n"
 
-#: g10/mainproc.c:340
+#: g10/mainproc.c:342
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "desencripta��o falhou: %s\n"
 
-#: g10/mainproc.c:358
+#: g10/mainproc.c:360
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:360
+#: g10/mainproc.c:362
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro original='%.*s'\n"
 
-#: g10/mainproc.c:587 g10/mainproc.c:596
+#: g10/mainproc.c:589 g10/mainproc.c:598
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:601
 msgid "Notation: "
 msgstr "Nota��o: "
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:608
 msgid "Policy: "
 msgstr "Pol�tica: "
 
-#: g10/mainproc.c:1025
+#: g10/mainproc.c:1027
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1031
+#: g10/mainproc.c:1033
 #, 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:1057 g10/mainproc.c:1068
+#: g10/mainproc.c:1059 g10/mainproc.c:1070
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1058 g10/mainproc.c:1069
+#: g10/mainproc.c:1060 g10/mainproc.c:1071
 msgid "Good signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1060
+#: g10/mainproc.c:1062
 msgid "                aka \""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1115
+#: g10/mainproc.c:1117
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1212
+#: g10/mainproc.c:1214
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1219
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -2685,7 +2704,7 @@ msgstr "%s: directoria criada\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diretoria inexistente!\n"
 
-#: g10/openfile.c:182 g10/openfile.c:253 g10/ringedit.c:1348 g10/tdbio.c:458
+#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1348 g10/tdbio.c:458
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: imposs�vel criar: %s\n"
@@ -3067,6 +3086,11 @@ msgstr "falha ao colocar `%s' na base de dados de confian�a: %s\n"
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "AVISO: ainda � imposs�vel manipular registos de prefer�ncias longos\n"
 
+#: g10/verify.c:143
+#, c-format
+msgid "input line %u too long or missing LF\n"
+msgstr ""
+
 #: g10/ringedit.c:318
 #, c-format
 msgid "%s: can't create keyring: %s\n"
@@ -3114,34 +3138,35 @@ msgstr ""
 "ignorado `%s': esta � uma chave ElGamal gerada pelo PGP que n�o � segura "
 "para assinaturas!\n"
 
-#: g10/openfile.c:65
+#. do not overwrite
+#: g10/openfile.c:72
 #, c-format
 msgid "File `%s' exists. "
 msgstr "Arquivo `%s' j� existe. "
 
-#: g10/openfile.c:67
+#: g10/openfile.c:74
 msgid "Overwrite (y/N)? "
 msgstr "Escrever por cima (s/N)? "
 
-#: g10/openfile.c:97
+#: g10/openfile.c:102
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr "%s: sufixo desconhecido\n"
 
-#: g10/openfile.c:119
+#: g10/openfile.c:124
 msgid "Enter new filename"
 msgstr "Digite novo nome de ficheiro"
 
-#: g10/openfile.c:160
+#: g10/openfile.c:165
 msgid "writing to stdout\n"
 msgstr "a escrever em \"stdout\"\n"
 
-#: g10/openfile.c:219
+#: g10/openfile.c:243
 #, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "a assumir dados assinados em `%s'\n"
 
-#: g10/openfile.c:269
+#: g10/openfile.c:293
 #, c-format
 msgid "%s: new options file created\n"
 msgstr "%s: novo ficheiro de op��es criado\n"
@@ -3400,7 +3425,8 @@ msgid ""
 "Please enter a new filename. If you just hit RETURN the default\n"
 "file (which is shown in brackets) will be used."
 msgstr ""
-"Por favor digite um novo nome de ficheiro. Se voc� apenas carregar em RETURN\n"
+"Por favor digite um novo nome de ficheiro. Se voc� apenas carregar em "
+"RETURN\n"
 "o ficheiro por omiss�o (que � mostrado entre par�nteses) ser� utilizado."
 
 #: g10/helptext.c:237
diff --git a/po/ru.po b/po/ru.po
index 2dc1ba340..d2510af71 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-09-05 19:21+0200\n"
+"POT-Creation-Date: 1999-09-23 08:53+0200\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-01-26 22:08:36+0100\n"
 "From: Gregory Steuck <[email protected]>\n"
@@ -28,11 +28,11 @@ msgstr ""
 "��� �������� ����� ������, ��������� ��������� suid(root).\n"
 "���������� ��� ����� � �������������� ����� �������.\n"
 
-#: util/secmem.c:275
+#: util/secmem.c:281
 msgid "operation is not possible without initialized secure memory\n"
 msgstr ""
 
-#: util/secmem.c:276
+#: util/secmem.c:282
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 
@@ -338,7 +338,7 @@ msgstr ""
 "������������ ��������� ������. ����������, ��������� ���-������, �����\n"
 "�� ����� ������� �������������� ��������� �����! (����� ��� %d ����)\n"
 
-#: g10/g10.c:185
+#: g10/g10.c:187
 msgid ""
 "@Commands:\n"
 " "
@@ -346,142 +346,142 @@ msgstr ""
 "@�������:\n"
 " "
 
-#: g10/g10.c:187
+#: g10/g10.c:189
 #, fuzzy
 msgid "|[file]|make a signature"
 msgstr "|[����]|������� �������"
 
-#: g10/g10.c:188
+#: g10/g10.c:190
 #, fuzzy
 msgid "|[file]|make a clear text signature"
 msgstr "|[����]|������� ��������� �������"
 
-#: g10/g10.c:189
+#: g10/g10.c:191
 msgid "make a detached signature"
 msgstr "������� ��������� �������"
 
-#: g10/g10.c:190
+#: g10/g10.c:192
 msgid "encrypt data"
 msgstr "����������� ������"
 
-#: g10/g10.c:191
+#: g10/g10.c:193
 msgid "encryption only with symmetric cipher"
 msgstr "����������� ������������ ����������"
 
-#: g10/g10.c:192
+#: g10/g10.c:194
 msgid "store only"
 msgstr "������ ���������"
 
-#: g10/g10.c:193
+#: g10/g10.c:195
 msgid "decrypt data (default)"
 msgstr "������������ ������ (�� ���������)"
 
-#: g10/g10.c:194
+#: g10/g10.c:196
 msgid "verify a signature"
 msgstr "��������� �������"
 
-#: g10/g10.c:195
+#: g10/g10.c:198
 msgid "list keys"
 msgstr "������ ������"
 
-#: g10/g10.c:197
+#: g10/g10.c:200
 msgid "list keys and signatures"
 msgstr "������ ������ � ��������"
 
-#: g10/g10.c:198
+#: g10/g10.c:201
 msgid "check key signatures"
 msgstr "��������� ������� �� �����"
 
-#: g10/g10.c:199
+#: g10/g10.c:202
 msgid "list keys and fingerprints"
 msgstr "������ ������ � �� \"����������� �������\""
 
-#: g10/g10.c:200
+#: g10/g10.c:203
 msgid "list secret keys"
 msgstr "������ ��������� ������"
 
-#: g10/g10.c:201
+#: g10/g10.c:204
 msgid "generate a new key pair"
 msgstr "������������� ����� ���� ������ (�������� � ���������)"
 
-#: g10/g10.c:202
+#: g10/g10.c:205
 msgid "remove key from the public keyring"
 msgstr "������� ���� �� ������"
 
-#: g10/g10.c:203
+#: g10/g10.c:206
 #, fuzzy
 msgid "sign a key"
 msgstr "��������� ����"
 
-#: g10/g10.c:204
+#: g10/g10.c:207
 #, fuzzy
 msgid "sign a key locally"
 msgstr "��������� ����"
 
-#: g10/g10.c:205
+#: g10/g10.c:208
 msgid "sign or edit a key"
 msgstr "��������� ��� ������������� ����"
 
-#: g10/g10.c:206
+#: g10/g10.c:209
 msgid "generate a revocation certificate"
 msgstr "������������� ���������� ����������"
 
-#: g10/g10.c:207
+#: g10/g10.c:210
 msgid "export keys"
 msgstr "�������������� �����"
 
-#: g10/g10.c:208
+#: g10/g10.c:211
 msgid "export keys to a key server"
 msgstr ""
 
-#: g10/g10.c:209
+#: g10/g10.c:212
 msgid "import keys from a key server"
 msgstr ""
 
-#: g10/g10.c:212
+#: g10/g10.c:215
 msgid "import/merge keys"
 msgstr "�������������/�������� �����"
 
-#: g10/g10.c:214
+#: g10/g10.c:217
 msgid "list only the sequence of packets"
 msgstr "���������� ������ ������������������ �������"
 
-#: g10/g10.c:216
+#: g10/g10.c:219
 #, fuzzy
 msgid "export the ownertrust values"
 msgstr "�������������� ��������� �������\n"
 
-#: g10/g10.c:218
+#: g10/g10.c:221
 #, fuzzy
 msgid "import ownertrust values"
 msgstr "������������� ��������� �������\n"
 
-#: g10/g10.c:220
+#: g10/g10.c:223
 #, fuzzy
 msgid "update the trust database"
 msgstr "|[�����]|��������� ���� ������ �������"
 
-#: g10/g10.c:222
+#: g10/g10.c:225
 msgid "|[NAMES]|check the trust database"
 msgstr "|[�����]|��������� ���� ������ �������"
 
-#: g10/g10.c:223
+#: g10/g10.c:226
 msgid "fix a corrupted trust database"
 msgstr "��������� ����������� ���� ������ �������"
 
-#: g10/g10.c:224
+#: g10/g10.c:227
 msgid "De-Armor a file or stdin"
 msgstr "������������ stdin ��� ���� �� ASCII-�������������"
 
-#: g10/g10.c:225
+#: g10/g10.c:229
 msgid "En-Armor a file or stdin"
 msgstr "������������ stdin ��� ���� � ASCII-�������������"
 
-#: g10/g10.c:226
+#: g10/g10.c:231
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|���������� �������� ���������"
 
-#: g10/g10.c:230
+#: g10/g10.c:235
 msgid ""
 "@\n"
 "Options:\n"
@@ -491,178 +491,178 @@ msgstr ""
 "���������:\n"
 " "
 
-#: g10/g10.c:232
+#: g10/g10.c:237
 msgid "create ascii armored output"
 msgstr "����� � ASCII-�������������"
 
-#: g10/g10.c:233
+#: g10/g10.c:239
 #, fuzzy
 msgid "|NAME|encrypt for NAME"
 msgstr "|���|������������ ������������ ���������� ���"
 
-#: g10/g10.c:236
+#: g10/g10.c:242
 #, fuzzy
 msgid "|NAME|use NAME as default recipient"
 msgstr "|���|������������ ��� � �������� ���������� ����� �� ���������"
 
-#: g10/g10.c:238
+#: g10/g10.c:244
 msgid "use the default key as default recipient"
 msgstr ""
 
-#: g10/g10.c:242
+#: g10/g10.c:248
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "������������ ��������� ������������� ������������ ��� ������� ��� �����������"
 
-#: g10/g10.c:243
+#: g10/g10.c:249
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|���������� ������� ������ (0 - �� �������)"
 
-#: g10/g10.c:245
+#: g10/g10.c:251
 msgid "use canonical text mode"
 msgstr "������������ ������������ ��������� �����"
 
-#: g10/g10.c:246
+#: g10/g10.c:252
 msgid "use as output file"
 msgstr "������������ � �������� ��������� �����"
 
-#: g10/g10.c:247
+#: g10/g10.c:253
 msgid "verbose"
 msgstr "������������"
 
-#: g10/g10.c:248
+#: g10/g10.c:254
 msgid "be somewhat more quiet"
 msgstr ""
 
-#: g10/g10.c:249
+#: g10/g10.c:255
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: g10/g10.c:250
+#: g10/g10.c:256
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "��������� ������� �� �����"
 
-#: g10/g10.c:251
+#: g10/g10.c:257
 #, fuzzy
 msgid "always use a MDC for encryption"
 msgstr "������������ ��������� ������������� ������������ ��� ����������"
 
-#: g10/g10.c:252
+#: g10/g10.c:258
 msgid "do not make any changes"
 msgstr "Keine wirklichen �nderungen durchf�hren"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:254
+#: g10/g10.c:260
 msgid "batch mode: never ask"
 msgstr "�������� �����: ������ �� ����������"
 
-#: g10/g10.c:255
+#: g10/g10.c:261
 msgid "assume yes on most questions"
 msgstr "�������� \"��\" �� ����������� ��������"
 
-#: g10/g10.c:256
+#: g10/g10.c:262
 msgid "assume no on most questions"
 msgstr "�������� \"���\" �� ����������� ��������"
 
-#: g10/g10.c:257
+#: g10/g10.c:263
 msgid "add this keyring to the list of keyrings"
 msgstr "�������� ��� ������ � ������ ������ ������"
 
-#: g10/g10.c:258
+#: g10/g10.c:264
 msgid "add this secret keyring to the list"
 msgstr "�������� ��� ��������� ������ � ������ ������ ������"
 
-#: g10/g10.c:259
+#: g10/g10.c:265
 msgid "|NAME|use NAME as default secret key"
 msgstr "|���|������������ ��� � �������� ���������� ����� �� ���������"
 
-#: g10/g10.c:260
+#: g10/g10.c:266
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: g10/g10.c:261
+#: g10/g10.c:267
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|���|������������ ������������ ���������� ���"
 
-#: g10/g10.c:262
+#: g10/g10.c:268
 msgid "read options from file"
 msgstr "������ ��������� �� �����"
 
-#: g10/g10.c:264
+#: g10/g10.c:270
 msgid "set debugging flags"
 msgstr "���������� ���������� �����"
 
-#: g10/g10.c:265
+#: g10/g10.c:271
 msgid "enable full debugging"
 msgstr "��������� ��� �������"
 
-#: g10/g10.c:266
+#: g10/g10.c:272
 msgid "|FD|write status info to this FD"
 msgstr "|FD| ���������� ���������� � ��������� � ���������� (FD)"
 
-#: g10/g10.c:267
+#: g10/g10.c:273
 msgid "do not write comment packets"
 msgstr "�� ������ ������ � �������������"
 
-#: g10/g10.c:268
+#: g10/g10.c:274
 msgid "(default is 1)"
 msgstr "(�� ��������� 1)"
 
-#: g10/g10.c:269
+#: g10/g10.c:275
 msgid "(default is 3)"
 msgstr "(�� ��������� 3)"
 
-#: g10/g10.c:271
+#: g10/g10.c:277
 #, fuzzy
 msgid "|FILE|load extension module FILE"
 msgstr "|����|��������� ���� � ������������ ��������"
 
-#: g10/g10.c:272
+#: g10/g10.c:278
 msgid "emulate the mode described in RFC1991"
 msgstr "����������� ����� ��������� � RFC1991"
 
-#: g10/g10.c:273
+#: g10/g10.c:279
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:274
+#: g10/g10.c:280
 #, fuzzy
 msgid "|N|use passphrase mode N"
 msgstr "|N|������������ �������� ����� ������ N\n"
 
-#: g10/g10.c:276
+#: g10/g10.c:282
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|���|������������ ���-�������� ��� ��� �������� ����"
 
-#: g10/g10.c:278
+#: g10/g10.c:284
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|���|������������ ������������ ���������� ��� ��� �������� ����"
 
-#: g10/g10.c:279
+#: g10/g10.c:285
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|���|������������ ������������ ���������� ���"
 
-#: g10/g10.c:280
+#: g10/g10.c:286
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|���|������������ ���-�������� ���"
 
-#: g10/g10.c:281
+#: g10/g10.c:287
 msgid "|N|use compress algorithm N"
 msgstr "|N|������������ �������� ������ N"
 
-#: g10/g10.c:282
+#: g10/g10.c:288
 msgid "throw keyid field of encrypted packets"
 msgstr "����������� ���� keyid � ������������� �������"
 
-#: g10/g10.c:283
+#: g10/g10.c:289
 msgid "|NAME=VALUE|use this notation data"
 msgstr ""
 
-#: g10/g10.c:285
+#: g10/g10.c:291
 #, fuzzy
 msgid ""
 "@\n"
@@ -683,17 +683,17 @@ msgstr ""
 " --list-keys [names]        �������� ������ ������\n"
 " --fingerprint [names]      �������� \"��������� �������\" ������\n"
 
-#: g10/g10.c:370
+#: g10/g10.c:378
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "����������, ����������� ��������� �� ������� �� ������ "
 "<[email protected]>.\n"
 
-#: g10/g10.c:374
+#: g10/g10.c:382
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�������������: gpg [���������] [�����] (-h ��� ������)"
 
-#: g10/g10.c:377
+#: g10/g10.c:385
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -703,7 +703,7 @@ msgstr ""
 "�����������, ��������� �������, ������� ��� ��������������\n"
 "����� ������ ������� �� ������� ������\n"
 
-#: g10/g10.c:382
+#: g10/g10.c:390
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -711,198 +711,198 @@ msgstr ""
 "\n"
 "�������������� ���������:\n"
 
-#: g10/g10.c:456
+#: g10/g10.c:468
 msgid "usage: gpg [options] "
 msgstr "�������������: gpg [���������] "
 
-#: g10/g10.c:509
+#: g10/g10.c:521
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Kommandos\n"
 
-#: g10/g10.c:644
+#: g10/g10.c:656
 #, fuzzy, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "���������: ���� ���������� �� ��������� `%s' �����������\n"
 
-#: g10/g10.c:648
+#: g10/g10.c:660
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���� ���������� `%s': %s\n"
 
-#: g10/g10.c:655
+#: g10/g10.c:667
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� ��������� �� `%s'\n"
 
-#: g10/g10.c:835
+#: g10/g10.c:848
 #, fuzzy, c-format
 msgid "%s is not a valid character set\n"
 msgstr "������������ ������ � �����������.\n"
 
-#: g10/g10.c:892 g10/g10.c:901
+#: g10/g10.c:912 g10/g10.c:921
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/g10.c:894
+#: g10/g10.c:914
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr ""
 
-#: g10/g10.c:897
+#: g10/g10.c:917
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr ""
 
-#: g10/g10.c:916 g10/g10.c:928
+#: g10/g10.c:936 g10/g10.c:948
 msgid "selected cipher algorithm is invalid\n"
 msgstr "������ ������������ �������� ����������\n"
 
-#: g10/g10.c:922 g10/g10.c:934
+#: g10/g10.c:942 g10/g10.c:954
 msgid "selected digest algorithm is invalid\n"
 msgstr "������ ������������ ��������-��������\n"
 
-#: g10/g10.c:938
+#: g10/g10.c:958
 msgid "the given policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:941
+#: g10/g10.c:961
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "�������� �������� ����� ����� �������� �� %d �� %d\n"
 
-#: g10/g10.c:943
+#: g10/g10.c:963
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ ���� ������ 0\n"
 
-#: g10/g10.c:945
+#: g10/g10.c:965
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ ���� ������ 1\n"
 
-#: g10/g10.c:947
+#: g10/g10.c:967
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:950
+#: g10/g10.c:970
 #, fuzzy
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "���������: ������� S2K ����� (0) ����� �� �������������\n"
 
-#: g10/g10.c:954
+#: g10/g10.c:974
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "������������ ����� S2K: ������ ���� 0, 1 ��� 3\n"
 
-#: g10/g10.c:1031
+#: g10/g10.c:1051
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "������ ������������� ���� ������ �������: %s\n"
 
-#: g10/g10.c:1037
+#: g10/g10.c:1057
 msgid "--store [filename]"
 msgstr "--store [��� �����]"
 
-#: g10/g10.c:1044
+#: g10/g10.c:1064
 msgid "--symmetric [filename]"
 msgstr "--symmetric [��� �����]"
 
-#: g10/g10.c:1052
+#: g10/g10.c:1072
 msgid "--encrypt [filename]"
 msgstr "--encrypt [��� �����]"
 
-#: g10/g10.c:1065
+#: g10/g10.c:1085
 msgid "--sign [filename]"
 msgstr "--sign [��� �����]"
 
-#: g10/g10.c:1078
+#: g10/g10.c:1098
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [��� �����]"
 
-#: g10/g10.c:1092
+#: g10/g10.c:1112
 msgid "--clearsign [filename]"
 msgstr "--clearsign [��� �����]"
 
-#: g10/g10.c:1104
+#: g10/g10.c:1129
 msgid "--decrypt [filename]"
 msgstr "--decrypt [��� �����]"
 
-#: g10/g10.c:1112
+#: g10/g10.c:1137
 msgid "--sign-key user-id"
 msgstr ""
 
-#: g10/g10.c:1120
+#: g10/g10.c:1145
 #, fuzzy
 msgid "--lsign-key user-id"
 msgstr "--delete-key ���-������������"
 
-#: g10/g10.c:1128
+#: g10/g10.c:1153
 #, fuzzy
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key ���-������������"
 
-#: g10/g10.c:1144
+#: g10/g10.c:1169
 #, fuzzy
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key ���-������������"
 
-#: g10/g10.c:1147
+#: g10/g10.c:1172
 #, fuzzy
 msgid "--delete-key user-id"
 msgstr "--delete-key ���-������������"
 
-#: g10/encode.c:259 g10/g10.c:1171 g10/sign.c:366
+#: g10/encode.c:259 g10/g10.c:1196 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "���������� ������� ���� `%s': %s\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1207
 #, fuzzy
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [������������� ������������] [������ ������]"
 
-#: g10/g10.c:1243
+#: g10/g10.c:1268
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "������ �������������: %s\n"
 
-#: g10/g10.c:1251
+#: g10/g10.c:1276
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "������ �����������: %s\n"
 
-#: g10/g10.c:1319
+#: g10/g10.c:1344
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "������������ ���-�������� `%s'\n"
 
-#: g10/g10.c:1400
+#: g10/g10.c:1425
 msgid "[filename]"
 msgstr "[��� �����]"
 
-#: g10/g10.c:1404
+#: g10/g10.c:1429
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/decrypt.c:59 g10/g10.c:1407 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1432 g10/verify.c:67 g10/verify.c:109
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "���������� ������� ���� `%s'\n"
 
-#: g10/g10.c:1576
+#: g10/g10.c:1601
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 
-#: g10/g10.c:1582
+#: g10/g10.c:1607
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1588
+#: g10/g10.c:1613
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1596
+#: g10/g10.c:1621
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
@@ -1578,7 +1578,7 @@ msgstr ""
 msgid "Really create? "
 msgstr "������������� �������? "
 
-#: g10/encode.c:91 g10/openfile.c:156 g10/openfile.c:246 g10/tdbio.c:468
+#: g10/encode.c:91 g10/openfile.c:161 g10/openfile.c:270 g10/tdbio.c:468
 #: g10/tdbio.c:529
 #, c-format
 msgid "%s: can't open: %s\n"
@@ -1749,7 +1749,7 @@ msgstr "���� %08lX: �������� ���� �� ������: %s\n"
 msgid "no default public keyring\n"
 msgstr "��� ������ �������� ������ �� ���������\n"
 
-#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:580
+#: g10/import.c:399 g10/openfile.c:213 g10/sign.c:268 g10/sign.c:580
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "������������ � `%s'\n"
@@ -1921,7 +1921,7 @@ msgstr ""
 msgid "key %08lX: revocation certificate added\n"
 msgstr "���� %08lX: ���������� ���������� ��������\n"
 
-#: g10/import.c:1128 g10/import.c:1183
+#: g10/import.c:1128 g10/import.c:1181
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "���� %08lX: ���� ����� �� ����� ����-�������\n"
@@ -2543,75 +2543,75 @@ msgstr "��������� ���� �� ����������"
 msgid "public key decryption failed: %s\n"
 msgstr "����������� �������� ������ �� ������� %s\n"
 
-#: g10/mainproc.c:330
+#: g10/mainproc.c:332
 #, fuzzy
 msgid "decryption okay\n"
 msgstr "����������� �� �������: %s\n"
 
-#: g10/mainproc.c:335
+#: g10/mainproc.c:337
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:340
+#: g10/mainproc.c:342
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "����������� �� �������: %s\n"
 
-#: g10/mainproc.c:358
+#: g10/mainproc.c:360
 #, fuzzy
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "���������: ����������� �������� \"������-���-�����-����\"\n"
 
-#: g10/mainproc.c:360
+#: g10/mainproc.c:362
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:587 g10/mainproc.c:596
+#: g10/mainproc.c:589 g10/mainproc.c:598
 #, fuzzy
 msgid "WARNING: invalid notation data found\n"
 msgstr "�� ������� ���������� RFC1991 ��� OpenPGP ������.\n"
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:601
 msgid "Notation: "
 msgstr ""
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:608
 msgid "Policy: "
 msgstr ""
 
-#: g10/mainproc.c:1025
+#: g10/mainproc.c:1027
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1031
+#: g10/mainproc.c:1033
 #, 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:1057 g10/mainproc.c:1068
+#: g10/mainproc.c:1059 g10/mainproc.c:1070
 msgid "BAD signature from \""
 msgstr "������ ������� �� \""
 
-#: g10/mainproc.c:1058 g10/mainproc.c:1069
+#: g10/mainproc.c:1060 g10/mainproc.c:1071
 msgid "Good signature from \""
 msgstr "������� ������� �� \""
 
-#: g10/mainproc.c:1060
+#: g10/mainproc.c:1062
 msgid "                aka \""
 msgstr ""
 
-#: g10/mainproc.c:1115
+#: g10/mainproc.c:1117
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "���������� ��������� �������: %s\n"
 
-#: g10/mainproc.c:1212
+#: g10/mainproc.c:1214
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:1217
+#: g10/mainproc.c:1219
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -2828,7 +2828,7 @@ msgstr "%s: ���������� �������: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/openfile.c:182 g10/openfile.c:253 g10/ringedit.c:1348 g10/tdbio.c:458
+#: g10/openfile.c:209 g10/openfile.c:277 g10/ringedit.c:1348 g10/tdbio.c:458
 #, fuzzy, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: ���������� �������: %s\n"
@@ -3217,6 +3217,11 @@ msgstr "������ ������������� ���� ������ �������: %s\n"
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr ""
 
+#: g10/verify.c:143
+#, c-format
+msgid "input line %u too long or missing LF\n"
+msgstr ""
+
 #: g10/ringedit.c:318
 #, fuzzy, c-format
 msgid "%s: can't create keyring: %s\n"
@@ -3262,36 +3267,36 @@ msgid ""
 msgstr "���� ElGamal ����, ��������� PGP, �� ������� ��� �������� ��������!\n"
 
 #. do not overwrite
-#: g10/openfile.c:65
+#: g10/openfile.c:72
 #, c-format
 msgid "File `%s' exists. "
 msgstr "���� `%s' ����������. "
 
-#: g10/openfile.c:67
+#: g10/openfile.c:74
 msgid "Overwrite (y/N)? "
 msgstr "���������� (y/N)? "
 
-#: g10/openfile.c:97
+#: g10/openfile.c:102
 #, c-format
 msgid "%s: unknown suffix\n"
 msgstr ""
 
-#: g10/openfile.c:119
+#: g10/openfile.c:124
 #, fuzzy
 msgid "Enter new filename"
 msgstr "--store [��� �����]"
 
-#: g10/openfile.c:160
+#: g10/openfile.c:165
 #, fuzzy
 msgid "writing to stdout\n"
 msgstr "������������ � `%s'\n"
 
-#: g10/openfile.c:219
+#: g10/openfile.c:243
 #, fuzzy, c-format
 msgid "assuming signed data in `%s'\n"
 msgstr "���������� ������� ����������� ������ `%s' .\n"
 
-#: g10/openfile.c:269
+#: g10/openfile.c:293
 #, c-format
 msgid "%s: new options file created\n"
 msgstr ""
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index ce00b3698..e9791e45c 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,28 +1,28 @@
-Wed Sep 15 16:22:17 CEST 1999  Werner Koch  <[email protected]>
+Thu Sep 23 09:49:25 1999  Werner Koch  ([email protected])
+
+	* commit: Remove leading and trailing empty lines when copying
+	Changes to Changelog
 
+Wed Sep 15 16:22:17 CEST 1999  Werner Koch  <[email protected]>
 
 	* gnupg.spec: Add Portuguese description
 
 Thu Sep  2 16:40:55 CEST 1999  Werner Koch  <[email protected]>
 
-
 	* mkdiff: changed format of diff file name and made script more
 	general.
 
 Wed Aug  4 10:34:18 CEST 1999  Werner Koch  <[email protected]>
 
-
 	* config.guess: Updated from gnu/common and applied my emx patch again.
 	* config.sub: Updated from gnu/common.
 
 Wed Jul 14 19:42:08 CEST 1999  Werner Koch  <[email protected]>
 
-
 	* ltmain.sh, ltconfig.sh : Updated to libtool 1.3.3
 
 Mon Jul 12 14:55:34 CEST 1999  Werner Koch  <[email protected]>
 
-
 	* autogen.sh: Run libtoolize
 
 Sat May 22 22:47:26 CEST 1999  Werner Koch  <[email protected]>
diff --git a/scripts/commit b/scripts/commit
index 992f93c3d..18a9b4aa7 100755
--- a/scripts/commit
+++ b/scripts/commit
@@ -11,15 +11,25 @@ addr="<`id -un`@`hostname -d`>"
 for i in `find . -name Changes -print`; do
     dir=`dirname $i`
     if [ -s $dir/Changes ]; then
-	lines=`wc -l <$dir/Changes`
-	echo "$date  $name  $addr" >$dir/ChangeLog.new
-	echo >>$dir/ChangeLog.new
-	cat $dir/Changes   >>$dir/ChangeLog.new
-	[ -f $dir/ChangeLog ] && cat $dir/ChangeLog >>$dir/ChangeLog.new
-	echo -n > $dir/Changes
-	[ -f $dir/ChangeLog ] && rm $dir/ChangeLog
-	mv $dir/ChangeLog.new $dir/ChangeLog
-	echo "$lines new lines in $dir/ChangeLog"
+	awk '
+	state == 0 && /^[ \t]*$/  { next }
+	state == 0  { state = 1 }
+	/^[ \t]*$/ { empty++; next }
+		   { while ( empty > 0 ) { print ""; empty--; }; print  }
+	' < $dir/Changes > $dir/Changes.tmp
+	if [ -s $dir/Changes.tmp ]; then
+	    lines=`wc -l <$dir/Changes.tmp`
+	    echo "$date  $name  $addr" >$dir/ChangeLog.new
+	    echo >>$dir/ChangeLog.new
+	    cat $dir/Changes.tmp   >>$dir/ChangeLog.new
+	    echo >>$dir/ChangeLog.new
+	    [ -f $dir/ChangeLog ] && cat $dir/ChangeLog >>$dir/ChangeLog.new
+	    echo -n > $dir/Changes
+	    [ -f $dir/ChangeLog ] && rm $dir/ChangeLog
+	    mv $dir/ChangeLog.new $dir/ChangeLog
+	    echo "$lines new lines in $dir/ChangeLog"
+	fi
+	rm $dir/Changes.tmp || true
     fi
 done