See ChangeLog: Sat Jan 9 18:54:57 CET 1999 Werner Koch

23 files changed, 3402 insertions, 1599 deletions

diff --git a/NEWS b/NEWS
index 065f5698b..36bffa6de 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+Noteworthy changes in version 0.9.1
+-----------------------------------
 
     * Polish language support.
 
diff --git a/checks/run-gpg.patterns b/checks/run-gpg.patterns
index 3646e3785..455a3ab6b 100644
--- a/checks/run-gpg.patterns
+++ b/checks/run-gpg.patterns
@@ -6,4 +6,4 @@ gpg: NOTE: secret key 2E5FA4F4 is NOT protected.
 gpg: NOTE: secret key 439F02CA is NOT protected.
 gpg: WARNING: using insecure random number generator
 gpg: NOTE: signature key expired
-gpg: NOTE: this is a development version!
+NOTE: this is a development version!
diff --git a/cipher/random.c b/cipher/random.c
index 1812467ae..50e14aadc 100644
--- a/cipher/random.c
+++ b/cipher/random.c
@@ -377,9 +377,6 @@ read_random_source( int requester, size_t length, int level )
 {
     static int (*fnc)(void (*)(const void*, size_t, int), int,
 						    size_t, int) = NULL;
-    int nbytes;
-    int goodness;
-
     if( !fnc ) {
 	if( !is_initialized )
 	    initialize();
diff --git a/configure.in b/configure.in
index 6fcc58af1..b7de3d773 100644
--- a/configure.in
+++ b/configure.in
@@ -60,10 +60,6 @@ else
     CFLAGS="$CFLAGS -O2"
 fi
 
-if test "$GCC" = yes; then
-    CFLAGS="$CFLAGS -Wall"
-fi
-
 
 AC_MSG_CHECKING([whether included zlib is requested])
 AC_ARG_WITH(included-zlib,
@@ -91,6 +87,10 @@ AC_PROG_INSTALL
 AM_CYGWIN32
 
 
+if test "$GCC" = yes; then
+    CFLAGS="$CFLAGS -Wall"
+fi
+
 case "${target}" in
     i386--mingw32)
         # special stuff for Windoze NT
diff --git a/debian/distfiles b/debian/distfiles
index df6fac50c..f7f226104 100644
--- a/debian/distfiles
+++ b/debian/distfiles
@@ -2,6 +2,5 @@ README.Debian
 changelog
 control
 copyright
-distfiles
 preinst
 rules
diff --git a/g10/armor.c b/g10/armor.c
index 1d58c4146..ab49cc680 100644
--- a/g10/armor.c
+++ b/g10/armor.c
@@ -29,6 +29,7 @@
 #include "iobuf.h"
 #include "memory.h"
 #include "util.h"
+#include "iobuf.h"
 #include "filter.h"
 #include "packet.h"
 #include "options.h"
@@ -373,8 +374,6 @@ check_input( armor_filter_context_t *afx, IOBUF a )
 {
     int rc = 0;
     int i;
-    size_t n;
-    unsigned emplines;
     byte *line;
     unsigned len;
     unsigned maxlen;
diff --git a/g10/cipher.c b/g10/cipher.c
index c654db011..0d6e54ff2 100644
--- a/g10/cipher.c
+++ b/g10/cipher.c
@@ -32,6 +32,7 @@
 #include "filter.h"
 #include "packet.h"
 #include "options.h"
+#include "main.h"
 
 
 #define MIN_PARTIAL_SIZE 512
diff --git a/g10/getkey.c b/g10/getkey.c
index aa2a8ce34..0a8e4b2bd 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -225,7 +225,6 @@ getkey_disable_caches()
   #if MAX_PK_CACHE_ENTRIES
     {
 	pk_cache_entry_t ce, ce2;
-	u32 keyid[2];
 
 	for( ce = pk_cache; ce; ce = ce2 ) {
 	    ce2 = ce->next;
diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index 3acce404b..53d8c7bfb 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -922,7 +922,7 @@ parse_sig_subpkt( const byte *buffer, sigsubpkttype_t reqtype, size_t *ret_n )
 	buffer += n; buflen -=n;
     }
     if( reqtype == SIGSUBPKT_TEST_CRITICAL )
-	return buffer; /* as value true to indicate that there is no
+	return buffer; /* as value true to indicate that there is no */
 		       /* critical bit we don't understand */
     return NULL; /* end of packets; not found */
 
diff --git a/g10/trustdb.c b/g10/trustdb.c
index 759720cd7..674240a7b 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -1749,7 +1749,7 @@ enum_cert_paths( void **context, ulong *lid,
 /****************
  * Print the current path
  */
-int
+void
 enum_cert_paths_print( void **context, FILE *fp,
 				       int refresh, ulong selected_lid )
 {
diff --git a/g10/trustdb.h b/g10/trustdb.h
index 52caadb8f..3dd6b6203 100644
--- a/g10/trustdb.h
+++ b/g10/trustdb.h
@@ -53,7 +53,7 @@ int check_trust( PKT_public_key *pk, unsigned *r_trustlevel );
 int query_trust_info( PKT_public_key *pk );
 int enum_cert_paths( void **context, ulong *lid,
 		     unsigned *ownertrust, unsigned *validity );
-int enum_cert_paths_print( void **context, FILE *fp,
+void enum_cert_paths_print( void **context, FILE *fp,
 					   int refresh, ulong selected_lid );
 unsigned get_ownertrust( ulong lid );
 int get_ownertrust_info( ulong lid );
diff --git a/include/iobuf.h b/include/iobuf.h
index 8c836cc01..a88a59936 100644
--- a/include/iobuf.h
+++ b/include/iobuf.h
@@ -96,6 +96,8 @@ int   iobuf_seek( IOBUF a, ulong newpos );
 
 int  iobuf_readbyte(IOBUF a);
 int  iobuf_read(IOBUF a, byte *buf, unsigned buflen );
+unsigned iobuf_read_line( IOBUF a, byte **addr_of_buffer,
+			  unsigned *length_of_buffer, unsigned *max_length );
 int  iobuf_peek(IOBUF a, byte *buf, unsigned buflen );
 int  iobuf_writebyte(IOBUF a, unsigned c);
 int  iobuf_write(IOBUF a, byte *buf, unsigned buflen );
diff --git a/po/de.po b/po/de.po
index 494ce37f6..7a4ed1a50 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1998-12-23 16:53+0100\n"
+"POT-Creation-Date: 1999-01-09 15:45+0100\n"
 "PO-Revision-Date: 1998-12-13 22:34+0100\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -217,12 +217,12 @@ msgstr "Ohhh jeeee ... dies ist eine Wanze (Programmfehler) (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Sie haben eine Wanze (Programmfehler) gefunden ... (%s:%d)\n"
 
-#: cipher/random.c:406
+#: cipher/random.c:408
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "WARNUNG: Der Zufallszahlengenerator erzeugt keine echten Zufallszahlen!\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:409
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -720,66 +720,77 @@ msgstr "Auf geht's - Botschaft eintippen ...\n"
 msgid "can't open `%s'\n"
 msgstr "`%s' kann nicht ge�ffnet werden\n"
 
-#: g10/armor.c:344 g10/armor.c:391
+#: g10/armor.c:320
+#, c-format
+msgid "armor: %s\n"
+msgstr "ASCII-H�lle: %s\n"
+
+#: g10/armor.c:343
+msgid "invalid armor header: "
+msgstr "Ung�ltige ASCII-H�lle"
+
+#: g10/armor.c:350
 msgid "armor header: "
 msgstr "ASCII-H�lle: "
 
-#: g10/armor.c:355
+#: g10/armor.c:361
 msgid "invalid clearsig header\n"
 msgstr "Ung�ltige Klartextsignatur-Einleitung\n"
 
-#: g10/armor.c:382
-msgid "invalid armor header: "
-msgstr "Ung�ltige ASCII-H�lle"
-
-#: g10/armor.c:461
-#, c-format
-msgid "armor: %s\n"
-msgstr "ASCII-H�lle: %s\n"
+#: g10/armor.c:415
+#, fuzzy
+msgid "nested clear text signatures\n"
+msgstr "|[file]|Eine Klartextunterschrift erzeugen"
 
-#: g10/armor.c:534
+#: g10/armor.c:531
 msgid "invalid dash escaped line: "
 msgstr "Ung�ltige mit Bindestrich \"escapte\" Zeile: "
 
-#: g10/armor.c:603
-msgid "invalid clear text header: "
-msgstr "ung�ltige Klartexteinleitung"
+#: g10/armor.c:539
+#, fuzzy
+msgid "unexpected armor:"
+msgstr "Unerwartete Daten"
 
-#: g10/armor.c:846
+#: g10/armor.c:625
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Ung�ltiges \"radix64\" Zeichen %02x ignoriert\n"
 
-#: g10/armor.c:879
+#: g10/armor.c:655
 msgid "premature eof (no CRC)\n"
 msgstr "vorzeitiges Dateiende (keine Pr�fsumme)\n"
 
-#: g10/armor.c:898
+#: g10/armor.c:672
 msgid "premature eof (in CRC)\n"
 msgstr "vorzeitiges Dateiende (innerhalb der Pr�fsumme)\n"
 
-#: g10/armor.c:902
+#: g10/armor.c:676
 msgid "malformed CRC\n"
 msgstr "Falsch aufgebaute Pr�fsumme\n"
 
-#: g10/armor.c:906
+#: g10/armor.c:680
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "Pr�fsummenfehler; %06lx - %06lx\n"
 
-#: g10/armor.c:925
+#: g10/armor.c:697
 msgid "premature eof (in Trailer)\n"
 msgstr "vorzeitiges Dateiende (im Nachsatz)\n"
 
-#: g10/armor.c:929
+#: g10/armor.c:701
 msgid "error in trailer line\n"
 msgstr "Fehler in der Nachsatzzeile\n"
 
-#: g10/armor.c:1183
+#: g10/armor.c:962
 #, fuzzy
 msgid "no valid OpenPGP data found.\n"
 msgstr "Keine g�ltigen RFC1991- oder OpenPGP-Daten gefunden.\n"
 
+#: g10/armor.c:964
+#, c-format
+msgid "invalid armor: line longer than %d characters\n"
+msgstr ""
+
 #: g10/pkclist.c:138
 #, c-format
 msgid ""
@@ -875,7 +886,7 @@ msgstr ""
 msgid "key %08lX: key has been revoked!\n"
 msgstr "Schl�ssel %08lX: Schl�ssel wurde widerrufen\n"
 
-#: g10/pkclist.c:286 g10/pkclist.c:379
+#: g10/pkclist.c:286 g10/pkclist.c:381
 msgid "Use this key anyway? "
 msgstr "Diesen Schl�ssel trotzdem benutzen?"
 
@@ -917,7 +928,7 @@ msgstr ""
 "Dieser Schl�ssel geh�rt uns (alldieweil wir den geheimen Schl�ssel dazu "
 "haben)\n"
 
-#: g10/pkclist.c:374
+#: g10/pkclist.c:376
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -928,55 +939,55 @@ msgstr ""
 "Wenn Sie *wirklich* wissen, was Sie tun, k�nnen Sie die n�chste\n"
 "Frage mit ja beantworten\n"
 
-#: g10/pkclist.c:383
+#: g10/pkclist.c:385
 msgid "WARNING: Using untrusted key!\n"
 msgstr "WARNUNG: Ein Schl�ssel ohne gesichertes Vertrauen wird benutzt!\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:421
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "WARNUNG: Dieser Schl�ssel wurde von seinem Besitzer widerrufen!\n"
 
-#: g10/pkclist.c:420
+#: g10/pkclist.c:422
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Das k�nnte bedeuten, da� die Signatur gef�lscht ist.\n"
 
-#: g10/pkclist.c:441
+#: g10/pkclist.c:443
 msgid "Note: This key has expired!\n"
 msgstr "Hinweis: Dieser Schl�ssel ist verfallen!\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:450
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "WARNUNG: Dieser Schl�ssel tr�gt keine vertrauensw�rdige Signatur!\n"
 
-#: g10/pkclist.c:450
+#: g10/pkclist.c:452
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Es gibt keinen Hinweis, da� die Signatur wirklich dem vorgeblichen "
 "Besitzer geh�rt.\n"
 
-#: g10/pkclist.c:466
+#: g10/pkclist.c:468
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "WARNUNG: Wir haben KEIN Vertrauen zu diesem Schl�ssel!\n"
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:469
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Die Signatur ist wahrscheinlich eine F�LSCHUNG.\n"
 
-#: g10/pkclist.c:474
+#: g10/pkclist.c:476
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "WARNUNG: Dieser Schl�ssel ist nicht durch hinreichend vertrauensw�rdige "
 "Signaturen zertifiziert!\n"
 
-#: g10/pkclist.c:477
+#: g10/pkclist.c:479
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "         Es ist nicht sicher, da� die Signatur wirklich dem vorgeblichen "
 "Besitzer geh�rt.\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:524
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -984,25 +995,25 @@ msgstr ""
 "Sie gaben keine User-ID angegeben (Benutzen Sie die Option \"-r\").\n"
 "\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:529
 msgid "Enter the user ID: "
 msgstr "Geben Sie die User-ID ein: "
 
-#: g10/pkclist.c:538
+#: g10/pkclist.c:540
 msgid "No such user ID.\n"
 msgstr "Keine solche User-ID vorhanden.\n"
 
-#: g10/pkclist.c:572 g10/pkclist.c:599
+#: g10/pkclist.c:574 g10/pkclist.c:601
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: �bersprungen: %s\n"
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:582
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: Fehler beim Pr�fen des Schl�ssels: %s\n"
 
-#: g10/pkclist.c:606
+#: g10/pkclist.c:608
 msgid "no valid addressees\n"
 msgstr "Keine g�ltigen Adressaten\n"
 
@@ -1301,8 +1312,8 @@ msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
 msgid "Really create? "
 msgstr "Wirklich erzeugen? "
 
-#: g10/encode.c:88 g10/openfile.c:81 g10/openfile.c:158 g10/tdbio.c:445
-#: g10/tdbio.c:504
+#: g10/encode.c:88 g10/openfile.c:81 g10/openfile.c:158 g10/tdbio.c:459
+#: g10/tdbio.c:510
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: kann nicht ge�ffnet werden: %s\n"
@@ -1356,7 +1367,7 @@ msgstr "zu viele Eintr�ge im pk-Lager - abgeschaltet\n"
 msgid "too many entries in unk cache - disabled\n"
 msgstr "zu viele Eintr�ge im unk-Lager - abgeschaltet\n"
 
-#: g10/getkey.c:1021
+#: g10/getkey.c:1039
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr ""
@@ -1944,8 +1955,8 @@ msgid "Key not changed so no update needed.\n"
 msgstr "Schl�ssel ist nicht ge�ndert worden, also ist keine �nderung n�tig.\n"
 
 #: g10/keyedit.c:669 g10/keyedit.c:727
-#, c-format
-msgid "update of trust db failed: %s\n"
+#, fuzzy, c-format
+msgid "update of trustdb failed: %s\n"
 msgstr "�nderung der \"Trust-DB\" fehlgeschlagen: %s\n"
 
 #: g10/keyedit.c:701
@@ -2023,7 +2034,8 @@ msgid "No secondary key with index %d\n"
 msgstr "Kein Zweitschl�ssel mit Index %d\n"
 
 #: g10/mainproc.c:198
-msgid "public key encrypted data: Good DEK\n"
+#, fuzzy
+msgid "public key encrypted data: good DEK\n"
 msgstr "Mit �ffentlichem Sch�ssel verschl�sselte Daten: Korrekte DEK\n"
 
 #: g10/mainproc.c:201
@@ -2067,33 +2079,34 @@ msgstr "FALSCHE Unterschrift von \""
 msgid "Good signature from \""
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:861
+#: g10/mainproc.c:879
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Signatur kann nicht gepr�ft werden: %s\n"
 
-#: g10/mainproc.c:934
+#: g10/mainproc.c:952
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:939
+#: g10/mainproc.c:957
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ung�ltiges root-Paket in proc_tree() entdeckt\n"
 
-#: g10/misc.c:88
+#: g10/misc.c:90
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "core-dump-Erzeugung kann nicht abgeschaltet werden: %s\n"
 
-#: g10/misc.c:90
-msgid "WARNING: Program may create a core file!\n"
+#: g10/misc.c:93
+#, fuzzy
+msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm k�nnte einen core-dump schreiben!\n"
 
-#: g10/misc.c:198
+#: g10/misc.c:200
 msgid "Experimental algorithms should not be used!\n"
 msgstr ""
 
-#: g10/misc.c:212
+#: g10/misc.c:214
 msgid ""
 "RSA keys are deprecated; please consider creating a new key and use this key "
 "in the future\n"
@@ -2101,8 +2114,8 @@ msgstr ""
 "RSA Schl�ssel sind nicht erw�nscht; bitte denken Sie dar�ber nach, einen\n"
 "neuen Schl�ssel zu erzeugen und diesen in Zukunft zu benutzen\n"
 
-#: g10/misc.c:233
-msgid "This cipher algorithm is depreciated; please use a more standard one!\n"
+#: g10/misc.c:235
+msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 
 #: g10/parse-packet.c:113
@@ -2126,32 +2139,37 @@ msgstr ""
 "Benutzer: \""
 
 #: g10/passphrase.c:150
-#, c-format
-msgid "(%u-bit %s key, ID %08lX, created %s)\n"
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "(%u-Bit %s Schl�ssel, ID %08lX, erzeugt %s)\n"
 
-#: g10/passphrase.c:174
+#: g10/passphrase.c:155
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr ""
+
+#: g10/passphrase.c:183
 msgid "Enter passphrase: "
 msgstr "Geben Sie das Mantra ein: "
 
-#: g10/passphrase.c:178
+#: g10/passphrase.c:187
 msgid "Repeat passphrase: "
 msgstr "Geben Sie das Mantra nochmal ein: "
 
-#: g10/plaintext.c:103
+#: g10/plaintext.c:63
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "Daten wurden nicht gespeichert; verwenden Sie daf�r die Option \"--output\"\n"
 
-#: g10/plaintext.c:216
+#: g10/plaintext.c:166
 msgid "Please enter name of data file: "
 msgstr "Bitte geben Sie den Namen der Datendatei ein: "
 
-#: g10/plaintext.c:237
+#: g10/plaintext.c:187
 msgid "reading stdin ...\n"
 msgstr "lese stdin ...\n"
 
-#: g10/plaintext.c:300
+#: g10/plaintext.c:250
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kann signierte Datei `%s' nicht �ffnen.\n"
@@ -2162,7 +2180,8 @@ msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "Ungenannter Empf�nger: Versuch mit geheimen Schl�ssel %08lX ...\n"
 
 #: g10/pubkey-enc.c:84
-msgid "okay, we are the anonymous receiver.\n"
+#, fuzzy
+msgid "okay, we are the anonymous recipient.\n"
 msgstr "Alles klar, wir sind der ungenannte Empf�nger.\n"
 
 #: g10/pubkey-enc.c:136
@@ -2179,11 +2198,11 @@ msgstr "Hinweis: Verfahren %d ist kein bevorzugtes Verschl�sselungsverfahren\n"
 msgid "protection algorithm %d is not supported\n"
 msgstr "Schutzverfahren %d wird nicht unterst�tzt\n"
 
-#: g10/seckey-cert.c:169
+#: g10/seckey-cert.c:176
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Ung�ltiges Mantra; versuchen Sie's doch noch einmal ...\n"
 
-#: g10/seckey-cert.c:216
+#: g10/seckey-cert.c:223
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "WARNUNG: Unsicherer Schl�ssel entdeckt -\n"
@@ -2196,18 +2215,27 @@ msgstr ""
 "Dieser durch PGP erzeugte ElGamal-Schl�ssel ist f�r Signaturen NICHT sicher "
 "genug!\n"
 
-#: g10/sig-check.c:165
-msgid "public key created in future (time warp or clock problem)\n"
+#: g10/sig-check.c:166
+#, fuzzy, c-format
+msgid "public key created %lu %s in future (time warp or clock problem)\n"
 msgstr ""
 "�ffentlicher Schl�ssel wurde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht �berein)\n"
 
-#: g10/sig-check.c:170
+#: g10/sig-check.c:168
+msgid "second"
+msgstr ""
+
+#: g10/sig-check.c:168
+msgid "seconds"
+msgstr ""
+
+#: g10/sig-check.c:173
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "Hinweis: Schl�ssel der Signatur ist verfallen am %s.\n"
 
-#: g10/sig-check.c:226
+#: g10/sig-check.c:230
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 
@@ -2230,133 +2258,135 @@ msgstr "unterschreibe:"
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "WARNUNG: `%s' ist eine leere Datei.\n"
 
-#: g10/tdbio.c:116 g10/tdbio.c:1413
+#: g10/tdbio.c:116 g10/tdbio.c:1418
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb Satz %lu: lseek fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:122 g10/tdbio.c:1420
+#: g10/tdbio.c:122 g10/tdbio.c:1425
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb Satz %lu: write fehlgeschlagen (n=%d): %s\n"
 
 #: g10/tdbio.c:232
-msgid "trustdb transaction to large\n"
+#, fuzzy
+msgid "trustdb transaction too large\n"
 msgstr "trustdb Transaktion zu gro�\n"
 
-#: g10/tdbio.c:402
+#: g10/tdbio.c:416
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: kann nicht zugegriffen werden: %s\n"
 
-#: g10/ringedit.c:273 g10/tdbio.c:422
+#: g10/ringedit.c:273 g10/tdbio.c:436
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: Verzeichnis kann nicht erzeugt werden: %s\n"
 
-#: g10/ringedit.c:279 g10/tdbio.c:425
+#: g10/ringedit.c:279 g10/tdbio.c:439
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: Verzeichnis erzeugt\n"
 
-#: g10/tdbio.c:429
+#: g10/tdbio.c:443
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: Verzeichnis existiert nicht!\n"
 
-#: g10/openfile.c:101 g10/openfile.c:165 g10/ringedit.c:1275 g10/tdbio.c:435
+#: g10/openfile.c:101 g10/openfile.c:165 g10/ringedit.c:1275 g10/tdbio.c:449
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: kann nicht erzeugt werden: %s\n"
 
-#: g10/tdbio.c:459
+#: g10/tdbio.c:473
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: Fehler beim Erzeugen des Versionsatzes: %s"
 
-#: g10/tdbio.c:463
-#, c-format
-msgid "%s: invalid trust-db created\n"
+#: g10/tdbio.c:477
+#, fuzzy, c-format
+msgid "%s: invalid trustdb created\n"
 msgstr "%s: ung�ltige trust-db erzeugt\n"
 
-#: g10/tdbio.c:465
-#, c-format
-msgid "%s: trust-db created\n"
+#: g10/tdbio.c:479
+#, fuzzy, c-format
+msgid "%s: trustdb created\n"
 msgstr "%s: trust-db erzeugt\n"
 
-#: g10/tdbio.c:506
-#, c-format
-msgid "%s: invalid trust-db\n"
+#: g10/tdbio.c:512
+#, fuzzy, c-format
+msgid "%s: invalid trustdb\n"
 msgstr "%s: ung�lte 'Trust'-Datenbank\n"
 
-#: g10/tdbio.c:540
+#: g10/tdbio.c:545
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: hashtable kann nicht erzeugt werden: %s\n"
 
-#: g10/tdbio.c:548
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: Fehler beim �ndern des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:564 g10/tdbio.c:603 g10/tdbio.c:628 g10/tdbio.c:1346
-#: g10/tdbio.c:1373
+#: g10/tdbio.c:569 g10/tdbio.c:608 g10/tdbio.c:633 g10/tdbio.c:1351
+#: g10/tdbio.c:1378
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: Fehler beim Lesen des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:577
+#: g10/tdbio.c:582
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: Fehler beim Schreiben des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:1053
+#: g10/tdbio.c:1058
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:1061
+#: g10/tdbio.c:1066
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1082
+#: g10/tdbio.c:1087
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: keine trustdb Datei\n"
 
-#: g10/tdbio.c:1098
+#: g10/tdbio.c:1103
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: version record with recnum %lu\n"
 
-#: g10/tdbio.c:1103
+#: g10/tdbio.c:1108
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: invalid file version %d\n"
 
-#: g10/tdbio.c:1379
+#: g10/tdbio.c:1384
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: Fehler beim Lesen eines freien Satzes: %s\n"
 
-#: g10/tdbio.c:1387
+#: g10/tdbio.c:1392
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: Fehler beim Schreiben eines Verzeichnis-Satzes: %s\n"
 
-#: g10/tdbio.c:1397
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: konnte einen Satz nicht Nullen: %s\n"
 
-#: g10/tdbio.c:1427
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: konnte Satz nicht anh�ngen: %s\n"
 
 #: g10/trustdb.c:142
-msgid "The trust DB is corrupted; please run \"gpgm --fix-trust-db\".\n"
+#, fuzzy
+msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n"
 msgstr ""
 "Die \"Trust\"-Datenbank ist besch�digt; verwenden Sie \"gpgm "
 "--fix-trustdb\".\n"
@@ -2377,8 +2407,8 @@ msgid "trust record %lu: delete failed: %s\n"
 msgstr "Vertrauenssatz %lu: l�schen fehlgeschlagen: %s\n"
 
 #: g10/trustdb.c:198
-#, c-format
-msgid "trust db: sync failed: %s\n"
+#, fuzzy, c-format
+msgid "trustdb: sync failed: %s\n"
 msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n"
 
 #: g10/trustdb.c:327
@@ -2407,8 +2437,8 @@ msgid "chained sigrec %lu has a wrong owner\n"
 msgstr "Verketteter Signatursatz %lu hat einen falschen Besitzer\n"
 
 #: g10/trustdb.c:463
-#, c-format
-msgid "`%s' is not a valid long keyID\n"
+#, fuzzy, c-format
+msgid "'%s' is not a valid long keyID\n"
 msgstr "`%s' ist keine g�ltige lange Schl�ssel-ID\n"
 
 #: g10/trustdb.c:498
@@ -2495,28 +2525,28 @@ msgid "Ooops, no user ids\n"
 msgstr "Huch, keine User-IDs\n"
 
 #: g10/trustdb.c:1088 g10/trustdb.c:1106
-#, c-format
-msgid "user `%s' read problem: %s\n"
+#, fuzzy, c-format
+msgid "user '%s' read problem: %s\n"
 msgstr "User `%s' Leseproblem: %s\n"
 
 #: g10/trustdb.c:1091 g10/trustdb.c:1109
-#, c-format
-msgid "user `%s' list problem: %s\n"
+#, fuzzy, c-format
+msgid "user '%s' list problem: %s\n"
 msgstr "User `%s' Listenproblem: %s\n"
 
 #: g10/trustdb.c:1099 g10/trustdb.c:1346
-#, c-format
-msgid "user `%s' not found: %s\n"
+#, fuzzy, c-format
+msgid "user '%s' not found: %s\n"
 msgstr "Benutzer `%s' nicht gefunden: %s\n"
 
 #: g10/trustdb.c:1101 g10/trustdb.c:1348
-#, c-format
-msgid "problem finding `%s' in trustdb: %s\n"
+#, fuzzy, c-format
+msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "Problem, `%s' in der Trust-DB zu finden: %s\n"
 
 #: g10/trustdb.c:1104
-#, c-format
-msgid "user `%s' not in trustdb\n"
+#, fuzzy, c-format
+msgid "user '%s' not in trustdb\n"
 msgstr "User `%s' ist nicht in der trustdb\n"
 
 #: g10/trustdb.c:1139
@@ -2553,16 +2583,6 @@ msgstr "Fehler: ung�ltiger Fingerabdruck\n"
 msgid "error: no ownertrust value\n"
 msgstr "Fehler: Keine \"Owner trust\" Werte\n"
 
-#: g10/trustdb.c:1223
-#, c-format
-msgid "LID %lu: changing trust from %u to %u\n"
-msgstr "LID %lu: �ndern des 'Trusts' von %u auf %u\n"
-
-#: g10/trustdb.c:1226
-#, c-format
-msgid "LID %lu: setting trust to %u\n"
-msgstr "LID %lu: Setze 'Trust' auf %u\n"
-
 #: g10/trustdb.c:1234
 msgid "key not in trustdb, searching ring.\n"
 msgstr "Schl�ssel ist nicht in der trustdb, Schl.bund wird durchsucht.\n"
@@ -2589,13 +2609,13 @@ msgid "error finding dir record: %s\n"
 msgstr "Fehler beim Auffinden des Verz.Satzes: %s\n"
 
 #: g10/trustdb.c:1351
-#, c-format
-msgid "user `%s' not in trustdb - inserting\n"
+#, fuzzy, c-format
+msgid "user '%s' not in trustdb - inserting\n"
 msgstr "User `%s' ist nich in der 'Trust'-Datenbank - wird eingef�gt\n"
 
 #: g10/trustdb.c:1354
-#, c-format
-msgid "failed to put `%s' into trustdb: %s\n"
+#, fuzzy, c-format
+msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "konnte `%s' nicht in die 'Trust'-Datenbank hineintun: %s\n"
 
 #: g10/trustdb.c:1404
@@ -2792,7 +2812,7 @@ msgstr "lid %lu hat keinen Schl�ssel\n"
 msgid "lid %lu: can't get keyblock: %s\n"
 msgstr "lid %lu: Schl�sselblock nicht verf�gbar: %s\n"
 
-#: g10/trustdb.c:2159 g10/trustdb.c:3073
+#: g10/trustdb.c:2159 g10/trustdb.c:3082
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir fehlgeschlagen: %s\n"
@@ -2881,12 +2901,12 @@ msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "Signatursatz %lu[%d] zeigt auf falschen Satz.\n"
 
 #. that should never happen
-#: g10/trustdb.c:3043
+#: g10/trustdb.c:3052
 #, c-format
 msgid "insert_trust_record: keyblock not found: %s\n"
 msgstr "insert_trust_record: Schl�sselblock nicht gefunden: %s\n"
 
-#: g10/trustdb.c:3061
+#: g10/trustdb.c:3070
 msgid "did not use primary key for insert_trust_record()\n"
 msgstr "F�r insert_trust_record() wurde nicht der Hauptschl�ssel benutzt\n"
 
@@ -2967,8 +2987,9 @@ msgid "encrypted with unknown algorithm %d\n"
 msgstr "Mit unbekanntem Verfahren verschl�sselt %d\n"
 
 #: g10/encr-data.c:74
+#, fuzzy
 msgid ""
-"WARNING: Message was encrypted with a weak key in the symmetric cipher.\n"
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "Warnung: Botschaft wurde mit einem unsicheren Schl�ssel verschl�sselt.\n"
 
@@ -3234,6 +3255,15 @@ msgstr "Keine Hilfe vorhanden."
 msgid "No help available for `%s'"
 msgstr "Keine Hilfe f�r `%s' vorhanden."
 
+#~ msgid "invalid clear text header: "
+#~ msgstr "ung�ltige Klartexteinleitung"
+
+#~ msgid "LID %lu: changing trust from %u to %u\n"
+#~ msgstr "LID %lu: �ndern des 'Trusts' von %u auf %u\n"
+
+#~ msgid "LID %lu: setting trust to %u\n"
+#~ msgstr "LID %lu: Setze 'Trust' auf %u\n"
+
 #~ msgid "You will see a list of signators etc. here\n"
 #~ msgstr "Sie sollten hier eigentlich eine Liste der Signierer sehen.\n"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index f31a9478c..533aa082d 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -5,7 +5,7 @@
 # I also got inspiration from it.po by Marco d'Itri <[email protected]>
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1998-12-23 16:53+0100\n"
+"POT-Creation-Date: 1999-01-09 15:45+0100\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-13 10:49:25+0100\n"
 "From: Urko Lusa <[email protected]>\n"
@@ -30,175 +30,218 @@ msgid "yY"
 msgstr "sS"
 
 #: util/errors.c:54
-msgid "General error"
+#, fuzzy
+msgid "general error"
 msgstr "Error general"
 
 #: util/errors.c:55
-msgid "Unknown packet type"
+#, fuzzy
+msgid "unknown packet type"
 msgstr "Formato desconocido"
 
 #: util/errors.c:56
-msgid "Unknown version"
+#, fuzzy
+msgid "unknown version"
 msgstr "Versi�n desconocida"
 
 #: util/errors.c:57
-msgid "Unknown pubkey algorithm"
+#, fuzzy
+msgid "unknown pubkey algorithm"
 msgstr "Algoritmo de clave p�blica desconocido"
 
 #: util/errors.c:58
-msgid "Unknown digest algorithm"
+#, fuzzy
+msgid "unknown digest algorithm"
 msgstr "Algoritmo desconocido de resumen de mensaje"
 
 #: util/errors.c:59
-msgid "Bad public key"
+#, fuzzy
+msgid "bad public key"
 msgstr "Clave p�blica incorrecta"
 
 #: util/errors.c:60
-msgid "Bad secret key"
+#, fuzzy
+msgid "bad secret key"
 msgstr "Clave secreta incorrecta"
 
 #: util/errors.c:61
-msgid "Bad signature"
+#, fuzzy
+msgid "bad signature"
 msgstr "Firma incorrecta"
 
 #: util/errors.c:62
-msgid "Checksum error"
+#, fuzzy
+msgid "checksum error"
 msgstr "Error en suma de comprobaci�n"
 
 #: util/errors.c:63
-msgid "Bad passphrase"
+#, fuzzy
+msgid "bad passphrase"
 msgstr "Contrase�a incorrecta"
 
 #: util/errors.c:64
-msgid "Public key not found"
+#, fuzzy
+msgid "public key not found"
 msgstr "Clave p�blica no encontrada"
 
 #: util/errors.c:65
-msgid "Unknown cipher algorithm"
+#, fuzzy
+msgid "unknown cipher algorithm"
 msgstr "Algoritmo de cifrado desconocido"
 
 #: util/errors.c:66
-msgid "Can't open the keyring"
+#, fuzzy
+msgid "can't open the keyring"
 msgstr "No se puede abrir el anillo"
 
 #: util/errors.c:67
-msgid "Invalid packet"
+#, fuzzy
+msgid "invalid packet"
 msgstr "Valor no v�lido"
 
 #: util/errors.c:68
-msgid "Invalid armor"
+#, fuzzy
+msgid "invalid armor"
 msgstr "Armadura no v�lida"
 
 #: util/errors.c:69
-msgid "No such user id"
+#, fuzzy
+msgid "no such user id"
 msgstr "No existe el identificativo de usuario"
 
 #: util/errors.c:70
-msgid "Secret key not available"
+#, fuzzy
+msgid "secret key not available"
 msgstr "Clave secreta no disponible"
 
 #: util/errors.c:71
-msgid "Wrong secret key used"
+#, fuzzy
+msgid "wrong secret key used"
 msgstr "Clave secreta incorrecta"
 
 #: util/errors.c:72
-msgid "Not supported"
+#, fuzzy
+msgid "not supported"
 msgstr "No soportado"
 
 #: util/errors.c:73
-msgid "Bad key"
+#, fuzzy
+msgid "bad key"
 msgstr "Clave incorrecta"
 
 #: util/errors.c:74
-msgid "File read error"
+#, fuzzy
+msgid "file read error"
 msgstr "Error de lectura"
 
 #: util/errors.c:75
-msgid "File write error"
+#, fuzzy
+msgid "file write error"
 msgstr "Error de escritura"
 
 #: util/errors.c:76
-msgid "Unknown compress algorithm"
+#, fuzzy
+msgid "unknown compress algorithm"
 msgstr "Algoritmo de compresi�n desconocido"
 
 #: util/errors.c:77
-msgid "File open error"
+#, fuzzy
+msgid "file open error"
 msgstr "Error al abrir fichero"
 
 #: util/errors.c:78
-msgid "File create error"
+#, fuzzy
+msgid "file create error"
 msgstr "Error al cerrar fichero"
 
 #: util/errors.c:79
-msgid "Invalid passphrase"
+#, fuzzy
+msgid "invalid passphrase"
 msgstr "Contrase�a incorrecta"
 
 #: util/errors.c:80
-msgid "Unimplemented pubkey algorithm"
+#, fuzzy
+msgid "unimplemented pubkey algorithm"
 msgstr "Algoritmo de clave p�blica no implementado"
 
 #: util/errors.c:81
-msgid "Unimplemented cipher algorithm"
+#, fuzzy
+msgid "unimplemented cipher algorithm"
 msgstr "Algoritmo de cifrado no implementado"
 
 #: util/errors.c:82
-msgid "Unknown signature class"
+#, fuzzy
+msgid "unknown signature class"
 msgstr "Clase de firma desconocida"
 
 #: util/errors.c:83
-msgid "Trust database error"
+#, fuzzy
+msgid "trust database error"
 msgstr "Error en la base de datos de confianza"
 
 #: util/errors.c:84
-msgid "Bad MPI"
+#, fuzzy
+msgid "bad MPI"
 msgstr "MPI incorrecto"
 
 #: util/errors.c:85
-msgid "Resource limit"
+#, fuzzy
+msgid "resource limit"
 msgstr "L�mite de recurso"
 
 #: util/errors.c:86
-msgid "Invalid keyring"
+#, fuzzy
+msgid "invalid keyring"
 msgstr "Anillo no v�lido"
 
 #: util/errors.c:87
-msgid "Bad certificate"
+#, fuzzy
+msgid "bad certificate"
 msgstr "Certificado incorrecto"
 
 #: util/errors.c:88
-msgid "Malformed user id"
+#, fuzzy
+msgid "malformed user id"
 msgstr "Identificativo de usuario mal formado"
 
 #: util/errors.c:89
-msgid "File close error"
+#, fuzzy
+msgid "file close error"
 msgstr "Error al cerrar fichero"
 
 #: util/errors.c:90
-msgid "File rename error"
+#, fuzzy
+msgid "file rename error"
 msgstr "Error al renombrar fichero"
 
 #: util/errors.c:91
-msgid "File delete error"
+#, fuzzy
+msgid "file delete error"
 msgstr "Error al borrar fichero"
 
 #: util/errors.c:92
-msgid "Unexpected data"
+#, fuzzy
+msgid "unexpected data"
 msgstr "Datos inesperados"
 
 #: util/errors.c:93
-msgid "Timestamp conflict"
+#, fuzzy
+msgid "timestamp conflict"
 msgstr "Conflicto con sello de fecha"
 
 #: util/errors.c:94
-msgid "Unusable pubkey algorithm"
+#, fuzzy
+msgid "unusable pubkey algorithm"
 msgstr "Algoritmo de clave p�blica no utilizable"
 
 #: util/errors.c:95
-msgid "File exists"
+#, fuzzy
+msgid "file exists"
 msgstr "El fichero existe. "
 
 #: util/errors.c:96
-msgid "Weak key"
+#, fuzzy
+msgid "weak key"
 msgstr "Clave d�bil"
 
 #: util/logger.c:178
@@ -211,12 +254,12 @@ msgstr "�Oh! vaya... esto es un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Ha encontrado Vd. un bug... (%s:%d)\n"
 
-#: cipher/random.c:406
+#: cipher/random.c:408
 #, fuzzy
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "Aviso: �se est� usando un generador de n�meros aleatorios inseguro!\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:409
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -721,66 +764,77 @@ msgstr ""
 msgid "can't open `%s'\n"
 msgstr "no puede abrirse `%s'\n"
 
-#: g10/armor.c:344 g10/armor.c:391
+#: g10/armor.c:320
+#, c-format
+msgid "armor: %s\n"
+msgstr "armadura: %s\n"
+
+#: g10/armor.c:343
+msgid "invalid armor header: "
+msgstr "cabecera de armadura no v�lida: "
+
+#: g10/armor.c:350
 msgid "armor header: "
 msgstr "cabecera de armadura: "
 
-#: g10/armor.c:355
+#: g10/armor.c:361
 msgid "invalid clearsig header\n"
 msgstr "cabecera de firma clara no v�lida\n"
 
-#: g10/armor.c:382
-msgid "invalid armor header: "
-msgstr "cabecera de armadura no v�lida: "
-
-#: g10/armor.c:461
-#, c-format
-msgid "armor: %s\n"
-msgstr "armadura: %s\n"
+#: g10/armor.c:415
+#, fuzzy
+msgid "nested clear text signatures\n"
+msgstr "|[file]|hace una firma en texto claro"
 
-#: g10/armor.c:534
+#: g10/armor.c:531
 msgid "invalid dash escaped line: "
 msgstr "L�nea con guiones no v�lida: "
 
-#: g10/armor.c:603
-msgid "invalid clear text header: "
-msgstr "cabecera de texto claro no v�lida: "
+#: g10/armor.c:539
+#, fuzzy
+msgid "unexpected armor:"
+msgstr "Datos inesperados"
 
-#: g10/armor.c:846
+#: g10/armor.c:625
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracteres no v�lidos radix64 %02x ignorados\n"
 
-#: g10/armor.c:879
+#: g10/armor.c:655
 msgid "premature eof (no CRC)\n"
 msgstr "Fin de fichero prematuro\n"
 
-#: g10/armor.c:898
+#: g10/armor.c:672
 msgid "premature eof (in CRC)\n"
 msgstr "Fin de suma de comprobaci�n prematuro\n"
 
-#: g10/armor.c:902
+#: g10/armor.c:676
 msgid "malformed CRC\n"
 msgstr "Suma de comprobaci�n mal creada\n"
 
-#: g10/armor.c:906
+#: g10/armor.c:680
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "Error en suma de comprobaci�n: %06lx - %06lx\n"
 
-#: g10/armor.c:925
+#: g10/armor.c:697
 msgid "premature eof (in Trailer)\n"
 msgstr ""
 
-#: g10/armor.c:929
+#: g10/armor.c:701
 msgid "error in trailer line\n"
 msgstr ""
 
-#: g10/armor.c:1183
+#: g10/armor.c:962
 #, fuzzy
 msgid "no valid OpenPGP data found.\n"
 msgstr "RFC1991 no v�lida o datos OpenPGP no encontrados\n"
 
+#: g10/armor.c:964
+#, c-format
+msgid "invalid armor: line longer than %d characters\n"
+msgstr ""
+
 #: g10/pkclist.c:138
 #, fuzzy, c-format
 msgid ""
@@ -870,7 +924,7 @@ msgstr ""
 msgid "key %08lX: key has been revoked!\n"
 msgstr "clave %08lX: aceptada como clave secreta.\n"
 
-#: g10/pkclist.c:286 g10/pkclist.c:379
+#: g10/pkclist.c:286 g10/pkclist.c:381
 msgid "Use this key anyway? "
 msgstr "�Usar esta clave de todas formas? "
 
@@ -904,7 +958,7 @@ msgstr ""
 msgid "This key belongs to us\n"
 msgstr ""
 
-#: g10/pkclist.c:374
+#: g10/pkclist.c:376
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -916,51 +970,51 @@ msgstr ""
 "\"s�\" a la siguiente pregunta.\n"
 "\n"
 
-#: g10/pkclist.c:383
+#: g10/pkclist.c:385
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATENCI�N: �Usando una clave no fiable!\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:421
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATENCI�N: �Esta clave ha sido revocada por su propietario!\n"
 
-#: g10/pkclist.c:420
+#: g10/pkclist.c:422
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "          Esto puede significar que la firma est� falsificada.\n"
 
-#: g10/pkclist.c:441
+#: g10/pkclist.c:443
 msgid "Note: This key has expired!\n"
 msgstr "Nota: �Esta clave est� caducada!\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:450
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ATENCI�N: �Esta clave no est� certificada por una firma de confianza!\n"
 
-#: g10/pkclist.c:450
+#: g10/pkclist.c:452
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         No hay indicios de que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:466
+#: g10/pkclist.c:468
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATENCI�N: �Esta firma NO es de confianza!\n"
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:469
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         La firma es probablemente una FALSIFICACI�N.\n"
 
-#: g10/pkclist.c:474
+#: g10/pkclist.c:476
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVISO: �Esta clave no est� certificada con suficientes firmas de confianza!\n"
 
-#: g10/pkclist.c:477
+#: g10/pkclist.c:479
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         No es seguro que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:524
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -968,25 +1022,25 @@ msgstr ""
 "No se ha especificado un ID de usuario (puede usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:529
 msgid "Enter the user ID: "
 msgstr "Introduzca el ID de usuario: "
 
-#: g10/pkclist.c:538
+#: g10/pkclist.c:540
 msgid "No such user ID.\n"
 msgstr "ID de usuario inexistente.\n"
 
-#: g10/pkclist.c:572 g10/pkclist.c:599
+#: g10/pkclist.c:574 g10/pkclist.c:601
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:582
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: error comprobando la clave: %s\n"
 
-#: g10/pkclist.c:606
+#: g10/pkclist.c:608
 msgid "no valid addressees\n"
 msgstr "no hay direcciones v�lidas\n"
 
@@ -1288,8 +1342,8 @@ msgstr "Creaci�n de la clave fallida: %s\n"
 msgid "Really create? "
 msgstr "�Crear de verdad? "
 
-#: g10/encode.c:88 g10/openfile.c:81 g10/openfile.c:158 g10/tdbio.c:445
-#: g10/tdbio.c:504
+#: g10/encode.c:88 g10/openfile.c:81 g10/openfile.c:158 g10/tdbio.c:459
+#: g10/tdbio.c:510
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: no puede abrirse: %s\n"
@@ -1342,7 +1396,7 @@ msgstr ""
 msgid "too many entries in unk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:1021
+#: g10/getkey.c:1039
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "usando clave secundaria %08lX en vez de clave primaria %08lX\n"
@@ -1927,8 +1981,8 @@ msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
 
 #: g10/keyedit.c:669 g10/keyedit.c:727
-#, c-format
-msgid "update of trust db failed: %s\n"
+#, fuzzy, c-format
+msgid "update of trustdb failed: %s\n"
 msgstr "actualizaci�n de confianza fallida: %s\n"
 
 #: g10/keyedit.c:701
@@ -2007,7 +2061,7 @@ msgstr "No hay ninguna clave secundaria con el �ndice %d\n"
 
 #: g10/mainproc.c:198
 #, fuzzy
-msgid "public key encrypted data: Good DEK\n"
+msgid "public key encrypted data: good DEK\n"
 msgstr "descifrado de la clave p�blica fallido: %s\n"
 
 #: g10/mainproc.c:201
@@ -2052,33 +2106,33 @@ msgstr "Firma INCORRECTA de \""
 msgid "Good signature from \""
 msgstr "Firma correcta de \""
 
-#: g10/mainproc.c:861
+#: g10/mainproc.c:879
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:934
+#: g10/mainproc.c:952
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:939
+#: g10/mainproc.c:957
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:88
+#: g10/misc.c:90
 #, fuzzy, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: g10/misc.c:90
-msgid "WARNING: Program may create a core file!\n"
+#: g10/misc.c:93
+msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/misc.c:198
+#: g10/misc.c:200
 msgid "Experimental algorithms should not be used!\n"
 msgstr ""
 
-#: g10/misc.c:212
+#: g10/misc.c:214
 msgid ""
 "RSA keys are deprecated; please consider creating a new key and use this key "
 "in the future\n"
@@ -2086,8 +2140,8 @@ msgstr ""
 "Las claves RSA est�n en desuso, considere la creaci�n de una nueva clave "
 "para futuros usos\n"
 
-#: g10/misc.c:233
-msgid "This cipher algorithm is depreciated; please use a more standard one!\n"
+#: g10/misc.c:235
+msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 
 #: g10/parse-packet.c:113
@@ -2111,33 +2165,38 @@ msgstr ""
 "del usuario: \""
 
 #: g10/passphrase.c:150
-#, c-format
-msgid "(%u-bit %s key, ID %08lX, created %s)\n"
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s)\n"
 
-#: g10/passphrase.c:174
+#: g10/passphrase.c:155
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr ""
+
+#: g10/passphrase.c:183
 #, fuzzy
 msgid "Enter passphrase: "
 msgstr "Introduzca contrase�a: "
 
-#: g10/passphrase.c:178
+#: g10/passphrase.c:187
 #, fuzzy
 msgid "Repeat passphrase: "
 msgstr "Repita contrase�a: "
 
-#: g10/plaintext.c:103
+#: g10/plaintext.c:63
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "datos no grabados; use la opci�n \"--output\" para grabarlos\n"
 
-#: g10/plaintext.c:216
+#: g10/plaintext.c:166
 msgid "Please enter name of data file: "
 msgstr "Introduzca el nombre del fichero de datos: "
 
-#: g10/plaintext.c:237
+#: g10/plaintext.c:187
 msgid "reading stdin ...\n"
 msgstr ""
 
-#: g10/plaintext.c:300
+#: g10/plaintext.c:250
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposible abrir datos firmados `%s'\n"
@@ -2148,7 +2207,8 @@ msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "destinatario an�nimo, probando clave secreta %08lX ...\n"
 
 #: g10/pubkey-enc.c:84
-msgid "okay, we are the anonymous receiver.\n"
+#, fuzzy
+msgid "okay, we are the anonymous recipient.\n"
 msgstr "De acuerdo, somo el destinatario an�nimo.\n"
 
 #: g10/pubkey-enc.c:136
@@ -2166,11 +2226,11 @@ msgstr "nota: algoritmo de cifrado %d no encontrado en las preferencias\n"
 msgid "protection algorithm %d is not supported\n"
 msgstr "el algoritmo de protecci�n %d no est� soportado\n"
 
-#: g10/seckey-cert.c:169
+#: g10/seckey-cert.c:176
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Contrase�a incorrecta, int�ntelo de nuevo...\n"
 
-#: g10/seckey-cert.c:216
+#: g10/seckey-cert.c:223
 #, fuzzy
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "Aviso: detectada clave d�bil - por favor cambie la contrase�a.\n"
@@ -2182,18 +2242,27 @@ msgstr ""
 "�esto es una clave ElGamal generada por PGP que NO es segura para las "
 "firmas!\n"
 
-#: g10/sig-check.c:165
-msgid "public key created in future (time warp or clock problem)\n"
+#: g10/sig-check.c:166
+#, fuzzy, c-format
+msgid "public key created %lu %s in future (time warp or clock problem)\n"
 msgstr ""
 "clave p�blica creada en el futuro (salto en el tiempo o problemas con el "
 "reloj)\n"
 
-#: g10/sig-check.c:170
+#: g10/sig-check.c:168
+msgid "second"
+msgstr ""
+
+#: g10/sig-check.c:168
+msgid "seconds"
+msgstr ""
+
+#: g10/sig-check.c:173
 #, fuzzy, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "atenci�n: firma de la clave caducada el %s\n"
 
-#: g10/sig-check.c:226
+#: g10/sig-check.c:230
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 
@@ -2216,133 +2285,134 @@ msgstr ""
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "%s: atenci�n: fichero vac�o\n"
 
-#: g10/tdbio.c:116 g10/tdbio.c:1413
+#: g10/tdbio.c:116 g10/tdbio.c:1418
 #, fuzzy, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
-#: g10/tdbio.c:122 g10/tdbio.c:1420
+#: g10/tdbio.c:122 g10/tdbio.c:1425
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 
 #: g10/tdbio.c:232
-msgid "trustdb transaction to large\n"
+msgid "trustdb transaction too large\n"
 msgstr ""
 
-#: g10/tdbio.c:402
+#: g10/tdbio.c:416
 #, fuzzy, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: no puede abrirse: %s\n"
 
-#: g10/ringedit.c:273 g10/tdbio.c:422
+#: g10/ringedit.c:273 g10/tdbio.c:436
 #, fuzzy, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: no puede abrirse: %s\n"
 
-#: g10/ringedit.c:279 g10/tdbio.c:425
+#: g10/ringedit.c:279 g10/tdbio.c:439
 #, c-format
 msgid "%s: directory created\n"
 msgstr ""
 
-#: g10/tdbio.c:429
+#: g10/tdbio.c:443
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/openfile.c:101 g10/openfile.c:165 g10/ringedit.c:1275 g10/tdbio.c:435
+#: g10/openfile.c:101 g10/openfile.c:165 g10/ringedit.c:1275 g10/tdbio.c:449
 #, fuzzy, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: no puede abrirse: %s\n"
 
-#: g10/tdbio.c:459
+#: g10/tdbio.c:473
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr ""
 
-#: g10/tdbio.c:463
-#, c-format
-msgid "%s: invalid trust-db created\n"
-msgstr ""
+#: g10/tdbio.c:477
+#, fuzzy, c-format
+msgid "%s: invalid trustdb created\n"
+msgstr "actualizaci�n de confianza fallida: %s\n"
 
-#: g10/tdbio.c:465
-#, c-format
-msgid "%s: trust-db created\n"
-msgstr ""
+#: g10/tdbio.c:479
+#, fuzzy, c-format
+msgid "%s: trustdb created\n"
+msgstr "actualizaci�n de confianza fallida: %s\n"
 
-#: g10/tdbio.c:506
-#, c-format
-msgid "%s: invalid trust-db\n"
-msgstr ""
+#: g10/tdbio.c:512
+#, fuzzy, c-format
+msgid "%s: invalid trustdb\n"
+msgstr "actualizaci�n de confianza fallida: %s\n"
 
-#: g10/tdbio.c:540
+#: g10/tdbio.c:545
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:548
+#: g10/tdbio.c:553
 #, fuzzy, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error comprobando la clave: %s\n"
 
-#: g10/tdbio.c:564 g10/tdbio.c:603 g10/tdbio.c:628 g10/tdbio.c:1346
-#: g10/tdbio.c:1373
+#: g10/tdbio.c:569 g10/tdbio.c:608 g10/tdbio.c:633 g10/tdbio.c:1351
+#: g10/tdbio.c:1378
 #, fuzzy, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error comprobando la clave: %s\n"
 
-#: g10/tdbio.c:577
+#: g10/tdbio.c:582
 #, fuzzy, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error comprobando la clave: %s\n"
 
-#: g10/tdbio.c:1053
+#: g10/tdbio.c:1058
 #, fuzzy, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
-#: g10/tdbio.c:1061
+#: g10/tdbio.c:1066
 #, fuzzy, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "actualizaci�n de confianza fallida: %s\n"
 
-#: g10/tdbio.c:1082
+#: g10/tdbio.c:1087
 #, fuzzy, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "actualizaci�n de confianza fallida: %s\n"
 
-#: g10/tdbio.c:1098
+#: g10/tdbio.c:1103
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr ""
 
-#: g10/tdbio.c:1103
+#: g10/tdbio.c:1108
 #, fuzzy, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "cabecera de firma clara no v�lida\n"
 
-#: g10/tdbio.c:1379
+#: g10/tdbio.c:1384
 #, fuzzy, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error comprobando la clave: %s\n"
 
-#: g10/tdbio.c:1387
+#: g10/tdbio.c:1392
 #, fuzzy, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error comprobando la clave: %s\n"
 
-#: g10/tdbio.c:1397
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1427
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
 #: g10/trustdb.c:142
-msgid "The trust DB is corrupted; please run \"gpgm --fix-trust-db\".\n"
+#, fuzzy
+msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n"
 msgstr ""
 "La base de datos de confianza est� da�ada. Por favor, ejecute\n"
 "\"gpgm --fix-trust-db\".\n"
@@ -2364,7 +2434,7 @@ msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
 #: g10/trustdb.c:198
 #, fuzzy, c-format
-msgid "trust db: sync failed: %s\n"
+msgid "trustdb: sync failed: %s\n"
 msgstr "actualizaci�n de confianza fallida: %s\n"
 
 #: g10/trustdb.c:327
@@ -2394,7 +2464,7 @@ msgstr ""
 
 #: g10/trustdb.c:463
 #, fuzzy, c-format
-msgid "`%s' is not a valid long keyID\n"
+msgid "'%s' is not a valid long keyID\n"
 msgstr "Caracter no v�lido en el comentario\n"
 
 #: g10/trustdb.c:498
@@ -2477,29 +2547,29 @@ msgid "Ooops, no user ids\n"
 msgstr "lista clave e identificativos de usuario"
 
 #: g10/trustdb.c:1088 g10/trustdb.c:1106
-#, c-format
-msgid "user `%s' read problem: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "user '%s' read problem: %s\n"
+msgstr "%s: usuario no encontrado\n"
 
 #: g10/trustdb.c:1091 g10/trustdb.c:1109
-#, c-format
-msgid "user `%s' list problem: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "user '%s' list problem: %s\n"
+msgstr "%s: usuario no encontrado\n"
 
 #: g10/trustdb.c:1099 g10/trustdb.c:1346
 #, fuzzy, c-format
-msgid "user `%s' not found: %s\n"
+msgid "user '%s' not found: %s\n"
 msgstr "%s: usuario no encontrado\n"
 
 #: g10/trustdb.c:1101 g10/trustdb.c:1348
-#, c-format
-msgid "problem finding `%s' in trustdb: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "problem finding '%s' in trustdb: %s\n"
+msgstr "inicializaci�n de la base de datos de confianza `%s' fallida\n"
 
 #: g10/trustdb.c:1104
-#, c-format
-msgid "user `%s' not in trustdb\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "user '%s' not in trustdb\n"
+msgstr "%s: usuario no encontrado\n"
 
 #: g10/trustdb.c:1139
 #, c-format
@@ -2535,16 +2605,6 @@ msgstr "muestra huella digital"
 msgid "error: no ownertrust value\n"
 msgstr "exporta los valores de confianza"
 
-#: g10/trustdb.c:1223
-#, c-format
-msgid "LID %lu: changing trust from %u to %u\n"
-msgstr ""
-
-#: g10/trustdb.c:1226
-#, c-format
-msgid "LID %lu: setting trust to %u\n"
-msgstr ""
-
 #: g10/trustdb.c:1234
 msgid "key not in trustdb, searching ring.\n"
 msgstr ""
@@ -2571,13 +2631,13 @@ msgid "error finding dir record: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
 #: g10/trustdb.c:1351
-#, c-format
-msgid "user `%s' not in trustdb - inserting\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "user '%s' not in trustdb - inserting\n"
+msgstr "actualizaci�n de confianza fallida: %s\n"
 
 #: g10/trustdb.c:1354
 #, fuzzy, c-format
-msgid "failed to put `%s' into trustdb: %s\n"
+msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "inicializaci�n de la base de datos de confianza `%s' fallida\n"
 
 #: g10/trustdb.c:1404
@@ -2776,7 +2836,7 @@ msgstr ""
 msgid "lid %lu: can't get keyblock: %s\n"
 msgstr ""
 
-#: g10/trustdb.c:2159 g10/trustdb.c:3073
+#: g10/trustdb.c:2159 g10/trustdb.c:3082
 #, fuzzy, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
@@ -2869,12 +2929,12 @@ msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr ""
 
 #. that should never happen
-#: g10/trustdb.c:3043
+#: g10/trustdb.c:3052
 #, fuzzy, c-format
 msgid "insert_trust_record: keyblock not found: %s\n"
 msgstr "clave %08lX: clave secreta no encontrada: %s\n"
 
-#: g10/trustdb.c:3061
+#: g10/trustdb.c:3070
 msgid "did not use primary key for insert_trust_record()\n"
 msgstr ""
 
@@ -2958,7 +3018,7 @@ msgstr ""
 #: g10/encr-data.c:74
 #, fuzzy
 msgid ""
-"WARNING: Message was encrypted with a weak key in the symmetric cipher.\n"
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "Atenci�n: mensaje cifrado con una clave d�bil en el cifrado sim�trico.\n"
 
@@ -3095,6 +3155,9 @@ msgstr "Ayuda no disponible"
 msgid "No help available for `%s'"
 msgstr "Ayuda no disponible para `%s'"
 
+#~ msgid "invalid clear text header: "
+#~ msgstr "cabecera de texto claro no v�lida: "
+
 #~ msgid "You will see a list of signators etc. here\n"
 #~ msgstr "Aqu� se ver� una lista de firmantes, etc.\n"
 
diff --git a/po/fr.po b/po/fr.po
index 484f3e8a5..552753727 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 0.4.5a\n"
-"POT-Creation-Date: 1998-12-23 16:53+0100\n"
+"POT-Creation-Date: 1999-01-09 15:45+0100\n"
 "PO-Revision-Date: 1998-12-15 00:35+01:00\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -26,175 +26,218 @@ msgid "yY"
 msgstr "oO"
 
 #: util/errors.c:54
-msgid "General error"
+#, fuzzy
+msgid "general error"
 msgstr "Erreur g�n�rale"
 
 #: util/errors.c:55
-msgid "Unknown packet type"
+#, fuzzy
+msgid "unknown packet type"
 msgstr "Type de paquet inconnu"
 
 #: util/errors.c:56
-msgid "Unknown version"
+#, fuzzy
+msgid "unknown version"
 msgstr "Version inconnue"
 
 #: util/errors.c:57
-msgid "Unknown pubkey algorithm"
+#, fuzzy
+msgid "unknown pubkey algorithm"
 msgstr "Algorithme de cl� publique inconnu"
 
 #: util/errors.c:58
-msgid "Unknown digest algorithm"
+#, fuzzy
+msgid "unknown digest algorithm"
 msgstr "Algorithme de hachage inconnu"
 
 #: util/errors.c:59
-msgid "Bad public key"
+#, fuzzy
+msgid "bad public key"
 msgstr "Mauvaise cl� publique"
 
 #: util/errors.c:60
-msgid "Bad secret key"
+#, fuzzy
+msgid "bad secret key"
 msgstr "Mauvaise cl� secr�te"
 
 #: util/errors.c:61
-msgid "Bad signature"
+#, fuzzy
+msgid "bad signature"
 msgstr "Mauvaise signature"
 
 #: util/errors.c:62
-msgid "Checksum error"
+#, fuzzy
+msgid "checksum error"
 msgstr "Erreur de checksum"
 
 #: util/errors.c:63
-msgid "Bad passphrase"
+#, fuzzy
+msgid "bad passphrase"
 msgstr "Mauvais mot de passe"
 
 #: util/errors.c:64
-msgid "Public key not found"
+#, fuzzy
+msgid "public key not found"
 msgstr "Cl� publique non trouv�e"
 
 #: util/errors.c:65
-msgid "Unknown cipher algorithm"
+#, fuzzy
+msgid "unknown cipher algorithm"
 msgstr "Algorithme de chiffrement inconnu"
 
 #: util/errors.c:66
-msgid "Can't open the keyring"
+#, fuzzy
+msgid "can't open the keyring"
 msgstr "Ne peut ouvrir le porte-cl�s"
 
 #: util/errors.c:67
-msgid "Invalid packet"
+#, fuzzy
+msgid "invalid packet"
 msgstr "Paquet invalide"
 
 #: util/errors.c:68
-msgid "Invalid armor"
+#, fuzzy
+msgid "invalid armor"
 msgstr "Armure invalide"
 
 #: util/errors.c:69
-msgid "No such user id"
+#, fuzzy
+msgid "no such user id"
 msgstr "Pas de tel utilisateur"
 
 #: util/errors.c:70
-msgid "Secret key not available"
+#, fuzzy
+msgid "secret key not available"
 msgstr "La cl� secr�te n'est pas disponible"
 
 #: util/errors.c:71
-msgid "Wrong secret key used"
+#, fuzzy
+msgid "wrong secret key used"
 msgstr "Mauvaise cl� secr�te utilis�e"
 
 #: util/errors.c:72
-msgid "Not supported"
+#, fuzzy
+msgid "not supported"
 msgstr "Non support�"
 
 #: util/errors.c:73
-msgid "Bad key"
+#, fuzzy
+msgid "bad key"
 msgstr "Mauvaise cl�"
 
 #: util/errors.c:74
-msgid "File read error"
+#, fuzzy
+msgid "file read error"
 msgstr "Erreur de lecture"
 
 #: util/errors.c:75
-msgid "File write error"
+#, fuzzy
+msgid "file write error"
 msgstr "Erreur d'�criture"
 
 #: util/errors.c:76
-msgid "Unknown compress algorithm"
+#, fuzzy
+msgid "unknown compress algorithm"
 msgstr "Algorithme de compression inconnu"
 
 #: util/errors.c:77
-msgid "File open error"
+#, fuzzy
+msgid "file open error"
 msgstr "Erreur d'ouverture de fichier"
 
 #: util/errors.c:78
-msgid "File create error"
+#, fuzzy
+msgid "file create error"
 msgstr "Erreur de cr�ation de fichier"
 
 #: util/errors.c:79
-msgid "Invalid passphrase"
+#, fuzzy
+msgid "invalid passphrase"
 msgstr "Mot de passe invalide"
 
 #: util/errors.c:80
-msgid "Unimplemented pubkey algorithm"
+#, fuzzy
+msgid "unimplemented pubkey algorithm"
 msgstr "Algorithme de cl� publique non impl�ment�"
 
 #: util/errors.c:81
-msgid "Unimplemented cipher algorithm"
+#, fuzzy
+msgid "unimplemented cipher algorithm"
 msgstr "Algorithme de chiffrement non impl�ment�"
 
 #: util/errors.c:82
-msgid "Unknown signature class"
+#, fuzzy
+msgid "unknown signature class"
 msgstr "Classe de signature inconnue"
 
 #: util/errors.c:83
-msgid "Trust database error"
+#, fuzzy
+msgid "trust database error"
 msgstr "Erreur dans la base de confiance"
 
 #: util/errors.c:84
-msgid "Bad MPI"
+#, fuzzy
+msgid "bad MPI"
 msgstr "Mauvais entier en pr�cision multiple"
 
 #: util/errors.c:85
-msgid "Resource limit"
+#, fuzzy
+msgid "resource limit"
 msgstr "Limite de ressources"
 
 #: util/errors.c:86
-msgid "Invalid keyring"
+#, fuzzy
+msgid "invalid keyring"
 msgstr "Porte-cl�s invalide"
 
 #: util/errors.c:87
-msgid "Bad certificate"
+#, fuzzy
+msgid "bad certificate"
 msgstr "Mauvais certificat"
 
 #: util/errors.c:88
-msgid "Malformed user id"
+#, fuzzy
+msgid "malformed user id"
 msgstr "Nom d'utilisateur malform�"
 
 #: util/errors.c:89
-msgid "File close error"
+#, fuzzy
+msgid "file close error"
 msgstr "Erreur de fermeture de fichier"
 
 #: util/errors.c:90
-msgid "File rename error"
+#, fuzzy
+msgid "file rename error"
 msgstr "Erreur pendant le changement de nom du fichier"
 
 #: util/errors.c:91
-msgid "File delete error"
+#, fuzzy
+msgid "file delete error"
 msgstr "Erreur pendant la suppression du fichier"
 
 #: util/errors.c:92
-msgid "Unexpected data"
+#, fuzzy
+msgid "unexpected data"
 msgstr "Donn�es inattendues"
 
 #: util/errors.c:93
-msgid "Timestamp conflict"
+#, fuzzy
+msgid "timestamp conflict"
 msgstr "Conflit de dates"
 
 #: util/errors.c:94
-msgid "Unusable pubkey algorithm"
+#, fuzzy
+msgid "unusable pubkey algorithm"
 msgstr "Algorithme de cl�s publiques inutilisable"
 
 #: util/errors.c:95
-msgid "File exists"
+#, fuzzy
+msgid "file exists"
 msgstr "Le fichier existe"
 
 #: util/errors.c:96
-msgid "Weak key"
+#, fuzzy
+msgid "weak key"
 msgstr "Mauvaise cl�"
 
 #: util/logger.c:178
@@ -207,12 +250,12 @@ msgstr "... c'est un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vous avez trouv� un bug ... (%s:%d)\n"
 
-#: cipher/random.c:406
+#: cipher/random.c:408
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ATTENTION : utilisation d'un g�n�rateur de nombres al�atoires peu s�r !!\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:409
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -713,66 +756,77 @@ msgstr "Continuez et tapez votre message...\n"
 msgid "can't open `%s'\n"
 msgstr "ne peut ouvrir `%s'\n"
 
-#: g10/armor.c:344 g10/armor.c:391
+#: g10/armor.c:320
+#, c-format
+msgid "armor: %s\n"
+msgstr "armure : %s\n"
+
+#: g10/armor.c:343
+msgid "invalid armor header: "
+msgstr "en-t�te d'armure invalide : "
+
+#: g10/armor.c:350
 msgid "armor header: "
 msgstr "en-t�te d'armure : "
 
-#: g10/armor.c:355
+#: g10/armor.c:361
 msgid "invalid clearsig header\n"
 msgstr "en-t�te de signature claire invalide\n"
 
-#: g10/armor.c:382
-msgid "invalid armor header: "
-msgstr "en-t�te d'armure invalide : "
-
-#: g10/armor.c:461
-#, c-format
-msgid "armor: %s\n"
-msgstr "armure : %s\n"
+#: g10/armor.c:415
+#, fuzzy
+msgid "nested clear text signatures\n"
+msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/armor.c:534
+#: g10/armor.c:531
 msgid "invalid dash escaped line: "
 msgstr "ligne de traits d'�chappement invalide : "
 
-#: g10/armor.c:603
-msgid "invalid clear text header: "
-msgstr "en-t�te de texte clair invalide : "
+#: g10/armor.c:539
+#, fuzzy
+msgid "unexpected armor:"
+msgstr "Donn�es inattendues"
 
-#: g10/armor.c:846
+#: g10/armor.c:625
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caract�re %02x invalide en base 64 ignor�\n"
 
-#: g10/armor.c:879
+#: g10/armor.c:655
 msgid "premature eof (no CRC)\n"
 msgstr "fin de fichier pr�matur�e (pas de CRC)\n"
 
-#: g10/armor.c:898
+#: g10/armor.c:672
 msgid "premature eof (in CRC)\n"
 msgstr "fin de fichier pr�matur�e (dans le CRC)\n"
 
-#: g10/armor.c:902
+#: g10/armor.c:676
 msgid "malformed CRC\n"
 msgstr "CRC malform�\n"
 
-#: g10/armor.c:906
+#: g10/armor.c:680
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "Erreur de CRC ; %06lx - %06lx\n"
 
-#: g10/armor.c:925
+#: g10/armor.c:697
 msgid "premature eof (in Trailer)\n"
 msgstr "fin de fichier pr�matur�e (dans la remorque)\n"
 
-#: g10/armor.c:929
+#: g10/armor.c:701
 msgid "error in trailer line\n"
 msgstr "erreur dans la ligne de remorque\n"
 
-#: g10/armor.c:1183
+#: g10/armor.c:962
 #, fuzzy
 msgid "no valid OpenPGP data found.\n"
 msgstr "pas de donn�e RFC1991 ou OpenPGP valide trouv�e.\n"
 
+#: g10/armor.c:964
+#, c-format
+msgid "invalid armor: line longer than %d characters\n"
+msgstr ""
+
 #: g10/pkclist.c:138
 #, c-format
 msgid ""
@@ -864,7 +918,7 @@ msgstr ""
 msgid "key %08lX: key has been revoked!\n"
 msgstr "cl� %08lX : la cl� a �t� r�voqu�e !\n"
 
-#: g10/pkclist.c:286 g10/pkclist.c:379
+#: g10/pkclist.c:286 g10/pkclist.c:381
 msgid "Use this key anyway? "
 msgstr "Utiliser cette cl� quand-m�me ? "
 
@@ -901,7 +955,7 @@ msgstr "Cette cl� appartient probablement � son propri�taire\n"
 msgid "This key belongs to us\n"
 msgstr "Cette cl� nous appartient\n"
 
-#: g10/pkclist.c:374
+#: g10/pkclist.c:376
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -913,53 +967,53 @@ msgstr ""
 "oui � la prochaine question\n"
 "\n"
 
-#: g10/pkclist.c:383
+#: g10/pkclist.c:385
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATTENTION : Utilisation d'une cl� sans confiance !\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:421
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATTENTION : Cette cl� � �t� r�voqu�e par son propri�taire !\n"
 
-#: g10/pkclist.c:420
+#: g10/pkclist.c:422
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Cela pourrait signifier que la signature est fausse.\n"
 
-#: g10/pkclist.c:441
+#: g10/pkclist.c:443
 msgid "Note: This key has expired!\n"
 msgstr "Note : Cette cl� a expir� !\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:450
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ATTENTION : Cette cl� n'est pas certifi�e avec une signature de confiance !\n"
 
-#: g10/pkclist.c:450
+#: g10/pkclist.c:452
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Rien ne dit que la signature appartient � son propri�taire.\n"
 
-#: g10/pkclist.c:466
+#: g10/pkclist.c:468
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATTENTION : Nous ne faisons PAS confiance � cette cl� !\n"
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:469
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         La signature est certainement FAUSSE.\n"
 
-#: g10/pkclist.c:474
+#: g10/pkclist.c:476
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATTENTION : Les signatures de cette cl� n'ont pas une confiance suffisante "
 "!\n"
 
-#: g10/pkclist.c:477
+#: g10/pkclist.c:479
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "         Il n'est pas s�r que la signature appartient � son propri�taire.\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:524
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -968,25 +1022,25 @@ msgstr ""
 "\"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:529
 msgid "Enter the user ID: "
 msgstr "Entrez le nom d'utilisateur : "
 
-#: g10/pkclist.c:538
+#: g10/pkclist.c:540
 msgid "No such user ID.\n"
 msgstr "Pas de tel utilisateur.\n"
 
-#: g10/pkclist.c:572 g10/pkclist.c:599
+#: g10/pkclist.c:574 g10/pkclist.c:601
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s : ignor� : %s\n"
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:582
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s : erreur pendant la v�rification de la cl� : %s\n"
 
-#: g10/pkclist.c:606
+#: g10/pkclist.c:608
 msgid "no valid addressees\n"
 msgstr "pas de destinataire valide\n"
 
@@ -1287,8 +1341,8 @@ msgstr "La g�n�ration de cl� a �chou� : %s\n"
 msgid "Really create? "
 msgstr "Cr�er vraiment ? "
 
-#: g10/encode.c:88 g10/openfile.c:81 g10/openfile.c:158 g10/tdbio.c:445
-#: g10/tdbio.c:504
+#: g10/encode.c:88 g10/openfile.c:81 g10/openfile.c:158 g10/tdbio.c:459
+#: g10/tdbio.c:510
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s : ne peut ouvrir : %s\n"
@@ -1340,7 +1394,7 @@ msgstr "trop d'entr�es dans le cache pk - d�sactiv�\n"
 msgid "too many entries in unk cache - disabled\n"
 msgstr "trop d'entr�es dans le cache unk - d�sactiv�\n"
 
-#: g10/getkey.c:1021
+#: g10/getkey.c:1039
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr ""
@@ -1927,8 +1981,8 @@ msgid "Key not changed so no update needed.\n"
 msgstr "La cl� n'a pas chang� donc la mise � jour est inutile.\n"
 
 #: g10/keyedit.c:669 g10/keyedit.c:727
-#, c-format
-msgid "update of trust db failed: %s\n"
+#, fuzzy, c-format
+msgid "update of trustdb failed: %s\n"
 msgstr "la mise � jour de la base de confiance a �chou� : %s\n"
 
 #: g10/keyedit.c:701
@@ -2006,7 +2060,8 @@ msgid "No secondary key with index %d\n"
 msgstr "Pas de cl� secondaire avec l'index %d\n"
 
 #: g10/mainproc.c:198
-msgid "public key encrypted data: Good DEK\n"
+#, fuzzy
+msgid "public key encrypted data: good DEK\n"
 msgstr "donn�es chiffr�es avec la cl� publique : bonne cl� de chiffrement\n"
 
 #: g10/mainproc.c:201
@@ -2049,33 +2104,34 @@ msgstr "MAUVAISE signature de \""
 msgid "Good signature from \""
 msgstr "Bonne signature de \""
 
-#: g10/mainproc.c:861
+#: g10/mainproc.c:879
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne peut v�rifier la signature : %s\n"
 
-#: g10/mainproc.c:934
+#: g10/mainproc.c:952
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:939
+#: g10/mainproc.c:957
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
 
-#: g10/misc.c:88
+#: g10/misc.c:90
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ne peut emp�cher la g�n�ration de fichiers core : %s\n"
 
-#: g10/misc.c:90
-msgid "WARNING: Program may create a core file!\n"
+#: g10/misc.c:93
+#, fuzzy
+msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION : Le programme peut cr�er un fichier core !\n"
 
-#: g10/misc.c:198
+#: g10/misc.c:200
 msgid "Experimental algorithms should not be used!\n"
 msgstr "Les algorithmes exp�rimentaux ne devraient pas �tre utilis�s !\n"
 
-#: g10/misc.c:212
+#: g10/misc.c:214
 msgid ""
 "RSA keys are deprecated; please consider creating a new key and use this key "
 "in the future\n"
@@ -2083,8 +2139,9 @@ msgstr ""
 "Les cl�s RSA sont d�conseill�es : consid�rez cr�er une nouvelle cl�\n"
 "et l'utiliser dans l'avenir\n"
 
-#: g10/misc.c:233
-msgid "This cipher algorithm is depreciated; please use a more standard one!\n"
+#: g10/misc.c:235
+#, fuzzy
+msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "Cet algorithme de chiffrement est d�conseill� ; utilisez-en un\n"
 "plus standard!\n"
@@ -2110,33 +2167,38 @@ msgstr ""
 "l'utilisateur: \""
 
 #: g10/passphrase.c:150
-#, c-format
-msgid "(%u-bit %s key, ID %08lX, created %s)\n"
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "(cl� de %u bits %s, ID %08lX, cr��e le %s)\n"
 
-#: g10/passphrase.c:174
+#: g10/passphrase.c:155
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr ""
+
+#: g10/passphrase.c:183
 msgid "Enter passphrase: "
 msgstr "Entrez le mot de passe : "
 
-#: g10/passphrase.c:178
+#: g10/passphrase.c:187
 msgid "Repeat passphrase: "
 msgstr "R�p�tez le mot de passe : "
 
-#: g10/plaintext.c:103
+#: g10/plaintext.c:63
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "donn�es non enregistr�es ; utilisez l'option \"--output\" pour\n"
 "les enregistrer\n"
 
-#: g10/plaintext.c:216
+#: g10/plaintext.c:166
 msgid "Please enter name of data file: "
 msgstr "Entrez le nom d'un fichier de donn�es : "
 
-#: g10/plaintext.c:237
+#: g10/plaintext.c:187
 msgid "reading stdin ...\n"
 msgstr "lecture de l'entr�e standard...\n"
 
-#: g10/plaintext.c:300
+#: g10/plaintext.c:250
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "ne peut ouvir les donn�es sign�es `%s'\n"
@@ -2147,7 +2209,8 @@ msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "destinataire anonyme ; essai de la cl� secr�te %08lX ...\n"
 
 #: g10/pubkey-enc.c:84
-msgid "okay, we are the anonymous receiver.\n"
+#, fuzzy
+msgid "okay, we are the anonymous recipient.\n"
 msgstr "d'accord, nous sommes le destinataire anonyme.\n"
 
 #: g10/pubkey-enc.c:136
@@ -2166,11 +2229,11 @@ msgstr ""
 msgid "protection algorithm %d is not supported\n"
 msgstr "l'algorithme de protection %d n'est pas support�\n"
 
-#: g10/seckey-cert.c:169
+#: g10/seckey-cert.c:176
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Mot de passe invalide ; r�essayez...\n"
 
-#: g10/seckey-cert.c:216
+#: g10/seckey-cert.c:223
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "ATTENTION : Mauvaise cl� d�tect�e - changez encore le mot de passe.\n"
 
@@ -2181,18 +2244,27 @@ msgstr ""
 "Ceci est une cl� ElGamal g�n�r�e par PGP qui n'est PAS s�re pour les\n"
 "signatures!\n"
 
-#: g10/sig-check.c:165
-msgid "public key created in future (time warp or clock problem)\n"
+#: g10/sig-check.c:166
+#, fuzzy, c-format
+msgid "public key created %lu %s in future (time warp or clock problem)\n"
 msgstr ""
 "cl� publique cr��e dans le futur (voyage dans le temps ou probl�me\n"
 "d'horloge)\n"
 
-#: g10/sig-check.c:170
+#: g10/sig-check.c:168
+msgid "second"
+msgstr ""
+
+#: g10/sig-check.c:168
+msgid "seconds"
+msgstr ""
+
+#: g10/sig-check.c:173
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTE : la cl� de signature a expir� le %s\n"
 
-#: g10/sig-check.c:226
+#: g10/sig-check.c:230
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "la signature est suppos�e �tre fausse car un bit critique est\n"
@@ -2217,12 +2289,12 @@ msgstr "signature :"
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATTENTION : `%s' est un fichier vide\n"
 
-#: g10/tdbio.c:116 g10/tdbio.c:1413
+#: g10/tdbio.c:116 g10/tdbio.c:1418
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "enregistrement de base de confiance %lu : lseek a �chou� : %s\n"
 
-#: g10/tdbio.c:122 g10/tdbio.c:1420
+#: g10/tdbio.c:122 g10/tdbio.c:1425
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -2230,125 +2302,127 @@ msgstr ""
 "%s\n"
 
 #: g10/tdbio.c:232
-msgid "trustdb transaction to large\n"
+#, fuzzy
+msgid "trustdb transaction too large\n"
 msgstr "transaction de base de confiance trop volumineuse\n"
 
-#: g10/tdbio.c:402
+#: g10/tdbio.c:416
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s : ne peut acc�der : %s\n"
 
-#: g10/ringedit.c:273 g10/tdbio.c:422
+#: g10/ringedit.c:273 g10/tdbio.c:436
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s : ne peut cr�er le r�pertoire : %s\n"
 
-#: g10/ringedit.c:279 g10/tdbio.c:425
+#: g10/ringedit.c:279 g10/tdbio.c:439
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s : r�pertoire cr��\n"
 
-#: g10/tdbio.c:429
+#: g10/tdbio.c:443
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s : le r�pertoire n'existe pas !\n"
 
-#: g10/openfile.c:101 g10/openfile.c:165 g10/ringedit.c:1275 g10/tdbio.c:435
+#: g10/openfile.c:101 g10/openfile.c:165 g10/ringedit.c:1275 g10/tdbio.c:449
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s : ne peut cr�er : %s\n"
 
-#: g10/tdbio.c:459
+#: g10/tdbio.c:473
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s : n'a pas pu cr�er un enregistrement de version : %s"
 
-#: g10/tdbio.c:463
-#, c-format
-msgid "%s: invalid trust-db created\n"
+#: g10/tdbio.c:477
+#, fuzzy, c-format
+msgid "%s: invalid trustdb created\n"
 msgstr "%s : base de confiance invalide cr��e\n"
 
-#: g10/tdbio.c:465
-#, c-format
-msgid "%s: trust-db created\n"
+#: g10/tdbio.c:479
+#, fuzzy, c-format
+msgid "%s: trustdb created\n"
 msgstr "%s : base de confiance cr��e\n"
 
-#: g10/tdbio.c:506
-#, c-format
-msgid "%s: invalid trust-db\n"
+#: g10/tdbio.c:512
+#, fuzzy, c-format
+msgid "%s: invalid trustdb\n"
 msgstr "%s : base de confiance invalide\n"
 
-#: g10/tdbio.c:540
+#: g10/tdbio.c:545
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s : la cr�ation de la table de hachage a �chou� : %s\n"
 
-#: g10/tdbio.c:548
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr ""
 "%s : erreur pendant la mise � jour de l'enregistrement de version : %s\n"
 
-#: g10/tdbio.c:564 g10/tdbio.c:603 g10/tdbio.c:628 g10/tdbio.c:1346
-#: g10/tdbio.c:1373
+#: g10/tdbio.c:569 g10/tdbio.c:608 g10/tdbio.c:633 g10/tdbio.c:1351
+#: g10/tdbio.c:1378
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s : erreur pendant la lecture de l'enregistrement de version : %s\n"
 
-#: g10/tdbio.c:577
+#: g10/tdbio.c:582
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s : erreur pendant l'�criture de l'enregistrement de version : %s\n"
 
-#: g10/tdbio.c:1053
+#: g10/tdbio.c:1058
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de confiance : � lseek() � a �chou� : %s\n"
 
-#: g10/tdbio.c:1061
+#: g10/tdbio.c:1066
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de confiance : la lecture a �chou� (n=%d) : %s\n"
 
-#: g10/tdbio.c:1082
+#: g10/tdbio.c:1087
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s : ce n'est pas un fichier de base de confiance\n"
 
-#: g10/tdbio.c:1098
+#: g10/tdbio.c:1103
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s : enregistrement de version avec un num�ro %lu\n"
 
-#: g10/tdbio.c:1103
+#: g10/tdbio.c:1108
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s : version %d du fichier invalide\n"
 
-#: g10/tdbio.c:1379
+#: g10/tdbio.c:1384
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s : erreur pendant la lecture de l'enregistrement libre : %s\n"
 
-#: g10/tdbio.c:1387
+#: g10/tdbio.c:1392
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 "%s : erreur pendant l'�criture de l'enregistrement de\n"
 "r�pertoire : %s\n"
 
-#: g10/tdbio.c:1397
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s : n'a pu mettre un enregistrement � z�ro : %s\n"
 
-#: g10/tdbio.c:1427
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s : n'a pas pu ajouter un enregistrement : %s\n"
 
 #: g10/trustdb.c:142
-msgid "The trust DB is corrupted; please run \"gpgm --fix-trust-db\".\n"
+#, fuzzy
+msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n"
 msgstr ""
 "La base de confiance est corrompue ; ex�cutez � gpgm --fix-trust-db �.\n"
 
@@ -2370,8 +2444,8 @@ msgid "trust record %lu: delete failed: %s\n"
 msgstr "enregistrement de confiance %lu : la suppression a �chou� : %s\n"
 
 #: g10/trustdb.c:198
-#, c-format
-msgid "trust db: sync failed: %s\n"
+#, fuzzy, c-format
+msgid "trustdb: sync failed: %s\n"
 msgstr "base de confiance a �chou� : la synchronisation a �chou� : %s\n"
 
 #: g10/trustdb.c:327
@@ -2402,8 +2476,8 @@ msgid "chained sigrec %lu has a wrong owner\n"
 msgstr "l'enregistrement de signature %lu a un mauvais propri�taire\n"
 
 #: g10/trustdb.c:463
-#, c-format
-msgid "`%s' is not a valid long keyID\n"
+#, fuzzy, c-format
+msgid "'%s' is not a valid long keyID\n"
 msgstr "`%s' n'est pas une identification longue de cl� valide\n"
 
 #: g10/trustdb.c:498
@@ -2485,28 +2559,28 @@ msgid "Ooops, no user ids\n"
 msgstr "Ooops, pas de nom d'utilisateur\n"
 
 #: g10/trustdb.c:1088 g10/trustdb.c:1106
-#, c-format
-msgid "user `%s' read problem: %s\n"
+#, fuzzy, c-format
+msgid "user '%s' read problem: %s\n"
 msgstr "probl�me de lecture de l'utilisateur `%s' : %s\n"
 
 #: g10/trustdb.c:1091 g10/trustdb.c:1109
-#, c-format
-msgid "user `%s' list problem: %s\n"
+#, fuzzy, c-format
+msgid "user '%s' list problem: %s\n"
 msgstr "probl�me de liste � l'utilisateur `%s' : %s\n"
 
 #: g10/trustdb.c:1099 g10/trustdb.c:1346
-#, c-format
-msgid "user `%s' not found: %s\n"
+#, fuzzy, c-format
+msgid "user '%s' not found: %s\n"
 msgstr "l'utilisateur `%s' n'a pas �t� trouv� : %s\n"
 
 #: g10/trustdb.c:1101 g10/trustdb.c:1348
-#, c-format
-msgid "problem finding `%s' in trustdb: %s\n"
+#, fuzzy, c-format
+msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "probl�me de recherche de `%s' dans la base de confiance : %s\n"
 
 #: g10/trustdb.c:1104
-#, c-format
-msgid "user `%s' not in trustdb\n"
+#, fuzzy, c-format
+msgid "user '%s' not in trustdb\n"
 msgstr "l'utilisateur `%s' n'est pas dans la base de confiance\n"
 
 #: g10/trustdb.c:1139
@@ -2543,16 +2617,6 @@ msgstr "erreur : empreinte digitale invalide\n"
 msgid "error: no ownertrust value\n"
 msgstr "erreur : pas d'indice de confiance\n"
 
-#: g10/trustdb.c:1223
-#, c-format
-msgid "LID %lu: changing trust from %u to %u\n"
-msgstr "LID %lu : changement de la confiance de %u vers %u\n"
-
-#: g10/trustdb.c:1226
-#, c-format
-msgid "LID %lu: setting trust to %u\n"
-msgstr "LID %lu : la confiance est maintenant %u\n"
-
 #: g10/trustdb.c:1234
 msgid "key not in trustdb, searching ring.\n"
 msgstr "la cl� n'est pas dans la base de confiance, recherche du porte-cl�s.\n"
@@ -2579,13 +2643,13 @@ msgid "error finding dir record: %s\n"
 msgstr "erreur pendant la recherche de l'enregistrement de r�pertoire : %s\n"
 
 #: g10/trustdb.c:1351
-#, c-format
-msgid "user `%s' not in trustdb - inserting\n"
+#, fuzzy, c-format
+msgid "user '%s' not in trustdb - inserting\n"
 msgstr "l'utilisateur `%s' n'est pas dans la base de confiance - insertion\n"
 
 #: g10/trustdb.c:1354
-#, c-format
-msgid "failed to put `%s' into trustdb: %s\n"
+#, fuzzy, 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"
 
 #: g10/trustdb.c:1404
@@ -2793,7 +2857,7 @@ msgstr "la lid %lu n'a pas de cl�\n"
 msgid "lid %lu: can't get keyblock: %s\n"
 msgstr "lid %lu: ne peut obtenir le bloc de cl�s: %s\n"
 
-#: g10/trustdb.c:2159 g10/trustdb.c:3073
+#: g10/trustdb.c:2159 g10/trustdb.c:3082
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir a �chou� : %s\n"
@@ -2884,12 +2948,12 @@ msgstr ""
 "enregistrement de r�pertoire\n"
 
 #. that should never happen
-#: g10/trustdb.c:3043
+#: g10/trustdb.c:3052
 #, c-format
 msgid "insert_trust_record: keyblock not found: %s\n"
 msgstr "insert_trust_record : bloc de cl�s non trouv� : %s\n"
 
-#: g10/trustdb.c:3061
+#: g10/trustdb.c:3070
 msgid "did not use primary key for insert_trust_record()\n"
 msgstr "n'a pas utilis� la cl� principale pour � insert_trust_record() �\n"
 
@@ -2971,8 +3035,9 @@ msgid "encrypted with unknown algorithm %d\n"
 msgstr "chiffr� avec l'algorithme inconnu %d\n"
 
 #: g10/encr-data.c:74
+#, fuzzy
 msgid ""
-"WARNING: Message was encrypted with a weak key in the symmetric cipher.\n"
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "ATTENTION : Le message a �t� chiffr� avec une mauvaise cl� pendant le\n"
 "chiffrement sym�trique.\n"
@@ -3126,3 +3191,12 @@ msgstr "Pas d'aide disponible"
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Pas d'aide disponible pour `%s'"
+
+#~ msgid "invalid clear text header: "
+#~ msgstr "en-t�te de texte clair invalide : "
+
+#~ msgid "LID %lu: changing trust from %u to %u\n"
+#~ msgstr "LID %lu : changement de la confiance de %u vers %u\n"
+
+#~ msgid "LID %lu: setting trust to %u\n"
+#~ msgstr "LID %lu : la confiance est maintenant %u\n"
diff --git a/po/it.po b/po/it.po
index 95cda1977..29aa11056 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-0.4.3\n"
-"POT-Creation-Date: 1998-12-23 16:53+0100\n"
+"POT-Creation-Date: 1999-01-09 15:45+0100\n"
 "PO-Revision-Date: 1998-11-09 16:19+01:00\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -26,175 +26,218 @@ msgid "yY"
 msgstr "sS"
 
 #: util/errors.c:54
-msgid "General error"
+#, fuzzy
+msgid "general error"
 msgstr "Errore generale"
 
 #: util/errors.c:55
-msgid "Unknown packet type"
+#, fuzzy
+msgid "unknown packet type"
 msgstr "Tipo del pacchetto sconosciuto"
 
 #: util/errors.c:56
-msgid "Unknown version"
+#, fuzzy
+msgid "unknown version"
 msgstr "Versione sconosciuta"
 
 #: util/errors.c:57
-msgid "Unknown pubkey algorithm"
+#, fuzzy
+msgid "unknown pubkey algorithm"
 msgstr "Algoritmo della chiave pubblica sconosciuto"
 
 #: util/errors.c:58
-msgid "Unknown digest algorithm"
+#, fuzzy
+msgid "unknown digest algorithm"
 msgstr "Algoritmo del digest sconosciuto"
 
 #: util/errors.c:59
-msgid "Bad public key"
+#, fuzzy
+msgid "bad public key"
 msgstr "Chiave pubblica errata o danneggiata"
 
 #: util/errors.c:60
-msgid "Bad secret key"
+#, fuzzy
+msgid "bad secret key"
 msgstr "Chiave segreta errata o danneggiata"
 
 #: util/errors.c:61
-msgid "Bad signature"
+#, fuzzy
+msgid "bad signature"
 msgstr "Firma errata o danneggiata"
 
 #: util/errors.c:62
-msgid "Checksum error"
+#, fuzzy
+msgid "checksum error"
 msgstr "Checksum errato"
 
 #: util/errors.c:63
-msgid "Bad passphrase"
+#, fuzzy
+msgid "bad passphrase"
 msgstr "Passphrase errata"
 
 #: util/errors.c:64
-msgid "Public key not found"
+#, fuzzy
+msgid "public key not found"
 msgstr "Chiave pubblica non trovata"
 
 #: util/errors.c:65
-msgid "Unknown cipher algorithm"
+#, fuzzy
+msgid "unknown cipher algorithm"
 msgstr "Algoritmo di cifratura sconosciuto"
 
 #: util/errors.c:66
-msgid "Can't open the keyring"
+#, fuzzy
+msgid "can't open the keyring"
 msgstr "Impossibile aprire il portachiavi"
 
 #: util/errors.c:67
-msgid "Invalid packet"
+#, fuzzy
+msgid "invalid packet"
 msgstr "Pacchetto non valido"
 
 #: util/errors.c:68
-msgid "Invalid armor"
+#, fuzzy
+msgid "invalid armor"
 msgstr "Armatura non valida"
 
 #: util/errors.c:69
-msgid "No such user id"
+#, fuzzy
+msgid "no such user id"
 msgstr "User id inesistente"
 
 #: util/errors.c:70
-msgid "Secret key not available"
+#, fuzzy
+msgid "secret key not available"
 msgstr "La chiave segreta non � disponibile."
 
 #: util/errors.c:71
-msgid "Wrong secret key used"
+#, fuzzy
+msgid "wrong secret key used"
 msgstr "� stata usata la chiave segreta sbagliata"
 
 #: util/errors.c:72
-msgid "Not supported"
+#, fuzzy
+msgid "not supported"
 msgstr "Non gestito"
 
 #: util/errors.c:73
-msgid "Bad key"
+#, fuzzy
+msgid "bad key"
 msgstr "Chiave danneggiata"
 
 #: util/errors.c:74
-msgid "File read error"
+#, fuzzy
+msgid "file read error"
 msgstr "Errore durante la lettura del file"
 
 #: util/errors.c:75
-msgid "File write error"
+#, fuzzy
+msgid "file write error"
 msgstr "Errore durante la scrittura del file"
 
 #: util/errors.c:76
-msgid "Unknown compress algorithm"
+#, fuzzy
+msgid "unknown compress algorithm"
 msgstr "Algoritmo di compressione sconosciuto"
 
 #: util/errors.c:77
-msgid "File open error"
+#, fuzzy
+msgid "file open error"
 msgstr "Errore durante l'apertura del file"
 
 #: util/errors.c:78
-msgid "File create error"
+#, fuzzy
+msgid "file create error"
 msgstr "Errore durante la creazione del file"
 
 #: util/errors.c:79
-msgid "Invalid passphrase"
+#, fuzzy
+msgid "invalid passphrase"
 msgstr "Passphrase non valida"
 
 #: util/errors.c:80
-msgid "Unimplemented pubkey algorithm"
+#, fuzzy
+msgid "unimplemented pubkey algorithm"
 msgstr "Algoritmo della chiave pubblica non implementato"
 
 #: util/errors.c:81
-msgid "Unimplemented cipher algorithm"
+#, fuzzy
+msgid "unimplemented cipher algorithm"
 msgstr "Algoritmo di cifratura non implementato"
 
 #: util/errors.c:82
-msgid "Unknown signature class"
+#, fuzzy
+msgid "unknown signature class"
 msgstr "Classe della firma sconosciuta."
 
 #: util/errors.c:83
-msgid "Trust database error"
+#, fuzzy
+msgid "trust database error"
 msgstr "Errore nel database della fiducia"
 
 #: util/errors.c:84
-msgid "Bad MPI"
+#, fuzzy
+msgid "bad MPI"
 msgstr "MPI danneggiato"
 
 #: util/errors.c:85
-msgid "Resource limit"
+#, fuzzy
+msgid "resource limit"
 msgstr "Limite della risorsa"
 
 #: util/errors.c:86
-msgid "Invalid keyring"
+#, fuzzy
+msgid "invalid keyring"
 msgstr "Portachiavi non valido"
 
 #: util/errors.c:87
-msgid "Bad certificate"
+#, fuzzy
+msgid "bad certificate"
 msgstr "Certificato danneggiato"
 
 #: util/errors.c:88
-msgid "Malformed user id"
+#, fuzzy
+msgid "malformed user id"
 msgstr "User id malformato"
 
 #: util/errors.c:89
-msgid "File close error"
+#, fuzzy
+msgid "file close error"
 msgstr "Errore durante la chiusura del file"
 
 #: util/errors.c:90
-msgid "File rename error"
+#, fuzzy
+msgid "file rename error"
 msgstr "Errore durante la rinominazione del file"
 
 #: util/errors.c:91
-msgid "File delete error"
+#, fuzzy
+msgid "file delete error"
 msgstr "Errore durante la cancellazione del file"
 
 #: util/errors.c:92
-msgid "Unexpected data"
+#, fuzzy
+msgid "unexpected data"
 msgstr "Dati inaspettati"
 
 #: util/errors.c:93
-msgid "Timestamp conflict"
+#, fuzzy
+msgid "timestamp conflict"
 msgstr "Date in conflitto"
 
 #: util/errors.c:94
-msgid "Unusable pubkey algorithm"
+#, fuzzy
+msgid "unusable pubkey algorithm"
 msgstr "Algoritmo della chiave pubblica non utilizzabile"
 
 #: util/errors.c:95
-msgid "File exists"
+#, fuzzy
+msgid "file exists"
 msgstr "Il file esiste"
 
 #: util/errors.c:96
-msgid "Weak key"
+#, fuzzy
+msgid "weak key"
 msgstr "Chiave debole"
 
 #: util/logger.c:178
@@ -207,13 +250,13 @@ msgstr "... questo � un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Hai trovato un bug... (%s:%d)\n"
 
-#: cipher/random.c:406
+#: cipher/random.c:408
 #, fuzzy
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "Attenzione: si sta usando un generatore di numeri casuali non sicuro!!\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:409
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -711,66 +754,77 @@ msgstr ""
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/armor.c:344 g10/armor.c:391
+#: g10/armor.c:320
+#, c-format
+msgid "armor: %s\n"
+msgstr "armatura: %s\n"
+
+#: g10/armor.c:343
+msgid "invalid armor header: "
+msgstr "header dell'armatura non valido: "
+
+#: g10/armor.c:350
 msgid "armor header: "
 msgstr "header dell'armatura: "
 
-#: g10/armor.c:355
+#: g10/armor.c:361
 msgid "invalid clearsig header\n"
 msgstr "header della firma in chiaro non valido\n"
 
-#: g10/armor.c:382
-msgid "invalid armor header: "
-msgstr "header dell'armatura non valido: "
-
-#: g10/armor.c:461
-#, c-format
-msgid "armor: %s\n"
-msgstr "armatura: %s\n"
+#: g10/armor.c:415
+#, fuzzy
+msgid "nested clear text signatures\n"
+msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/armor.c:534
+#: g10/armor.c:531
 msgid "invalid dash escaped line: "
 msgstr "riga protetta con il trattino non valida: "
 
-#: g10/armor.c:603
-msgid "invalid clear text header: "
-msgstr "header del testo in chiaro non valido: "
+#: g10/armor.c:539
+#, fuzzy
+msgid "unexpected armor:"
+msgstr "Dati inaspettati"
 
-#: g10/armor.c:846
+#: g10/armor.c:625
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Carattere radix64 non valido %02x saltato\n"
 
-#: g10/armor.c:879
+#: g10/armor.c:655
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematura (nessun CRC)\n"
 
-#: g10/armor.c:898
+#: g10/armor.c:672
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematura (nel CRC)\n"
 
-#: g10/armor.c:902
+#: g10/armor.c:676
 msgid "malformed CRC\n"
 msgstr "CRC malformato\n"
 
-#: g10/armor.c:906
+#: g10/armor.c:680
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "errore nel CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:925
+#: g10/armor.c:697
 msgid "premature eof (in Trailer)\n"
 msgstr "eof prematura (nella coda)\n"
 
-#: g10/armor.c:929
+#: g10/armor.c:701
 msgid "error in trailer line\n"
 msgstr "errore nella riga della coda\n"
 
-#: g10/armor.c:1183
+#: g10/armor.c:962
 #, fuzzy
 msgid "no valid OpenPGP data found.\n"
 msgstr "Non sono stati trovati dati RFC1991 o OpenPGP validi.\n"
 
+#: g10/armor.c:964
+#, c-format
+msgid "invalid armor: line longer than %d characters\n"
+msgstr ""
+
 #: g10/pkclist.c:138
 #, fuzzy, c-format
 msgid ""
@@ -862,7 +916,7 @@ msgstr ""
 msgid "key %08lX: key has been revoked!\n"
 msgstr "chiave %08lX: accettata come chiave segreta\n"
 
-#: g10/pkclist.c:286 g10/pkclist.c:379
+#: g10/pkclist.c:286 g10/pkclist.c:381
 msgid "Use this key anyway? "
 msgstr "Uso lo stesso questa chiave? "
 
@@ -896,7 +950,7 @@ msgstr ""
 msgid "This key belongs to us\n"
 msgstr ""
 
-#: g10/pkclist.c:374
+#: g10/pkclist.c:376
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -908,51 +962,51 @@ msgstr ""
 "prossima domanda.\n"
 "\n"
 
-#: g10/pkclist.c:383
+#: g10/pkclist.c:385
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATTENZIONE: uso di una chiave non fidata!\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:421
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATTENZIONE: questa chiave � stata revocata dal suo proprietario!\n"
 
-#: g10/pkclist.c:420
+#: g10/pkclist.c:422
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Questo pu� significare che la firma � stata falsificata.\n"
 
-#: g10/pkclist.c:441
+#: g10/pkclist.c:443
 msgid "Note: This key has expired!\n"
 msgstr "Nota: questa chiave � scaduta!\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:450
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "ATTENZIONE: questa chiave non � certificata con una firma fidata!\n"
 
-#: g10/pkclist.c:450
+#: g10/pkclist.c:452
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Non ci sono indicazioni che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:466
+#: g10/pkclist.c:468
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n"
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:469
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          La firma � probabilmente un FALSO.\n"
 
-#: g10/pkclist.c:474
+#: g10/pkclist.c:476
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATTENZIONE: questa chiave non � certificata con firme abbastanza fidate!\n"
 
-#: g10/pkclist.c:477
+#: g10/pkclist.c:479
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Non � sicuro che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:524
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -960,25 +1014,25 @@ msgstr ""
 "Non hai specificato un user ID. (puoi usare \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:529
 msgid "Enter the user ID: "
 msgstr "Inserisci l'user ID: "
 
-#: g10/pkclist.c:538
+#: g10/pkclist.c:540
 msgid "No such user ID.\n"
 msgstr "User ID inesistente.\n"
 
-#: g10/pkclist.c:572 g10/pkclist.c:599
+#: g10/pkclist.c:574 g10/pkclist.c:601
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: saltata: %s\n"
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:582
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: errore nel controllare la chiave: %s\n"
 
-#: g10/pkclist.c:606
+#: g10/pkclist.c:608
 msgid "no valid addressees\n"
 msgstr "nessun indirizzo valido\n"
 
@@ -1277,8 +1331,8 @@ msgstr "Generazione della chiave fallita: %s\n"
 msgid "Really create? "
 msgstr "Crea davvero? "
 
-#: g10/encode.c:88 g10/openfile.c:81 g10/openfile.c:158 g10/tdbio.c:445
-#: g10/tdbio.c:504
+#: g10/encode.c:88 g10/openfile.c:81 g10/openfile.c:158 g10/tdbio.c:459
+#: g10/tdbio.c:510
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: impossibile aprire: %s\n"
@@ -1331,7 +1385,7 @@ msgstr ""
 msgid "too many entries in unk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:1021
+#: g10/getkey.c:1039
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
@@ -1915,8 +1969,8 @@ msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
 
 #: g10/keyedit.c:669 g10/keyedit.c:727
-#, c-format
-msgid "update of trust db failed: %s\n"
+#, fuzzy, c-format
+msgid "update of trustdb failed: %s\n"
 msgstr "aggiornamento del trustdb fallito: %s\n"
 
 #: g10/keyedit.c:701
@@ -1995,7 +2049,7 @@ msgstr "Nessuna chiave secondaria con l'indice %d\n"
 
 #: g10/mainproc.c:198
 #, fuzzy
-msgid "public key encrypted data: Good DEK\n"
+msgid "public key encrypted data: good DEK\n"
 msgstr "Decifratura della chiave pubblica fallita: %s\n"
 
 #: g10/mainproc.c:201
@@ -2040,33 +2094,33 @@ msgstr "Firma NON corretta da \""
 msgid "Good signature from \""
 msgstr "Buona firma da \""
 
-#: g10/mainproc.c:861
+#: g10/mainproc.c:879
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:934
+#: g10/mainproc.c:952
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:939
+#: g10/mainproc.c:957
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:88
+#: g10/misc.c:90
 #, fuzzy, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/misc.c:90
-msgid "WARNING: Program may create a core file!\n"
+#: g10/misc.c:93
+msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/misc.c:198
+#: g10/misc.c:200
 msgid "Experimental algorithms should not be used!\n"
 msgstr ""
 
-#: g10/misc.c:212
+#: g10/misc.c:214
 msgid ""
 "RSA keys are deprecated; please consider creating a new key and use this key "
 "in the future\n"
@@ -2074,8 +2128,8 @@ msgstr ""
 "L'uso di chiavi RSA � deprecato; per favore in futuro considera di creare e\n"
 "usare una nuova chiave.\n"
 
-#: g10/misc.c:233
-msgid "This cipher algorithm is depreciated; please use a more standard one!\n"
+#: g10/misc.c:235
+msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 
 #: g10/parse-packet.c:113
@@ -2099,34 +2153,39 @@ msgstr ""
 "dell'utente: \""
 
 #: g10/passphrase.c:150
-#, c-format
-msgid "(%u-bit %s key, ID %08lX, created %s)\n"
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "(chiave %2$s di %1$u-bit, ID %3$08lX, creata il %4$s)\n"
 
-#: g10/passphrase.c:174
+#: g10/passphrase.c:155
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr ""
+
+#: g10/passphrase.c:183
 #, fuzzy
 msgid "Enter passphrase: "
 msgstr "Inserisci la passphrase: "
 
-#: g10/passphrase.c:178
+#: g10/passphrase.c:187
 #, fuzzy
 msgid "Repeat passphrase: "
 msgstr "Ripeti la passphrase: "
 
-#: g10/plaintext.c:103
+#: g10/plaintext.c:63
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "i dati non sono stati salvati; usa l'opzione \"--output\" per salvarli\n"
 
-#: g10/plaintext.c:216
+#: g10/plaintext.c:166
 msgid "Please enter name of data file: "
 msgstr "Inserisci il nome del file di dati: "
 
-#: g10/plaintext.c:237
+#: g10/plaintext.c:187
 msgid "reading stdin ...\n"
 msgstr ""
 
-#: g10/plaintext.c:300
+#: g10/plaintext.c:250
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossibile aprire i dati firmati `%s'\n"
@@ -2137,7 +2196,8 @@ msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "ricevente anonimo; provo la chiave segreta %08lX ...\n"
 
 #: g10/pubkey-enc.c:84
-msgid "okay, we are the anonymous receiver.\n"
+#, fuzzy
+msgid "okay, we are the anonymous recipient.\n"
 msgstr "Bene, siamo il ricevente anonimo.\n"
 
 #: g10/pubkey-enc.c:136
@@ -2155,11 +2215,11 @@ msgstr "nota: algoritmo di cifratura %d non trovato nelle impostazioni\n"
 msgid "protection algorithm %d is not supported\n"
 msgstr "l'algoritmo di protezione %d non � gestito\n"
 
-#: g10/seckey-cert.c:169
+#: g10/seckey-cert.c:176
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Passphrase non valida; riprova...\n"
 
-#: g10/seckey-cert.c:216
+#: g10/seckey-cert.c:223
 #, fuzzy
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
@@ -2172,18 +2232,27 @@ msgid ""
 msgstr ""
 "questa � una chiave ElGamal generata da PGP che NON � sicura per le firme!\n"
 
-#: g10/sig-check.c:165
-msgid "public key created in future (time warp or clock problem)\n"
+#: g10/sig-check.c:166
+#, fuzzy, c-format
+msgid "public key created %lu %s in future (time warp or clock problem)\n"
 msgstr ""
 "chiave pubblica creata nel futuro (salto nel tempo o problema con\n"
 "l'orologio)\n"
 
-#: g10/sig-check.c:170
+#: g10/sig-check.c:168
+msgid "second"
+msgstr ""
+
+#: g10/sig-check.c:168
+msgid "seconds"
+msgstr ""
+
+#: g10/sig-check.c:173
 #, fuzzy, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "attenzione: firma della chiave scaduta il %s\n"
 
-#: g10/sig-check.c:226
+#: g10/sig-check.c:230
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 
@@ -2207,133 +2276,134 @@ msgstr "sign"
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "%s: attenzione: file vuoto\n"
 
-#: g10/tdbio.c:116 g10/tdbio.c:1413
+#: g10/tdbio.c:116 g10/tdbio.c:1418
 #, fuzzy, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/tdbio.c:122 g10/tdbio.c:1420
+#: g10/tdbio.c:122 g10/tdbio.c:1425
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 
 #: g10/tdbio.c:232
-msgid "trustdb transaction to large\n"
+msgid "trustdb transaction too large\n"
 msgstr ""
 
-#: g10/tdbio.c:402
+#: g10/tdbio.c:416
 #, fuzzy, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: impossibile creare: %s\n"
 
-#: g10/ringedit.c:273 g10/tdbio.c:422
+#: g10/ringedit.c:273 g10/tdbio.c:436
 #, fuzzy, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: impossibile creare: %s\n"
 
-#: g10/ringedit.c:279 g10/tdbio.c:425
+#: g10/ringedit.c:279 g10/tdbio.c:439
 #, fuzzy, c-format
 msgid "%s: directory created\n"
 msgstr "%s: impossibile creare: %s\n"
 
-#: g10/tdbio.c:429
+#: g10/tdbio.c:443
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/openfile.c:101 g10/openfile.c:165 g10/ringedit.c:1275 g10/tdbio.c:435
+#: g10/openfile.c:101 g10/openfile.c:165 g10/ringedit.c:1275 g10/tdbio.c:449
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: impossibile creare: %s\n"
 
-#: g10/tdbio.c:459
+#: g10/tdbio.c:473
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr ""
 
-#: g10/tdbio.c:463
-#, c-format
-msgid "%s: invalid trust-db created\n"
-msgstr ""
+#: g10/tdbio.c:477
+#, fuzzy, c-format
+msgid "%s: invalid trustdb created\n"
+msgstr "%s: impossibile creare: %s\n"
 
-#: g10/tdbio.c:465
+#: g10/tdbio.c:479
 #, fuzzy, c-format
-msgid "%s: trust-db created\n"
+msgid "%s: trustdb created\n"
 msgstr "%s: impossibile creare: %s\n"
 
-#: g10/tdbio.c:506
-#, c-format
-msgid "%s: invalid trust-db\n"
-msgstr ""
+#: g10/tdbio.c:512
+#, fuzzy, c-format
+msgid "%s: invalid trustdb\n"
+msgstr "aggiornamento del trustdb fallito: %s\n"
 
-#: g10/tdbio.c:540
+#: g10/tdbio.c:545
 #, fuzzy, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: impossibile creare: %s\n"
 
-#: g10/tdbio.c:548
+#: g10/tdbio.c:553
 #, fuzzy, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: errore nel controllare la chiave: %s\n"
 
-#: g10/tdbio.c:564 g10/tdbio.c:603 g10/tdbio.c:628 g10/tdbio.c:1346
-#: g10/tdbio.c:1373
+#: g10/tdbio.c:569 g10/tdbio.c:608 g10/tdbio.c:633 g10/tdbio.c:1351
+#: g10/tdbio.c:1378
 #, fuzzy, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: errore nel controllare la chiave: %s\n"
 
-#: g10/tdbio.c:577
+#: g10/tdbio.c:582
 #, fuzzy, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: errore nel controllare la chiave: %s\n"
 
-#: g10/tdbio.c:1053
+#: g10/tdbio.c:1058
 #, fuzzy, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/tdbio.c:1061
+#: g10/tdbio.c:1066
 #, fuzzy, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "aggiornamento del trustdb fallito: %s\n"
 
-#: g10/tdbio.c:1082
+#: g10/tdbio.c:1087
 #, fuzzy, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "aggiornamento del trustdb fallito: %s\n"
 
-#: g10/tdbio.c:1098
+#: g10/tdbio.c:1103
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr ""
 
-#: g10/tdbio.c:1103
+#: g10/tdbio.c:1108
 #, fuzzy, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "header della firma in chiaro non valido\n"
 
-#: g10/tdbio.c:1379
+#: g10/tdbio.c:1384
 #, fuzzy, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: errore nel controllare la chiave: %s\n"
 
-#: g10/tdbio.c:1387
+#: g10/tdbio.c:1392
 #, fuzzy, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: errore nel controllare la chiave: %s\n"
 
-#: g10/tdbio.c:1397
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1427
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
 #: g10/trustdb.c:142
-msgid "The trust DB is corrupted; please run \"gpgm --fix-trust-db\".\n"
+#, fuzzy
+msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n"
 msgstr "Il trustdb � rovinato; per favore esegui \"gpgm --fix-trust-db\".\n"
 
 #: g10/trustdb.c:155
@@ -2353,7 +2423,7 @@ msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
 #: g10/trustdb.c:198
 #, fuzzy, c-format
-msgid "trust db: sync failed: %s\n"
+msgid "trustdb: sync failed: %s\n"
 msgstr "aggiornamento del trustdb fallito: %s\n"
 
 #: g10/trustdb.c:327
@@ -2383,7 +2453,7 @@ msgstr "la chained sigrec %lu ha il proprietario sbagliato\n"
 
 #: g10/trustdb.c:463
 #, fuzzy, c-format
-msgid "`%s' is not a valid long keyID\n"
+msgid "'%s' is not a valid long keyID\n"
 msgstr "Carattere non valido nel commento\n"
 
 #: g10/trustdb.c:498
@@ -2466,29 +2536,29 @@ msgid "Ooops, no user ids\n"
 msgstr "elenca le chiavi e gli user id"
 
 #: g10/trustdb.c:1088 g10/trustdb.c:1106
-#, c-format
-msgid "user `%s' read problem: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "user '%s' read problem: %s\n"
+msgstr "%s: utente non trovato\n"
 
 #: g10/trustdb.c:1091 g10/trustdb.c:1109
-#, c-format
-msgid "user `%s' list problem: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "user '%s' list problem: %s\n"
+msgstr "%s: utente non trovato\n"
 
 #: g10/trustdb.c:1099 g10/trustdb.c:1346
 #, fuzzy, c-format
-msgid "user `%s' not found: %s\n"
+msgid "user '%s' not found: %s\n"
 msgstr "%s: utente non trovato\n"
 
 #: g10/trustdb.c:1101 g10/trustdb.c:1348
-#, c-format
-msgid "problem finding `%s' in trustdb: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "problem finding '%s' in trustdb: %s\n"
+msgstr "inizializzazione del trustdb fallita: %s\n"
 
 #: g10/trustdb.c:1104
-#, c-format
-msgid "user `%s' not in trustdb\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "user '%s' not in trustdb\n"
+msgstr "%s: utente non trovato\n"
 
 #: g10/trustdb.c:1139
 #, c-format
@@ -2524,16 +2594,6 @@ msgstr "errore nella riga della coda\n"
 msgid "error: no ownertrust value\n"
 msgstr "esporta i valori di fiducia"
 
-#: g10/trustdb.c:1223
-#, c-format
-msgid "LID %lu: changing trust from %u to %u\n"
-msgstr ""
-
-#: g10/trustdb.c:1226
-#, c-format
-msgid "LID %lu: setting trust to %u\n"
-msgstr ""
-
 #: g10/trustdb.c:1234
 msgid "key not in trustdb, searching ring.\n"
 msgstr ""
@@ -2560,13 +2620,13 @@ msgid "error finding dir record: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
 #: g10/trustdb.c:1351
-#, c-format
-msgid "user `%s' not in trustdb - inserting\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "user '%s' not in trustdb - inserting\n"
+msgstr "aggiornamento del trustdb fallito: %s\n"
 
 #: g10/trustdb.c:1354
 #, fuzzy, c-format
-msgid "failed to put `%s' into trustdb: %s\n"
+msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
 #: g10/trustdb.c:1404
@@ -2764,7 +2824,7 @@ msgstr "Il lid %lu non ha una chiave\n"
 msgid "lid %lu: can't get keyblock: %s\n"
 msgstr "lid %lu: impossibile ottenere il keyblock: %s\n"
 
-#: g10/trustdb.c:2159 g10/trustdb.c:3073
+#: g10/trustdb.c:2159 g10/trustdb.c:3082
 #, fuzzy, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
@@ -2851,12 +2911,12 @@ msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "Il rec di %lu[%d] nella hintlist di %lu non punta a un record dir\n"
 
 #. that should never happen
-#: g10/trustdb.c:3043
+#: g10/trustdb.c:3052
 #, fuzzy, c-format
 msgid "insert_trust_record: keyblock not found: %s\n"
 msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
 
-#: g10/trustdb.c:3061
+#: g10/trustdb.c:3070
 msgid "did not use primary key for insert_trust_record()\n"
 msgstr ""
 
@@ -2938,7 +2998,7 @@ msgstr ""
 #: g10/encr-data.c:74
 #, fuzzy
 msgid ""
-"WARNING: Message was encrypted with a weak key in the symmetric cipher.\n"
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "Attenzione: il messaggio era stato crittografato usando una chiave debole\n"
 "per il cifrario simmetrico\n"
@@ -3077,5 +3137,8 @@ msgstr "Nessun aiuto disponibile"
 msgid "No help available for `%s'"
 msgstr "Nessun aiuto disponibile per `%s'"
 
+#~ msgid "invalid clear text header: "
+#~ msgstr "header del testo in chiaro non valido: "
+
 #~ msgid "You will see a list of signators etc. here\n"
 #~ msgstr "Qui vedrai una lista di firmatari, ecc.\n"
diff --git a/po/pl.po b/po/pl.po
index 430f3ba3c..aaf861279 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-0.4.0\n"
-"POT-Creation-Date: 1998-11-10 17:16+020\n"
+"POT-Creation-Date: 1999-01-09 15:45+0100\n"
 "PO-Revision-Date: 1998-12-24 03:12+01:00\n"
 "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -18,29 +18,235 @@ msgstr ""
 "Files: util/secmem.c util/argparse.c cipher/random.c cipher/rand-dummy.c "
 "cipher/rand-unix.c cipher/rand-w32.c g10/g10.c g10/pkclist.c g10/keygen.c "
 "g10/decrypt.c g10/encode.c g10/import.c g10/keyedit.c g10/keylist.c "
-"g10/mainproc.c g10/passphrase.c g10/plaintext.c g10/pref.c "
-"g10/seckey-cert.c g10/sig-check.c g10/sign.c g10/trustdb.c g10/verify.c "
-"g10/status.c g10/pubkey-enc.c\n"
+"g10/mainproc.c g10/passphrase.c g10/plaintext.c g10/pref.c g10/seckey-cert.c "
+"g10/sig-check.c g10/sign.c g10/trustdb.c g10/verify.c g10/status.c "
+"g10/pubkey-enc.c\n"
 
-#: util/secmem.c:226
+#: util/secmem.c:77
 msgid "Warning: using insecure memory!\n"
 msgstr "Ostrze�enie: u�ywana pami�� nie jest pami�ci� bezpieczn�!\n"
 
-#: util/miscutil.c:110
+#: util/miscutil.c:143
 msgid "yes"
 msgstr "tak"
 
-#: util/miscutil.c:111
+#: util/miscutil.c:144
 msgid "yY"
 msgstr "tT"
 
-#: cipher/rand-dummy.c:106
-msgid "warning: using insecure random number generator!!\n"
+#: util/errors.c:54
+msgid "general error"
+msgstr ""
+
+#: util/errors.c:55
+msgid "unknown packet type"
+msgstr ""
+
+#: util/errors.c:56
+msgid "unknown version"
+msgstr ""
+
+#: util/errors.c:57
+msgid "unknown pubkey algorithm"
+msgstr ""
+
+#: util/errors.c:58
+msgid "unknown digest algorithm"
+msgstr ""
+
+#: util/errors.c:59
+#, fuzzy
+msgid "bad public key"
+msgstr "brak domy�lnego zbioru kluczy publicznych\n"
+
+#: util/errors.c:60
+#, fuzzy
+msgid "bad secret key"
+msgstr "lista kluczy tajnych"
+
+#: util/errors.c:61
+#, fuzzy
+msgid "bad signature"
+msgstr "1 niepoprawny podpis\n"
+
+#: util/errors.c:62
+msgid "checksum error"
+msgstr ""
+
+#: util/errors.c:63
+#, fuzzy
+msgid "bad passphrase"
+msgstr "Prosz� powt�rzy� wyra�enie przej�ciowe: "
+
+#: util/errors.c:64
+#, fuzzy
+msgid "public key not found"
+msgstr "klucz %08lX: brak klucza publicznegoL %s\n"
+
+#: util/errors.c:65
+#, fuzzy
+msgid "unknown cipher algorithm"
+msgstr "|NAZWA|algorytm szyfruj�cy NAZWA"
+
+#: util/errors.c:66
+#, fuzzy
+msgid "can't open the keyring"
+msgstr "nie mog� zapisa� zbioru kluczy\n"
+
+#: util/errors.c:67
+#, fuzzy
+msgid "invalid packet"
+msgstr "niepoprawna warto��\n"
+
+#: util/errors.c:68
+#, fuzzy
+msgid "invalid armor"
+msgstr "niepoprawna warto��\n"
+
+#: util/errors.c:69
+#, fuzzy
+msgid "no such user id"
+msgstr "Brak takiego identyfikatora u�ytkownika.\n"
+
+#: util/errors.c:70
+#, fuzzy
+msgid "secret key not available"
+msgstr "Dost�pny jest klucz tajny.\n"
+
+#: util/errors.c:71
+#, fuzzy
+msgid "wrong secret key used"
+msgstr "lista kluczy tajnych"
+
+#: util/errors.c:72
+msgid "not supported"
+msgstr ""
+
+#: util/errors.c:73
+#, fuzzy
+msgid "bad key"
+msgstr "dodkl"
+
+#: util/errors.c:74
+#, fuzzy
+msgid "file read error"
+msgstr "b��d odczytu: %s\n"
+
+#: util/errors.c:75
+msgid "file write error"
+msgstr ""
+
+#: util/errors.c:76
+#, fuzzy
+msgid "unknown compress algorithm"
+msgstr "|N|algorytm kompresji N"
+
+#: util/errors.c:77
+msgid "file open error"
+msgstr ""
+
+#: util/errors.c:78
+msgid "file create error"
+msgstr ""
+
+#: util/errors.c:79
+#, fuzzy
+msgid "invalid passphrase"
+msgstr "Wyra�enie przej�ciowe: "
+
+#: util/errors.c:80
+#, fuzzy
+msgid "unimplemented pubkey algorithm"
+msgstr ""
+"klucz %08lX: nie obs�ugiwany algorytm szyfrowania z kluczem publicznym\n"
+
+#: util/errors.c:81
+#, fuzzy
+msgid "unimplemented cipher algorithm"
+msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
+
+#: util/errors.c:82
+msgid "unknown signature class"
+msgstr ""
+
+#: util/errors.c:83
+msgid "trust database error"
+msgstr ""
+
+#: util/errors.c:84
+msgid "bad MPI"
+msgstr ""
+
+#: util/errors.c:85
+msgid "resource limit"
+msgstr ""
+
+#: util/errors.c:86
+#, fuzzy
+msgid "invalid keyring"
+msgstr "niepoprawna warto��\n"
+
+#: util/errors.c:87
+msgid "bad certificate"
+msgstr ""
+
+#: util/errors.c:88
+#, fuzzy
+msgid "malformed user id"
+msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
+
+#: util/errors.c:89
+msgid "file close error"
+msgstr ""
+
+#: util/errors.c:90
+msgid "file rename error"
+msgstr ""
+
+#: util/errors.c:91
+msgid "file delete error"
+msgstr ""
+
+#: util/errors.c:92
+msgid "unexpected data"
+msgstr ""
+
+#: util/errors.c:93
+msgid "timestamp conflict"
+msgstr ""
+
+#: util/errors.c:94
+#, fuzzy
+msgid "unusable pubkey algorithm"
+msgstr "|N|algorytm kompresji N"
+
+#: util/errors.c:95
+#, fuzzy
+msgid "file exists"
+msgstr "Plik `%s' ju� istnieje. "
+
+#: util/errors.c:96
+msgid "weak key"
+msgstr ""
+
+#: util/logger.c:178
+#, c-format
+msgid "... this is a bug (%s:%d:%s)\n"
+msgstr ""
+
+#: util/logger.c:184
+#, c-format
+msgid "you found a bug ... (%s:%d)\n"
+msgstr ""
+
+#: cipher/random.c:408
+#, fuzzy
+msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ostrze�enie: u�ywany generator liczb losowych\n"
 "nie jest kryptograficznie bezpieczny!!\n"
 
-#: cipher/rand-dummy.c:107
+#: cipher/random.c:409
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -54,7 +260,7 @@ msgstr ""
 "JAKIEKOLWIEK DANE GENEROWANE PRZEZ TEN PROGRAM NIE NADAJ� SI� DO \n"
 "NORMALNEGO U�YTKU I NIE ZAPEWNIAJ� BEZPIECZE�STWA!!\n"
 
-#: cipher/rand-unix.c:149
+#: cipher/rndlinux.c:118
 #, c-format
 msgid ""
 "\n"
@@ -65,7 +271,8 @@ msgstr ""
 "Brakuje mo�liwo�ci wygenerowania odpowiedniej liczby losowych bajt�w.\n"
 "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:143
+
+#: g10/g10.c:160
 msgid ""
 "@Commands:\n"
 " "
@@ -73,121 +280,130 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/g10.c:146
+#: g10/g10.c:163
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: g10/g10.c:147
+#: g10/g10.c:164
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu na czytelnym dokumencie"
 
-#: g10/g10.c:148
+#: g10/g10.c:165
 msgid "make a detached signature"
 msgstr "sporz�dzenie podpisu oddzielonego od dokumentu"
 
-#: g10/g10.c:149
+#: g10/g10.c:166
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/g10.c:150
+#: g10/g10.c:167
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/g10.c:151
+#: g10/g10.c:168
 msgid "store only"
 msgstr "tylko zapis"
 
-#: g10/g10.c:152
+#: g10/g10.c:169
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lnie)"
 
-#: g10/g10.c:153
+#: g10/g10.c:170
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/g10.c:155
+#: g10/g10.c:172
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/g10.c:156
+#: g10/g10.c:173
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpis�w"
 
-#: g10/g10.c:157
+#: g10/g10.c:174
 msgid "check key signatures"
 msgstr "sprawdzenie podpis�w kluczy"
 
-#: g10/g10.c:158
+#: g10/g10.c:175
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/g10.c:159
+#: g10/g10.c:176
 msgid "list secret keys"
 msgstr "lista kluczy tajnych"
 
-#: g10/g10.c:161
+#: g10/g10.c:178
 msgid "generate a new key pair"
 msgstr "generacja nowej pary klucza"
 
-#: g10/g10.c:163
+#: g10/g10.c:180
 msgid "remove key from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: g10/g10.c:165
+#: g10/g10.c:182
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/g10.c:166
+#: g10/g10.c:183
 msgid "generate a revocation certificate"
 msgstr "generacja certyfikatu uniewa�nienia klucza"
 
-#: g10/g10.c:168
+#: g10/g10.c:185
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/g10.c:171
+#: g10/g10.c:188
 msgid "import/merge keys"
 msgstr "do��czanie klucza do zbioru"
 
-#: g10/g10.c:172
+#: g10/g10.c:190
 msgid "list only the sequence of packets"
 msgstr "wypisane sekwencji pakiet�w"
 
-#: g10/g10.c:174
+#: g10/g10.c:193
 msgid "export the ownertrust values"
 msgstr ""
 "Przypisanie tych warto�ci nale�y do Ciebie, nie b�d� one udost�pnione\n"
 "nikomu innemu. S� one u�ywane do stworzenia sieci zaufania i nie ma\n"
 "to nic wsp�lnego z tworzon� sieci� certyfikat�w."
 
-#: g10/g10.c:175
+#: g10/g10.c:195
 msgid "import ownertrust values"
 msgstr ""
 "Przypisanie tych warto�ci nale�y do Ciebie, nie b�d� one udost�pnione\n"
 "nikomu innemu. S� one u�ywane do stworzenia sieci zaufania i nie ma\n"
 "to nic wsp�lnego z tworzon� sieci� certyfikat�w."
 
-#: g10/g10.c:176
+#: g10/g10.c:197
+#, fuzzy
+msgid "|[NAMES]|update the trust database"
+msgstr "|[NAZWY]|sprawdzenie bazy zaufania"
+
+#: g10/g10.c:199
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAZWY]|sprawdzenie bazy zaufania"
 
-#: g10/g10.c:177
+#: g10/g10.c:200
+msgid "fix a corrupted trust database"
+msgstr ""
+
+#: g10/g10.c:201
 msgid "De-Armor a file or stdin"
 msgstr "Zdj�cie opakowania ASCII pliku lub potoku"
 
-#: g10/g10.c:178
+#: g10/g10.c:202
 msgid "En-Armor a file or stdin"
 msgstr "Opakowanie ASCII pliku lub potoku"
 
-#: g10/g10.c:179
+#: g10/g10.c:203
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/g10.c:180
+#: g10/g10.c:204
 msgid "print all message digests"
 msgstr "wszystkie skr�ty wiadomo�ci"
 
-#: g10/g10.c:187
+#: g10/g10.c:211
 msgid ""
 "@\n"
 "Options:\n"
@@ -197,152 +413,190 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/g10.c:189
+#: g10/g10.c:213
 msgid "create ascii armored output"
 msgstr "plik wynikowy w opakowaniu ASCII"
 
-#: g10/g10.c:191
+#: g10/g10.c:215
 msgid "use this user-id to sign or decrypt"
 msgstr "u�y� tego identyfikatora do podpisania lub odszyfrowania"
 
-#: g10/g10.c:192
+#: g10/g10.c:216
 msgid "use this user-id for encryption"
 msgstr "u�y� tego identyfikatora do szyfrowania"
 
-#: g10/g10.c:193
+#: g10/g10.c:217
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - brak)"
 
-#: g10/g10.c:194
+#: g10/g10.c:219
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/g10.c:196
+#: g10/g10.c:221
 msgid "use as output file"
 msgstr "plik wyj�ciowy"
 
-#: g10/g10.c:197
+#: g10/g10.c:222
 msgid "verbose"
 msgstr "z informacjami dodatkowymi"
 
+#: g10/g10.c:223
+msgid "be somewhat more quiet"
+msgstr ""
+
+#: g10/g10.c:224
+#, fuzzy
+msgid "force v3 signatures"
+msgstr "sprawdzenie podpis�w kluczy"
+
 #. { oDryRun, "dry-run",   0, N_("do not make any changes") },
-#: g10/g10.c:199
+#: g10/g10.c:226
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: �adnych pyta�"
 
-#: g10/g10.c:200
+#: g10/g10.c:227
 msgid "assume yes on most questions"
 msgstr "automatyczna odpowied� tak na wi�kszo�� pyta�"
 
-#: g10/g10.c:201
+#: g10/g10.c:228
 msgid "assume no on most questions"
 msgstr "automatyczna odpowied� nie na wi�kszo�� pyta�"
 
-#: g10/g10.c:202
+#: g10/g10.c:229
 msgid "add this keyring to the list of keyrings"
 msgstr "doda� zbi�r kluczy do listy"
 
-#: g10/g10.c:203
+#: g10/g10.c:230
 msgid "add this secret keyring to the list"
 msgstr "doda� zbi�r kluczy tajnych do listy"
 
-#: g10/g10.c:204
+#: g10/g10.c:231
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego klucza tajnego"
 
-#: g10/g10.c:205
+#: g10/g10.c:232
+#, fuzzy
+msgid "|NAME|set terminal charset to NAME"
+msgstr "|NAZWA|algorytm szyfruj�cy NAZWA"
+
+#: g10/g10.c:233
 msgid "read options from file"
 msgstr "wczytanie opcji z pliku"
 
-#: g10/g10.c:207
+#: g10/g10.c:235
 msgid "set debugging flags"
 msgstr "ustawienie opcji �ledzenia wykonania programu"
 
-#: g10/g10.c:208
+#: g10/g10.c:236
 msgid "enable full debugging"
 msgstr "umo�liwienie pe�nego �ledzenia programu"
 
-#: g10/g10.c:209
+#: g10/g10.c:237
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapisa� opis stanu do FD"
 
-#: g10/g10.c:210
+#: g10/g10.c:238
 msgid "do not write comment packets"
 msgstr "nie zapisywa� pakiet�w z komentarzem"
 
-#: g10/g10.c:211
+#: g10/g10.c:239
 msgid "(default is 1)"
 msgstr "(domy�lnie 1)"
 
-#: g10/g10.c:212
+#: g10/g10.c:240
 msgid "(default is 3)"
 msgstr "(domy�lnie 3)"
 
-#: g10/g10.c:213
-msgid "|file|load extension module"
+#: g10/g10.c:242
+msgid "|KEYID|ulimately trust this key"
+msgstr ""
+
+#: g10/g10.c:243
+#, fuzzy
+msgid "|FILE|load extension module FILE"
 msgstr "|plik|�adowanie modu�u rozszerzenia"
 
-#: g10/g10.c:214
+#: g10/g10.c:244
 msgid "emulate the mode described in RFC1991"
 msgstr "emulacja trybu opisanego w RFC1991"
 
-#: g10/g10.c:216
+#: g10/g10.c:245
+#, fuzzy
+msgid "|N|use passphrase mode N"
+msgstr "Wyra�enie przej�ciowe: "
+
+#: g10/g10.c:247
+#, fuzzy
+msgid "|NAME|use message digest algorithm NAME for passphrases"
+msgstr "|NAZWA|algorytm obliczania skr�t�w wiadomo�ci NAZWA"
+
+#: g10/g10.c:249
+#, fuzzy
+msgid "|NAME|use cipher algorithm NAME for passphrases"
+msgstr "|NAZWA|algorytm szyfruj�cy NAZWA"
+
+#: g10/g10.c:251
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|algorytm szyfruj�cy NAZWA"
 
-#: g10/g10.c:217
+#: g10/g10.c:252
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|algorytm obliczania skr�t�w wiadomo�ci NAZWA"
 
-#: g10/g10.c:218
+#: g10/g10.c:253
 msgid "|N|use compress algorithm N"
 msgstr "|N|algorytm kompresji N"
 
-#: g10/g10.c:219
+#: g10/g10.c:254
 msgid "throw keyid field of encrypted packets"
 msgstr "usuni�cie identyfikatora klucza zaszyfrowanych pakiet�w"
 
-#: g10/g10.c:227
+#: g10/g10.c:262
+#, fuzzy
 msgid ""
 "@\n"
 "Examples:\n"
 "\n"
 " -se -r Bob [file]          sign and encrypt for user Bob\n"
-" -sat [file]                make a clear text signature\n"
-" -sb  [file]                make a detached signature\n"
-" -k   [userid]              show keys\n"
-" -kc  [userid]              show fingerprint\n"
+" --clearsign [file]         make a clear text signature\n"
+" --detach-sign [file]       make a detached signature\n"
+" --list-keys [names]        show keys\n"
+" --fingerprint [names]      show fingerprints\n"
 msgstr ""
 "@\n"
 "Przyk�ady:\n"
 "\n"
 " -se -r Bob [plik]           podpisanie i zaszyfrowanie kluczem Boba\n"
-" -sat [plik]                 podpisanie z pozostawieniem czytelnego dokumentu\n"
-" -sb  [plik]                 podpisanie z umieszczeniem podpisu w osobnym pliku\n"
+" -sat [plik]                 podpisanie z pozostawieniem czytelnego "
+"dokumentu\n"
+" -sb  [plik]                 podpisanie z umieszczeniem podpisu w osobnym "
+"pliku\n"
 " -k   [identyfikator]        pokazuje klucz\n"
 " -kc  [identyfikator]        pokazuje odcisk klucza\n"
 
-#: g10/g10.c:302
+#: g10/g10.c:341
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: g10/g10.c:307
+#: g10/g10.c:346
 msgid "Usage: gpgm [options] [files] (-h for help)"
 msgstr "Spos�b u�ycia: gpgm [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/g10.c:309
+#: g10/g10.c:348
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Spos�b u�ycia: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/g10.c:314
+#: g10/g10.c:353
+#, fuzzy
 msgid ""
 "Syntax: gpgm [options] [files]\n"
-"GNUPG maintenance utility\n"
+"GnuPG maintenance utility\n"
 msgstr ""
 "Sk�adnia: gpgm [opcje] [pliki]\n"
 "GNUPG program obs�uguj�cy\n"
 
-#: g10/g10.c:317
+#: g10/g10.c:356
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -352,7 +606,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/g10.c:323
+#: g10/g10.c:362
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -360,150 +614,234 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/g10.c:398
+#: g10/g10.c:437
 msgid "usage: gpgm [options] "
 msgstr "spos�b u�ycia: gpgm [opcje]"
 
-#: g10/g10.c:400
+#: g10/g10.c:439
 msgid "usage: gpg [options] "
 msgstr "spos�b u�ycia: gpg [opcje]"
 
-#: g10/g10.c:441
+#: g10/g10.c:480
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/g10.c:547
-#, c-format
-msgid "note: no default option file `%s'\n"
+#: g10/g10.c:618
+#, fuzzy, c-format
+msgid "NOTE: no default option file `%s'\n"
 msgstr "uwaga: brak domy�lnego pliku opcji '%s\"\n"
 
-#: g10/g10.c:551
+#: g10/g10.c:622
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji `%s': %s\n"
 
-#: g10/g10.c:558
+#: g10/g10.c:629
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z `%s'\n"
 
-#: g10/g10.c:737
+#: g10/g10.c:782
+#, fuzzy, c-format
+msgid "%s is not a valid character set\n"
+msgstr "Niew�a�ciwy znak w komentarzu\n"
+
+#: g10/g10.c:817 g10/g10.c:829
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/g10.c:743
+#: g10/g10.c:823 g10/g10.c:835
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm geenracji skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/g10.c:746
+#: g10/g10.c:838
 #, 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:748
+#: g10/g10.c:840
 msgid "completes-needed must be greater than 0\n"
 msgstr "opcja completes-needed musi by� ustawiona na warto�� wi�ksz� od 0\n"
 
-#: g10/g10.c:750
+#: g10/g10.c:842
 msgid "marginals-needed must be greater than 1\n"
 msgstr "opcja marginals-needed musi by� ustawiona na warto�� wi�ksz� od 1\n"
 
-#: g10/g10.c:833
+#: g10/g10.c:844
+msgid "max-cert-depth must be in range 1 to 255\n"
+msgstr ""
+
+#: g10/g10.c:847
+msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
+msgstr ""
+
+#: g10/g10.c:851
+msgid "invalid S2K mode; must be 0, 1 or 3\n"
+msgstr ""
+
+#: g10/g10.c:934
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/g10.c:839
+#: g10/g10.c:940
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/g10.c:847
+#: g10/g10.c:948
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:855
+#: g10/g10.c:956
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/g10.c:868
+#: g10/g10.c:969
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/g10.c:881
+#: g10/g10.c:982
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:895
+#: g10/g10.c:996
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/g10.c:907
+#: g10/g10.c:1008
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/g10.c:916
-msgid "--edit-key username"
+#: g10/g10.c:1017
+#, fuzzy
+msgid "--edit-key username [commands]"
 msgstr "--edit-key nazwa u�ytkownika"
 
-#: g10/g10.c:924
+#: g10/g10.c:1033
 msgid "--delete-secret-key username"
 msgstr "--delete-secret-key nazwa u�ytkownika"
 
-#: g10/g10.c:927
+#: g10/g10.c:1036
 msgid "--delete-key username"
 msgstr "--delete-key nazwa u�ytkownika"
 
-#: g10/encode.c:211 g10/g10.c:950 g10/keylist.c:79
+#: g10/encode.c:216 g10/g10.c:1059 g10/sign.c:301
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "nie mog� otworzy� %s: %s\n"
 
-#: g10/g10.c:961
+#: g10/g10.c:1070
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
 
-#: g10/g10.c:1016
+#: g10/g10.c:1127
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Usuni�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1024
+#: g10/g10.c:1135
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1085
+#: g10/g10.c:1201
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu `%s'\n"
 
-#: g10/g10.c:1155
+#: g10/g10.c:1280
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/decrypt.c:59 g10/g10.c:1157 g10/verify.c:66
+#: g10/g10.c:1284
+msgid "Go ahead and type your message ...\n"
+msgstr ""
+
+#: g10/decrypt.c:59 g10/g10.c:1287 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mog� otworzy� '%s\"\n"
 
-#: g10/g10.c:1202
-msgid ""
-"RSA keys are deprecated; please consider creating a new key and use this key "
-"in the future\n"
+#: g10/armor.c:320
+#, fuzzy, c-format
+msgid "armor: %s\n"
+msgstr "b��d odczytu: %s\n"
+
+#: g10/armor.c:343
+msgid "invalid armor header: "
+msgstr ""
+
+#: g10/armor.c:350
+msgid "armor header: "
+msgstr ""
+
+#: g10/armor.c:361
+#, fuzzy
+msgid "invalid clearsig header\n"
+msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
+
+#: g10/armor.c:415
+#, fuzzy
+msgid "nested clear text signatures\n"
+msgstr "|[plik]|z�o�enie podpisu na czytelnym dokumencie"
+
+#: g10/armor.c:531
+msgid "invalid dash escaped line: "
+msgstr ""
+
+#: g10/armor.c:539
+msgid "unexpected armor:"
+msgstr ""
+
+#: g10/armor.c:625
+#, fuzzy, c-format
+msgid "invalid radix64 character %02x skipped\n"
+msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
+
+#: g10/armor.c:655
+msgid "premature eof (no CRC)\n"
+msgstr ""
+
+#: g10/armor.c:672
+msgid "premature eof (in CRC)\n"
+msgstr ""
+
+#: g10/armor.c:676
+msgid "malformed CRC\n"
+msgstr ""
+
+#: g10/armor.c:680
+#, c-format
+msgid "CRC error; %06lx - %06lx\n"
+msgstr ""
+
+#: g10/armor.c:697
+msgid "premature eof (in Trailer)\n"
+msgstr ""
+
+#: g10/armor.c:701
+msgid "error in trailer line\n"
+msgstr ""
+
+#: g10/armor.c:962
+msgid "no valid OpenPGP data found.\n"
 msgstr ""
-"Klucze RSA s� odradzane; prosz� rozwa�y� przej�cie na inne algorytmy po\n"
-"wygenerowaniu odpowiednich kluczy.\n"
 
-#: g10/pkclist.c:71
+#: g10/armor.c:964
 #, c-format
+msgid "invalid armor: line longer than %d characters\n"
+msgstr ""
+
+#: g10/pkclist.c:138
+#, fuzzy, c-format
 msgid ""
-"No owner trust defined for %lu:\n"
+"No trust value assigned to %lu:\n"
 "%4u%c/%08lX %s \""
 msgstr ""
 "Brak definicji zaufania w�a�ciciela dla %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:81
+#: g10/pkclist.c:148
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -526,31 +864,29 @@ msgstr ""
 " 4 = W pe�ni mu ufam.\n"
 " i = potrzebuj� wi�cej informacji\n"
 
-#: g10/pkclist.c:90
+#: g10/pkclist.c:157
 msgid " m = back to the main menu\n"
 msgstr " p = powr�t do g��wnego menu\n"
 
+#: g10/pkclist.c:159
+msgid " q = quit\n"
+msgstr ""
+
 #. a string with valid answers
-#: g10/pkclist.c:95
-msgid "sSmM"
+#: g10/pkclist.c:164
+#, fuzzy
+msgid "sSmMqQ"
 msgstr "iIpP"
 
-#: g10/pkclist.c:99
-msgid "edit_ownertrust.value"
-msgstr ""
-"Przypisanie tych warto�ci nale�y do Ciebie, nie b�d� one udost�pnione\n"
-"nikomu innemu. S� one u�ywane do stworzenia sieci zaufania i nie ma\n"
-"to nic wsp�lnego z tworzon� sieci� certyfikat�w."
-
-#: g10/pkclist.c:99
+#: g10/pkclist.c:168
 msgid "Your decision? "
 msgstr "Twoja decyzja? "
 
-#: g10/pkclist.c:118
-msgid "You will see a list of signators etc. here\n"
-msgstr "Tu uka�e si� lista podpis�w itd.\n"
+#: g10/pkclist.c:188
+msgid "Certificates leading to an ultimately trusted key:\n"
+msgstr ""
 
-#: g10/pkclist.c:145
+#: g10/pkclist.c:223
 msgid ""
 "Could not find a valid trust path to the key.  Let's see whether we\n"
 "can assign some missing owner trust values.\n"
@@ -560,21 +896,65 @@ msgstr ""
 "Sprawd�my czy mo�na przypisa� brakuj�ce warto�ci zaufania.\n"
 "\n"
 
-#: g10/pkclist.c:170
+#: g10/pkclist.c:261
 msgid ""
-"No owner trust values changed.\n"
+"No path leading to one of our keys found.\n"
 "\n"
-msgstr "Parametry zaufania w�a�ciciela nie zosta�y zmienione.\n"
+msgstr ""
 
-#: g10/pkclist.c:189
-msgid "revoked_key.override"
+#: g10/pkclist.c:263
+msgid ""
+"No certificates with undefined trust found.\n"
+"\n"
 msgstr ""
 
-#: g10/pkclist.c:190 g10/pkclist.c:277
+#: g10/pkclist.c:265
+#, fuzzy
+msgid ""
+"No trust values changed.\n"
+"\n"
+msgstr "Parametry zaufania w�a�ciciela nie zosta�y zmienione.\n"
+
+#: g10/pkclist.c:280
+#, fuzzy, c-format
+msgid "key %08lX: key has been revoked!\n"
+msgstr "klucz %08lX: pozostawiony bez zmian\n"
+
+#: g10/pkclist.c:286 g10/pkclist.c:381
 msgid "Use this key anyway? "
 msgstr "U�y� tego klucza pomimo to? "
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:308
+#, fuzzy, c-format
+msgid "%08lX: key has expired\n"
+msgstr "Uwaga: Data wa�no�ci tego klucza up�yn�a!\n"
+
+#: g10/pkclist.c:314
+#, c-format
+msgid "%08lX: no info to calculate a trust probability\n"
+msgstr ""
+
+#: g10/pkclist.c:332
+#, fuzzy, c-format
+msgid "%08lX: We do NOT trust this key\n"
+msgstr "OSTRZE�ENIE: Nie ufamy temu kluczowi!\n"
+
+#: g10/pkclist.c:338
+#, c-format
+msgid ""
+"%08lX: It is not sure that this key really belongs to the owner\n"
+"but it is accepted anyway\n"
+msgstr ""
+
+#: g10/pkclist.c:344
+msgid "This key probably belongs to the owner\n"
+msgstr ""
+
+#: g10/pkclist.c:349
+msgid "This key belongs to us\n"
+msgstr ""
+
+#: g10/pkclist.c:376
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -585,53 +965,54 @@ msgstr ""
 "w�a�ciciela. Je�li nie masz co do tego �adnych w�tpliwo�ci i *naprawd�*\n"
 "wiesz co robisz mo�esz odpowiedzie� \"tak\" na nast�pne pytanie.\n"
 
-#: g10/pkclist.c:276
-msgid "untrusted_key.override"
-msgstr "If you want to use this untrusted key anyway, answer \"yes\"."
-
-#: g10/pkclist.c:281
+#: g10/pkclist.c:385
 msgid "WARNING: Using untrusted key!\n"
 msgstr "OSTRZE�ENIE: u�ywany jest klucz nie obdarzony zaufaniem!\n"
 
-#: g10/pkclist.c:317
+#: g10/pkclist.c:421
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony przez w�a�ciciela!\n"
 
-#: g10/pkclist.c:318
+#: g10/pkclist.c:422
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         To mo�e oznacza� �e podpis jest fa�szerstwem.\n"
 
-#: g10/pkclist.c:339
+#: g10/pkclist.c:443
 msgid "Note: This key has expired!\n"
 msgstr "Uwaga: Data wa�no�ci tego klucza up�yn�a!\n"
 
-#: g10/pkclist.c:346
+#: g10/pkclist.c:450
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "OSTRZE�ENIE: Ten klucz nie jest po�wiadczony zaufanym podpisem!\n"
 
-#: g10/pkclist.c:348
+#: g10/pkclist.c:452
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
-msgstr "          Nic nie wskazuje na to �e ten podpis nale�y do w�a�ciciela klucza.\n"
+msgstr ""
+"          Nic nie wskazuje na to �e ten podpis nale�y do w�a�ciciela "
+"klucza.\n"
 
-#: g10/pkclist.c:363
+#: g10/pkclist.c:468
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "OSTRZE�ENIE: Nie ufamy temu kluczowi!\n"
 
-#: g10/pkclist.c:364
+#: g10/pkclist.c:469
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Ten podpis prawdopodobnie jest FA�SZERSTWEM.\n"
 
-#: g10/pkclist.c:371
+#: g10/pkclist.c:476
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
-msgstr "OSTRZE�ENIE: Ten klucz nie jest po�wiadczony wystarczaj�co zaufanymi podpisami!\n"
+msgstr ""
+"OSTRZE�ENIE: Ten klucz nie jest po�wiadczony wystarczaj�co zaufanymi "
+"podpisami!\n"
 
-#: g10/pkclist.c:374
+#: g10/pkclist.c:479
 msgid "         It is not certain that the signature belongs to the owner.\n"
-msgstr "         Nie ma pewno�ci �e ten podpis zosta� z�o�nony przez w�a�ciciela.\n"
+msgstr ""
+"         Nie ma pewno�ci �e ten podpis zosta� z�o�nony przez w�a�ciciela.\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:524
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -639,82 +1020,80 @@ msgstr ""
 "Nie poda�e� identyfikatora u�ytkownika (user ID). \n"
 "Mo�na to zrobi� za pomoc� opcji \"-r\".\n"
 
-#: g10/pkclist.c:423
-msgid "pklist.user_id.enter"
-msgstr "Podaj identyfikator u�ytkownika adresata tych informacji."
-
-#: g10/pkclist.c:424
+#: g10/pkclist.c:529
 msgid "Enter the user ID: "
 msgstr "Wprowad� identyfikator u�ytkownika (user ID): "
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:540
 msgid "No such user ID.\n"
 msgstr "Brak takiego identyfikatora u�ytkownika.\n"
 
-#: g10/pkclist.c:469 g10/pkclist.c:496
+#: g10/pkclist.c:574 g10/pkclist.c:601
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: pomini�ty: %s\n"
 
-#: g10/pkclist.c:477
+#: g10/pkclist.c:582
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: b��d podczas sprawdzania klucza: %s\n"
 
-#: g10/pkclist.c:503
+#: g10/pkclist.c:608
 msgid "no valid addressees\n"
 msgstr "brak poprawnych adres�w\n"
 
-#: g10/keygen.c:123
+#: g10/keygen.c:124
 msgid "writing self signature\n"
 msgstr "zapis podpisu klucza nim samym\n"
 
-#: g10/keygen.c:161
+#: g10/keygen.c:162
 msgid "writing key binding signature\n"
 msgstr "zapis podpisu wi���cego klucz\n"
 
-#: g10/keygen.c:383
+#: g10/keygen.c:388
 msgid "Please select what kind of key you want:\n"
 msgstr "Prosz� wybra� rodzaj klucza:\n"
 
-#: g10/keygen.c:385
+#: g10/keygen.c:390
 #, c-format
 msgid "   (%d) DSA and ElGamal (default)\n"
 msgstr "   (%d) Para kluczy dla algorytm�w DSA i ElGamala (domy�lne)\n"
 
-#: g10/keygen.c:386
+#: g10/keygen.c:391
 #, c-format
-msgid "   (%d) ElGamal (sign and encrypt)\n"
-msgstr "   (%d) Klucz dla algorytmu ElGamala (szyfrowanie i podpisywanie)\n"
+msgid "   (%d) DSA (sign only)\n"
+msgstr "   (%d) DSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:387
+#: g10/keygen.c:393
 #, c-format
 msgid "   (%d) ElGamal (encrypt only)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (tylko szyfrowanie)\n"
 
-#: g10/keygen.c:388
+#: g10/keygen.c:394
 #, c-format
-msgid "   (%d) DSA (sign only)\n"
-msgstr "   (%d) DSA (tylko do podpisywania)\n"
+msgid "   (%d) ElGamal (sign and encrypt)\n"
+msgstr "   (%d) Klucz dla algorytmu ElGamala (szyfrowanie i podpisywanie)\n"
 
-#: g10/keygen.c:389
+#: g10/keygen.c:396
 #, c-format
 msgid "   (%d) ElGamal in a v3 packet\n"
-msgstr "   (%d) Klucz dla algorytmu ElGamala w pakiecie w trzeciej wersji formatu\n"
-
-#: g10/keygen.c:393
-msgid "keygen.algo"
-msgstr "Select the algorithm to use:Needs more explanation here."
+msgstr ""
+"   (%d) Klucz dla algorytmu ElGamala w pakiecie w trzeciej wersji formatu\n"
 
-#: g10/keygen.c:393
+#: g10/keygen.c:401
 msgid "Your selection? "
 msgstr "Tw�j wyb�r? "
 
-#: g10/keygen.c:419
+#: g10/keygen.c:411
+#, fuzzy
+msgid "Do you really want to create a sign and encrypt key? "
+msgstr "Czy na pewno chcesz usun�� wybrane klucze? "
+
+#: g10/keygen.c:432
 msgid "Invalid selection.\n"
 msgstr "Niew�a�ciwy wyb�r.\n"
 
-#: g10/keygen.c:431
+#: g10/keygen.c:444
 #, c-format
 msgid ""
 "About to generate a new %s keypair.\n"
@@ -727,23 +1106,19 @@ msgstr ""
 "               domy�lny rozmiar klucza wynosi 1024 bity\n"
 "  najwi�kszy sugerowany rozmiar klucza wynosi 2048 bit�w\n"
 
-#: g10/keygen.c:437
-msgid "keygen.size"
-msgstr ""
-
-#: g10/keygen.c:438
+#: g10/keygen.c:451
 msgid "What keysize do you want? (1024) "
 msgstr "Jakiej d�ugo�ci klucz wygenerowa�? (1024) "
 
-#: g10/keygen.c:443
+#: g10/keygen.c:456
 msgid "DSA only allows keysizes from 512 to 1024\n"
 msgstr "Klucz dla DSA musi mie� d�ugo�� pomi�dzy 512 i 1024 bitow.\n"
 
-#: g10/keygen.c:445
+#: g10/keygen.c:458
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "D�ugo�� klucza zbyt ma�a; minimalna dopuszczona wynosi 768 bit�w.\n"
 
-#: g10/keygen.c:448
+#: g10/keygen.c:461
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -751,15 +1126,11 @@ msgstr ""
 "Klucze d�u�sze ni� 2048 bit�w s� odradzane poniewa� obliczenia\n"
 "potrzebne do ich wygenerowania trwaj� BARDZO d�ugo!\n"
 
-#: g10/keygen.c:450
-msgid "keygen.size.huge.okay"
-msgstr ""
-
-#: g10/keygen.c:451
+#: g10/keygen.c:464
 msgid "Are you sure that you want this keysize? "
 msgstr "Na pewno wygenerowa� klucz takiej d�ugo�ci? "
 
-#: g10/keygen.c:452
+#: g10/keygen.c:465
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -767,25 +1138,21 @@ msgstr ""
 "Nale�y tak�e pami�ta� o tym, �e informacje mog� by� te� wykradzione z\n"
 "komputera przez pods�uch emisji elektromagnetycznej klawiatury i monitora!\n"
 
-#: g10/keygen.c:459
-msgid "keygen.size.large.okay"
-msgstr ""
-
-#: g10/keygen.c:460
+#: g10/keygen.c:473
 msgid "Do you really need such a large keysize? "
 msgstr "Czy naprawd� potrzebujesz takiego d�ugiego klucza? "
 
-#: g10/keygen.c:466
+#: g10/keygen.c:479
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "��dana d�ugo�� klucza to %u bity.\n"
 
-#: g10/keygen.c:469 g10/keygen.c:473
+#: g10/keygen.c:482 g10/keygen.c:486
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�glono do %u bit�w\n"
 
-#: g10/keygen.c:485
+#: g10/keygen.c:499
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -801,37 +1168,29 @@ msgstr ""
 "      <n>m = termin wa�no�ci klucza up�ywa za n miesi�cy\n"
 "      <n>y = termin wa�no�ci klucza up�ywa za n lat\n"
 
-#: g10/keygen.c:500
-msgid "keygen.valid"
-msgstr ""
-
-#: g10/keygen.c:500
+#: g10/keygen.c:514
 msgid "Key is valid for? (0) "
 msgstr "Okres wa�no�ci klucza ? (0) "
 
-#: g10/keygen.c:511
+#: g10/keygen.c:525
 msgid "invalid value\n"
 msgstr "niepoprawna warto��\n"
 
-#: g10/keygen.c:516
+#: g10/keygen.c:530
 msgid "Key does not expire at all\n"
 msgstr "Klucz nie ma daty wa�no�ci (nie traci wa�no�ci z up�ywem czasu).\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:519
+#: g10/keygen.c:536
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Data wa�no�ci klucza: %s\n"
 
-#: g10/keygen.c:524
-msgid "keygen.valid.okay"
-msgstr ""
-
-#: g10/keygen.c:525
+#: g10/keygen.c:542
 msgid "Is this correct (y/n)? "
 msgstr "Dane poprawne (t/n)? "
 
-#: g10/keygen.c:553
+#: g10/keygen.c:584
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -847,51 +1206,39 @@ msgstr ""
 "    \"Jan Kowalski (Ziutek) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:564
-msgid "keygen.name"
-msgstr ""
-
-#: g10/keygen.c:564
+#: g10/keygen.c:595
 msgid "Real name: "
 msgstr "Imi� i nazwisko: "
 
-#: g10/keygen.c:568
+#: g10/keygen.c:599
 msgid "Invalid character in name\n"
 msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:570
+#: g10/keygen.c:601
 msgid "Name may not start with a digit\n"
 msgstr "Imi� lub nazwisko nie mo�e zaczyna� si� od cyfry\n"
 
-#: g10/keygen.c:572
+#: g10/keygen.c:603
 msgid "Name must be at least 5 characters long\n"
 msgstr "Imi� i nazwisko musz� mie� conajmniej 5 znak�w d�ugo�ci.\n"
 
-#: g10/keygen.c:580
-msgid "keygen.email"
-msgstr ""
-
-#: g10/keygen.c:580
+#: g10/keygen.c:611
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:592
+#: g10/keygen.c:623
 msgid "Not a valid email address\n"
 msgstr "To nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:600
-msgid "keygen.comment"
-msgstr ""
-
-#: g10/keygen.c:600
+#: g10/keygen.c:631
 msgid "Comment: "
 msgstr "Komentarz:"
 
-#: g10/keygen.c:606
+#: g10/keygen.c:637
 msgid "Invalid character in comment\n"
 msgstr "Niew�a�ciwy znak w komentarzu\n"
 
-#: g10/keygen.c:626
+#: g10/keygen.c:657
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -902,38 +1249,31 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:660
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:638
-msgid "keygen.userid.cmd"
-msgstr ""
-"I  - zmiana imienia lub nazwiska.\n"
-"K  - zmiana komentarza.\n"
-"E  - zmiana adresu email.\n"
-"D  - przej�cie do w�a�ciwej generacji klucza.\n"
-"W  - wyj�cie z procedury generacji i z programu."
-
-#: g10/keygen.c:639
+#: g10/keygen.c:670
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, \n"
 "przej�� (D)alej czy (W)yj�� z programu ? "
 
-#: g10/keygen.c:686
+#: g10/keygen.c:722
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
-msgstr "Musisz poda� wyra�enie przej�ciowe (has�o) aby ochroni� sw�k klucz tajny.\n"
+msgstr ""
+"Musisz poda� wyra�enie przej�ciowe (has�o) aby ochroni� sw�k klucz tajny.\n"
 
-#: g10/keyedit.c:379 g10/keygen.c:694
+#: g10/keyedit.c:389 g10/keygen.c:730
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr ""
-"Powt�rzone wyra�enie przej�ciowe nie zgadza si� z podanym w pierwszej pr�bie;\n"
+"Powt�rzone wyra�enie przej�ciowe nie zgadza si� z podanym w pierwszej "
+"pr�bie;\n"
 "spr�buj jeszcze raz.\n"
 
-#: g10/keygen.c:700
+#: g10/keygen.c:736
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -945,354 +1285,448 @@ msgstr ""
 "i opcji \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:721
+#: g10/keygen.c:757
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (work in another window, move the mouse, utilize the\n"
 "network and the disks) during the prime generation; this gives the random\n"
 "number generator a better chance to gain enough entropy.\n"
 msgstr ""
-"Program musi wygenerowa� du�o losowych bajt�w. Dobrze by by�o, zmusi� komputer\n"
+"Program musi wygenerowa� du�o losowych bajt�w. Dobrze by by�o, zmusi� "
+"komputer\n"
 "do r�wnoleg�ej pracy nad czym� innym (w innym oknie, wykona� jakie� ruchy\n"
 "myszk�, u�y� sieci albo odwo�a� si� do dysku) podczas generacji liczb\n"
-"pierwszych; to daje komputerowi szans� zebrania dostatecznej ilo�ci entropii\n"
+"pierwszych; to daje komputerowi szans� zebrania dostatecznej ilo�ci "
+"entropii\n"
 "do zasilenia generatora liczb losowych.\n"
 
-#: g10/keygen.c:788
+#: g10/keygen.c:827
 msgid "Key generation can only be used in interactive mode\n"
 msgstr "Generacj� klucza mo�na wykonywa� tylko w trybie interaktywnym\n"
 
-#: g10/keygen.c:796
+#: g10/keygen.c:835
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Para kluczy dla DSA b�dzie mia�a 1024 bity d�ugo�ci.\n"
 
-#: g10/keygen.c:802
+#: g10/keygen.c:841
 msgid "Key generation cancelled.\n"
 msgstr "Procedura generacji klucza zosta�a anulowana.\n"
 
-#: g10/keygen.c:812
+#: g10/keygen.c:851
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "zapisuj� certyfikat publiczny w `%s'\n"
 
-#: g10/keygen.c:813
+#: g10/keygen.c:852
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "zapisuj� certyfikat prywatny w `%s'\n"
 
-#: g10/keygen.c:890
+#: g10/keygen.c:929
 msgid "public and secret key created and signed.\n"
 msgstr "Prywatny i publiczny klucz zosta� stworzony i podpisany.\n"
 
-#: g10/keygen.c:892
+#: g10/keygen.c:931
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--add-key\" to generate a secondary key for this purpose.\n"
 msgstr ""
 "Uwaga: ten klucz nie mo�e by� wykorzystany do szyfrowania. Je�li chcesz \n"
-"u�y� go do szyfrowania, musisz komend� \"--add-key\" doda� do niego podklucz\n"
+"u�y� go do szyfrowania, musisz komend� \"--add-key\" doda� do niego "
+"podklucz\n"
 "do obs�ugi szyfrowania i deszyfrowania.\n"
 
-#: g10/keygen.c:906 g10/keygen.c:990
+#: g10/keygen.c:945 g10/keygen.c:1030
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/keygen.c:967
-msgid "keygen.sub.okay"
-msgstr "Odpowiedz \"tak\" (lub po prostu \"t\") je�li zgadzasz si� na stworzenie podklucza."
-
-#: g10/keygen.c:968
+#: g10/keygen.c:1008
 msgid "Really create? "
 msgstr "Na pewno generowa�? "
 
-#: g10/encode.c:87
+#: g10/encode.c:88 g10/openfile.c:81 g10/openfile.c:158 g10/tdbio.c:459
+#: g10/tdbio.c:510
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: nie mog� otworzy�: %s\n"
 
-#: g10/encode.c:106
+#: g10/encode.c:107
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "b��d podczs tworzenia wyra�enia przej�ciowego (has�a): %s\n"
 
-#: g10/encode.c:151 g10/encode.c:262
-#, c-format
-msgid "%s: warning: empty file\n"
+#: g10/encode.c:155 g10/encode.c:269
+#, fuzzy, c-format
+msgid "%s: WARNING: empty file\n"
 msgstr "%s: ostrze�enie: plik jest pusty\n"
 
-#: g10/encode.c:217
+#: g10/encode.c:222
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "odczyt z `%s'\n"
 
-#: g10/encode.c:390
-#, c-format
-msgid "%s encrypted for: %s\n"
+#: g10/encode.c:397
+#, fuzzy, c-format
+msgid "%s/%s encrypted for: %s\n"
 msgstr "%s zaszyfrowany dla: %s\n"
 
-#: g10/import.c:105 g10/trustdb.c:1342
+#: g10/export.c:114
+#, fuzzy, c-format
+msgid "%s: user not found: %s\n"
+msgstr "%s: nie znaleziono u�ytkownika\n"
+
+#: g10/export.c:123
+#, c-format
+msgid "certificate read problem: %s\n"
+msgstr ""
+
+#: g10/export.c:132
+#, fuzzy, c-format
+msgid "key %08lX: not a rfc2440 key - skipped\n"
+msgstr "klucz %08lX: niepoprawny certyfikat uniewa�nienia: %s - pomini�ty\n"
+
+#: g10/export.c:174
+#, fuzzy
+msgid "WARNING: nothing exported\n"
+msgstr "OSTRZE�ENIE: u�ywany jest klucz nie obdarzony zaufaniem!\n"
+
+#: g10/getkey.c:164
+msgid "too many entries in pk cache - disabled\n"
+msgstr ""
+
+#: g10/getkey.c:295
+msgid "too many entries in unk cache - disabled\n"
+msgstr ""
+
+#: g10/getkey.c:1039
+#, c-format
+msgid "using secondary key %08lX instead of primary key %08lX\n"
+msgstr ""
+
+#: g10/import.c:129 g10/trustdb.c:1180
 #, c-format
 msgid "can't open file: %s\n"
 msgstr "nie mo�na otworzy� pliku: %s\n"
 
-#: g10/import.c:121
+#: g10/import.c:148
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "pomijam blok typu %d\n"
 
-#: g10/import.c:131 g10/trustdb.c:1420
+#: g10/import.c:155 g10/trustdb.c:1474 g10/trustdb.c:1543
+#, c-format
+msgid "%lu keys so far processed\n"
+msgstr ""
+
+#: g10/import.c:160 g10/trustdb.c:1256
 #, c-format
 msgid "read error: %s\n"
 msgstr "b��d odczytu: %s\n"
 
-#: g10/import.c:271 g10/import.c:441
+#: g10/import.c:162
+#, c-format
+msgid "Total number processed: %lu\n"
+msgstr ""
+
+#: g10/import.c:164
+#, c-format
+msgid "          w/o user IDs: %lu\n"
+msgstr ""
+
+#: g10/import.c:166
+#, c-format
+msgid "              imported: %lu"
+msgstr ""
+
+#: g10/import.c:172
+#, c-format
+msgid "             unchanged: %lu\n"
+msgstr ""
+
+#: g10/import.c:174
+#, c-format
+msgid "          new user IDs: %lu\n"
+msgstr ""
+
+#: g10/import.c:176
+#, c-format
+msgid "           new subkeys: %lu\n"
+msgstr ""
+
+#: g10/import.c:178
+#, fuzzy, c-format
+msgid "        new signatures: %lu\n"
+msgstr "klucz %08lX: %d nowych podpis�w\n"
+
+#: g10/import.c:180
+#, c-format
+msgid "   new key revocations: %lu\n"
+msgstr ""
+
+#: g10/import.c:182
+#, fuzzy, c-format
+msgid "      secret keys read: %lu\n"
+msgstr "b��d procedury enum_secret_keys: %s\n"
+
+#: g10/import.c:184
+#, fuzzy, c-format
+msgid "  secret keys imported: %lu\n"
+msgstr "Klucz %08lX: klucz tajny wczytany do zbioru\n"
+
+#: g10/import.c:186
+#, fuzzy, c-format
+msgid " secret keys unchanged: %lu\n"
+msgstr "b��d procedury enum_secret_keys: %s\n"
+
+#: g10/import.c:328 g10/import.c:520
 #, c-format
 msgid "key %08lX: no user id\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
 
-#: g10/import.c:281
+#: g10/import.c:339
 #, c-format
 msgid "key %08lX: no valid user ids\n"
 msgstr "klucz %08lX: brak poprawnych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:283
+#: g10/import.c:341
 msgid "this may be caused by a missing self-signature\n"
 msgstr "to mo�e by� spowodowane brakiem podpisu w�a�ciciela klucza\n"
 
-#: g10/import.c:291 g10/import.c:508
+#: g10/import.c:352 g10/import.c:588
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "klucz %08lX: brak klucza publicznegoL %s\n"
 
-#: g10/import.c:297
+#: g10/import.c:358
 msgid "no default public keyring\n"
 msgstr "brak domy�lnego zbioru kluczy publicznych\n"
 
-#: g10/import.c:301
+#: g10/import.c:362 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:592
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisywanie '%s\"\n"
 
-#: g10/import.c:305 g10/import.c:359 g10/import.c:562
+#: g10/import.c:366 g10/import.c:426 g10/import.c:642
 #, c-format
 msgid "can't lock public keyring: %s\n"
 msgstr "nie mog� zablokowa� zbioru kluczy publicznych: %s\n"
 
-#: g10/import.c:308
+#: g10/import.c:369
 #, c-format
 msgid "can't write to keyring: %s\n"
 msgstr "niemo�liwy jest zapis do zbioru kluczy: %s\n"
 
-#. we are ready
-#: g10/import.c:311
+#: g10/import.c:373
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "klucz %08lX: klucz publiczny wczytany\n"
 
-#: g10/import.c:320
+#: g10/import.c:386
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "klucz %08lX: nie zgadza si� z lokalnie posiadan� kopi�\n"
 
-#: g10/import.c:333 g10/import.c:517
+#: g10/import.c:399 g10/import.c:597
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "klucz %08lX: brak oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:340 g10/import.c:524
+#: g10/import.c:406 g10/import.c:604
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "klucz %08lX: nie mo�na odczyta� oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:356 g10/import.c:456 g10/import.c:559
+#: g10/import.c:423 g10/import.c:535 g10/import.c:639
 msgid "writing keyblock\n"
 msgstr "zapisuj� blok klucza\n"
 
-#: g10/import.c:362 g10/import.c:565
+#: g10/import.c:429 g10/import.c:645
 #, c-format
 msgid "can't write keyblock: %s\n"
 msgstr "nie mog� zapisa� bloku klucza: %s\n"
 
-#: g10/import.c:366
+#: g10/import.c:434
 #, c-format
 msgid "key %08lX: 1 new user-id\n"
 msgstr "klucz %08lX: 1 nowy identyfikator u�ytkownika\n"
 
-#: g10/import.c:369
+#: g10/import.c:437
 #, c-format
 msgid "key %08lX: %d new user-ids\n"
 msgstr "klucz %08lX: %d nowych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:372
+#: g10/import.c:440
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "klucz %08lX: 1 nowy podpis\n"
 
-#: g10/import.c:375
+#: g10/import.c:443
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "klucz %08lX: %d nowych podpis�w\n"
 
-#: g10/import.c:378
+#: g10/import.c:446
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "klucz %08lX: 1 nowy podklucz\n"
 
-#: g10/import.c:381
+#: g10/import.c:449
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "klucz %08lX: %d nowych podkluczy\n"
 
-#: g10/import.c:385
+#: g10/import.c:459
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "klucz %08lX: pozostawiony bez zmian\n"
 
-#: g10/import.c:459
+#: g10/import.c:538
 #, c-format
 msgid "can't lock secret keyring: %s\n"
 msgstr "nie mog� zablokowa� zbioru kluczy tajnych: %s\n"
 
-#: g10/import.c:462
-msgid "can't write keyring\n"
-msgstr "nie mog� zapisa� zbioru kluczy\n"
+#: g10/import.c:541
+#, fuzzy, c-format
+msgid "can't write keyring: %s\n"
+msgstr "niemo�liwy jest zapis do zbioru kluczy: %s\n"
 
 #. we are ready
-#: g10/import.c:465
+#: g10/import.c:544
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "Klucz %08lX: klucz tajny wczytany do zbioru\n"
 
 #. we can't merge secret keys
-#: g10/import.c:468
+#: g10/import.c:548
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "Klucz %08lX: ten klucz ju� znajduje si� w zbiorze\n"
 
-#: g10/import.c:472
+#: g10/import.c:553
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "klucz %08lX: brak klucza tajnego: %s\n"
 
-#: g10/import.c:502
+#: g10/import.c:582
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "klucz %08lX: brak klucza publicznego - wczytany certyfikat \n"
 "uniwa�nienia nie mo�e by� zastosowany\n"
 
-#: g10/import.c:535
+#: g10/import.c:615
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "klucz %08lX: niepoprawny certyfikat uniewa�nienia:\n"
 "%s - odrzucony\n"
 
-#. we are ready
-#: g10/import.c:568
+#: g10/import.c:649
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "klucz %08lX: wczytany certyfikat uniewa�nienia\n"
 
-#: g10/import.c:598
+#: g10/import.c:680
 #, c-format
 msgid "key %08lX: no user-id for signature\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika do podpisu\n"
 
-#: g10/import.c:605
+#: g10/import.c:687
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
-msgstr "klucz %08lX: nie obs�ugiwany algorytm szyfrowania z kluczem publicznym\n"
+msgstr ""
+"klucz %08lX: nie obs�ugiwany algorytm szyfrowania z kluczem publicznym\n"
 
-#: g10/import.c:606
+#: g10/import.c:688
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "klucz %08lX: niepoprawny podpis w�a�ciciela klucza\n"
 
-#: g10/import.c:635
+#: g10/import.c:717
 #, c-format
 msgid "key %08lX: skipped userid '"
 msgstr "klucz %08lX: zosta� pomini�ty identyfikator u�ytkownika '"
 
-#: g10/import.c:658
+#: g10/import.c:740
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "klucz %08lX: certyfikat uniewa�nienia umieszczony w niew�a�ciwym miejscu\n"
 "- pomini�ty\n"
 
-#: g10/import.c:665
+#: g10/import.c:748
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "klucz %08lX: niepoprawny certyfikat uniewa�nienia: %s - pomini�ty\n"
 
-#: g10/import.c:727
+#: g10/import.c:807
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "klucz %08lX: dodany certyfikat uniewa�nienia\n"
 
-#: g10/import.c:790 g10/import.c:826
+#: g10/import.c:921 g10/import.c:976
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "klucz %08lX: dost�pna kopia nie jest podpisana ni� sam�\n"
 
-#: g10/keyedit.c:80
+#: g10/keyedit.c:81
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: nie znaleziono u�ytkownika\n"
 
-#: g10/keyedit.c:163
+#: g10/keyedit.c:164
 msgid "[self-signature]"
 msgstr "[podpis klucza nim samym]"
 
-#: g10/keyedit.c:181
+#: g10/keyedit.c:182
 msgid "1 bad signature\n"
 msgstr "1 niepoprawny podpis\n"
 
-#: g10/keyedit.c:183
+#: g10/keyedit.c:184
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d niepoprawnych podpis�w\n"
 
-#: g10/keyedit.c:185
+#: g10/keyedit.c:186
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis nie zosta� sprawdzony z powodu braku klucza\n"
 
-#: g10/keyedit.c:187
+#: g10/keyedit.c:188
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d podpis�w nie zosta�o sprawdzonych z powodu braku kluczy\n"
 
-#: g10/keyedit.c:189
+#: g10/keyedit.c:190
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis nie zosta� sprawdzony z powodu b��du\n"
 
-#: g10/keyedit.c:191
+#: g10/keyedit.c:192
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpis�w nie sprawdzonych z powodu b��d�w\n"
 
-#: g10/keyedit.c:193
+#: g10/keyedit.c:194
 msgid "1 user id without valid self-signature detected\n"
 msgstr "wykryto 1 identyfikator u�ytkownika bez podpisu w�a�ciciela klucza\n"
 
-#: g10/keyedit.c:195
+#: g10/keyedit.c:196
 #, c-format
 msgid "%d user ids without valid self-signatures detected\n"
-msgstr "wykryto %d identyfikator�w u�ytkownika bez podpis�w w�a�ciciela klucza\n"
+msgstr ""
+"wykryto %d identyfikator�w u�ytkownika bez podpis�w w�a�ciciela klucza\n"
 
-#: g10/keyedit.c:250
+#: g10/keyedit.c:258
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Ju� podpisano kluczem %08lX.\n"
 
-#: g10/keyedit.c:258
+#: g10/keyedit.c:266
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nie ma nic do podpisania kluczem %08lX.\n"
 
-#: g10/keyedit.c:267
+#: g10/keyedit.c:275
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -1300,357 +1734,441 @@ msgstr ""
 "Czy jeste� naprawd� pewien �e chcesz podpisa� ten klucz \n"
 "swoim kluczem: \""
 
-#: g10/keyedit.c:274
-msgid "sign_uid.okay"
-msgstr ""
-
-#: g10/keyedit.c:274
+#: g10/keyedit.c:282
 msgid "Really sign? "
 msgstr "Na pewno podpisa�? "
 
-#: g10/keyedit.c:295
+#: g10/keyedit.c:303 g10/sign.c:65
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podpisywanie nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:346
+#: g10/keyedit.c:356
 msgid "This key is not protected.\n"
 msgstr "Ten klucz nie jest chroniony.\n"
 
-#: g10/keyedit.c:349
+#: g10/keyedit.c:359
 msgid "Key is protected.\n"
 msgstr "Klucz jest chroniony.\n"
 
-#: g10/keyedit.c:366
+#: g10/keyedit.c:376
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tego klucza nie mo�na edytowa�: %s.\n"
 
-#: g10/keyedit.c:371
+#: g10/keyedit.c:381
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
-msgstr "Wprowad� nowe wyra�enie przej�ciowe (has�o) dla tego klucza tajnego.\n\n"
+msgstr ""
+"Wprowad� nowe wyra�enie przej�ciowe (has�o) dla tego klucza tajnego.\n"
+"\n"
 
-#: g10/keyedit.c:383
+#: g10/keyedit.c:393
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
-msgstr "Nie chcesz poda� wyra�enia przej�ciowego (has�a) - to z�y pomys�!\n\n"
-
-#: g10/keyedit.c:385
-msgid "change_passwd.empty.okay"
 msgstr ""
+"Nie chcesz poda� wyra�enia przej�ciowego (has�a) - to z�y pomys�!\n"
+"\n"
 
-#: g10/keyedit.c:386
+#: g10/keyedit.c:396
 msgid "Do you really want to do this? "
 msgstr "Czy na pewno chcesz to zrobi�? "
 
-#: g10/keyedit.c:441
+#: g10/keyedit.c:455
+msgid "moving a key signature to the correct place\n"
+msgstr ""
+
+#: g10/keyedit.c:490
 msgid "quit"
 msgstr "wyj�cie"
 
-#: g10/keyedit.c:441
+#: g10/keyedit.c:490
 msgid "quit this menu"
 msgstr "wyj�cie z tego menu"
 
-#: g10/keyedit.c:442
+#: g10/keyedit.c:491
 msgid "q"
 msgstr "w"
 
-#: g10/keyedit.c:443
+#: g10/keyedit.c:492
 msgid "save"
 msgstr "zapis"
 
-#: g10/keyedit.c:443
+#: g10/keyedit.c:492
 msgid "save and quit"
 msgstr "zapis zmian i wyj�cie"
 
-#: g10/keyedit.c:444
+#: g10/keyedit.c:493
 msgid "help"
 msgstr "pomoc"
 
-#: g10/keyedit.c:444
+#: g10/keyedit.c:493
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/keyedit.c:446
+#: g10/keyedit.c:495
 msgid "fpr"
 msgstr "odc"
 
-#: g10/keyedit.c:446
+#: g10/keyedit.c:495
 msgid "show fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/keyedit.c:447
+#: g10/keyedit.c:496
 msgid "list"
 msgstr "lista"
 
-#: g10/keyedit.c:447
+#: g10/keyedit.c:496
 msgid "list key and user ids"
 msgstr "lista kluczy i identyfikator�w u�ytkownik�w"
 
-#: g10/keyedit.c:448
+#: g10/keyedit.c:497
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:449
+#: g10/keyedit.c:498
 msgid "uid"
 msgstr "id"
 
-#: g10/keyedit.c:449
+#: g10/keyedit.c:498
 msgid "select user id N"
 msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:450
+#: g10/keyedit.c:499
 msgid "key"
 msgstr "klucz"
 
-#: g10/keyedit.c:450
+#: g10/keyedit.c:499
 msgid "select secondary key N"
 msgstr "wyb�r podklucza N"
 
-#: g10/keyedit.c:451
+#: g10/keyedit.c:500
 msgid "check"
 msgstr "lista"
 
-#: g10/keyedit.c:451
+#: g10/keyedit.c:500
 msgid "list signatures"
 msgstr "lista podpis�w"
 
-#: g10/keyedit.c:452
+#: g10/keyedit.c:501
 msgid "c"
 msgstr "l"
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:502
 msgid "sign"
 msgstr "podpis"
 
-#: g10/keyedit.c:453
+#: g10/keyedit.c:502
 msgid "sign the key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:503
 msgid "s"
 msgstr "p"
 
-#: g10/keyedit.c:455
+#: g10/keyedit.c:504
 msgid "debug"
 msgstr "�ledzenia"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:505
 msgid "adduid"
 msgstr "dodid"
 
-#: g10/keyedit.c:456
+#: g10/keyedit.c:505
 msgid "add a user id"
 msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
 
-#: g10/keyedit.c:457
+#: g10/keyedit.c:506
 msgid "deluid"
 msgstr "usid"
 
-#: g10/keyedit.c:457
+#: g10/keyedit.c:506
 msgid "delete user id"
 msgstr "usuni�cie identyfikatora u�ytkownika z klucza"
 
-#: g10/keyedit.c:458
+#: g10/keyedit.c:507
 msgid "addkey"
 msgstr "dodkl"
 
-#: g10/keyedit.c:458
+#: g10/keyedit.c:507
 msgid "add a secondary key"
 msgstr "dodanie podklucza"
 
-#: g10/keyedit.c:459
+#: g10/keyedit.c:508
 msgid "delkey"
 msgstr "uskl"
 
-#: g10/keyedit.c:459
+#: g10/keyedit.c:508
 msgid "delete a secondary key"
 msgstr "usuni�cie podklucza"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:509
+#, fuzzy
+msgid "expire"
+msgstr "opcje"
+
+#: g10/keyedit.c:509
+#, fuzzy
+msgid "change the expire date"
+msgstr "zmiana wyra�enia przej�ciowego (has�a)"
+
+#: g10/keyedit.c:510
 msgid "toggle"
 msgstr "prze�"
 
-#: g10/keyedit.c:460
+#: g10/keyedit.c:510
 msgid "toggle between secret and public key listing"
 msgstr "prze��czenie pomi�dzy list� kluczy publicznych i tajnych"
 
-#: g10/keyedit.c:462
+#: g10/keyedit.c:512
 msgid "t"
 msgstr "p"
 
-#: g10/keyedit.c:463
+#: g10/keyedit.c:513
 msgid "pref"
 msgstr "opcje"
 
-#: g10/keyedit.c:463
+#: g10/keyedit.c:513
 msgid "list preferences"
 msgstr "lista opcji"
 
-#: g10/keyedit.c:464
+#: g10/keyedit.c:514
 msgid "passwd"
 msgstr "has�o"
 
-#: g10/keyedit.c:464
+#: g10/keyedit.c:514
 msgid "change the passphrase"
 msgstr "zmiana wyra�enia przej�ciowego (has�a)"
 
-#: g10/keyedit.c:465
+#: g10/keyedit.c:515
 msgid "trust"
 msgstr "zaufanie"
 
-#: g10/keyedit.c:465
+#: g10/keyedit.c:515
 msgid "change the ownertrust"
 msgstr "zmiana zaufania w�a�ciciela"
 
-#: g10/keyedit.c:483
+#: g10/keyedit.c:534
 msgid "can't do that in batchmode\n"
 msgstr "operacja niemo�liwa do wykonania w trybie wsadowym\n"
 
 #. check that they match
 #. FIXME: check that they both match
-#: g10/keyedit.c:506
+#: g10/keyedit.c:561
 msgid "Secret key is available.\n"
 msgstr "Dost�pny jest klucz tajny.\n"
 
-#: g10/keyedit.c:522
-msgid "keyedit.cmd"
-msgstr "Please enter \"help\"."
-
-#: g10/keyedit.c:522
+#: g10/keyedit.c:590
 msgid "Command> "
 msgstr "Polecenie> "
 
-#: g10/keyedit.c:547
-msgid "Need the secret key to to this.\n"
+#: g10/keyedit.c:617
+#, fuzzy
+msgid "Need the secret key to do this.\n"
 msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
 
-#: g10/keyedit.c:566
-msgid "keyedit.save.okay"
-msgstr ""
-
-#: g10/keyedit.c:567
+#: g10/keyedit.c:639
 msgid "Save changes? "
 msgstr "Zapisa� zmiany? "
 
-#: g10/keyedit.c:569
-msgid "keyedit.cancel.okay"
-msgstr ""
-
-#: g10/keyedit.c:570
+#: g10/keyedit.c:642
 msgid "Quit without saving? "
 msgstr "Wyj�� bez zapisania zmian? "
 
-#: g10/keyedit.c:580
+#: g10/keyedit.c:652
 #, c-format
 msgid "update failed: %s\n"
 msgstr "naniesienie poprawek nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:587
+#: g10/keyedit.c:659
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "naniesienie poprawek na kluczu tajnym nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:666
 msgid "Key not changed so no update needed.\n"
-msgstr "Klucz nie zosta� zmieniony wi�c nanoszenie poprawek nie jest konieczne.\n"
-
-#: g10/keyedit.c:625
-msgid "keyedit.sign_all.okay"
 msgstr ""
+"Klucz nie zosta� zmieniony wi�c nanoszenie poprawek nie jest konieczne.\n"
+
+#: g10/keyedit.c:669 g10/keyedit.c:727
+#, fuzzy, c-format
+msgid "update of trustdb failed: %s\n"
+msgstr "naniesienie poprawek na kluczu tajnym nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:701
 msgid "Really sign all user ids? "
 msgstr "Podpisa� wszystkie identyfikatory u�ytkownika na tym kluczu? "
 
-#: g10/keyedit.c:627
+#: g10/keyedit.c:702
 msgid "Hint: Select the user ids to sign\n"
 msgstr "Podpowied�: wybierz identyfikatory u�ytkownika do podpisania.\n"
 
-#: g10/keyedit.c:655
+#: g10/keyedit.c:738
 msgid "You must select at least one user id.\n"
 msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:657
+#: g10/keyedit.c:740
 msgid "You can't delete the last user id!\n"
 msgstr "Nie mo�esz usun�� ostatniego identyfikatora u�ytkownika!\n"
 
-#: g10/keyedit.c:659
-msgid "keyedit.remove.uid.okay"
-msgstr ""
-
-#: g10/keyedit.c:660
+#: g10/keyedit.c:743
 msgid "Really remove all selected user ids? "
 msgstr "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:661
+#: g10/keyedit.c:744
 msgid "Really remove this user id? "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:767
 msgid "You must select at least one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:686
-msgid "keyedit.remove.subkey.okay"
-msgstr ""
-
-#: g10/keyedit.c:688
+#: g10/keyedit.c:771
 msgid "Do you really want to delete the selected keys? "
 msgstr "Czy na pewno chcesz usun�� wybrane klucze? "
 
-#: g10/keyedit.c:689
+#: g10/keyedit.c:772
 msgid "Do you really want to delete this key? "
 msgstr "Czy na pewno chcesz usun�� ten klucz? "
 
-#: g10/keyedit.c:726
+#: g10/keyedit.c:819
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawna komenda  (spr�buj \"pomoc\")\n"
 
-#: g10/keyedit.c:1106
+#: g10/keyedit.c:1197
+msgid "Please remove selections from the secret keys.\n"
+msgstr ""
+
+#: g10/keyedit.c:1203
+#, fuzzy
+msgid "Please select at most one secondary key.\n"
+msgstr "Musisz wybra� co najmniej jeden klucz.\n"
+
+#: g10/keyedit.c:1207
+msgid "Changing exiration time for a secondary key.\n"
+msgstr ""
+
+#: g10/keyedit.c:1209
+msgid "Changing exiration time for the primary key.\n"
+msgstr ""
+
+#: g10/keyedit.c:1250
+msgid "You can't change the expiration date of a v3 key\n"
+msgstr ""
+
+#: g10/keyedit.c:1266
+msgid "No corresponding signature in secret ring\n"
+msgstr ""
+
+#: g10/keyedit.c:1326
 #, c-format
 msgid "No user id with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1371
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Brak podklucza o indeksie %d\n"
 
 #: g10/mainproc.c:198
+#, fuzzy
+msgid "public key encrypted data: good DEK\n"
+msgstr "b��d odszyfrowywania klucza publicznego: %s\n"
+
+#: g10/mainproc.c:201
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "b��d odszyfrowywania klucza publicznego: %s\n"
 
 #: g10/mainproc.c:228
+#, fuzzy
+msgid "decryption okay\n"
+msgstr "b��d odszyfrowywania: %s\n"
+
+#: g10/mainproc.c:231
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:842
+#: g10/mainproc.c:248
+msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
+msgstr ""
+
+#: g10/mainproc.c:250
+#, c-format
+msgid "original file name='%.*s'\n"
+msgstr ""
+
+#: g10/mainproc.c:833
+msgid "signature verification suppressed\n"
+msgstr ""
+
+#: g10/mainproc.c:839
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
 "Podpis z�o�ony %.*s za pomoc� %s,\n"
 "z u�yciem klucza o identyfikatorze %08lX\n"
 
-#: g10/mainproc.c:848
+#: g10/mainproc.c:847
 msgid "BAD signature from \""
 msgstr "NIEPOPRAWNY podpis z�o�ony przez \""
 
-#: g10/mainproc.c:849
+#: g10/mainproc.c:848
 msgid "Good signature from \""
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:860
+#: g10/mainproc.c:879
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie mog� sprawdzi� podpisu: %s\n"
 
-#: g10/passphrase.c:117
+#: g10/mainproc.c:952
+msgid "old style (PGP 2.x) signature\n"
+msgstr ""
+
+#: g10/mainproc.c:957
+msgid "invalid root packet detected in proc_tree()\n"
+msgstr ""
+
+#: g10/misc.c:90
+#, fuzzy, c-format
+msgid "can't disable core dumps: %s\n"
+msgstr "nie mog� otworzy� %s: %s\n"
+
+#: g10/misc.c:93
+msgid "WARNING: program may create a core file!\n"
+msgstr ""
+
+#: g10/misc.c:200
+msgid "Experimental algorithms should not be used!\n"
+msgstr ""
+
+#: g10/misc.c:214
+msgid ""
+"RSA keys are deprecated; please consider creating a new key and use this key "
+"in the future\n"
+msgstr ""
+"Klucze RSA s� odradzane; prosz� rozwa�y� przej�cie na inne algorytmy po\n"
+"wygenerowaniu odpowiednich kluczy.\n"
+
+#: g10/misc.c:235
+msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
+msgstr ""
+
+#: g10/parse-packet.c:113
+#, fuzzy, c-format
+msgid "can't handle public key algorithm %d\n"
+msgstr "nie mog� zablokowa� zbioru kluczy publicznych: %s\n"
+
+#: g10/parse-packet.c:892
+#, c-format
+msgid "subpacket of type %d has critical bit set\n"
+msgstr ""
+
+#: g10/passphrase.c:141
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -1660,157 +2178,818 @@ msgstr ""
 "Musisz poda� wyra�enie przej�ciowe (has�o) aby uaktywni� klucz tajny\n"
 "dla u�ytkownika: \""
 
-#: g10/passphrase.c:126
-#, c-format
-msgid "(%u-bit %s key, ID %08lX, created %s)\n"
+#: g10/passphrase.c:150
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "(d�ugo�� %u bit�w, typ %s, klucz %08lX, stworzony %s)\n"
 
-#: g10/passphrase.c:167
-msgid "passphrase.enter"
+#: g10/passphrase.c:155
+#, c-format
+msgid " (main key ID %08lX)"
 msgstr ""
-"Prosz� wprowadzi� wyra�enie przej�ciowe (tajne zdanie)\n"
-"  Bla, bla, bla ..."
 
-#: g10/passphrase.c:167
-msgid "Enter pass phrase: "
+#: g10/passphrase.c:183
+#, fuzzy
+msgid "Enter passphrase: "
 msgstr "Wyra�enie przej�ciowe: "
 
-#: g10/passphrase.c:170
-msgid "passphrase.repeat"
-msgstr "Prosz� powt�rzy� podane wyra�enie przej�ciowe dla wyeliminowania pomy�ek."
-
-#: g10/passphrase.c:171
-msgid "Repeat pass phrase: "
+#: g10/passphrase.c:187
+#, fuzzy
+msgid "Repeat passphrase: "
 msgstr "Prosz� powt�rzy� wyra�enie przej�ciowe: "
 
-#: g10/plaintext.c:210
-msgid "detached_signature.filename"
+#: g10/plaintext.c:63
+msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:211
+#: g10/plaintext.c:166
 msgid "Please enter name of data file: "
 msgstr "Nazwa pliku: "
 
-#: g10/plaintext.c:295
+#: g10/plaintext.c:187
+msgid "reading stdin ...\n"
+msgstr ""
+
+#: g10/plaintext.c:250
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nie mog� otworzy� podpisanego pliku `%s'\n"
 
+#: g10/pubkey-enc.c:78
+#, c-format
+msgid "anonymous receiver; trying secret key %08lX ...\n"
+msgstr "adresat anonimowy; pr�buj� klucz tajny %08lX ...\n"
+
+#: g10/pubkey-enc.c:84
+#, fuzzy
+msgid "okay, we are the anonymous recipient.\n"
+msgstr "OK, to my jeste�my adresatem anonimowym.\n"
+
+#: g10/pubkey-enc.c:136
+#, fuzzy
+msgid "old encoding of the DEK is not supported\n"
+msgstr "%d - algorytm ochrony nie obs�ugiwany\n"
+
+#: g10/pubkey-enc.c:183
+#, fuzzy, c-format
+msgid "NOTE: cipher algorithm %d not found in preferences\n"
+msgstr "uwaga: brak algorytmu szyfruj�cego %d w ustawieniach\n"
+
 #: g10/seckey-cert.c:56
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "%d - algorytm ochrony nie obs�ugiwany\n"
 
-#: g10/seckey-cert.c:169
+#: g10/seckey-cert.c:176
 msgid "Invalid passphrase; please try again ...\n"
-msgstr "Niepoprawne wyra�enie przej�ciowe (has�o); prosz� spr�bowa� ponownie ...\n"
+msgstr ""
+"Niepoprawne wyra�enie przej�ciowe (has�o); prosz� spr�bowa� ponownie ...\n"
 
-#: g10/seckey-cert.c:215
-msgid "Warning: Weak key detected - please change passphrase again.\n"
+#: g10/seckey-cert.c:223
+#, fuzzy
+msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "Ostrze�enie: Wykryto klucz s�aby algorytmu - nale�y ponownie zmieni� \n"
 "wyra�enie przej�ciowe (has�o).\n"
 
-#: g10/sig-check.c:165
-msgid "public key created in future (time warp or clock problem)\n"
+#: g10/sig-check.c:155
+msgid ""
+"this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
+msgstr ""
+
+#: g10/sig-check.c:166
+#, fuzzy, c-format
+msgid "public key created %lu %s in future (time warp or clock problem)\n"
 msgstr ""
 "Klucz publiczny zosta� stworzony w przysz�o�ci (zaburzenia \n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/sig-check.c:171
-#, c-format
-msgid "warning: signature key expired %s\n"
+#: g10/sig-check.c:168
+msgid "second"
+msgstr ""
+
+#: g10/sig-check.c:168
+msgid "seconds"
+msgstr ""
+
+#: g10/sig-check.c:173
+#, fuzzy, c-format
+msgid "NOTE: signature key expired %s\n"
 msgstr "ostrze�enie: klucz podpisuj�cy przekroczy� dat� wa�no�ci %s\n"
 
-#: g10/trustdb.c:316
+#: g10/sig-check.c:230
+msgid "assuming bad signature due to an unknown critical bit\n"
+msgstr ""
+
+#: g10/sign.c:69
+#, fuzzy, c-format
+msgid "%s signature from: %s\n"
+msgstr "NIEPOPRAWNY podpis z�o�ony przez \""
+
+#: g10/sign.c:200 g10/sign.c:587
+#, fuzzy, c-format
+msgid "can't create %s: %s\n"
+msgstr "nie mog� otworzy� %s: %s\n"
+
+#: g10/sign.c:296
+#, fuzzy
+msgid "signing:"
+msgstr "podpis"
+
+#: g10/sign.c:336
+#, fuzzy, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "%s: ostrze�enie: plik jest pusty\n"
+
+#: g10/tdbio.c:116 g10/tdbio.c:1418
+#, fuzzy, c-format
+msgid "trustdb rec %lu: lseek failed: %s\n"
+msgstr "naniesienie poprawek na kluczu tajnym nie powiod�o si�: %s\n"
+
+#: g10/tdbio.c:122 g10/tdbio.c:1425
 #, c-format
-msgid "error reading sigrec: %s\n"
+msgid "trustdb rec %lu: write failed (n=%d): %s\n"
+msgstr ""
+
+#: g10/tdbio.c:232
+msgid "trustdb transaction too large\n"
+msgstr ""
+
+#: g10/tdbio.c:416
+#, fuzzy, c-format
+msgid "%s: can't access: %s\n"
+msgstr "%s: nie mog� otworzy�: %s\n"
+
+#: g10/ringedit.c:273 g10/tdbio.c:436
+#, fuzzy, c-format
+msgid "%s: can't create directory: %s\n"
+msgstr "%s: nie mog� otworzy�: %s\n"
+
+#: g10/ringedit.c:279 g10/tdbio.c:439
+#, c-format
+msgid "%s: directory created\n"
+msgstr ""
+
+#: g10/tdbio.c:443
+#, c-format
+msgid "%s: directory does not exist!\n"
+msgstr ""
+
+#: g10/openfile.c:101 g10/openfile.c:165 g10/ringedit.c:1275 g10/tdbio.c:449
+#, fuzzy, c-format
+msgid "%s: can't create: %s\n"
+msgstr "%s: nie mog� otworzy�: %s\n"
+
+#: g10/tdbio.c:473
+#, c-format
+msgid "%s: failed to create version record: %s"
+msgstr ""
+
+#: g10/tdbio.c:477
+#, c-format
+msgid "%s: invalid trustdb created\n"
+msgstr ""
+
+#: g10/tdbio.c:479
+#, c-format
+msgid "%s: trustdb created\n"
+msgstr ""
+
+#: g10/tdbio.c:512
+#, c-format
+msgid "%s: invalid trustdb\n"
+msgstr ""
+
+#: g10/tdbio.c:545
+#, c-format
+msgid "%s: failed to create hashtable: %s\n"
+msgstr ""
+
+#: g10/tdbio.c:553
+#, fuzzy, c-format
+msgid "%s: error updating version record: %s\n"
+msgstr "b��d odczytu rekordu podpisu: %s\n"
+
+#: g10/tdbio.c:569 g10/tdbio.c:608 g10/tdbio.c:633 g10/tdbio.c:1351
+#: g10/tdbio.c:1378
+#, fuzzy, c-format
+msgid "%s: error reading version record: %s\n"
+msgstr "b��d odczytu rekordu podpisu: %s\n"
+
+#: g10/tdbio.c:582
+#, fuzzy, c-format
+msgid "%s: error writing version record: %s\n"
+msgstr "b��d odczytu rekordu podpisu: %s\n"
+
+#: g10/tdbio.c:1058
+#, fuzzy, c-format
+msgid "trustdb: lseek failed: %s\n"
+msgstr "naniesienie poprawek na kluczu tajnym nie powiod�o si�: %s\n"
+
+#: g10/tdbio.c:1066
+#, fuzzy, c-format
+msgid "trustdb: read failed (n=%d): %s\n"
+msgstr "naniesienie poprawek nie powiod�o si�: %s\n"
+
+#: g10/tdbio.c:1087
+#, c-format
+msgid "%s: not a trustdb file\n"
+msgstr ""
+
+#: g10/tdbio.c:1103
+#, c-format
+msgid "%s: version record with recnum %lu\n"
+msgstr ""
+
+#: g10/tdbio.c:1108
+#, c-format
+msgid "%s: invalid file version %d\n"
+msgstr ""
+
+#: g10/tdbio.c:1384
+#, fuzzy, c-format
+msgid "%s: error reading free record: %s\n"
+msgstr "b��d odczytu rekordu podpisu: %s\n"
+
+#: g10/tdbio.c:1392
+#, fuzzy, c-format
+msgid "%s: error writing dir record: %s\n"
+msgstr "b��d odczytu rekordu podpisu: %s\n"
+
+#: g10/tdbio.c:1402
+#, c-format
+msgid "%s: failed to zero a record: %s\n"
+msgstr ""
+
+#: g10/tdbio.c:1432
+#, c-format
+msgid "%s: failed to append a record: %s\n"
+msgstr ""
+
+#: g10/trustdb.c:142
+msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n"
+msgstr ""
+
+#: g10/trustdb.c:155
+#, c-format
+msgid "trust record %lu, req type %d: read failed: %s\n"
+msgstr ""
+
+#: g10/trustdb.c:170
+#, c-format
+msgid "trust record %lu, type %d: write failed: %s\n"
+msgstr ""
+
+#: g10/trustdb.c:184
+#, fuzzy, c-format
+msgid "trust record %lu: delete failed: %s\n"
+msgstr "naniesienie poprawek na kluczu tajnym nie powiod�o si�: %s\n"
+
+#: g10/trustdb.c:198
+#, fuzzy, c-format
+msgid "trustdb: sync failed: %s\n"
+msgstr "naniesienie poprawek na kluczu tajnym nie powiod�o si�: %s\n"
+
+#: g10/trustdb.c:327
+#, fuzzy, c-format
+msgid "error reading dir record for LID %lu: %s\n"
+msgstr "b��d odczytu rekordu podpisu: %s\n"
+
+#: g10/trustdb.c:334
+#, c-format
+msgid "lid %lu: expected dir record, got type %d\n"
+msgstr ""
+
+#: g10/trustdb.c:339
+#, c-format
+msgid "no primary key for LID %lu\n"
+msgstr ""
+
+#: g10/trustdb.c:344
+#, fuzzy, c-format
+msgid "error reading primary key for LID %lu: %s\n"
 msgstr "b��d odczytu rekordu podpisu: %s\n"
 
-#: g10/trustdb.c:321
+#: g10/trustdb.c:420
 #, c-format
 msgid "chained sigrec %lu has a wrong owner\n"
 msgstr "powi�zany rekord podpisu %lu ma niew�a�ciwego w�a�ciciela\n"
 
-#: g10/trustdb.c:364
+#: g10/trustdb.c:463
 #, c-format
-msgid "key %08lX: secret key without public key\n"
-msgstr "klucz %08lX: klucz tajny bez klucza jawnego\n"
+msgid "'%s' is not a valid long keyID\n"
+msgstr ""
 
-#: g10/trustdb.c:369
-#, c-format
-msgid "key %08lX: secret and public key don't match\n"
-msgstr "klucz %08lX: klucz tajny nie pasuje do klucza jawnego\n"
+#: g10/trustdb.c:498
+#, fuzzy, c-format
+msgid "key %08lX: no public key for trusted key - skipped\n"
+msgstr "klucz %08lX: klucz publiczny wczytany\n"
 
-#: g10/trustdb.c:380
+#: g10/trustdb.c:507 g10/trustdb.c:565
 #, c-format
 msgid "key %08lX: can't put it into the trustdb\n"
 msgstr "klucz %08lX: wpisanie do Bazy Zaufania niemo�liwe\n"
 
-#: g10/trustdb.c:386
+#: g10/trustdb.c:512 g10/trustdb.c:571
 #, c-format
 msgid "key %08lX: query record failed\n"
 msgstr "klucz %08lX: wyszukanie zapisu nie powiod�o si�\n"
 
-#: g10/trustdb.c:395
-#, c-format
-msgid "key %08lX: already in ultikey_table\n"
+#: g10/trustdb.c:517 g10/trustdb.c:580
+#, fuzzy, c-format
+msgid "key %08lX: already in trusted key table\n"
 msgstr "klucz %08lX: ju� znajduje si� w in ultikey_table\n"
 
-#: g10/trustdb.c:402
+#: g10/trustdb.c:520 g10/trustdb.c:583
+#, fuzzy, c-format
+msgid "key %08lX: accepted as trusted key.\n"
+msgstr "Klucz %08lX.%lu: wprowadzony do bazy zaufania\n"
+
+#: g10/trustdb.c:536
+#, fuzzy, c-format
+msgid "NOTE: secret key %08lX is NOT protected.\n"
+msgstr "Ten klucz nie jest chroniony.\n"
+
+#: g10/trustdb.c:548
+#, fuzzy, c-format
+msgid "key %08lX: secret key without public key - skipped\n"
+msgstr "klucz %08lX: klucz tajny bez klucza jawnego\n"
+
+#: g10/trustdb.c:555
+#, c-format
+msgid "key %08lX: secret and public key don't match\n"
+msgstr "klucz %08lX: klucz tajny nie pasuje do klucza jawnego\n"
+
+#: g10/trustdb.c:591
+#, fuzzy, c-format
+msgid "enumerate secret keys failed: %s\n"
+msgstr "b��d procedury enum_secret_keys: %s\n"
+
+#: g10/trustdb.c:774
+#, fuzzy, c-format
+msgid "lid %lu: read dir record failed: %s\n"
+msgstr "klucz %08lX: wprowadzenie wpisu zaufania nie powiod�o si�: %s\n"
+
+#: g10/trustdb.c:783
+#, fuzzy, c-format
+msgid "lid %lu: read key record failed: %s\n"
+msgstr "klucz %08lX: wprowadzenie wpisu zaufania nie powiod�o si�: %s\n"
+
+#: g10/trustdb.c:793
+#, fuzzy, c-format
+msgid "lid %lu: read uid record failed: %s\n"
+msgstr "klucz %08lX: wprowadzenie wpisu zaufania nie powiod�o si�: %s\n"
+
+#: g10/trustdb.c:802
+#, fuzzy, c-format
+msgid "lid %lu: read pref record failed: %s\n"
+msgstr "klucz %08lX: wprowadzenie wpisu zaufania nie powiod�o si�: %s\n"
+
+#: g10/trustdb.c:812
+#, fuzzy, c-format
+msgid "lid %lu: read sig record failed: %s\n"
+msgstr "klucz %08lX: wprowadzenie wpisu zaufania nie powiod�o si�: %s\n"
+
+#: g10/trustdb.c:1013
+msgid "Ooops, no keys\n"
+msgstr ""
+
+#: g10/trustdb.c:1017
+#, fuzzy
+msgid "Ooops, no user ids\n"
+msgstr "lista kluczy i identyfikator�w u�ytkownik�w"
+
+#: g10/trustdb.c:1088 g10/trustdb.c:1106
+#, c-format
+msgid "user '%s' read problem: %s\n"
+msgstr ""
+
+#: g10/trustdb.c:1091 g10/trustdb.c:1109
+#, c-format
+msgid "user '%s' list problem: %s\n"
+msgstr ""
+
+#: g10/trustdb.c:1099 g10/trustdb.c:1346
+#, fuzzy, c-format
+msgid "user '%s' not found: %s\n"
+msgstr "%s: nie znaleziono u�ytkownika\n"
+
+#: g10/trustdb.c:1101 g10/trustdb.c:1348
+#, c-format
+msgid "problem finding '%s' in trustdb: %s\n"
+msgstr ""
+
+#: g10/trustdb.c:1104
+#, c-format
+msgid "user '%s' not in trustdb\n"
+msgstr ""
+
+#: g10/trustdb.c:1139
+#, c-format
+msgid ""
+"# List of assigned trustvalues, created %s\n"
+"# (Use \"gpgm --import-ownertrust\" to restore them)\n"
+msgstr ""
+
+#: g10/trustdb.c:1145
+msgid "directory record w/o primary key\n"
+msgstr ""
+
+#: g10/trustdb.c:1152
+#, fuzzy, c-format
+msgid "error reading key record: %s\n"
+msgstr "b��d odczytu rekordu podpisu: %s\n"
+
+#: g10/trustdb.c:1192
+msgid "line too long\n"
+msgstr ""
+
+#: g10/trustdb.c:1200
+msgid "error: missing colon\n"
+msgstr ""
+
+#: g10/trustdb.c:1205
+#, fuzzy
+msgid "error: invalid fingerprint\n"
+msgstr "okazanie odcisku klucza"
+
+#: g10/trustdb.c:1209
+#, fuzzy
+msgid "error: no ownertrust value\n"
+msgstr ""
+"Przypisanie tych warto�ci nale�y do Ciebie, nie b�d� one udost�pnione\n"
+"nikomu innemu. S� one u�ywane do stworzenia sieci zaufania i nie ma\n"
+"to nic wsp�lnego z tworzon� sieci� certyfikat�w."
+
+#: g10/trustdb.c:1234
+msgid "key not in trustdb, searching ring.\n"
+msgstr ""
+
+#: g10/trustdb.c:1237
+#, fuzzy, c-format
+msgid "key not in ring: %s\n"
+msgstr "Generacja klucza nie powiod�a si�: %s\n"
+
+#: g10/trustdb.c:1241
+msgid "Oops: key is now in trustdb???\n"
+msgstr ""
+
+#. update the ownertrust
+#: g10/trustdb.c:1246
+#, fuzzy, c-format
+msgid "insert trust record failed: %s\n"
+msgstr "klucz %08lX: wprowadzenie wpisu zaufania nie powiod�o si�: %s\n"
+
+#. error
+#: g10/trustdb.c:1252
+#, fuzzy, c-format
+msgid "error finding dir record: %s\n"
+msgstr "b��d odczytu rekordu podpisu: %s\n"
+
+#: g10/trustdb.c:1351
+#, c-format
+msgid "user '%s' not in trustdb - inserting\n"
+msgstr ""
+
+#: g10/trustdb.c:1354
+#, fuzzy, c-format
+msgid "failed to put '%s' into trustdb: %s\n"
+msgstr "Inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
+
+#: g10/trustdb.c:1404
+#, c-format
+msgid "%s: keyblock read problem: %s\n"
+msgstr ""
+
+#: g10/trustdb.c:1418
+#, fuzzy, c-format
+msgid "%s: update failed: %s\n"
+msgstr "naniesienie poprawek nie powiod�o si�: %s\n"
+
+#: g10/trustdb.c:1421
+#, c-format
+msgid "%s: updated\n"
+msgstr ""
+
+#: g10/trustdb.c:1423
+#, c-format
+msgid "%s: okay\n"
+msgstr ""
+
+#: g10/trustdb.c:1438
+#, c-format
+msgid "lid %lu: dir record w/o key - skipped\n"
+msgstr ""
+
+#: g10/trustdb.c:1451
+#, fuzzy, c-format
+msgid "lid %lu: keyblock not found: %s\n"
+msgstr "klucz %08lX: brak klucza publicznegoL %s\n"
+
+#: g10/trustdb.c:1460 g10/trustdb.c:1529
+#, fuzzy, c-format
+msgid "lid %lu: update failed: %s\n"
+msgstr "naniesienie poprawek nie powiod�o si�: %s\n"
+
+#: g10/trustdb.c:1466 g10/trustdb.c:1535
+#, c-format
+msgid "lid %lu: updated\n"
+msgstr ""
+
+#: g10/trustdb.c:1470 g10/trustdb.c:1539
+#, c-format
+msgid "lid %lu: okay\n"
+msgstr ""
+
+#: g10/trustdb.c:1477 g10/trustdb.c:1545
+#, c-format
+msgid "%lu keys processed\n"
+msgstr ""
+
+#: g10/trustdb.c:1479
+#, fuzzy, c-format
+msgid "\t%lu keys skipped\n"
+msgstr "%s: pomini�ty: %s\n"
+
+#: g10/trustdb.c:1481 g10/trustdb.c:1547
+#, c-format
+msgid "\t%lu keys with errors\n"
+msgstr ""
+
+#: g10/trustdb.c:1483 g10/trustdb.c:1549
+#, c-format
+msgid "\t%lu keys updated\n"
+msgstr ""
+
+#: g10/trustdb.c:1513
+#, fuzzy, c-format
+msgid "lid ?: insert failed: %s\n"
+msgstr "naniesienie poprawek na kluczu tajnym nie powiod�o si�: %s\n"
+
+#: g10/trustdb.c:1518
+#, fuzzy, c-format
+msgid "lid %lu: insert failed: %s\n"
+msgstr "naniesienie poprawek na kluczu tajnym nie powiod�o si�: %s\n"
+
+#: g10/trustdb.c:1524
 #, c-format
-msgid "enum_secret_keys failed: %s\n"
+msgid "lid %lu: inserted\n"
+msgstr ""
+
+#: g10/trustdb.c:1551
+#, c-format
+msgid "\t%lu keys inserted\n"
+msgstr ""
+
+#: g10/trustdb.c:1554
+#, fuzzy, c-format
+msgid "enumerate keyblocks failed: %s\n"
 msgstr "b��d procedury enum_secret_keys: %s\n"
 
-#: g10/trustdb.c:1614
+#: g10/trustdb.c:1599
+#, fuzzy, c-format
+msgid "check_trust: search dir record failed: %s\n"
+msgstr "klucz %08lX: wprowadzenie wpisu zaufania nie powiod�o si�: %s\n"
+
+#: g10/trustdb.c:1606
 #, c-format
 msgid "key %08lX: insert trust record failed: %s\n"
 msgstr "klucz %08lX: wprowadzenie wpisu zaufania nie powiod�o si�: %s\n"
 
-#: g10/trustdb.c:1618
+#: g10/trustdb.c:1610
 #, c-format
 msgid "key %08lX.%lu: inserted into trustdb\n"
 msgstr "Klucz %08lX.%lu: wprowadzony do bazy zaufania\n"
 
-#: g10/trustdb.c:1629
+#: g10/trustdb.c:1618
 #, c-format
 msgid "key %08lX.%lu: created in future (time warp or clock problem)\n"
 msgstr ""
 "Klucz %08lX.%lu: stworzony w przysz�o�ci (zaburzenia czasoprzestrzeni,\n"
 "lub �le ustawiony zegar systemowy)\n"
 
-#: g10/trustdb.c:1637
+#: g10/trustdb.c:1625
 #, c-format
 msgid "key %08lX.%lu: expired at %s\n"
 msgstr "klucz %08lX.%lu: okres wa�no�ci up�yn�� %s\n"
 
-#: g10/trustdb.c:1646
+#: g10/trustdb.c:1633
 #, c-format
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "klucz %08lX.%lu: b��d przy sprawdzaniu zaufania: %s\n"
 
-#: g10/status.c:233
-msgid "No help available"
-msgstr "Pomoc niedost�pna"
+#: g10/trustdb.c:1842 g10/trustdb.c:1871 g10/trustdb.c:2610
+msgid "WARNING: can't yet handle long pref records\n"
+msgstr ""
+
+#: g10/trustdb.c:1893
+#, fuzzy, c-format
+msgid "get_dir_record: search_record failed: %s\n"
+msgstr "naniesienie poprawek na kluczu tajnym nie powiod�o si�: %s\n"
 
-#: g10/status.c:239
+#: g10/trustdb.c:1956
 #, c-format
-msgid "No help available for `%s'"
-msgstr "Brak informacji o `%s'"
+msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n"
+msgstr ""
 
-#: g10/pubkey-enc.c:78
+#: g10/trustdb.c:1960
 #, c-format
-msgid "anonymous receiver; trying secret key %08lX ...\n"
-msgstr "adresat anonimowy; pr�buj� klucz tajny %08lX ...\n"
+msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but not marked\n"
+msgstr ""
 
-#: g10/pubkey-enc.c:84
-msgid "okay, we are the anonymous receiver.\n"
-msgstr "OK, to my jeste�my adresatem anonimowym.\n"
+#. we need the dir record
+#: g10/trustdb.c:1967
+#, c-format
+msgid "sig rec %lu[%d] in hintlist of %lu does not point to a dir record\n"
+msgstr ""
 
-#: g10/pubkey-enc.c:183
+#: g10/trustdb.c:1973
 #, c-format
-msgid "note: cipher algorithm %d not found in preferences\n"
-msgstr "uwaga: brak algorytmu szyfruj�cego %d w ustawieniach\n"
+msgid "lid %lu: no primary key\n"
+msgstr ""
+
+#: g10/trustdb.c:2006
+#, fuzzy, c-format
+msgid "lid %lu: user id not found in keyblock\n"
+msgstr "%s: nie znaleziono u�ytkownika\n"
+
+#: g10/trustdb.c:2010
+#, fuzzy, c-format
+msgid "lid %lu: user id without signature\n"
+msgstr "klucz %08lX: brak identyfikatora u�ytkownika do podpisu\n"
+
+#: g10/trustdb.c:2017
+#, c-format
+msgid "lid %lu: self-signature in hintlist\n"
+msgstr ""
+
+#: g10/trustdb.c:2028 g10/trustdb.c:2747 g10/trustdb.c:2831
+msgid "Valid certificate revocation"
+msgstr ""
+
+#: g10/trustdb.c:2029 g10/trustdb.c:2748 g10/trustdb.c:2832
+msgid "Good certificate"
+msgstr ""
+
+#: g10/trustdb.c:2038
+msgid "very strange: no public key\n"
+msgstr ""
+
+#: g10/trustdb.c:2086
+#, c-format
+msgid "hintlist %lu[%d] of %lu does not point to a dir record\n"
+msgstr ""
+
+#: g10/trustdb.c:2092
+#, c-format
+msgid "lid %lu does not have a key\n"
+msgstr ""
+
+#: g10/trustdb.c:2102
+#, fuzzy, c-format
+msgid "lid %lu: can't get keyblock: %s\n"
+msgstr "nie mog� zapisa� bloku klucza: %s\n"
+
+#: g10/trustdb.c:2159 g10/trustdb.c:3082
+#, fuzzy, c-format
+msgid "tdbio_search_dir failed: %s\n"
+msgstr "Usuni�cie opakowania ASCII nie powiod�o si�: %s\n"
+
+#: g10/trustdb.c:2312
+#, fuzzy, c-format
+msgid "key %08lX.%lu: Good subkey binding\n"
+msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
+
+#: g10/trustdb.c:2318 g10/trustdb.c:2360
+#, fuzzy, c-format
+msgid "key %08lX.%lu: Invalid subkey binding: %s\n"
+msgstr "klucz %08lX: brak poprawnych identyfikator�w u�ytkownika\n"
+
+#: g10/trustdb.c:2333
+#, fuzzy, c-format
+msgid "key %08lX.%lu: Valid key revocation\n"
+msgstr "klucz %08lX.%lu: okres wa�no�ci up�yn�� %s\n"
+
+#: g10/trustdb.c:2339
+#, fuzzy, c-format
+msgid "key %08lX.%lu: Invalid key revocation: %s\n"
+msgstr "klucz %08lX: brak klucza publicznegoL %s\n"
+
+#: g10/trustdb.c:2354
+#, fuzzy, c-format
+msgid "key %08lX.%lu: Valid subkey revocation\n"
+msgstr "klucz %08lX: brak poprawnych identyfikator�w u�ytkownika\n"
+
+#: g10/trustdb.c:2454
+#, fuzzy
+msgid "Good self-signature"
+msgstr "[podpis klucza nim samym]"
+
+#: g10/trustdb.c:2465
+#, fuzzy
+msgid "Invalid self-signature"
+msgstr "klucz %08lX: niepoprawny podpis w�a�ciciela klucza\n"
+
+#: g10/trustdb.c:2475
+msgid "Valid user ID revocation skipped due to a newer self signature\n"
+msgstr ""
+
+#: g10/trustdb.c:2482
+#, fuzzy
+msgid "Valid user ID revocation\n"
+msgstr "Niew�a�ciwy wyb�r.\n"
+
+#: g10/trustdb.c:2489
+#, fuzzy
+msgid "Invalid user ID revocation"
+msgstr "Niew�a�ciwy wyb�r.\n"
+
+#: g10/trustdb.c:2573
+#, fuzzy
+msgid "Too many preferences"
+msgstr "lista opcji"
+
+#: g10/trustdb.c:2587
+msgid "Too many preference items"
+msgstr ""
+
+#: g10/trustdb.c:2726
+msgid "Duplicated certificate - deleted"
+msgstr ""
+
+#: g10/trustdb.c:2759
+msgid "Hmmm, public key lost?"
+msgstr ""
+
+#: g10/trustdb.c:2769 g10/trustdb.c:2852
+#, fuzzy
+msgid "Invalid certificate revocation"
+msgstr "Niew�a�ciwy wyb�r.\n"
+
+#: g10/trustdb.c:2770 g10/trustdb.c:2853
+#, fuzzy
+msgid "Invalid certificate"
+msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
+
+#: g10/trustdb.c:2785
+#, c-format
+msgid "uid %08lX.%lu/%02X%02X: has shadow dir %lu but is not yet marked.\n"
+msgstr ""
+
+#: g10/trustdb.c:2799
+#, c-format
+msgid "sig record %lu[%d] points to wrong record.\n"
+msgstr ""
+
+#. that should never happen
+#: g10/trustdb.c:3052
+#, fuzzy, c-format
+msgid "insert_trust_record: keyblock not found: %s\n"
+msgstr "klucz %08lX: brak klucza tajnego: %s\n"
+
+#: g10/trustdb.c:3070
+msgid "did not use primary key for insert_trust_record()\n"
+msgstr ""
+
+#: g10/ringedit.c:293
+#, fuzzy, c-format
+msgid "%s: can't create keyring: %s\n"
+msgstr "niemo�liwy jest zapis do zbioru kluczy: %s\n"
+
+#: g10/ringedit.c:299 g10/ringedit.c:1283
+#, c-format
+msgid "%s: keyring created\n"
+msgstr ""
+
+#: g10/ringedit.c:1469
+msgid "WARNING: 2 files with confidential information exists.\n"
+msgstr ""
+
+#: g10/ringedit.c:1470
+#, c-format
+msgid "%s is the unchanged one\n"
+msgstr ""
+
+#: g10/ringedit.c:1471
+#, c-format
+msgid "%s is the new one\n"
+msgstr ""
+
+#: g10/ringedit.c:1472
+msgid "Please fix this possible security flaw\n"
+msgstr ""
+
+#: g10/skclist.c:94
+#, fuzzy, c-format
+msgid "skipped `%s': %s\n"
+msgstr "%s: pomini�ty: %s\n"
+
+#: g10/skclist.c:100
+#, c-format
+msgid ""
+"skipped `%s': this is a PGP generated ElGamal key which is not secure for "
+"signatures!\n"
+msgstr ""
 
 #. do not overwrite
 #: g10/openfile.c:58
@@ -1818,18 +2997,42 @@ msgstr "uwaga: brak algorytmu szyfruj�cego %d w ustawieniach\n"
 msgid "File `%s' exists. "
 msgstr "Plik `%s' ju� istnieje. "
 
-#: g10/openfile.c:59
-msgid "openfile.overwrite.okay"
-msgstr ""
-
 #: g10/openfile.c:60
 msgid "Overwrite (y/N)? "
 msgstr "Nadpisa� (t/N)? "
 
+#: g10/openfile.c:85
+#, fuzzy
+msgid "writing to stdout\n"
+msgstr "zapisywanie '%s\"\n"
+
+#: g10/openfile.c:134
+#, fuzzy, c-format
+msgid "assuming signed data in `%s'\n"
+msgstr "nie mog� otworzy� podpisanego pliku `%s'\n"
+
+#: g10/openfile.c:181
+#, c-format
+msgid "%s: new options file created\n"
+msgstr ""
+
+#: g10/encr-data.c:59
+#, fuzzy, c-format
+msgid "%s encrypted data\n"
+msgstr "szyfrowanie danych"
+
+#: g10/encr-data.c:61
+#, c-format
+msgid "encrypted with unknown algorithm %d\n"
+msgstr ""
+
 #: g10/encr-data.c:74
+#, fuzzy
 msgid ""
-"Warning: Message was encrypted with a weak key in the symmetric cipher.\n"
-msgstr "Ostrze�enie: Informacje by�y szyfrowane s�abym kluczem szyfru symetrycznego.\n"
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+msgstr ""
+"Ostrze�enie: Informacje by�y szyfrowane s�abym kluczem szyfru "
+"symetrycznego.\n"
 
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
@@ -1842,3 +3045,141 @@ msgstr ""
 "brak mo�liwo�ci generacji dobrego klucza dla szyfru symetrycznego;\n"
 "operacja by�a powtarzana %d razy!\n"
 
+#. begin of list
+#: g10/helptext.c:48
+msgid "edit_ownertrust.value"
+msgstr ""
+"Przypisanie tych warto�ci nale�y do Ciebie, nie b�d� one udost�pnione\n"
+"nikomu innemu. S� one u�ywane do stworzenia sieci zaufania i nie ma\n"
+"to nic wsp�lnego z tworzon� sieci� certyfikat�w."
+
+#: g10/helptext.c:54
+msgid "revoked_key.override"
+msgstr ""
+
+#: g10/helptext.c:58
+msgid "untrusted_key.override"
+msgstr "If you want to use this untrusted key anyway, answer \"yes\"."
+
+#: g10/helptext.c:62
+msgid "pklist.user_id.enter"
+msgstr "Podaj identyfikator u�ytkownika adresata tych informacji."
+
+#: g10/helptext.c:66
+msgid "keygen.algo"
+msgstr "Select the algorithm to use:Needs more explanation here."
+
+#: g10/helptext.c:82
+#, fuzzy
+msgid "keygen.algo.elg_se"
+msgstr "Select the algorithm to use:Needs more explanation here."
+
+#: g10/helptext.c:89
+msgid "keygen.size"
+msgstr ""
+
+#: g10/helptext.c:93
+msgid "keygen.size.huge.okay"
+msgstr ""
+
+#: g10/helptext.c:98
+msgid "keygen.size.large.okay"
+msgstr ""
+
+#: g10/helptext.c:103
+msgid "keygen.valid"
+msgstr ""
+
+#: g10/helptext.c:107
+msgid "keygen.valid.okay"
+msgstr ""
+
+#: g10/helptext.c:112
+msgid "keygen.name"
+msgstr ""
+
+#: g10/helptext.c:117
+msgid "keygen.email"
+msgstr ""
+
+#: g10/helptext.c:121
+msgid "keygen.comment"
+msgstr ""
+
+#: g10/helptext.c:126
+msgid "keygen.userid.cmd"
+msgstr ""
+"I  - zmiana imienia lub nazwiska.\n"
+"K  - zmiana komentarza.\n"
+"E  - zmiana adresu email.\n"
+"D  - przej�cie do w�a�ciwej generacji klucza.\n"
+"W  - wyj�cie z procedury generacji i z programu."
+
+#: g10/helptext.c:135
+msgid "keygen.sub.okay"
+msgstr ""
+"Odpowiedz \"tak\" (lub po prostu \"t\") je�li zgadzasz si� na stworzenie "
+"podklucza."
+
+#: g10/helptext.c:139
+msgid "sign_uid.okay"
+msgstr ""
+
+#: g10/helptext.c:144
+msgid "change_passwd.empty.okay"
+msgstr ""
+
+#: g10/helptext.c:149
+msgid "keyedit.cmd"
+msgstr "Please enter \"help\"."
+
+#: g10/helptext.c:153
+msgid "keyedit.save.okay"
+msgstr ""
+
+#: g10/helptext.c:158
+msgid "keyedit.cancel.okay"
+msgstr ""
+
+#: g10/helptext.c:162
+msgid "keyedit.sign_all.okay"
+msgstr ""
+
+#: g10/helptext.c:166
+msgid "keyedit.remove.uid.okay"
+msgstr ""
+
+#: g10/helptext.c:171
+msgid "keyedit.remove.subkey.okay"
+msgstr ""
+
+#: g10/helptext.c:175
+msgid "passphrase.enter"
+msgstr ""
+"Prosz� wprowadzi� wyra�enie przej�ciowe (tajne zdanie)\n"
+"  Bla, bla, bla ..."
+
+#: g10/helptext.c:182
+msgid "passphrase.repeat"
+msgstr ""
+"Prosz� powt�rzy� podane wyra�enie przej�ciowe dla wyeliminowania pomy�ek."
+
+#: g10/helptext.c:186
+msgid "detached_signature.filename"
+msgstr ""
+
+#: g10/helptext.c:190
+msgid "openfile.overwrite.okay"
+msgstr ""
+
+#: g10/helptext.c:204
+msgid "No help available"
+msgstr "Pomoc niedost�pna"
+
+#: g10/helptext.c:216
+#, c-format
+msgid "No help available for `%s'"
+msgstr "Brak informacji o `%s'"
+
+#~ msgid "You will see a list of signators etc. here\n"
+#~ msgstr "Tu uka�e si� lista podpis�w itd.\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index eea21763a..5256eeb4a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1998-12-23 16:53+0100\n"
+"POT-Creation-Date: 1999-01-09 15:45+0100\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-20 23:46:36-0200\n"
 "From: Thiago Jung Bauermann <[email protected]>\n"
@@ -29,175 +29,218 @@ msgid "yY"
 msgstr "sS"
 
 #: util/errors.c:54
-msgid "General error"
+#, fuzzy
+msgid "general error"
 msgstr "Erro geral"
 
 #: util/errors.c:55
-msgid "Unknown packet type"
+#, fuzzy
+msgid "unknown packet type"
 msgstr "Formato desconhecido"
 
 #: util/errors.c:56
-msgid "Unknown version"
+#, fuzzy
+msgid "unknown version"
 msgstr "Vers�o desconhecida"
 
 #: util/errors.c:57
-msgid "Unknown pubkey algorithm"
+#, fuzzy
+msgid "unknown pubkey algorithm"
 msgstr "Algoritmo de chave p�blica desconhecido"
 
 #: util/errors.c:58
-msgid "Unknown digest algorithm"
+#, fuzzy
+msgid "unknown digest algorithm"
 msgstr "Algoritmo de \"digest\" desconhecido"
 
 #: util/errors.c:59
-msgid "Bad public key"
+#, fuzzy
+msgid "bad public key"
 msgstr "Chave p�blica incorreta"
 
 #: util/errors.c:60
-msgid "Bad secret key"
+#, fuzzy
+msgid "bad secret key"
 msgstr "Chave secreta incorreta"
 
 #: util/errors.c:61
-msgid "Bad signature"
+#, fuzzy
+msgid "bad signature"
 msgstr "Assinatura incorreta"
 
 #: util/errors.c:62
-msgid "Checksum error"
+#, fuzzy
+msgid "checksum error"
 msgstr "Erro de \"checksum\""
 
 #: util/errors.c:63
-msgid "Bad passphrase"
+#, fuzzy
+msgid "bad passphrase"
 msgstr "Frase secreta incorreta"
 
 #: util/errors.c:64
-msgid "Public key not found"
+#, fuzzy
+msgid "public key not found"
 msgstr "Chave p�blica n�o encontrada"
 
 #: util/errors.c:65
-msgid "Unknown cipher algorithm"
+#, fuzzy
+msgid "unknown cipher algorithm"
 msgstr "Algoritmo de criptografia desconhecido"
 
 #: util/errors.c:66
-msgid "Can't open the keyring"
+#, fuzzy
+msgid "can't open the keyring"
 msgstr "N�o � poss�vel abrir o anel de chaves"
 
 #: util/errors.c:67
-msgid "Invalid packet"
+#, fuzzy
+msgid "invalid packet"
 msgstr "Valor inv�lido"
 
 #: util/errors.c:68
-msgid "Invalid armor"
+#, fuzzy
+msgid "invalid armor"
 msgstr "Armadura inv�lida"
 
 #: util/errors.c:69
-msgid "No such user id"
+#, fuzzy
+msgid "no such user id"
 msgstr "Identificador de usu�rio inexistente"
 
 #: util/errors.c:70
-msgid "Secret key not available"
+#, fuzzy
+msgid "secret key not available"
 msgstr "Chave secreta n�o dispon�vel"
 
 #: util/errors.c:71
-msgid "Wrong secret key used"
+#, fuzzy
+msgid "wrong secret key used"
 msgstr "Chave secreta incorreta"
 
 #: util/errors.c:72
-msgid "Not supported"
+#, fuzzy
+msgid "not supported"
 msgstr "N�o suportado"
 
 #: util/errors.c:73
-msgid "Bad key"
+#, fuzzy
+msgid "bad key"
 msgstr "Chave incorreta"
 
 #: util/errors.c:74
-msgid "File read error"
+#, fuzzy
+msgid "file read error"
 msgstr "Erro de leitura"
 
 #: util/errors.c:75
-msgid "File write error"
+#, fuzzy
+msgid "file write error"
 msgstr "Erro de escrita"
 
 #: util/errors.c:76
-msgid "Unknown compress algorithm"
+#, fuzzy
+msgid "unknown compress algorithm"
 msgstr "Algoritmo de compress�o desconhecido"
 
 #: util/errors.c:77
-msgid "File open error"
+#, fuzzy
+msgid "file open error"
 msgstr "Erro abrindo arquivo"
 
 #: util/errors.c:78
-msgid "File create error"
+#, fuzzy
+msgid "file create error"
 msgstr "Erro criando arquivo"
 
 #: util/errors.c:79
-msgid "Invalid passphrase"
+#, fuzzy
+msgid "invalid passphrase"
 msgstr "Frase secreta inv�lida"
 
 #: util/errors.c:80
-msgid "Unimplemented pubkey algorithm"
+#, fuzzy
+msgid "unimplemented pubkey algorithm"
 msgstr "Algoritmo de chave p�blica n�o implementado"
 
 #: util/errors.c:81
-msgid "Unimplemented cipher algorithm"
+#, fuzzy
+msgid "unimplemented cipher algorithm"
 msgstr "Algoritmo de criptografia n�o implementado"
 
 #: util/errors.c:82
-msgid "Unknown signature class"
+#, fuzzy
+msgid "unknown signature class"
 msgstr "Classe de assinatura desconhecida"
 
 #: util/errors.c:83
-msgid "Trust database error"
+#, fuzzy
+msgid "trust database error"
 msgstr "Erro no banco de dados de confian�a"
 
 #: util/errors.c:84
-msgid "Bad MPI"
+#, fuzzy
+msgid "bad MPI"
 msgstr "MPI incorreto"
 
 #: util/errors.c:85
-msgid "Resource limit"
+#, fuzzy
+msgid "resource limit"
 msgstr "Limite de recurso"
 
 #: util/errors.c:86
-msgid "Invalid keyring"
+#, fuzzy
+msgid "invalid keyring"
 msgstr "Anel de chaves inv�lido"
 
 #: util/errors.c:87
-msgid "Bad certificate"
+#, fuzzy
+msgid "bad certificate"
 msgstr "Certificado incorreto"
 
 #: util/errors.c:88
-msgid "Malformed user id"
+#, fuzzy
+msgid "malformed user id"
 msgstr "Identifica��o de usu�rio mal formada"
 
 #: util/errors.c:89
-msgid "File close error"
+#, fuzzy
+msgid "file close error"
 msgstr "Erro fechando arquivo"
 
 #: util/errors.c:90
-msgid "File rename error"
+#, fuzzy
+msgid "file rename error"
 msgstr "Erro renomeando arquivo"
 
 #: util/errors.c:91
-msgid "File delete error"
+#, fuzzy
+msgid "file delete error"
 msgstr "Erro deletando arquivo"
 
 #: util/errors.c:92
-msgid "Unexpected data"
+#, fuzzy
+msgid "unexpected data"
 msgstr "Dados inesperados"
 
 #: util/errors.c:93
-msgid "Timestamp conflict"
+#, fuzzy
+msgid "timestamp conflict"
 msgstr "Conflito com \"timestamp\""
 
 #: util/errors.c:94
-msgid "Unusable pubkey algorithm"
+#, fuzzy
+msgid "unusable pubkey algorithm"
 msgstr "Algoritmo de chave p�blica inutiliz�vel"
 
 #: util/errors.c:95
-msgid "File exists"
+#, fuzzy
+msgid "file exists"
 msgstr "O arquivo j� existe"
 
 #: util/errors.c:96
-msgid "Weak key"
+#, fuzzy
+msgid "weak key"
 msgstr "Chave fraca"
 
 #: util/logger.c:178
@@ -210,11 +253,11 @@ msgstr "... isto � um bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "voc� encontrou um bug ... (%s:%d)\n"
 
-#: cipher/random.c:406
+#: cipher/random.c:408
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: usando gerador de n�meros aleat�rios inseguro!\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:409
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -717,66 +760,77 @@ msgstr "V� em frente e digite sua mensagem ...\n"
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/armor.c:344 g10/armor.c:391
+#: g10/armor.c:320
+#, c-format
+msgid "armor: %s\n"
+msgstr "armadura: %s\n"
+
+#: g10/armor.c:343
+msgid "invalid armor header: "
+msgstr "cabe�alho de armadura inv�lido: "
+
+#: g10/armor.c:350
 msgid "armor header: "
 msgstr "cabe�alho de armadura: "
 
-#: g10/armor.c:355
+#: g10/armor.c:361
 msgid "invalid clearsig header\n"
 msgstr "cabe�alho de assinatura em texto puro inv�lido\n"
 
-#: g10/armor.c:382
-msgid "invalid armor header: "
-msgstr "cabe�alho de armadura inv�lido: "
-
-#: g10/armor.c:461
-#, c-format
-msgid "armor: %s\n"
-msgstr "armadura: %s\n"
+#: g10/armor.c:415
+#, fuzzy
+msgid "nested clear text signatures\n"
+msgstr "|[arquivo]|faz uma assinatura em texto puro"
 
-#: g10/armor.c:534
+#: g10/armor.c:531
 msgid "invalid dash escaped line: "
 msgstr "linha com h�fen inv�lida: "
 
-#: g10/armor.c:603
-msgid "invalid clear text header: "
-msgstr "cabe�alho de texto puro inv�lido: "
+#: g10/armor.c:539
+#, fuzzy
+msgid "unexpected armor:"
+msgstr "Dados inesperados"
 
-#: g10/armor.c:846
+#: g10/armor.c:625
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caractere radix64 inv�lido %02x ignorado\n"
 
-#: g10/armor.c:879
+#: g10/armor.c:655
 msgid "premature eof (no CRC)\n"
 msgstr "fim de arquivo prematuro (sem CRC)\n"
 
-#: g10/armor.c:898
+#: g10/armor.c:672
 msgid "premature eof (in CRC)\n"
 msgstr "fim de arquivo prematuro (no CRC)\n"
 
-#: g10/armor.c:902
+#: g10/armor.c:676
 msgid "malformed CRC\n"
 msgstr "CRC malformado\n"
 
-#: g10/armor.c:906
+#: g10/armor.c:680
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:925
+#: g10/armor.c:697
 msgid "premature eof (in Trailer)\n"
 msgstr "fim de arquivo prematuro (no \"Trailer\")\n"
 
-#: g10/armor.c:929
+#: g10/armor.c:701
 msgid "error in trailer line\n"
 msgstr "erro na linha \"trailer\"\n"
 
-#: g10/armor.c:1183
+#: g10/armor.c:962
 #, fuzzy
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenum dado RFC1991 ou OpenPGP v�lido encontrado.\n"
 
+#: g10/armor.c:964
+#, c-format
+msgid "invalid armor: line longer than %d characters\n"
+msgstr ""
+
 #: g10/pkclist.c:138
 #, c-format
 msgid ""
@@ -868,7 +922,7 @@ msgstr ""
 msgid "key %08lX: key has been revoked!\n"
 msgstr "chave %08lX: a chave foi revogada!\n"
 
-#: g10/pkclist.c:286 g10/pkclist.c:379
+#: g10/pkclist.c:286 g10/pkclist.c:381
 msgid "Use this key anyway? "
 msgstr "Usa esta chave de qualquer modo?"
 
@@ -904,7 +958,7 @@ msgstr "Esta chave provavelmente pertence ao dono\n"
 msgid "This key belongs to us\n"
 msgstr "Esta chave pertence a n�s (n�s temos a chave secreta)\n"
 
-#: g10/pkclist.c:374
+#: g10/pkclist.c:376
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -916,49 +970,49 @@ msgstr ""
 "afirmativamente � pr�xima pergunta\n"
 "\n"
 
-#: g10/pkclist.c:383
+#: g10/pkclist.c:385
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVISO: Usando chave n�o confi�vel!\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:421
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:420
+#: g10/pkclist.c:422
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Isto pode significar que a assinatura � falsificada.\n"
 
-#: g10/pkclist.c:441
+#: g10/pkclist.c:443
 msgid "Note: This key has expired!\n"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:450
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: Esta chave n�o est� certificada com uma assinatura confi�vel!\n"
 
-#: g10/pkclist.c:450
+#: g10/pkclist.c:452
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         N�o h� indica��o de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:466
+#: g10/pkclist.c:468
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: N�s N�O confiamos nesta chave!\n"
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:469
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         A assinatura � provavelmente uma FALSIFICA��O.\n"
 
-#: g10/pkclist.c:474
+#: g10/pkclist.c:476
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "AVISO: Esta chave n�o est� certificada com assinaturas confi�veis!\n"
 
-#: g10/pkclist.c:477
+#: g10/pkclist.c:479
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         N�o se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:524
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -966,25 +1020,25 @@ msgstr ""
 "Voc� n�o especificou um ID de usu�rio. (pode-se usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:529
 msgid "Enter the user ID: "
 msgstr "Digite o identificador de usu�rio:"
 
-#: g10/pkclist.c:538
+#: g10/pkclist.c:540
 msgid "No such user ID.\n"
 msgstr "Identificador de usu�rio inexistente.\n"
 
-#: g10/pkclist.c:572 g10/pkclist.c:599
+#: g10/pkclist.c:574 g10/pkclist.c:601
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:582
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: erro verificando chave: %s\n"
 
-#: g10/pkclist.c:606
+#: g10/pkclist.c:608
 msgid "no valid addressees\n"
 msgstr "nenhum endere�o v�lido\n"
 
@@ -1284,8 +1338,8 @@ msgstr "A gera��o de chaves falhou: %s\n"
 msgid "Really create? "
 msgstr "Realmente criar? "
 
-#: g10/encode.c:88 g10/openfile.c:81 g10/openfile.c:158 g10/tdbio.c:445
-#: g10/tdbio.c:504
+#: g10/encode.c:88 g10/openfile.c:81 g10/openfile.c:158 g10/tdbio.c:459
+#: g10/tdbio.c:510
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: imposs�vel abrir: %s\n"
@@ -1337,7 +1391,7 @@ msgstr "entradas demais no cache pk - desabilitado\n"
 msgid "too many entries in unk cache - disabled\n"
 msgstr "entradas demais no cache unk - desabilitado\n"
 
-#: g10/getkey.c:1021
+#: g10/getkey.c:1039
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
@@ -1922,8 +1976,8 @@ msgid "Key not changed so no update needed.\n"
 msgstr "Chave sem mudan�as, nenhuma atualiza��o � necess�ria.\n"
 
 #: g10/keyedit.c:669 g10/keyedit.c:727
-#, c-format
-msgid "update of trust db failed: %s\n"
+#, fuzzy, c-format
+msgid "update of trustdb failed: %s\n"
 msgstr "atualiza��o da confian�a falhou: %s\n"
 
 #: g10/keyedit.c:701
@@ -2002,7 +2056,7 @@ msgstr "Nenhuma chave secund�ria com �ndice %d\n"
 
 #: g10/mainproc.c:198
 #, fuzzy
-msgid "public key encrypted data: Good DEK\n"
+msgid "public key encrypted data: good DEK\n"
 msgstr "dados codificados com chave p�blica: DEK bom\n"
 
 #: g10/mainproc.c:201
@@ -2045,33 +2099,34 @@ msgstr "Assinatura INCORRETA de \""
 msgid "Good signature from \""
 msgstr "Assinatura correta de\""
 
-#: g10/mainproc.c:861
+#: g10/mainproc.c:879
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:934
+#: g10/mainproc.c:952
 msgid "old style (PGP 2.x) signature\n"
 msgstr "assinatura antiga (PGP2.x)\n"
 
-#: g10/mainproc.c:939
+#: g10/mainproc.c:957
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
-#: g10/misc.c:88
+#: g10/misc.c:90
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "imposs�vel desabilitar core dumps: %s\n"
 
-#: g10/misc.c:90
-msgid "WARNING: Program may create a core file!\n"
+#: g10/misc.c:93
+#, fuzzy
+msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/misc.c:198
+#: g10/misc.c:200
 msgid "Experimental algorithms should not be used!\n"
 msgstr ""
 
-#: g10/misc.c:212
+#: g10/misc.c:214
 msgid ""
 "RSA keys are deprecated; please consider creating a new key and use this key "
 "in the future\n"
@@ -2079,8 +2134,8 @@ msgstr ""
 "Chaves RSA n�o s�o recomend�veis; por favor considere criar uma nova chave e "
 "us�-la no futuro\n"
 
-#: g10/misc.c:233
-msgid "This cipher algorithm is depreciated; please use a more standard one!\n"
+#: g10/misc.c:235
+msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 
 #: g10/parse-packet.c:113
@@ -2104,31 +2159,36 @@ msgstr ""
 "usu�rio: \""
 
 #: g10/passphrase.c:150
-#, c-format
-msgid "(%u-bit %s key, ID %08lX, created %s)\n"
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "(chave %u-bit/%s, ID %08lX, criada em %s)\n"
 
-#: g10/passphrase.c:174
+#: g10/passphrase.c:155
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr ""
+
+#: g10/passphrase.c:183
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:178
+#: g10/passphrase.c:187
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
-#: g10/plaintext.c:103
+#: g10/plaintext.c:63
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "dados n�o salvos; use a op��o \"--output\" para salv�-los\n"
 
-#: g10/plaintext.c:216
+#: g10/plaintext.c:166
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do arquivo de dados: "
 
-#: g10/plaintext.c:237
+#: g10/plaintext.c:187
 msgid "reading stdin ...\n"
 msgstr "lendo \"stdin\" ...\n"
 
-#: g10/plaintext.c:300
+#: g10/plaintext.c:250
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
@@ -2139,7 +2199,8 @@ msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "destinat�rio an�nimo; tentando chave secreta %08lX ...\n"
 
 #: g10/pubkey-enc.c:84
-msgid "okay, we are the anonymous receiver.\n"
+#, fuzzy
+msgid "okay, we are the anonymous recipient.\n"
 msgstr "correto, n�s somos o destinat�rio an�nimo.\n"
 
 #: g10/pubkey-enc.c:136
@@ -2156,11 +2217,11 @@ msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 msgid "protection algorithm %d is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: g10/seckey-cert.c:169
+#: g10/seckey-cert.c:176
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Frase secreta inv�lida; por favor tente novamente ...\n"
 
-#: g10/seckey-cert.c:216
+#: g10/seckey-cert.c:223
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Chave fraca detectada - por favor mude a frase secreta novamente\n"
@@ -2171,17 +2232,26 @@ msgid ""
 msgstr ""
 "esta � uma chave ElGamal gerada pelo PGP que N�O � segura para assinaturas!\n"
 
-#: g10/sig-check.c:165
-msgid "public key created in future (time warp or clock problem)\n"
+#: g10/sig-check.c:166
+#, fuzzy, c-format
+msgid "public key created %lu %s in future (time warp or clock problem)\n"
 msgstr ""
 "chave p�blica criada no futuro (viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/sig-check.c:170
+#: g10/sig-check.c:168
+msgid "second"
+msgstr ""
+
+#: g10/sig-check.c:168
+msgid "seconds"
+msgstr ""
+
+#: g10/sig-check.c:173
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTA: chave de assinatura expirou %s\n"
 
-#: g10/sig-check.c:226
+#: g10/sig-check.c:230
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 
@@ -2204,133 +2274,135 @@ msgstr "assinando:"
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/tdbio.c:116 g10/tdbio.c:1413
+#: g10/tdbio.c:116 g10/tdbio.c:1418
 #, fuzzy, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "banco de dados de confian�a rec %lu: lseek falhou: %s\n"
 
-#: g10/tdbio.c:122 g10/tdbio.c:1420
+#: g10/tdbio.c:122 g10/tdbio.c:1425
 #, fuzzy, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "banco de dados de confian�a rec %lu: escrita falhou (n=%d): %s\n"
 
 #: g10/tdbio.c:232
-msgid "trustdb transaction to large\n"
+#, fuzzy
+msgid "trustdb transaction too large\n"
 msgstr "transa��o de banco de dados de confian�a muito grande\n"
 
-#: g10/tdbio.c:402
+#: g10/tdbio.c:416
 #, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: imposs�vel acessar: %s\n"
 
-#: g10/ringedit.c:273 g10/tdbio.c:422
+#: g10/ringedit.c:273 g10/tdbio.c:436
 #, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: imposs�vel criar diret�rio: %s\n"
 
-#: g10/ringedit.c:279 g10/tdbio.c:425
+#: g10/ringedit.c:279 g10/tdbio.c:439
 #, c-format
 msgid "%s: directory created\n"
 msgstr "%s: diret�rio criado\n"
 
-#: g10/tdbio.c:429
+#: g10/tdbio.c:443
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diret�rio inexistente!\n"
 
-#: g10/openfile.c:101 g10/openfile.c:165 g10/ringedit.c:1275 g10/tdbio.c:435
+#: g10/openfile.c:101 g10/openfile.c:165 g10/ringedit.c:1275 g10/tdbio.c:449
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: imposs�vel criar: %s\n"
 
-#: g10/tdbio.c:459
+#: g10/tdbio.c:473
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: falha ao criar registro de vers�o: %s"
 
-#: g10/tdbio.c:463
-#, c-format
-msgid "%s: invalid trust-db created\n"
+#: g10/tdbio.c:477
+#, fuzzy, c-format
+msgid "%s: invalid trustdb created\n"
 msgstr "%s: banco de dados de confian�a inv�lido criado\n"
 
-#: g10/tdbio.c:465
-#, c-format
-msgid "%s: trust-db created\n"
+#: g10/tdbio.c:479
+#, fuzzy, c-format
+msgid "%s: trustdb created\n"
 msgstr "%s: banco de dados de confian�a criado\n"
 
-#: g10/tdbio.c:506
-#, c-format
-msgid "%s: invalid trust-db\n"
+#: g10/tdbio.c:512
+#, fuzzy, c-format
+msgid "%s: invalid trustdb\n"
 msgstr "%s: banco de dados de confian�a inv�lido\n"
 
-#: g10/tdbio.c:540
+#: g10/tdbio.c:545
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: falha ao criar tabela \"hash\": %s\n"
 
-#: g10/tdbio.c:548
+#: g10/tdbio.c:553
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro atualizando registro de vers�o: %s\n"
 
-#: g10/tdbio.c:564 g10/tdbio.c:603 g10/tdbio.c:628 g10/tdbio.c:1346
-#: g10/tdbio.c:1373
+#: g10/tdbio.c:569 g10/tdbio.c:608 g10/tdbio.c:633 g10/tdbio.c:1351
+#: g10/tdbio.c:1378
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro lendo registro de vers�o: %s\n"
 
-#: g10/tdbio.c:577
+#: g10/tdbio.c:582
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro escrevendo registro de vers�o: %s\n"
 
-#: g10/tdbio.c:1053
+#: g10/tdbio.c:1058
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "banco de dados de confian�a: lseek falhou: %s\n"
 
-#: g10/tdbio.c:1061
+#: g10/tdbio.c:1066
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "banco de dados de confian�a: leitura falhou (n=%d): %s\n"
 
-#: g10/tdbio.c:1082
+#: g10/tdbio.c:1087
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: n�o � um banco de dados de confian�a\n"
 
-#: g10/tdbio.c:1098
+#: g10/tdbio.c:1103
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registro de vers�o com recnum %lu\n"
 
-#: g10/tdbio.c:1103
+#: g10/tdbio.c:1108
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vers�o de arquivo inv�lida %d\n"
 
-#: g10/tdbio.c:1379
+#: g10/tdbio.c:1384
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro lendo registro livre: %s\n"
 
-#: g10/tdbio.c:1387
+#: g10/tdbio.c:1392
 #, fuzzy, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro escrevendo registro de diret�rio: %s\n"
 
-#: g10/tdbio.c:1397
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: falha ao zerar um registro: %s\n"
 
-#: g10/tdbio.c:1427
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: falha ao anexar um registro: %s\n"
 
 #: g10/trustdb.c:142
-msgid "The trust DB is corrupted; please run \"gpgm --fix-trust-db\".\n"
+#, fuzzy
+msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n"
 msgstr ""
 "O banco de dados de confian�a est� danificado; por favor rode\n"
 "\"gpgm --fix-trust-db\".\n"
@@ -2351,8 +2423,8 @@ msgid "trust record %lu: delete failed: %s\n"
 msgstr "registro de confian�a %lu: remo��o falhou: %s\n"
 
 #: g10/trustdb.c:198
-#, c-format
-msgid "trust db: sync failed: %s\n"
+#, fuzzy, c-format
+msgid "trustdb: sync failed: %s\n"
 msgstr "banco de dados de confian�a: sincroniza��o falhou: %s\n"
 
 #: g10/trustdb.c:327
@@ -2382,7 +2454,7 @@ msgstr "sigrec em cadeia %lu possui dono errado\n"
 
 #: g10/trustdb.c:463
 #, fuzzy, c-format
-msgid "`%s' is not a valid long keyID\n"
+msgid "'%s' is not a valid long keyID\n"
 msgstr "%s n�o � um mapa de caracteres v�lido\n"
 
 #: g10/trustdb.c:498
@@ -2464,28 +2536,28 @@ msgid "Ooops, no user ids\n"
 msgstr "Ooops, nenhum id de usu�rio\n"
 
 #: g10/trustdb.c:1088 g10/trustdb.c:1106
-#, c-format
-msgid "user `%s' read problem: %s\n"
+#, fuzzy, c-format
+msgid "user '%s' read problem: %s\n"
 msgstr "erro de leitura do usu�rio `%s': %s\n"
 
 #: g10/trustdb.c:1091 g10/trustdb.c:1109
-#, c-format
-msgid "user `%s' list problem: %s\n"
+#, fuzzy, c-format
+msgid "user '%s' list problem: %s\n"
 msgstr "erro de listagem do usu�rio `%s': %s\n"
 
 #: g10/trustdb.c:1099 g10/trustdb.c:1346
-#, c-format
-msgid "user `%s' not found: %s\n"
+#, fuzzy, c-format
+msgid "user '%s' not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
 #: g10/trustdb.c:1101 g10/trustdb.c:1348
-#, c-format
-msgid "problem finding `%s' in trustdb: %s\n"
+#, fuzzy, c-format
+msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problemas encontrando `%s' no banco de dados de confian�a: %s\n"
 
 #: g10/trustdb.c:1104
-#, c-format
-msgid "user `%s' not in trustdb\n"
+#, fuzzy, c-format
+msgid "user '%s' not in trustdb\n"
 msgstr "usu�rio `%s' n�o est� no banco de dados de confian�a\n"
 
 #: g10/trustdb.c:1139
@@ -2522,16 +2594,6 @@ msgstr "erro: impress�o digital inv�lida\n"
 msgid "error: no ownertrust value\n"
 msgstr "erro: nenhum valor de confian�a\n"
 
-#: g10/trustdb.c:1223
-#, c-format
-msgid "LID %lu: changing trust from %u to %u\n"
-msgstr "LID %lu: mudando confian�a de %u para %u\n"
-
-#: g10/trustdb.c:1226
-#, c-format
-msgid "LID %lu: setting trust to %u\n"
-msgstr "LID %lu: estabelecendo confian�a para %u\n"
-
 #: g10/trustdb.c:1234
 msgid "key not in trustdb, searching ring.\n"
 msgstr ""
@@ -2559,14 +2621,14 @@ msgid "error finding dir record: %s\n"
 msgstr "erro encontrando registro de diret�rio: %s\n"
 
 #: g10/trustdb.c:1351
-#, c-format
-msgid "user `%s' not in trustdb - inserting\n"
+#, fuzzy, c-format
+msgid "user '%s' not in trustdb - inserting\n"
 msgstr ""
 "usu�rio `%s' n�o encontrado no banco de dados de confian�a - inserindo\n"
 
 #: g10/trustdb.c:1354
-#, c-format
-msgid "failed to put `%s' into trustdb: %s\n"
+#, fuzzy, c-format
+msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "falha ao colocar `%s' no banco de dados de confian�a: %s\n"
 
 #: g10/trustdb.c:1404
@@ -2769,7 +2831,7 @@ msgstr "lid %lu n�o tem uma chave\n"
 msgid "lid %lu: can't get keyblock: %s\n"
 msgstr "lid %lu: imposs�vel pegar bloco de chaves: %s\n"
 
-#: g10/trustdb.c:2159 g10/trustdb.c:3073
+#: g10/trustdb.c:2159 g10/trustdb.c:3082
 #, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "tdbio_search_dir falhou: %s\n"
@@ -2856,12 +2918,12 @@ msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr "registro de assinatura %lu[%d] aponta para registro errado.\n"
 
 #. that should never happen
-#: g10/trustdb.c:3043
+#: g10/trustdb.c:3052
 #, c-format
 msgid "insert_trust_record: keyblock not found: %s\n"
 msgstr "insert_trust_record: bloco de chaves n�o encontrado: %s\n"
 
-#: g10/trustdb.c:3061
+#: g10/trustdb.c:3070
 msgid "did not use primary key for insert_trust_record()\n"
 msgstr "voc� usou a chave prim�ria para insert_trust_record()\n"
 
@@ -2942,8 +3004,9 @@ msgid "encrypted with unknown algorithm %d\n"
 msgstr "codificado com algoritmo desconhecido %d\n"
 
 #: g10/encr-data.c:74
+#, fuzzy
 msgid ""
-"WARNING: Message was encrypted with a weak key in the symmetric cipher.\n"
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "AVISO: A mensagem foi codificada com uma chave fraca na criptografia\n"
 "sim�trica.\n"
@@ -3080,3 +3143,12 @@ msgstr "Nenhuma ajuda dispon�vel"
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
+
+#~ msgid "invalid clear text header: "
+#~ msgstr "cabe�alho de texto puro inv�lido: "
+
+#~ msgid "LID %lu: changing trust from %u to %u\n"
+#~ msgstr "LID %lu: mudando confian�a de %u para %u\n"
+
+#~ msgid "LID %lu: setting trust to %u\n"
+#~ msgstr "LID %lu: estabelecendo confian�a para %u\n"
diff --git a/po/ru.po b/po/ru.po
index 57a3155cc..d262f5e12 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: 1998-12-23 16:53+0100\n"
+"POT-Creation-Date: 1999-01-09 15:45+0100\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-01-26 22:08:36+0100\n"
 "From: Gregory Steuck <[email protected]>\n"
@@ -37,175 +37,217 @@ msgid "yY"
 msgstr "yY"
 
 #: util/errors.c:54
-msgid "General error"
+#, fuzzy
+msgid "general error"
 msgstr "����� ������"
 
 #: util/errors.c:55
-msgid "Unknown packet type"
+#, fuzzy
+msgid "unknown packet type"
 msgstr "����������� ��� ������"
 
 #: util/errors.c:56
-msgid "Unknown version"
+#, fuzzy
+msgid "unknown version"
 msgstr "����������� ������"
 
 #: util/errors.c:57
-msgid "Unknown pubkey algorithm"
+#, fuzzy
+msgid "unknown pubkey algorithm"
 msgstr "����������� �������� ���������� � �������� ������"
 
 #: util/errors.c:58
-msgid "Unknown digest algorithm"
+#, fuzzy
+msgid "unknown digest algorithm"
 msgstr "����������� �������� ��������� ���������"
 
 #: util/errors.c:59
-msgid "Bad public key"
+#, fuzzy
+msgid "bad public key"
 msgstr "������ �������� ����"
 
 #: util/errors.c:60
-msgid "Bad secret key"
+#, fuzzy
+msgid "bad secret key"
 msgstr "������ ��������� ����"
 
 #: util/errors.c:61
-msgid "Bad signature"
+#, fuzzy
+msgid "bad signature"
 msgstr "������ �������"
 
 #: util/errors.c:62
-msgid "Checksum error"
+#, fuzzy
+msgid "checksum error"
 msgstr "������������ ����������� �����"
 
 #: util/errors.c:63
-msgid "Bad passphrase"
+#, fuzzy
+msgid "bad passphrase"
 msgstr "�������� \"�������� �����\""
 
 #: util/errors.c:64
-msgid "Public key not found"
+#, fuzzy
+msgid "public key not found"
 msgstr "�������� ���� �� ������"
 
 #: util/errors.c:65
-msgid "Unknown cipher algorithm"
+#, fuzzy
+msgid "unknown cipher algorithm"
 msgstr "����������� �������� ����������"
 
 #: util/errors.c:66
-msgid "Can't open the keyring"
+#, fuzzy
+msgid "can't open the keyring"
 msgstr "���������� ������� \"������ ������\""
 
 #: util/errors.c:67
-msgid "Invalid packet"
+#, fuzzy
+msgid "invalid packet"
 msgstr "������������ �����"
 
 #: util/errors.c:68
-msgid "Invalid armor"
+#, fuzzy
+msgid "invalid armor"
 msgstr "������������ ASCII-���������"
 
 #: util/errors.c:69
-msgid "No such user id"
+#, fuzzy
+msgid "no such user id"
 msgstr "����������� ������������� ������������"
 
 #: util/errors.c:70
-msgid "Secret key not available"
+#, fuzzy
+msgid "secret key not available"
 msgstr "��������� ���� �� ����������"
 
 #: util/errors.c:71
-msgid "Wrong secret key used"
+#, fuzzy
+msgid "wrong secret key used"
 msgstr "����������� ������������ ��������� ����"
 
 #: util/errors.c:72
-msgid "Not supported"
+#, fuzzy
+msgid "not supported"
 msgstr "�� ��������������"
 
 #: util/errors.c:73
-msgid "Bad key"
+#, fuzzy
+msgid "bad key"
 msgstr "������ ����"
 
 #: util/errors.c:74
-msgid "File read error"
+#, fuzzy
+msgid "file read error"
 msgstr "������ ������ �����"
 
 #: util/errors.c:75
-msgid "File write error"
+#, fuzzy
+msgid "file write error"
 msgstr "������ ������ �����"
 
 #: util/errors.c:76
-msgid "Unknown compress algorithm"
+#, fuzzy
+msgid "unknown compress algorithm"
 msgstr "����������� �������� ��������"
 
 #: util/errors.c:77
-msgid "File open error"
+#, fuzzy
+msgid "file open error"
 msgstr "������ �������� �����"
 
 #: util/errors.c:78
-msgid "File create error"
+#, fuzzy
+msgid "file create error"
 msgstr "������ �������� �����"
 
 #: util/errors.c:79
-msgid "Invalid passphrase"
+#, fuzzy
+msgid "invalid passphrase"
 msgstr "�������� \"�������� �����\""
 
 #: util/errors.c:80
-msgid "Unimplemented pubkey algorithm"
+#, fuzzy
+msgid "unimplemented pubkey algorithm"
 msgstr "��������������� �������� ���������� � �������� ������"
 
 #: util/errors.c:81
-msgid "Unimplemented cipher algorithm"
+#, fuzzy
+msgid "unimplemented cipher algorithm"
 msgstr "��������������� �������� ����������"
 
 #: util/errors.c:82
-msgid "Unknown signature class"
+#, fuzzy
+msgid "unknown signature class"
 msgstr "������� ������������ ����"
 
 #: util/errors.c:83
-msgid "Trust database error"
+#, fuzzy
+msgid "trust database error"
 msgstr "������ � Trust-DB (���� ������ �������)"
 
 #: util/errors.c:84
-msgid "Bad MPI"
+msgid "bad MPI"
 msgstr ""
 
 #: util/errors.c:85
-msgid "Resource limit"
+#, fuzzy
+msgid "resource limit"
 msgstr "������������ ��������"
 
 #: util/errors.c:86
-msgid "Invalid keyring"
+#, fuzzy
+msgid "invalid keyring"
 msgstr "������������ \"������ ������\""
 
 #: util/errors.c:87
-msgid "Bad certificate"
+#, fuzzy
+msgid "bad certificate"
 msgstr "������ ����������"
 
 #: util/errors.c:88
-msgid "Malformed user id"
+#, fuzzy
+msgid "malformed user id"
 msgstr "������������ ����� �������������� ������������"
 
 #: util/errors.c:89
-msgid "File close error"
+#, fuzzy
+msgid "file close error"
 msgstr "������ �������� �����"
 
 #: util/errors.c:90
-msgid "File rename error"
+#, fuzzy
+msgid "file rename error"
 msgstr "������ �������������� �����"
 
 #: util/errors.c:91
-msgid "File delete error"
+#, fuzzy
+msgid "file delete error"
 msgstr "������ �������� �����"
 
 #: util/errors.c:92
-msgid "Unexpected data"
+#, fuzzy
+msgid "unexpected data"
 msgstr "����������� ������"
 
 #: util/errors.c:93
-msgid "Timestamp conflict"
+#, fuzzy
+msgid "timestamp conflict"
 msgstr "�������� ��������� ���������� (timestamp)"
 
 #: util/errors.c:94
-msgid "Unusable pubkey algorithm"
+#, fuzzy
+msgid "unusable pubkey algorithm"
 msgstr "����������� ��� ������������� �������� ��������� �����"
 
 #: util/errors.c:95
-msgid "File exists"
+#, fuzzy
+msgid "file exists"
 msgstr "���� ����������"
 
 #: util/errors.c:96
-msgid "Weak key"
+#, fuzzy
+msgid "weak key"
 msgstr "������ ����"
 
 #: util/logger.c:178
@@ -218,12 +260,12 @@ msgstr "��-�� ... ������ � ��������� (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "�� ����� ������ � ��������� ... (%s:%d)\n"
 
-#: cipher/random.c:406
+#: cipher/random.c:408
 #, fuzzy
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "��������: ������������ ���������� ��������� ��������� �����!\n"
 
-#: cipher/random.c:407
+#: cipher/random.c:409
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -738,67 +780,78 @@ msgstr ""
 msgid "can't open `%s'\n"
 msgstr "���������� ������� ���� `%s'\n"
 
-#: g10/armor.c:344 g10/armor.c:391
+#: g10/armor.c:320
+#, fuzzy, c-format
+msgid "armor: %s\n"
+msgstr "���������: %s\n"
+
+#: g10/armor.c:343
+msgid "invalid armor header: "
+msgstr ""
+
+#: g10/armor.c:350
 msgid "armor header: "
 msgstr ""
 
-#: g10/armor.c:355
+#: g10/armor.c:361
 #, fuzzy
 msgid "invalid clearsig header\n"
 msgstr "������������ ������ ��������� �������\n"
 
-#: g10/armor.c:382
-msgid "invalid armor header: "
-msgstr ""
-
-#: g10/armor.c:461
-#, fuzzy, c-format
-msgid "armor: %s\n"
-msgstr "���������: %s\n"
+#: g10/armor.c:415
+#, fuzzy
+msgid "nested clear text signatures\n"
+msgstr "|[����]|������� ��������� �������"
 
-#: g10/armor.c:534
+#: g10/armor.c:531
 msgid "invalid dash escaped line: "
 msgstr "������������ ������ ������������ � �������: "
 
-#: g10/armor.c:603
-msgid "invalid clear text header: "
-msgstr "������������ ��������� ���������: "
+#: g10/armor.c:539
+#, fuzzy
+msgid "unexpected armor:"
+msgstr "����������� ������"
 
-#: g10/armor.c:846
+#: g10/armor.c:625
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "������������ ��� ��������� radix64 ������ %02x ��������\n"
 
-#: g10/armor.c:879
+#: g10/armor.c:655
 msgid "premature eof (no CRC)\n"
 msgstr "����������� ����� ����� (��� CRC)\n"
 
-#: g10/armor.c:898
+#: g10/armor.c:672
 msgid "premature eof (in CRC)\n"
 msgstr "����������� ����� ����� (� CRC)\n"
 
-#: g10/armor.c:902
+#: g10/armor.c:676
 msgid "malformed CRC\n"
 msgstr "������������ ����� CRC\n"
 
-#: g10/armor.c:906
+#: g10/armor.c:680
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "������ CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:925
+#: g10/armor.c:697
 msgid "premature eof (in Trailer)\n"
 msgstr "����������� ����� ����� (� ������)\n"
 
-#: g10/armor.c:929
+#: g10/armor.c:701
 msgid "error in trailer line\n"
 msgstr "������ � ����������� ������\n"
 
-#: g10/armor.c:1183
+#: g10/armor.c:962
 #, fuzzy
 msgid "no valid OpenPGP data found.\n"
 msgstr "�� ������� ���������� RFC1991 ��� OpenPGP ������.\n"
 
+#: g10/armor.c:964
+#, c-format
+msgid "invalid armor: line longer than %d characters\n"
+msgstr ""
+
 #: g10/pkclist.c:138
 #, fuzzy, c-format
 msgid ""
@@ -891,7 +944,7 @@ msgstr "�������� ���������� ������� �� ��������.\n"
 msgid "key %08lX: key has been revoked!\n"
 msgstr "build_sigrecs: ���� ist widerrufen\n"
 
-#: g10/pkclist.c:286 g10/pkclist.c:379
+#: g10/pkclist.c:286 g10/pkclist.c:381
 msgid "Use this key anyway? "
 msgstr "��� ����� ������������ ���� ����?"
 
@@ -925,7 +978,7 @@ msgstr ""
 msgid "This key belongs to us\n"
 msgstr ""
 
-#: g10/pkclist.c:374
+#: g10/pkclist.c:376
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -936,50 +989,50 @@ msgstr ""
 "��� ������ ��� ����������. ��������� \"��\" �� ��������� ������,\n"
 "������ ���� �� *�������������* ��������� ��� �������.\n"
 
-#: g10/pkclist.c:383
+#: g10/pkclist.c:385
 msgid "WARNING: Using untrusted key!\n"
 msgstr "��������: ������������ ���� � �������� ��� �������!\n"
 
-#: g10/pkclist.c:419
+#: g10/pkclist.c:421
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "��������: �������� ����� ��� ������� ���!\n"
 
-#: g10/pkclist.c:420
+#: g10/pkclist.c:422
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "          ��� ����� ��������, ��� ������� ����������.\n"
 
-#: g10/pkclist.c:441
+#: g10/pkclist.c:443
 msgid "Note: This key has expired!\n"
 msgstr "���������: ���� �������� ����� ��� �����!\n"
 
-#: g10/pkclist.c:448
+#: g10/pkclist.c:450
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "��������: ���� ���� �� ������� ���������� ��������!\n"
 
-#: g10/pkclist.c:450
+#: g10/pkclist.c:452
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         ��� ������� �������� �� ��, ��� ���� ����������� ��� ���������.\n"
 
-#: g10/pkclist.c:466
+#: g10/pkclist.c:468
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "��������: �� �� �������� ����� �����!\n"
 
-#: g10/pkclist.c:467
+#: g10/pkclist.c:469
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         ������� �������� -- ��������.\n"
 
-#: g10/pkclist.c:474
+#: g10/pkclist.c:476
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "��������: ���� ���� �� ������� ���������� ����������� ���������!\n"
 
-#: g10/pkclist.c:477
+#: g10/pkclist.c:479
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "          ��� �����������, ��� ������� ����������� ���������.\n"
 
-#: g10/pkclist.c:522
+#: g10/pkclist.c:524
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -988,25 +1041,25 @@ msgstr ""
 "\"-r\").\n"
 "\n"
 
-#: g10/pkclist.c:527
+#: g10/pkclist.c:529
 msgid "Enter the user ID: "
 msgstr "������� ������������� ������������: "
 
-#: g10/pkclist.c:538
+#: g10/pkclist.c:540
 msgid "No such user ID.\n"
 msgstr "��� ������ �������������� ������������.\n"
 
-#: g10/pkclist.c:572 g10/pkclist.c:599
+#: g10/pkclist.c:574 g10/pkclist.c:601
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ��������: %s\n"
 
-#: g10/pkclist.c:580
+#: g10/pkclist.c:582
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: ������ ��� �������� �����: %s\n"
 
-#: g10/pkclist.c:606
+#: g10/pkclist.c:608
 msgid "no valid addressees\n"
 msgstr "��� ���������� �������\n"
 
@@ -1309,8 +1362,8 @@ msgstr "��������� ����� �� �������: %s\n"
 msgid "Really create? "
 msgstr "������������� �������? "
 
-#: g10/encode.c:88 g10/openfile.c:81 g10/openfile.c:158 g10/tdbio.c:445
-#: g10/tdbio.c:504
+#: g10/encode.c:88 g10/openfile.c:81 g10/openfile.c:158 g10/tdbio.c:459
+#: g10/tdbio.c:510
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: ���������� �������: %s\n"
@@ -1363,7 +1416,7 @@ msgstr ""
 msgid "too many entries in unk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:1021
+#: g10/getkey.c:1039
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "������������ �������������� ���� %09lX ������ ��������� %08lX%\n"
@@ -1965,7 +2018,7 @@ msgstr "���� �� ���������, ���������� �� �����.\n"
 
 #: g10/keyedit.c:669 g10/keyedit.c:727
 #, fuzzy, c-format
-msgid "update of trust db failed: %s\n"
+msgid "update of trustdb failed: %s\n"
 msgstr "���������� ���� ������ ������� �� �������: %s\n"
 
 #: g10/keyedit.c:701
@@ -2050,7 +2103,7 @@ msgstr "��� ��������������� ����� � �������� %d\n"
 
 #: g10/mainproc.c:198
 #, fuzzy
-msgid "public key encrypted data: Good DEK\n"
+msgid "public key encrypted data: good DEK\n"
 msgstr "����������� �������� ������ �� ������� %s\n"
 
 #: g10/mainproc.c:201
@@ -2095,33 +2148,33 @@ msgstr "������ ������� �� \""
 msgid "Good signature from \""
 msgstr "������� ������� �� \""
 
-#: g10/mainproc.c:861
+#: g10/mainproc.c:879
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "���������� ��������� �������: %s\n"
 
-#: g10/mainproc.c:934
+#: g10/mainproc.c:952
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:939
+#: g10/mainproc.c:957
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:88
+#: g10/misc.c:90
 #, fuzzy, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "���������� ������� ���� `%s': %s\n"
 
-#: g10/misc.c:90
-msgid "WARNING: Program may create a core file!\n"
+#: g10/misc.c:93
+msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/misc.c:198
+#: g10/misc.c:200
 msgid "Experimental algorithms should not be used!\n"
 msgstr ""
 
-#: g10/misc.c:212
+#: g10/misc.c:214
 msgid ""
 "RSA keys are deprecated; please consider creating a new key and use this key "
 "in the future\n"
@@ -2129,8 +2182,8 @@ msgstr ""
 "����������� RSA ������� �� �������������, ����������, ��������� � ��������\n"
 "������ ����� ��� ������������� � �������\n"
 
-#: g10/misc.c:233
-msgid "This cipher algorithm is depreciated; please use a more standard one!\n"
+#: g10/misc.c:235
+msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 
 #: g10/parse-packet.c:113
@@ -2154,33 +2207,38 @@ msgstr ""
 "������������: \""
 
 #: g10/passphrase.c:150
-#, c-format
-msgid "(%u-bit %s key, ID %08lX, created %s)\n"
+#, fuzzy, c-format
+msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "(%u-��� %s ����, ID %08lX, ������ %s)\n"
 
-#: g10/passphrase.c:174
+#: g10/passphrase.c:155
+#, c-format
+msgid " (main key ID %08lX)"
+msgstr ""
+
+#: g10/passphrase.c:183
 #, fuzzy
 msgid "Enter passphrase: "
 msgstr "������� �������� �����: %s\n"
 
-#: g10/passphrase.c:178
+#: g10/passphrase.c:187
 #, fuzzy
 msgid "Repeat passphrase: "
 msgstr "��������� �������� �����: %s\n"
 
-#: g10/plaintext.c:103
+#: g10/plaintext.c:63
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "������ �� ���� ���������; �������������� --\"output\" ��� ����������\n"
 
-#: g10/plaintext.c:216
+#: g10/plaintext.c:166
 msgid "Please enter name of data file: "
 msgstr "����������, ������� ��� ����� ������: "
 
-#: g10/plaintext.c:237
+#: g10/plaintext.c:187
 msgid "reading stdin ...\n"
 msgstr ""
 
-#: g10/plaintext.c:300
+#: g10/plaintext.c:250
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "���������� ������� ����������� ������ `%s' .\n"
@@ -2191,7 +2249,8 @@ msgid "anonymous receiver; trying secret key %08lX ...\n"
 msgstr "��������� ����������, ������� ��������� ���� %08lX ...\n"
 
 #: g10/pubkey-enc.c:84
-msgid "okay, we are the anonymous receiver.\n"
+#, fuzzy
+msgid "okay, we are the anonymous recipient.\n"
 msgstr "��, �� -- ��������� ����������.\n"
 
 #: g10/pubkey-enc.c:136
@@ -2209,11 +2268,11 @@ msgstr "���������: ������������ �������� %d �� ������ � �������������\n"
 msgid "protection algorithm %d is not supported\n"
 msgstr "�������� ������ %d �� ��������������\n"
 
-#: g10/seckey-cert.c:169
+#: g10/seckey-cert.c:176
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "������������ �������� �����, ���������� ����� ...\n"
 
-#: g10/seckey-cert.c:216
+#: g10/seckey-cert.c:223
 #, fuzzy
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "��������������: ��������� ������ ���� - ������� �������� �����.\n"
@@ -2223,18 +2282,27 @@ msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr "���� ElGamal ����, ��������� PGP, �� ������� ��� �������� ��������!\n"
 
-#: g10/sig-check.c:165
-msgid "public key created in future (time warp or clock problem)\n"
+#: g10/sig-check.c:166
+#, fuzzy, c-format
+msgid "public key created %lu %s in future (time warp or clock problem)\n"
 msgstr ""
 "�������� ���� ������������ � ������� (����������� ������� ��� ����������� "
 "����������� ����)\n"
 
-#: g10/sig-check.c:170
+#: g10/sig-check.c:168
+msgid "second"
+msgstr ""
+
+#: g10/sig-check.c:168
+msgid "seconds"
+msgstr ""
+
+#: g10/sig-check.c:173
 #, fuzzy, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "��������������: ���� ������� ������� %s\n"
 
-#: g10/sig-check.c:226
+#: g10/sig-check.c:230
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 
@@ -2258,133 +2326,134 @@ msgstr "���������"
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "%s: ��������������: ������ ����.\n"
 
-#: g10/tdbio.c:116 g10/tdbio.c:1413
+#: g10/tdbio.c:116 g10/tdbio.c:1418
 #, fuzzy, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "���������� ������� �� �������: %s\n"
 
-#: g10/tdbio.c:122 g10/tdbio.c:1420
+#: g10/tdbio.c:122 g10/tdbio.c:1425
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 
 #: g10/tdbio.c:232
-msgid "trustdb transaction to large\n"
+msgid "trustdb transaction too large\n"
 msgstr ""
 
-#: g10/tdbio.c:402
+#: g10/tdbio.c:416
 #, fuzzy, c-format
 msgid "%s: can't access: %s\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/ringedit.c:273 g10/tdbio.c:422
+#: g10/ringedit.c:273 g10/tdbio.c:436
 #, fuzzy, c-format
 msgid "%s: can't create directory: %s\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/ringedit.c:279 g10/tdbio.c:425
+#: g10/ringedit.c:279 g10/tdbio.c:439
 #, fuzzy, c-format
 msgid "%s: directory created\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/tdbio.c:429
+#: g10/tdbio.c:443
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/openfile.c:101 g10/openfile.c:165 g10/ringedit.c:1275 g10/tdbio.c:435
+#: g10/openfile.c:101 g10/openfile.c:165 g10/ringedit.c:1275 g10/tdbio.c:449
 #, fuzzy, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/tdbio.c:459
+#: g10/tdbio.c:473
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr ""
 
-#: g10/tdbio.c:463
-#, c-format
-msgid "%s: invalid trust-db created\n"
-msgstr ""
+#: g10/tdbio.c:477
+#, fuzzy, c-format
+msgid "%s: invalid trustdb created\n"
+msgstr "%s: ���������� �������: %s\n"
 
-#: g10/tdbio.c:465
+#: g10/tdbio.c:479
 #, fuzzy, c-format
-msgid "%s: trust-db created\n"
+msgid "%s: trustdb created\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/tdbio.c:506
-#, c-format
-msgid "%s: invalid trust-db\n"
-msgstr ""
+#: g10/tdbio.c:512
+#, fuzzy, c-format
+msgid "%s: invalid trustdb\n"
+msgstr "���������� ���� ������ ������� �� �������: %s\n"
 
-#: g10/tdbio.c:540
+#: g10/tdbio.c:545
 #, fuzzy, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/tdbio.c:548
+#: g10/tdbio.c:553
 #, fuzzy, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/tdbio.c:564 g10/tdbio.c:603 g10/tdbio.c:628 g10/tdbio.c:1346
-#: g10/tdbio.c:1373
+#: g10/tdbio.c:569 g10/tdbio.c:608 g10/tdbio.c:633 g10/tdbio.c:1351
+#: g10/tdbio.c:1378
 #, fuzzy, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/tdbio.c:577
+#: g10/tdbio.c:582
 #, fuzzy, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/tdbio.c:1053
+#: g10/tdbio.c:1058
 #, fuzzy, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "���������� ������� �� �������: %s\n"
 
-#: g10/tdbio.c:1061
+#: g10/tdbio.c:1066
 #, fuzzy, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "���������� ���� ������ ������� �� �������: %s\n"
 
-#: g10/tdbio.c:1082
+#: g10/tdbio.c:1087
 #, fuzzy, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "���������� ���� ������ ������� �� �������: %s\n"
 
-#: g10/tdbio.c:1098
+#: g10/tdbio.c:1103
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr ""
 
-#: g10/tdbio.c:1103
+#: g10/tdbio.c:1108
 #, fuzzy, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "������������ ������ ��������� �������\n"
 
-#: g10/tdbio.c:1379
+#: g10/tdbio.c:1384
 #, fuzzy, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/tdbio.c:1387
+#: g10/tdbio.c:1392
 #, fuzzy, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/tdbio.c:1397
+#: g10/tdbio.c:1402
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1427
+#: g10/tdbio.c:1432
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
 #: g10/trustdb.c:142
-msgid "The trust DB is corrupted; please run \"gpgm --fix-trust-db\".\n"
+#, fuzzy
+msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n"
 msgstr "���� ������ ������� ���������: ��������� \"gpgm --fix-trust-db\".\n"
 
 #: g10/trustdb.c:155
@@ -2404,7 +2473,7 @@ msgstr "���������� ������� �� �������: %s\n"
 
 #: g10/trustdb.c:198
 #, fuzzy, c-format
-msgid "trust db: sync failed: %s\n"
+msgid "trustdb: sync failed: %s\n"
 msgstr "���������� ���� ������ ������� �� �������: %s\n"
 
 #: g10/trustdb.c:327
@@ -2434,7 +2503,7 @@ msgstr ""
 
 #: g10/trustdb.c:463
 #, fuzzy, c-format
-msgid "`%s' is not a valid long keyID\n"
+msgid "'%s' is not a valid long keyID\n"
 msgstr "������������ ������ � �����������.\n"
 
 #: g10/trustdb.c:498
@@ -2517,29 +2586,29 @@ msgid "Ooops, no user ids\n"
 msgstr "������ ������ � ��������������� �������������"
 
 #: g10/trustdb.c:1088 g10/trustdb.c:1106
-#, c-format
-msgid "user `%s' read problem: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "user '%s' read problem: %s\n"
+msgstr "%s: ������������ �� ������\n"
 
 #: g10/trustdb.c:1091 g10/trustdb.c:1109
-#, c-format
-msgid "user `%s' list problem: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "user '%s' list problem: %s\n"
+msgstr "%s: ������������ �� ������\n"
 
 #: g10/trustdb.c:1099 g10/trustdb.c:1346
 #, fuzzy, c-format
-msgid "user `%s' not found: %s\n"
+msgid "user '%s' not found: %s\n"
 msgstr "%s: ������������ �� ������\n"
 
 #: g10/trustdb.c:1101 g10/trustdb.c:1348
-#, c-format
-msgid "problem finding `%s' in trustdb: %s\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "problem finding '%s' in trustdb: %s\n"
+msgstr "������ ������������� ���� ������ �������: %s\n"
 
 #: g10/trustdb.c:1104
-#, c-format
-msgid "user `%s' not in trustdb\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "user '%s' not in trustdb\n"
+msgstr "%s: ������������ �� ������\n"
 
 #: g10/trustdb.c:1139
 #, c-format
@@ -2575,16 +2644,6 @@ msgstr "������ � ����������� ������\n"
 msgid "error: no ownertrust value\n"
 msgstr "�������������� ��������� �������\n"
 
-#: g10/trustdb.c:1223
-#, c-format
-msgid "LID %lu: changing trust from %u to %u\n"
-msgstr ""
-
-#: g10/trustdb.c:1226
-#, c-format
-msgid "LID %lu: setting trust to %u\n"
-msgstr ""
-
 #: g10/trustdb.c:1234
 msgid "key not in trustdb, searching ring.\n"
 msgstr ""
@@ -2611,13 +2670,13 @@ msgid "error finding dir record: %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
 #: g10/trustdb.c:1351
-#, c-format
-msgid "user `%s' not in trustdb - inserting\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "user '%s' not in trustdb - inserting\n"
+msgstr "���������� ���� ������ ������� �� �������: %s\n"
 
 #: g10/trustdb.c:1354
 #, fuzzy, c-format
-msgid "failed to put `%s' into trustdb: %s\n"
+msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "������ ������������� ���� ������ �������: %s\n"
 
 #: g10/trustdb.c:1404
@@ -2815,7 +2874,7 @@ msgstr ""
 msgid "lid %lu: can't get keyblock: %s\n"
 msgstr "���������� �������� ���� �����: %s\n"
 
-#: g10/trustdb.c:2159 g10/trustdb.c:3073
+#: g10/trustdb.c:2159 g10/trustdb.c:3082
 #, fuzzy, c-format
 msgid "tdbio_search_dir failed: %s\n"
 msgstr "������ �������������: %s\n"
@@ -2907,12 +2966,12 @@ msgid "sig record %lu[%d] points to wrong record.\n"
 msgstr ""
 
 #. that should never happen
-#: g10/trustdb.c:3043
+#: g10/trustdb.c:3052
 #, fuzzy, c-format
 msgid "insert_trust_record: keyblock not found: %s\n"
 msgstr "���� %08lX: ��������� ���� �� ������: %s\n"
 
-#: g10/trustdb.c:3061
+#: g10/trustdb.c:3070
 msgid "did not use primary key for insert_trust_record()\n"
 msgstr ""
 
@@ -2994,7 +3053,7 @@ msgstr ""
 #: g10/encr-data.c:74
 #, fuzzy
 msgid ""
-"WARNING: Message was encrypted with a weak key in the symmetric cipher.\n"
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
 "��������������: ��������� ���� �����������, ��������� ������ ����, � "
 "������������ ��������� ����������.\n"
@@ -3150,6 +3209,9 @@ msgstr "������ �����������."
 msgid "No help available for `%s'"
 msgstr "������ ��� `%s' �����������."
 
+#~ msgid "invalid clear text header: "
+#~ msgstr "������������ ��������� ���������: "
+
 #~ msgid "You will see a list of signators etc. here\n"
 #~ msgstr "����� �� ������� ������ ����������� � �.�.\n"
 
diff --git a/scripts/mksnapshot b/scripts/mksnapshot
new file mode 100755
index 000000000..0d7a94d32
--- /dev/null
+++ b/scripts/mksnapshot
@@ -0,0 +1,51 @@
+#!/bin/sh
+# Make a snapshot of the CVS head revision
+#  Fixme: we should either run autoconf here or make a real distribution
+
+set -e
+
+cd $HOME/pub
+
+
+fix_version () {
+    version=$(cat $1/VERSION)
+    echo "$version-snap$(date +%Y-%m-%d)" >$1/VERSION
+    cat <<EOF >$1/SNAPSHOT
+		  WARNING!
+
+This is a snapshot of the current CVS head branch!
+
+It may not compile or not work.  Please don't report
+bugs about this snapshot release it is just for your
+convenience and to reduce the load of out CVS server.
+
+Thanks,
+
+   Werner
+EOF
+}
+
+
+do_export () {
+    pgm=$1
+    mod=$2
+
+    rm -rf $pgm.new || true
+    rm -rf $pgm.old || true
+    cvs -Q export -r HEAD -d $pgm.new $mod
+    fix_version $pgm.new
+    [ -d $pgm ] && mv $pgm $pgm.old
+    if ! mv $pgm.new $pgm ; then
+	echo "rename failed - restoring" >&2
+	mv $pgm.old $pgm
+	exit 1
+    fi
+    rm -rf $pgm.old || true
+}
+
+
+do_export gnupg-snapshot gnupg
+
+
+exit 0
+
diff --git a/scripts/mkwebpage b/scripts/mkwebpage
new file mode 100755
index 000000000..8b6782477
--- /dev/null
+++ b/scripts/mkwebpage
@@ -0,0 +1,47 @@
+#!/bin/sh
+# Make a snapshot of the CVS head revision for the gnupg webpages
+
+set -e
+
+cd $HOME/pub
+
+
+fix_it () {
+    dir=$1
+
+    cat <<EOF >$dir/NEWS
+[ This is a snapshot of the NEWS file from the CVS head revision.
+  You will find the NEWS for the latest revision below the line
+  "Noteworthy changes in version 0.x.y".
+            					     (wk $(date +%Y-%m-%d)) ]
+
+
+EOF
+    cvs -Q checkout -p gnupg/NEWS >>$dir/NEWS
+}
+
+
+
+do_export () {
+    pgm=$1
+    mod=$2
+
+    rm -rf $pgm.new || true
+    rm -rf $pgm.old || true
+    cvs -Q export -r HEAD -d $pgm.new $mod
+    fix_it $pgm.new
+    [ -d $pgm ] && mv $pgm $pgm.old
+    if ! mv $pgm.new $pgm ; then
+	echo "rename failed - restoring" >&2
+	mv $pgm.old $pgm
+	exit 1
+    fi
+    rm -rf $pgm.old || true
+}
+
+
+do_export gnupg-www gnupg-www
+
+
+exit 0
+
diff --git a/tools/shmtest.c b/tools/shmtest.c
index fb336bd2e..53637e174 100644
--- a/tools/shmtest.c
+++ b/tools/shmtest.c
@@ -62,7 +62,7 @@ do_get_string( int mode, const char *keyword, byte *area, size_t areasize )
 {
     size_t n, len;
     char *p=NULL;
-    int yes;
+    int yes=0;
 
     n = area[0] << 8 | area[1];
     /* fixme: do some sanity checks here */
diff --git a/util/dotlock.c b/util/dotlock.c
index 620d8cdeb..71e6178b3 100644
--- a/util/dotlock.c
+++ b/util/dotlock.c
@@ -30,6 +30,7 @@
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <signal.h>
 #include "types.h"
 #include "util.h"
 #include "memory.h"