diff options
| author | Werner Koch <wk@gnupg.org> | 1999-01-21 06:25:29 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 1999-01-21 06:25:29 +0100 |
| commit | 9ef0f26270cb4c21686b69f34cb8768cb7a22e5d (patch) | |
| tree | 976c623aa7666cd3578725dbb600efc971a40e7f | |
| parent | See ChangeLog: Wed Jan 20 18:59:49 CET 1999 Werner Koch (diff) | |
| download | gnupg2-9ef0f26270cb4c21686b69f34cb8768cb7a22e5d.tar.xz gnupg2-9ef0f26270cb4c21686b69f34cb8768cb7a22e5d.zip | |
See ChangeLog: Thu Jan 21 06:22:10 CET 1999 Werner KochV0-9-2
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | TODO | 10 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | cipher/twofish.c | 1 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/copyright | 6 | ||||
| -rw-r--r-- | debian/rules | 8 | ||||
| -rw-r--r-- | g10/armor.c | 2 | ||||
| -rw-r--r-- | g10/g10.c | 2 | ||||
| -rw-r--r-- | g10/hkp.c | 1 | ||||
| -rw-r--r-- | g10/mainproc.c | 2 | ||||
| -rw-r--r-- | g10/sign.c | 2 | ||||
| -rw-r--r-- | g10/skclist.c | 2 | ||||
| -rw-r--r-- | include/distfiles | 1 | ||||
| -rw-r--r-- | mpi/mips3/README | 23 | ||||
| -rw-r--r-- | po/ChangeLog | 4 | ||||
| -rw-r--r-- | po/de.glo | 52 | ||||
| -rw-r--r-- | po/de.po | 530 | ||||
| -rw-r--r-- | po/es_ES.po | 1250 | ||||
| -rw-r--r-- | po/fr.po | 524 | ||||
| -rw-r--r-- | po/it.po | 521 | ||||
| -rw-r--r-- | po/pl.po | 518 | ||||
| -rw-r--r-- | po/pt_BR.po | 518 | ||||
| -rw-r--r-- | po/ru.po | 520 | ||||
| -rwxr-xr-x | scripts/config.sub | 2 | ||||
| -rw-r--r-- | util/ChangeLog | 4 | ||||
| -rw-r--r-- | util/http.c | 5 | ||||
| -rw-r--r-- | zlib/ChangeLog | 4 | ||||
| -rw-r--r-- | zlib/Makefile.am | 11 | ||||
| -rw-r--r-- | zlib/Makefile.am~ | 29 | ||||
| -rw-r--r-- | zlib/gzio.c | 875 | ||||
| -rw-r--r-- | zlib/inffixed.h | 151 | ||||
| -rw-r--r-- | zlib/trees.h | 128 | ||||
| -rw-r--r-- | zlib/zconf.h~ | 186 | ||||
| -rw-r--r-- | zlib/zlib.h~ | 782 |
37 files changed, 2777 insertions, 3923 deletions
@@ -1,3 +1,7 @@ +Wed Jan 20 21:40:21 CET 1999 Werner Koch <wk@isil.d.shuttle.de> + + * configure.in: --enable-m-guard is now default + Wed Jan 13 12:49:36 CET 1999 Werner Koch <wk@isil.d.shuttle.de> * INSTALL: Applied new information how to build rpms by Fabio Coatti @@ -1,9 +1,11 @@ +Noteworthy changes in version 0.9.2 +----------------------------------- * add some additional time warp checks. - * Option --keyserver and command --send-keys to utilize HKP servers + * Option --keyserver and command --send-keys to utilize HKP servers. - * Upgraded to zlib 1.1.3 + * Upgraded to zlib 1.1.3 and fixed an inflate bug * More cleanup on the cleartext signatures. @@ -19,16 +19,6 @@ Important * print a warning when a revoked/expired secret key is used. -> 0.9.1: I get some occasional segfaults during 'make check' unless I use -> --with-included-zlib. It's strange, I have zlib-1.1.2 on one machine, and -> zlib-1.1.3 on another, and both of them fail on occasion (maybe half of the -[ I hope this is fixed ] - -> gpg: /home/jam/.gnupg/pubring.gpg: can't open gdbm file: Can't be writer -> gpg: keyblock resource `/home/jam/.gnupg/pubring.gpg': file open error -> gpg: OOPS in close enum_keyblocks - ignored - - Needed ------ * remove more "Fixmes" @@ -1 +1 @@ -0.9.1a +0.9.2 diff --git a/cipher/twofish.c b/cipher/twofish.c index d52377f76..6ff7dee9f 100644 --- a/cipher/twofish.c +++ b/cipher/twofish.c @@ -22,6 +22,7 @@ #include <string.h> /* for memcmp() */ #include "types.h" /* for byte and u32 typedefs */ +#include "util.h" #include "errors.h" diff --git a/configure.in b/configure.in index d26b1bce1..96060957e 100644 --- a/configure.in +++ b/configure.in @@ -49,8 +49,8 @@ if test "$use_m_debug" = yes; then else AC_MSG_CHECKING([whether memory guard is requested]) AC_ARG_ENABLE(m-guard, - [ --disable-m-guard disable memory guard facility], - use_m_guard=$enableval, use_m_guard=yes) + [ --enable-m-guard enable memory guard facility], + use_m_guard=$enableval, use_m_guard=no) AC_MSG_RESULT($use_m_guard) fi if test "$use_m_guard" = yes ; then diff --git a/debian/changelog b/debian/changelog index 65c4bf31f..dd58db671 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +gnupg (0.9.2-1) unstable; urgency=low + + * New version. + * debian/rules (build): Removed CFLAGS as the default is now sufficient. + * debian/rules (clean): remove special handling cleanup in intl. + + -- Werner Koch <wk@isil.d.suttle.de> Wed, 20 Jan 1999 21:23:11 +0100 + gnupg (0.9.1-1) unstable; urgency=low * New upstream version. @@ -41,7 +49,7 @@ gnupg (0.4.2-1) unstable; urgency=low * New upstream version. * debian/preinst: improve message about the NEWS file which isn't actually installed when it's referred to, thanks to Martin Mitchell - <martin@debian.org>. + <martin@debian.org>. * debian/rules (binary-arch): don't install the now non-existent `rfcs', but do install `OpenPGP'. diff --git a/debian/copyright b/debian/copyright index bf4c9e3fa..9ee053bb2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,13 +4,13 @@ have some bugs and some features may not work at all. This package was put together by me, James Troup <james@nocrew.org>, from the sources, which I obtained from -ftp://ftp.guug.de/pub/gcrypt/gnupg-0.9.1.tar.gz. The changes were +ftp://ftp.gnupg.org/pub/gcrypt/gnupg-0.9.2.tar.gz. The changes were minimal, namely: - adding support for the Debian package maintenance scheme, by adding - various debian/* files. + various debian/* files. -Program Copyright (C) 1997, 1998 Werner Koch (dd9jn). +Program Copyright (C) 1998, 1999 Free Software Foundation, Inc. Modifications for Debian Copyright (C) 1998 James Troup. GNUPG is free software; you can redistribute it and/or modify diff --git a/debian/rules b/debian/rules index 0a67f794b..f0d81e18f 100644 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,5 @@ #!/usr/bin/make -f -# debian/rules file - for GNUPG (0.9.1) +# debian/rules file - for GNUPG (0.9.2) # Based on sample debian/rules file - for GNU Hello (1.3). # Copyright 1994,1995 by Ian Jackson. # Copyright 1998 James Troup @@ -12,7 +12,7 @@ build: $(checkdir) ./configure --prefix=/usr --with-included-gettext - $(MAKE) CFLAGS="-O2 -g -Wall" + $(MAKE) touch build test: build @@ -25,8 +25,6 @@ clean: -rm -f build -$(MAKE) -i distclean || $(MAKE) -f Makefile.in distclean -rm -rf debian/tmp debian/*~ debian/files* debian/substvars - # Cruft not removed by `make clean' - -rm -f intl/libintl.h binary-indep: @@ -63,7 +61,7 @@ endef # Below here is fairly generic really -binary: binary-indep binary-arch +binary: binary-indep binary-arch checkroot: $(checkdir) diff --git a/g10/armor.c b/g10/armor.c index 195fc2cb9..663e824a6 100644 --- a/g10/armor.c +++ b/g10/armor.c @@ -575,7 +575,7 @@ radix64_read( armor_filter_context_t *afx, IOBUF a, size_t *retn, byte *buf, size_t size ) { byte val; - int c, c2; + int c=0, c2; /*init c because gcc is not clever enough for the continue*/ int checkcrc=0; int rc = 0; size_t n = 0; @@ -1,5 +1,5 @@ /* g10.c - The GnuPG utility (main for gpg) - * Copyright (C) 1998 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -126,6 +126,7 @@ hkp_export( STRLIST users ) iobuf_write( hd.fp_write, iobuf_get_temp_buffer(temp), iobuf_get_temp_length(temp) ); iobuf_put( hd.fp_write, '\n' ); + iobuf_flush_temp( temp ); iobuf_close(temp); rc = http_wait_response( &hd, &status ); diff --git a/g10/mainproc.c b/g10/mainproc.c index 51547b886..2e5575dd8 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -279,7 +279,7 @@ proc_plaintext( CTX c, PACKET *pkt ) md_enable( c->mfx.md, DIGEST_ALGO_SHA1 ); md_enable( c->mfx.md, DIGEST_ALGO_MD5 ); } - md_start_debug( c->mfx.md, "verify" ); + /*md_start_debug( c->mfx.md, "verify" );*/ rc = handle_plaintext( pt, &c->mfx, c->sigs_only, clearsig ); if( rc == G10ERR_CREATE_FILE && !c->sigs_only) { /* can't write output but we hash it anyway to diff --git a/g10/sign.c b/g10/sign.c index fe13461d6..dd7f50c35 100644 --- a/g10/sign.c +++ b/g10/sign.c @@ -646,7 +646,7 @@ clearsign_file( const char *fname, STRLIST locusr, const char *outfile ) PKT_secret_key *sk = sk_rover->sk; md_enable(textmd, hash_for(sk->pubkey_algo)); } - md_start_debug( textmd, "sign" ); + /*md_start_debug( textmd, "sign" );*/ tfx.clearsign = 1; tfx.not_dash_escaped = opt.not_dash_escaped; tfx.escape_from = opt.escape_from; diff --git a/g10/skclist.c b/g10/skclist.c index 2c46d6699..74ae2a804 100644 --- a/g10/skclist.c +++ b/g10/skclist.c @@ -56,7 +56,7 @@ static int is_insecure( PKT_secret_key *sk ) { - BUG(); + return 0; /* FIXME!! */ } diff --git a/include/distfiles b/include/distfiles index 191dd880d..4462aa230 100644 --- a/include/distfiles +++ b/include/distfiles @@ -8,6 +8,7 @@ types.h util.h i18n.h host2net.h +http.h g10lib.h diff --git a/mpi/mips3/README b/mpi/mips3/README new file mode 100644 index 000000000..e94b2c746 --- /dev/null +++ b/mpi/mips3/README @@ -0,0 +1,23 @@ +This directory contains mpn functions optimized for MIPS3. Example of +processors that implement MIPS3 are R4000, R4400, R4600, R4700, and R8000. + +RELEVANT OPTIMIZATION ISSUES + +1. On the R4000 and R4400, branches, both the plain and the "likely" ones, + take 3 cycles to execute. (The fastest possible loop will take 4 cycles, + because of the delay insn.) + + On the R4600, branches takes a single cycle + + On the R8000, branches often take no noticable cycles, as they are + executed in a separate function unit.. + +2. The R4000 and R4400 have a load latency of 4 cycles. + +3. On the R4000 and R4400, multiplies take a data-dependent number of + cycles, contrary to the SGI documentation. There seem to be 3 or 4 + possible latencies. + +STATUS + +Good... diff --git a/po/ChangeLog b/po/ChangeLog index 1e3bfe557..42e83fb2c 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +Wed Jan 20 21:40:21 CET 1999 Werner Koch <wk@isil.d.shuttle.de> + + * es_ES.po: Import of new version. + Wed Jan 13 12:49:36 CET 1999 Werner Koch <wk@isil.d.shuttle.de> * de.po de.glo: New version imported. @@ -2,28 +2,28 @@ # Copyright (C) 1998 Free Software Foundation, Inc. # Walter Koch <walterk@dip.de>, 1998. # This is just a textfile for your information. -# It will _not_ be read or processed automatically by any program +# It will _not_ be read or processed automatically by any program ........ Authentisierung -algorithm Verfahren +algorithm Verfahren anonymous ungenannter armor ASCII-Hülle available vorhanden [besser?: verfügbar] -bad [signature] falsch[e] Unterschrift +bad [signature] falsch[e] Unterschrift bug "Bug (Programmfehler)" cache Lager [ ob das ernst gemeint ist? :-) ] certificate Zertifikat character set Zeichensatz checksum Prüfsumme cipher algorithm Verschlüsselungsverfahren -clearsig header Klartextsignatur-Einleitung -command Befehl +clearsig header Klartextsignatur-Einleitung +command Befehl compress algorithm Komprimierverfahren * core dump core-dump-Datei corrupted beschädigter -dash escaped mit Bindestrich \"escapte\" +dash escaped mit Bindestrich \"escapte\" decryption Enschlüsselung -DEK ??? +DEK ??? delete entfernen depreciated nicht viel wert digest algorithm Hashmethode @@ -31,7 +31,7 @@ disabled abgeschaltet encrypted verschlüsselte expire date Verfallsdatum failed fehlgeschlagen -fingerprint Fingerabdruck +fingerprint Fingerabdruck for-your-eyes-only Vertraulichkeit (\"for-your-eyes-only\") generated erzeugter good certificate Korrektes Zertifikat @@ -44,7 +44,7 @@ main key Hauptschlüssel maintenance utility Wartungs-Hilfsprogramm malformed ungünstig aufgebaute message Botschaft -mode Modus, Methode * +mode Modus, Methode * move schieben note Hinweis okay in Ordnung @@ -61,37 +61,39 @@ primary keys Hauptschlüssel protection algorithm Schutzverfahren pubkey algorithm Public-Key Verfahren (*) public key öffentlicher Schüssel -public key algorithm Public-Key Verfahren -radix64 radix64 +public key algorithm Public-Key Verfahren +radix64 radix64 retry ???? revo... Widerruf secondary key Zweitschlüssel secret key geheimer Schlüssel -self-signature Eigenbeglaubigung +self-signature Eigenbeglaubigung sender Absender sign user id User-ID beglaubigen * -signature (files) Unterschrift * -signature (keys) Beglaubigung * -simple S2K mode ???? -skipped übergangen, übersprungen, ignoriert -stdin - stdin -terminal charset Terminalzeichensatz +signature (files) Unterschrift * +signature (keys) Beglaubigung * +simple S2K mode ???? +skipped übergangen, übersprungen, ignoriert +stdin - stdin +terminal charset Terminalzeichensatz throw verwerfe Timestamp conflict Zeitangaben differieren Trust-DB 'Trust'-Datenbank -trusted - vertrauenswürdig -trustvalues - trustvalues +trusted - vertrauenswürdig +trustvalues - trustvalues trying Versuch type [message] [Botschaft] eintippen ulimately [trust] uneingeschränktes [Vertrauen] -update Ändern, Änderung -User - User +update Ändern, Änderung +User - User user ID User-ID user IDs User-IDs username Username -untrusted - nichtvertruenswürdigen -warning Warnung +untrusted - nichtvertruenswürdigen +warning Warnung weak key unsicherer Schlüssel (*) Uneinheitlich verwendet - - Gefällt mir nicht so toll
\ No newline at end of file + - Gefällt mir nicht so toll + + @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"POT-Creation-Date: 1999-01-09 22:24+0100\n" +"POT-Creation-Date: 1999-01-20 22:45+0100\n" "PO-Revision-Date: 1998-12-27 13:34+0100\n" "Last-Translator: Walter Koch <walterk@mail.dip.de>\n" "Language-Team: German <de@li.org>\n" @@ -208,6 +208,26 @@ msgstr "Datei existiert bereits" msgid "weak key" msgstr "Unsicherer Schlüssel" +#: util/errors.c:97 +#, fuzzy +msgid "invalid argument" +msgstr "Ungültige ASCII-Hülle" + +#: util/errors.c:98 +#, fuzzy +msgid "bad URI" +msgstr "Falsche MPI" + +#: util/errors.c:99 +#, fuzzy +msgid "unsupported URI" +msgstr "Wird nicht unterstützt" + +#: util/errors.c:100 +#, fuzzy +msgid "network error" +msgstr "Allgemeiner Fehler" + #: util/logger.c:178 #, c-format msgid "... this is a bug (%s:%d:%s)\n" @@ -218,12 +238,12 @@ msgstr "... dies ist ein Bug (Programmfehler) (%s:%d:%s)\n" msgid "you found a bug ... (%s:%d)\n" msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n" -#: cipher/random.c:405 +#: cipher/random.c:412 msgid "WARNING: using insecure random number generator!!\n" msgstr "" "WARNUNG: Der Zufallszahlengenerator erzeugt keine echten Zufallszahlen!\n" -#: cipher/random.c:406 +#: cipher/random.c:413 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -249,7 +269,7 @@ msgstr "" "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n" "(Es werden noch %d Byte benötigt.)\n" -#: g10/g10.c:160 +#: g10/g10.c:163 msgid "" "@Commands:\n" " " @@ -257,123 +277,127 @@ msgstr "" "@Befehle:\n" " " -#: g10/g10.c:163 +#: g10/g10.c:166 msgid "|[file]|make a signature" msgstr "|[file]|Eine Unterschrift erzeugen" -#: g10/g10.c:164 +#: g10/g10.c:167 msgid "|[file]|make a clear text signature" msgstr "|[file]|Eine Klartextunterschrift erzeugen" -#: g10/g10.c:165 +#: g10/g10.c:168 msgid "make a detached signature" msgstr "Eine abgetrennte Unterschrift erzeugen" -#: g10/g10.c:166 +#: g10/g10.c:169 msgid "encrypt data" msgstr "Daten verschlüsseln" -#: g10/g10.c:167 +#: g10/g10.c:170 msgid "encryption only with symmetric cipher" msgstr "Daten nur symmetrisch verschlüsseln" -#: g10/g10.c:168 +#: g10/g10.c:171 msgid "store only" msgstr "Nur speichern" -#: g10/g10.c:169 +#: g10/g10.c:172 msgid "decrypt data (default)" msgstr "Daten entschlüsseln (Voreinstellung)" -#: g10/g10.c:170 +#: g10/g10.c:173 msgid "verify a signature" msgstr "Signatur prüfen" -#: g10/g10.c:172 +#: g10/g10.c:175 msgid "list keys" msgstr "Liste der Schlüssel" -#: g10/g10.c:173 +#: g10/g10.c:176 msgid "list keys and signatures" msgstr "Liste der Schlüssel und ihrer Signaturen" -#: g10/g10.c:174 +#: g10/g10.c:177 msgid "check key signatures" msgstr "Signaturen der Schlüssel prüfen" -#: g10/g10.c:175 +#: g10/g10.c:178 msgid "list keys and fingerprints" msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\"" -#: g10/g10.c:176 +#: g10/g10.c:179 msgid "list secret keys" msgstr "Liste der geheimen Schlüssel" -#: g10/g10.c:178 +#: g10/g10.c:181 msgid "generate a new key pair" msgstr "Ein neues Schlüsselpaar erzeugen" -#: g10/g10.c:180 +#: g10/g10.c:183 msgid "remove key from the public keyring" msgstr "Schlüssel entfernen" -#: g10/g10.c:182 +#: g10/g10.c:185 msgid "sign or edit a key" msgstr "Unterschreiben oder Bearbeiten eines Schlüssels" -#: g10/g10.c:183 +#: g10/g10.c:186 msgid "generate a revocation certificate" msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen" -#: g10/g10.c:185 +#: g10/g10.c:188 msgid "export keys" msgstr "Schlüssel exportieren" -#: g10/g10.c:188 +#: g10/g10.c:189 +msgid "export keys to a key server" +msgstr "" + +#: g10/g10.c:192 msgid "import/merge keys" msgstr "Schlüssel importieren/kombinieren" -#: g10/g10.c:190 +#: g10/g10.c:194 msgid "list only the sequence of packets" msgstr "Lediglich die Struktur der Datenpakete anzeigen" -#: g10/g10.c:193 +#: g10/g10.c:197 msgid "export the ownertrust values" msgstr "Exportieren der \"Owner trust\" Werte" -#: g10/g10.c:195 +#: g10/g10.c:199 msgid "import ownertrust values" msgstr "Importieren der \"Owner trust\" Werte" -#: g10/g10.c:197 +#: g10/g10.c:201 msgid "|[NAMES]|update the trust database" msgstr "|[NAMES]|Ändern der \"Trust\"-Datenbank" -#: g10/g10.c:199 +#: g10/g10.c:203 msgid "|[NAMES]|check the trust database" msgstr "|[NAMES]|Überprüfen der \"Trust\"-Datenbank" -#: g10/g10.c:200 +#: g10/g10.c:204 msgid "fix a corrupted trust database" msgstr "Reparieren einer beschädigten \"Trust\"-Datenbank" -#: g10/g10.c:201 +#: g10/g10.c:205 msgid "De-Armor a file or stdin" msgstr "Datei oder stdin von der ASCII-Hülle befreien" -#: g10/g10.c:202 +#: g10/g10.c:206 msgid "En-Armor a file or stdin" msgstr "Datei oder stdin in eine ASCII-Hülle einpacken" -#: g10/g10.c:203 +#: g10/g10.c:207 msgid "|algo [files]|print message digests" msgstr "|algo [files]|Message-Digests für die Dateien ausgeben" -#: g10/g10.c:204 +#: g10/g10.c:208 msgid "print all message digests" msgstr "Message-Digests für die Eingabedaten ausgeben" -#: g10/g10.c:211 +#: g10/g10.c:215 msgid "" "@\n" "Options:\n" @@ -383,140 +407,144 @@ msgstr "" "Optionen:\n" " " -#: g10/g10.c:213 +#: g10/g10.c:217 msgid "create ascii armored output" msgstr "Ausgabe mit ASCII-Hülle versehen" -#: g10/g10.c:215 +#: g10/g10.c:219 msgid "use this user-id to sign or decrypt" msgstr "Mit dieser User-ID signieren" -#: g10/g10.c:216 +#: g10/g10.c:220 msgid "use this user-id for encryption" msgstr "Verschlüsseln für diese User-ID" -#: g10/g10.c:217 +#: g10/g10.c:221 msgid "|N|set compress level N (0 disables)" msgstr "Kompressionsstufe auf N setzen (0 = keine Kompr.)" -#: g10/g10.c:219 +#: g10/g10.c:223 msgid "use canonical text mode" msgstr "Textmodus benutzen" -#: g10/g10.c:221 +#: g10/g10.c:225 msgid "use as output file" msgstr "Als Ausgabedatei benutzen" -#: g10/g10.c:222 +#: g10/g10.c:226 msgid "verbose" msgstr "Detaillierte Informationen" -#: g10/g10.c:223 +#: g10/g10.c:227 msgid "be somewhat more quiet" msgstr "Etwas weniger Infos" -#: g10/g10.c:224 +#: g10/g10.c:228 msgid "force v3 signatures" msgstr "v3 Signaturen erzwingen" #. { oDryRun, "dry-run", 0, N_("do not make any changes") }, -#: g10/g10.c:226 +#: g10/g10.c:230 msgid "batch mode: never ask" msgstr "Stapelmodus: Keine Abfragen" -#: g10/g10.c:227 +#: g10/g10.c:231 msgid "assume yes on most questions" msgstr "\"Ja\" als Standardantwort annehmen" -#: g10/g10.c:228 +#: g10/g10.c:232 msgid "assume no on most questions" msgstr "\"Nein\" als Standardantwort annehmen" -#: g10/g10.c:229 +#: g10/g10.c:233 msgid "add this keyring to the list of keyrings" msgstr "Als öffentlichen Schlüsselbund mitbenutzen" -#: g10/g10.c:230 +#: g10/g10.c:234 msgid "add this secret keyring to the list" msgstr "Als geheimen Schlüsselbund mitbenutzen" -#: g10/g10.c:231 +#: g10/g10.c:235 msgid "|NAME|use NAME as default secret key" msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen" -#: g10/g10.c:232 +#: g10/g10.c:236 +msgid "|HOST|use this keyserver to lookup keys" +msgstr "" + +#: g10/g10.c:237 msgid "|NAME|set terminal charset to NAME" msgstr "|NAME|Terminalzeichensatz NAME benutzen" -#: g10/g10.c:233 +#: g10/g10.c:238 msgid "read options from file" msgstr "Optionen aus der Datei lesen" -#: g10/g10.c:235 +#: g10/g10.c:240 msgid "set debugging flags" msgstr "Debug-Flags einschalten" -#: g10/g10.c:236 +#: g10/g10.c:241 msgid "enable full debugging" msgstr "Alle Debug-Flags einschalten" -#: g10/g10.c:237 +#: g10/g10.c:242 msgid "|FD|write status info to this FD" msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben" -#: g10/g10.c:238 +#: g10/g10.c:243 msgid "do not write comment packets" msgstr "Keine Kommentarpakete schreiben" -#: g10/g10.c:239 +#: g10/g10.c:244 msgid "(default is 1)" msgstr "Benötigte Vollvertrauen (Voreinstellung 1)" -#: g10/g10.c:240 +#: g10/g10.c:245 msgid "(default is 3)" msgstr "Benötigte Teilvertrauen (Voreinstellung 3)" -#: g10/g10.c:242 +#: g10/g10.c:247 msgid "|KEYID|ulimately trust this key" msgstr "|KEYID|Diesem Schlüssel uneingeschränkt vertrauen" -#: g10/g10.c:243 +#: g10/g10.c:248 msgid "|FILE|load extension module FILE" msgstr "|FILE|Erweiterungsmodul DATEI laden" -#: g10/g10.c:244 +#: g10/g10.c:249 msgid "emulate the mode described in RFC1991" msgstr "Den in RFC1991 beschriebenen Modus nachahmen" -#: g10/g10.c:245 +#: g10/g10.c:250 msgid "|N|use passphrase mode N" msgstr "|N|Verwenden des Mantra-Modus N" -#: g10/g10.c:247 +#: g10/g10.c:252 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|NAME|Das Hashverfahren NAME für Mantras benutzen" -#: g10/g10.c:249 +#: g10/g10.c:254 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|NAME|Das Verschlü.verfahren NAME für Mantras benutzen" -#: g10/g10.c:251 +#: g10/g10.c:256 msgid "|NAME|use cipher algorithm NAME" msgstr "|NAME|Das Verschlü.verfahren NAME benutzen" -#: g10/g10.c:252 +#: g10/g10.c:257 msgid "|NAME|use message digest algorithm NAME" msgstr "|NAME|Das Hashverfahren NAME benutzen" -#: g10/g10.c:253 +#: g10/g10.c:258 msgid "|N|use compress algorithm N" msgstr "|N|Die Komprimierverfahren N benutzen" -#: g10/g10.c:254 +#: g10/g10.c:259 msgid "throw keyid field of encrypted packets" msgstr "entferne die Absender-ID verschlüsselter Pakete" -#: g10/g10.c:262 +#: g10/g10.c:267 msgid "" "@\n" "Examples:\n" @@ -536,19 +564,19 @@ msgstr "" " --list-keys [Namen] Schlüssel anzeigen\n" " --fingerprint [Namen] \"Fingerabdrücke\" anzeigen\n" -#: g10/g10.c:341 +#: g10/g10.c:346 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n" msgstr "Berichte über Bugs (Programmfehler) bitte an <gnupg-bugs@gnu.org>.\n" -#: g10/g10.c:346 +#: g10/g10.c:351 msgid "Usage: gpgm [options] [files] (-h for help)" msgstr "Syntax: gpgm [Optionen] [Dateien] (-h für Hilfe)" -#: g10/g10.c:348 +#: g10/g10.c:353 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Aufruf: gpg [Optionen] [Dateien] (-h für Hilfe)" -#: g10/g10.c:353 +#: g10/g10.c:358 msgid "" "Syntax: gpgm [options] [files]\n" "GnuPG maintenance utility\n" @@ -556,7 +584,7 @@ msgstr "" "Syntax: gpgm [options] [files]\n" "GnuPG Wartungs-Hilfsprogramm\n" -#: g10/g10.c:356 +#: g10/g10.c:361 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -566,7 +594,7 @@ msgstr "" "Signieren, prüfen, verschlüsseln, entschlüsseln\n" "Die voreingestellte Operation ist abhängig von den Eingabedaten\n" -#: g10/g10.c:362 +#: g10/g10.c:367 msgid "" "\n" "Supported algorithms:\n" @@ -574,221 +602,226 @@ msgstr "" "\n" "Unterstützte Verfahren:\n" -#: g10/g10.c:437 +#: g10/g10.c:442 msgid "usage: gpgm [options] " msgstr "Aufruf: gpgm [Optionen] " -#: g10/g10.c:439 +#: g10/g10.c:444 msgid "usage: gpg [options] " msgstr "Aufruf: gpg [Optionen] " -#: g10/g10.c:480 +#: g10/g10.c:485 msgid "conflicting commands\n" msgstr "Widersprüchliche Befehle\n" -#: g10/g10.c:618 +#: g10/g10.c:623 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n" -#: g10/g10.c:622 +#: g10/g10.c:627 #, c-format msgid "option file `%s': %s\n" msgstr "Optionendatei '%s': %s\n" -#: g10/g10.c:629 +#: g10/g10.c:634 #, c-format msgid "reading options from `%s'\n" msgstr "Optionen werden aus '%s' gelesen\n" -#: g10/g10.c:782 +#: g10/g10.c:788 #, c-format msgid "%s is not a valid character set\n" msgstr "%s ist kein gültiger Zeichensatz.\n" -#: g10/g10.c:817 g10/g10.c:829 +#: g10/g10.c:824 g10/g10.c:836 msgid "selected cipher algorithm is invalid\n" msgstr "Das ausgewählte Verschlüsslungsverfahren ist ungültig\n" -#: g10/g10.c:823 g10/g10.c:835 +#: g10/g10.c:830 g10/g10.c:842 msgid "selected digest algorithm is invalid\n" msgstr "Das ausgewählte Hashverfahren ist ungültig\n" -#: g10/g10.c:838 +#: g10/g10.c:845 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "Das Komprimierverfahren muß im Bereich %d bis %d liegen\n" -#: g10/g10.c:840 +#: g10/g10.c:847 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed müssen größer als 0 sein\n" -#: g10/g10.c:842 +#: g10/g10.c:849 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed müssen größer als 1 sein\n" -#: g10/g10.c:844 +#: g10/g10.c:851 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth muß im Bereich 1 bis 255 liegen\n" -#: g10/g10.c:847 +#: g10/g10.c:854 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n" -#: g10/g10.c:851 +#: g10/g10.c:858 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "ungültiger \"simple S2K\"-Modus; Wert muß 0, 1 oder 3 sein\n" -#: g10/g10.c:934 +#: g10/g10.c:941 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n" -#: g10/g10.c:940 +#: g10/g10.c:947 msgid "--store [filename]" msgstr "--store [Dateiname]" -#: g10/g10.c:948 +#: g10/g10.c:955 msgid "--symmetric [filename]" msgstr "--symmetric [Dateiname]" -#: g10/g10.c:956 +#: g10/g10.c:963 msgid "--encrypt [filename]" msgstr "--encrypt [Dateiname]" -#: g10/g10.c:969 +#: g10/g10.c:976 msgid "--sign [filename]" msgstr "--sign [Dateiname]" -#: g10/g10.c:982 +#: g10/g10.c:989 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [Dateiname]" -#: g10/g10.c:996 +#: g10/g10.c:1003 msgid "--clearsign [filename]" msgstr "--clearsign [Dateiname]" -#: g10/g10.c:1008 +#: g10/g10.c:1015 msgid "--decrypt [filename]" msgstr "--decrypt [Dateiname]" -#: g10/g10.c:1017 +#: g10/g10.c:1024 msgid "--edit-key username [commands]" msgstr "--edit-key Username [Befehle]" -#: g10/g10.c:1033 +#: g10/g10.c:1040 msgid "--delete-secret-key username" msgstr "--delete-secret-key Username" -#: g10/g10.c:1036 +#: g10/g10.c:1043 msgid "--delete-key username" msgstr "--delete-key Benutzername" -#: g10/encode.c:216 g10/g10.c:1059 g10/sign.c:301 +#: g10/encode.c:216 g10/g10.c:1066 g10/sign.c:311 #, c-format msgid "can't open %s: %s\n" msgstr "'%s' kann nicht geöffnet werden: %s\n" -#: g10/g10.c:1070 +#: g10/g10.c:1077 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [Benutzername] [Keyring]" -#: g10/g10.c:1127 +#: g10/g10.c:1138 #, c-format msgid "dearmoring failed: %s\n" msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n" -#: g10/g10.c:1135 +#: g10/g10.c:1146 #, c-format msgid "enarmoring failed: %s\n" msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n" -#: g10/g10.c:1201 +#: g10/g10.c:1212 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "Ungültiges Hashverfahren '%s'\n" -#: g10/g10.c:1280 +#: g10/g10.c:1291 msgid "[filename]" msgstr "[Dateiname]" -#: g10/g10.c:1284 +#: g10/g10.c:1295 msgid "Go ahead and type your message ...\n" msgstr "Auf geht's - Botschaft eintippen ...\n" -#: g10/decrypt.c:59 g10/g10.c:1287 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1298 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "'%s' kann nicht geöffnet werden\n" -#: g10/armor.c:321 +#: g10/armor.c:297 #, c-format msgid "armor: %s\n" msgstr "ASCII-Hülle: %s\n" -#: g10/armor.c:344 +#: g10/armor.c:320 msgid "invalid armor header: " msgstr "Ungültige ASCII-Hülle" -#: g10/armor.c:351 +#: g10/armor.c:327 msgid "armor header: " msgstr "ASCII-Hülle: " -#: g10/armor.c:362 +#: g10/armor.c:338 msgid "invalid clearsig header\n" msgstr "Ungültige Klartextsignatur-Einleitung\n" -#: g10/armor.c:414 +#: g10/armor.c:390 msgid "nested clear text signatures\n" msgstr "verschachtelte Klartextunterschriften\n" -#: g10/armor.c:530 +#: g10/armor.c:508 msgid "invalid dash escaped line: " msgstr "Ungültige mit Bindestrich \"escapte\" Zeile: " -#: g10/armor.c:538 +#: g10/armor.c:516 msgid "unexpected armor:" msgstr "Unerwartete ASCII-Hülle:" -#: g10/armor.c:624 +#: g10/armor.c:632 #, c-format msgid "invalid radix64 character %02x skipped\n" msgstr "Ungültiges \"radix64\" Zeichen %02x ignoriert\n" -#: g10/armor.c:654 +#: g10/armor.c:675 msgid "premature eof (no CRC)\n" msgstr "vorzeitiges Dateiende (keine Prüfsumme)\n" -#: g10/armor.c:671 +#: g10/armor.c:709 msgid "premature eof (in CRC)\n" msgstr "vorzeitiges Dateiende (innerhalb der Prüfsumme)\n" -#: g10/armor.c:675 +#: g10/armor.c:713 msgid "malformed CRC\n" msgstr "Falsch aufgebaute Prüfsumme\n" -#: g10/armor.c:679 +#: g10/armor.c:717 #, c-format msgid "CRC error; %06lx - %06lx\n" msgstr "Prüfsummenfehler; %06lx - %06lx\n" -#: g10/armor.c:696 +#: g10/armor.c:734 msgid "premature eof (in Trailer)\n" msgstr "vorzeitiges Dateiende (im Nachsatz)\n" -#: g10/armor.c:700 +#: g10/armor.c:738 msgid "error in trailer line\n" msgstr "Fehler in der Nachsatzzeile\n" -#: g10/armor.c:961 +#: g10/armor.c:999 msgid "no valid OpenPGP data found.\n" msgstr "Keine gültigen OpenPGP-Daten gefunden.\n" -#: g10/armor.c:963 +#: g10/armor.c:1001 #, c-format msgid "invalid armor: line longer than %d characters\n" msgstr "" +#: g10/armor.c:1005 +msgid "" +"quoted printable character in armor - probably a buggy MTA has been used\n" +msgstr "" + #: g10/pkclist.c:138 #, c-format msgid "" @@ -1292,20 +1325,37 @@ msgid "public and secret key created and signed.\n" msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n" #: g10/keygen.c:931 +#, fuzzy 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" +"the command \"--edit-key\" to generate a secondary key for this purpose.\n" msgstr "" "Bitte beachten Sie, daß dieser Schlüssel nicht zum Verschlüsseln benutzt\n" "werden kann. Sie können aber mit dem Befehl \"--add-key\" einen\n" "Zweitschlüssel zu diesem Schlüssel hinzufügen.\n" -#: g10/keygen.c:945 g10/keygen.c:1030 +#: g10/keygen.c:945 g10/keygen.c:1044 #, c-format msgid "Key generation failed: %s\n" msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n" -#: g10/keygen.c:1008 +#: g10/keygen.c:989 g10/sig-check.c:172 g10/sign.c:52 +#, fuzzy, c-format +msgid "" +"key has been created %lu second in future (time warp or clock problem)\n" +msgstr "" +"Öffentlicher Schlüssel wurde in der Zukunft %lu %s erzeugt (Zeitreise oder " +"Uhren stimmen nicht überein)\n" + +#: g10/keygen.c:991 g10/sig-check.c:174 g10/sign.c:54 +#, fuzzy, c-format +msgid "" +"key has been created %lu seconds in future (time warp or clock problem)\n" +msgstr "" +"Öffentlicher Schlüssel wurde in der Zukunft %lu %s erzeugt (Zeitreise oder " +"Uhren stimmen nicht überein)\n" + +#: g10/keygen.c:1022 msgid "Really create? " msgstr "Wirklich erzeugen? " @@ -1335,22 +1385,22 @@ msgstr "Lesen von '%s'\n" msgid "%s/%s encrypted for: %s\n" msgstr "%s verschlüsselt für: %s\n" -#: g10/export.c:114 +#: g10/export.c:147 #, c-format msgid "%s: user not found: %s\n" msgstr "%s: Benutzer nicht gefunden: %s\n" -#: g10/export.c:123 +#: g10/export.c:156 #, c-format msgid "certificate read problem: %s\n" msgstr "Zertifikat Leseproblem: %s\n" -#: g10/export.c:132 +#: g10/export.c:165 #, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" msgstr "Schlüssel %08lX: dies ist kein rfc2440-Schüssel - übersprungen\n" -#: g10/export.c:174 +#: g10/export.c:203 msgid "WARNING: nothing exported\n" msgstr "WARNUNG: Nichts exportiert\n" @@ -1368,266 +1418,281 @@ msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "" "der Zweitschlüssel %08lX wird anstelle des Hauptschlüssels %08lX verwendet\n" -#: g10/import.c:129 g10/trustdb.c:1180 +#: g10/import.c:117 g10/trustdb.c:1180 #, c-format msgid "can't open file: %s\n" msgstr "Kann die Datei nicht öffnen: %s\n" -#: g10/import.c:148 +#: g10/import.c:165 #, c-format msgid "skipping block of type %d\n" msgstr "überspringe den Block vom Typ %d\n" -#: g10/import.c:155 g10/trustdb.c:1474 g10/trustdb.c:1543 +#: g10/import.c:172 g10/trustdb.c:1474 g10/trustdb.c:1543 #, c-format msgid "%lu keys so far processed\n" msgstr "%lu Schlüssel bislang bearbeitet\n" -#: g10/import.c:160 g10/trustdb.c:1256 +#: g10/import.c:177 g10/trustdb.c:1256 #, c-format msgid "read error: %s\n" msgstr "Lesefehler: %s\n" -#: g10/import.c:162 +#: g10/import.c:179 #, c-format msgid "Total number processed: %lu\n" msgstr "Anzahl insgesamt bearbeiteter Schlüssel: %lu\n" -#: g10/import.c:164 +#: g10/import.c:181 #, c-format msgid " w/o user IDs: %lu\n" msgstr " ohne User-ID: %lu\n" -#: g10/import.c:166 +#: g10/import.c:183 #, c-format msgid " imported: %lu" msgstr " importiert: %lu" -#: g10/import.c:172 +#: g10/import.c:189 #, c-format msgid " unchanged: %lu\n" msgstr " unverändert: %lu\n" -#: g10/import.c:174 +#: g10/import.c:191 #, c-format msgid " new user IDs: %lu\n" msgstr " neue User-IDs: %lu\n" -#: g10/import.c:176 +#: g10/import.c:193 #, c-format msgid " new subkeys: %lu\n" msgstr " neue Unterschlüssel: %lu\n" -#: g10/import.c:178 +#: g10/import.c:195 #, c-format msgid " new signatures: %lu\n" msgstr " neue Signaturen: %lu\n" -#: g10/import.c:180 +#: g10/import.c:197 #, c-format msgid " new key revocations: %lu\n" msgstr "neue Schlüsselwiderrufe: %lu\n" -#: g10/import.c:182 +#: g10/import.c:199 #, c-format msgid " secret keys read: %lu\n" msgstr " gelesene geheime Schl.: %lu\n" -#: g10/import.c:184 +#: g10/import.c:201 #, c-format msgid " secret keys imported: %lu\n" msgstr "geheime Schlüssel importiert: %lu\n" -#: g10/import.c:186 +#: g10/import.c:203 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " unveränderte geh.Schl.: %lu\n" -#: g10/import.c:328 g10/import.c:520 +#: g10/import.c:343 g10/import.c:535 #, c-format msgid "key %08lX: no user id\n" msgstr "Schlüssel %08lX: Keine User-ID\n" -#: g10/import.c:339 +#: g10/import.c:354 #, c-format msgid "key %08lX: no valid user ids\n" msgstr "Schlüssel %08lX: Keine gültigen User-IDs\n" -#: g10/import.c:341 +#: g10/import.c:356 msgid "this may be caused by a missing self-signature\n" msgstr "dies könnte durch fehlende Eigenbeglaubigung verursacht worden sein\n" -#: g10/import.c:352 g10/import.c:588 +#: g10/import.c:367 g10/import.c:603 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "Schlüssel %08lX: Öffentlicher Schlüssel nicht gefunden: %s\n" -#: g10/import.c:358 +#: g10/import.c:373 msgid "no default public keyring\n" msgstr "Kein voreingestellter öffentlicher Schlüsselbund\n" -#: g10/import.c:362 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:592 +#: g10/import.c:377 g10/openfile.c:105 g10/sign.c:215 g10/sign.c:601 #, c-format msgid "writing to `%s'\n" msgstr "Schreiben nach '%s'\n" -#: g10/import.c:366 g10/import.c:426 g10/import.c:642 +#: g10/import.c:381 g10/import.c:441 g10/import.c:657 #, c-format msgid "can't lock public keyring: %s\n" msgstr "kann öffentlichen Schlüsselbund nicht sperren: %s\n" -#: g10/import.c:369 +#: g10/import.c:384 #, c-format msgid "can't write to keyring: %s\n" msgstr "kann Schlüsselbund nicht schreiben: %s\n" -#: g10/import.c:373 +#: g10/import.c:388 #, c-format msgid "key %08lX: public key imported\n" msgstr "Schlüssel %08lX: Öffentlicher Schlüssel importiert\n" -#: g10/import.c:386 +#: g10/import.c:401 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "Schlüssel %08lX: Stimmt nicht mit unserer Kopie überein\n" -#: g10/import.c:399 g10/import.c:597 +#: g10/import.c:414 g10/import.c:612 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "" "Schlüssel %08lX: der lokale originale Schlüsselblocks wurde nicht gefunden: " "%s\n" -#: g10/import.c:406 g10/import.c:604 +#: g10/import.c:421 g10/import.c:619 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "" "Schlüssel %08lX: Lesefehler im lokalen originalen Schlüsselblocks: %s\n" -#: g10/import.c:423 g10/import.c:535 g10/import.c:639 +#: g10/import.c:438 g10/import.c:550 g10/import.c:654 msgid "writing keyblock\n" msgstr "Schreiben des Schlüsselblocks\n" -#: g10/import.c:429 g10/import.c:645 +#: g10/import.c:444 g10/import.c:660 #, c-format msgid "can't write keyblock: %s\n" msgstr "Der Schlüsselblock kann nicht geschrieben werden: %s\n" -#: g10/import.c:434 +#: g10/import.c:449 #, c-format msgid "key %08lX: 1 new user-id\n" msgstr "Schlüssel %08lX: 1 neue User-ID\n" -#: g10/import.c:437 +#: g10/import.c:452 #, c-format msgid "key %08lX: %d new user-ids\n" msgstr "Schlüssel %08lX: %d neue User-IDs\n" -#: g10/import.c:440 +#: g10/import.c:455 #, c-format msgid "key %08lX: 1 new signature\n" msgstr "Schlüssel %08lX: 1 neue Signatur\n" -#: g10/import.c:443 +#: g10/import.c:458 #, c-format msgid "key %08lX: %d new signatures\n" msgstr "Schlüssel %08lX: %d neue Signaturen\n" -#: g10/import.c:446 +#: g10/import.c:461 #, c-format msgid "key %08lX: 1 new subkey\n" msgstr "Schlüssel %08lX: 1 neuer Unterschlüssel\n" -#: g10/import.c:449 +#: g10/import.c:464 #, c-format msgid "key %08lX: %d new subkeys\n" msgstr "Schlüssel %08lX: %d neue Unterschlüssel\n" -#: g10/import.c:459 +#: g10/import.c:474 #, c-format msgid "key %08lX: not changed\n" msgstr "Schlüssel %08lX: Nicht geändert\n" -#: g10/import.c:538 +#: g10/import.c:553 #, c-format msgid "can't lock secret keyring: %s\n" msgstr "kann geheimen Schlüsselbund nicht sperren: %s\n" -#: g10/import.c:541 +#: g10/import.c:556 #, c-format msgid "can't write keyring: %s\n" msgstr "kann Schlüsselbund nicht schreiben: %s\n" #. we are ready -#: g10/import.c:544 +#: g10/import.c:559 #, c-format msgid "key %08lX: secret key imported\n" msgstr "Schlüssel %08lX: Geheimer Schlüssel importiert\n" #. we can't merge secret keys -#: g10/import.c:548 +#: g10/import.c:563 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "Schlüssel %08lX: Ist bereits im geheimen Schlüsselbund\n" -#: g10/import.c:553 +#: g10/import.c:568 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "Schlüssel %08lX: geheimer Schlüssel nicht gefunden: %s\n" -#: g10/import.c:582 +#: g10/import.c:597 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "Schlüssel %08lX: Kein öffentlicher Schlüssel - der Schlüsselwiderruf kann " "nicht angebracht werden\n" -#: g10/import.c:615 +#: g10/import.c:630 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "Schlüssel %08lX: Ungültiges Widerrufzertifikat: %s - zurückgewiesen\n" -#: g10/import.c:649 +#: g10/import.c:664 #, c-format msgid "key %08lX: revocation certificate imported\n" msgstr "Schlüssel %08lX: Widerrufzertifikat importiert\n" -#: g10/import.c:680 +#: g10/import.c:698 #, c-format msgid "key %08lX: no user-id for signature\n" msgstr "Schlüssel %08lX: Keine User-ID für Signatur\n" -#: g10/import.c:687 +#: g10/import.c:705 g10/import.c:729 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "Schlüssel %08lX: Nicht unterstützetes Public-Key-Verfahren\n" -#: g10/import.c:688 +#: g10/import.c:706 #, c-format msgid "key %08lX: invalid self-signature\n" msgstr "Schlüssel %08lX: Ungültige Eigenbeglaubigung\n" -#: g10/import.c:717 +#: g10/import.c:722 +#, fuzzy, c-format +msgid "key %08lX: no subkey for key binding\n" +msgstr "Schlüssel %08lX.%lu: Korrekte Unterschlüssel-Anbindung\n" + +#: g10/import.c:730 +#, fuzzy, c-format +msgid "key %08lX: invalid subkey binding\n" +msgstr "Schlüssel %08lX.%lu: Ungültige Unterschlüssel-Anbindung\n" + +#: g10/import.c:761 #, c-format msgid "key %08lX: skipped userid '" msgstr "Schlüssel %08lX: übergehe User-ID '" -#: g10/import.c:740 +#: g10/import.c:781 +#, fuzzy, c-format +msgid "key %08lX: skipped subkey\n" +msgstr "Schlüssel %08lX: 1 neuer Unterschlüssel\n" + +#: g10/import.c:800 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "Schlüssel %08lX: Widerrufzertifikat an falschem Platz - übergangen\n" -#: g10/import.c:748 +#: g10/import.c:808 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "Schlüssel %08lX: Ungültiges Widerrufzertifikat: %s - übergangen\n" -#: g10/import.c:807 +#: g10/import.c:867 #, c-format msgid "key %08lX: revocation certificate added\n" msgstr "Schlüssel %08lX: Widerrufzertifikat hinzugefügt\n" -#: g10/import.c:921 g10/import.c:976 +#: g10/import.c:981 g10/import.c:1036 #, c-format msgid "key %08lX: our copy has no self-signature\n" msgstr "Schlüssel %08lX: Unsere Kopie hat keine Eigenbeglaubigung\n" @@ -1699,7 +1764,7 @@ msgstr "" msgid "Really sign? " msgstr "Wirklich unterschreiben? " -#: g10/keyedit.c:303 g10/sign.c:65 +#: g10/keyedit.c:303 g10/sign.c:75 #, c-format msgid "signing failed: %s\n" msgstr "Beglaubigung fehlgeschlagen: %s\n" @@ -2028,61 +2093,61 @@ msgstr "Keine User-ID mit Index %d\n" msgid "No secondary key with index %d\n" msgstr "Kein Zweitschlüssel mit Index %d\n" -#: g10/mainproc.c:198 +#: g10/mainproc.c:199 msgid "public key encrypted data: good DEK\n" msgstr "Mit öffentlichem Schüssel verschlüsselte Daten: Korrekte DEK\n" -#: g10/mainproc.c:201 +#: g10/mainproc.c:202 #, c-format msgid "public key decryption failed: %s\n" msgstr "Entschlüsselung mit öffentlichem Schlüssel fehlgeschlagen: %s\n" -#: g10/mainproc.c:228 +#: g10/mainproc.c:229 msgid "decryption okay\n" msgstr "Enschlüsselung fehlgeschlagen: %s\n" -#: g10/mainproc.c:231 +#: g10/mainproc.c:232 #, c-format msgid "decryption failed: %s\n" msgstr "Enschlüsselung fehlgeschlagen: %s\n" -#: g10/mainproc.c:248 +#: g10/mainproc.c:249 msgid "NOTE: sender requested \"for-your-eyes-only\"\n" msgstr "" "Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n" -#: g10/mainproc.c:250 +#: g10/mainproc.c:251 #, c-format msgid "original file name='%.*s'\n" msgstr "Ursprünglicher Dateiname='%.*s'\n" -#: g10/mainproc.c:833 +#: g10/mainproc.c:834 msgid "signature verification suppressed\n" msgstr "Unterschriften-Überprüfung unterdrückt\n" -#: g10/mainproc.c:839 +#: g10/mainproc.c:840 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Unterschrieben am %.*s mit %s Schlüssel %08lX\n" -#: g10/mainproc.c:847 +#: g10/mainproc.c:852 msgid "BAD signature from \"" msgstr "FALSCHE Unterschrift von \"" -#: g10/mainproc.c:848 +#: g10/mainproc.c:853 msgid "Good signature from \"" msgstr "Korrekte Unterschrift von \"" -#: g10/mainproc.c:879 +#: g10/mainproc.c:884 #, c-format msgid "Can't check signature: %s\n" msgstr "Signatur kann nicht geprüft werden: %s\n" -#: g10/mainproc.c:952 +#: g10/mainproc.c:957 msgid "old style (PGP 2.x) signature\n" msgstr "Unterschrift nach alter (PGP 2.x) Art\n" -#: g10/mainproc.c:957 +#: g10/mainproc.c:962 msgid "invalid root packet detected in proc_tree()\n" msgstr "ungültiges root-Paket in proc_tree() entdeckt\n" @@ -2157,15 +2222,15 @@ msgid "data not saved; use option \"--output\" to save it\n" msgstr "" "Daten wurden nicht gespeichert; verwenden Sie dafür die Option \"--output\"\n" -#: g10/plaintext.c:166 +#: g10/plaintext.c:208 msgid "Please enter name of data file: " msgstr "Bitte geben Sie den Namen der Datendatei ein: " -#: g10/plaintext.c:187 +#: g10/plaintext.c:229 msgid "reading stdin ...\n" msgstr "lese stdin ...\n" -#: g10/plaintext.c:250 +#: g10/plaintext.c:292 #, c-format msgid "can't open signed data `%s'\n" msgstr "kann signierte Datei '%s' nicht öffnen.\n" @@ -2210,50 +2275,50 @@ msgstr "" "Dieser durch PGP erzeugte ElGamal-Schlüssel ist für Signaturen NICHT sicher " "genug!\n" -#: g10/sig-check.c:166 +#: g10/sig-check.c:163 #, 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 %lu %s erzeugt (Zeitreise oder Uhren " -"stimmen nicht überein)\n" - -#: g10/sig-check.c:168 -msgid "second" -msgstr "Sekunde" +msgid "public key is %lu second newer than the signature\n" +msgstr "lid %lu: User-ID ohne Signatur\n" -#: g10/sig-check.c:168 -msgid "seconds" -msgstr "Sekunden" +#: g10/sig-check.c:164 +#, fuzzy, c-format +msgid "public key is %lu seconds newer than the signature\n" +msgstr "lid %lu: User-ID ohne Signatur\n" -#: g10/sig-check.c:173 +#: g10/sig-check.c:180 #, c-format msgid "NOTE: signature key expired %s\n" msgstr "Hinweis: Schlüssel der Signatur ist verfallen am %s.\n" -#: g10/sig-check.c:230 +#: g10/sig-check.c:237 msgid "assuming bad signature due to an unknown critical bit\n" msgstr "" "Vermutlich eine FALSCHE Unterschrift, wegen unbekanntem \"critical bit\"\n" -#: g10/sign.c:69 +#: g10/sign.c:79 #, c-format msgid "%s signature from: %s\n" msgstr "%s Unterschrift von: %s\n" -#: g10/sign.c:200 g10/sign.c:587 +#: g10/sign.c:210 g10/sign.c:596 #, c-format msgid "can't create %s: %s\n" msgstr "%s kann nicht erzeugt werden: %s\n" -#: g10/sign.c:296 +#: g10/sign.c:306 msgid "signing:" msgstr "unterschreibe:" -#: g10/sign.c:336 +#: g10/sign.c:346 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "WARNUNG: '%s' ist eine leere Datei.\n" +#: g10/textfilter.c:199 +#, c-format +msgid "can't handle text lines longer than %d characters\n" +msgstr "" + #: g10/tdbio.c:116 g10/tdbio.c:1418 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" @@ -2288,7 +2353,7 @@ msgstr "%s: Verzeichnis erzeugt\n" 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:449 +#: g10/openfile.c:101 g10/openfile.c:165 g10/ringedit.c:1292 g10/tdbio.c:449 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: kann nicht erzeugt werden: %s\n" @@ -2382,7 +2447,8 @@ msgstr "%s: konnte Satz nicht anhängen: %s\n" #: g10/trustdb.c:142 msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n" msgstr "" -"Die \"Trust\"-Datenbank ist beschädigt; verwenden Sie \"gpgm --fix-trustdb\".\n" +"Die \"Trust\"-Datenbank ist beschädigt; verwenden Sie \"gpgm " +"--fix-trustdb\".\n" #: g10/trustdb.c:155 #, c-format @@ -2908,35 +2974,39 @@ msgstr "Für insert_trust_record() wurde nicht der Hauptschlüssel benutzt\n" msgid "%s: can't create keyring: %s\n" msgstr "%s: Schlüsselbund kann nicht erzeugt werden: %s\n" -#: g10/ringedit.c:299 g10/ringedit.c:1283 +#: g10/ringedit.c:299 g10/ringedit.c:1300 #, c-format msgid "%s: keyring created\n" msgstr "%s: Schlüsselbund erstellt\n" -#: g10/ringedit.c:1469 +#: g10/ringedit.c:1486 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "Warnung: Zwei Dateien mit vertraulichem Inhalt vorhanden.\n" -#: g10/ringedit.c:1470 +#: g10/ringedit.c:1487 #, c-format msgid "%s is the unchanged one\n" msgstr "%s ist der Unveränderte\n" -#: g10/ringedit.c:1471 +#: g10/ringedit.c:1488 #, c-format msgid "%s is the new one\n" msgstr "%s ist der Neue\n" -#: g10/ringedit.c:1472 +#: g10/ringedit.c:1489 msgid "Please fix this possible security flaw\n" msgstr "Bitte diesen potentiellen Sicherheitsmangel beseitigen\n" -#: g10/skclist.c:94 +#: g10/skclist.c:88 g10/skclist.c:125 +msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" +msgstr "" + +#: g10/skclist.c:113 #, c-format msgid "skipped `%s': %s\n" msgstr "übersprungen '%s': %s\n" -#: g10/skclist.c:100 +#: g10/skclist.c:119 #, c-format msgid "" "skipped `%s': this is a PGP generated ElGamal key which is not secure for " @@ -3228,6 +3298,12 @@ msgstr "Keine Hilfe vorhanden." msgid "No help available for `%s'" msgstr "Keine Hilfe für '%s' vorhanden." +#~ msgid "second" +#~ msgstr "Sekunde" + +#~ msgid "seconds" +#~ msgstr "Sekunden" + #~ msgid "invalid clear text header: " #~ msgstr "ungültige Klartexteinleitung" diff --git a/po/es_ES.po b/po/es_ES.po index 746c94a49..030247bbd 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -5,10 +5,12 @@ # I also got inspiration from it.po by Marco d'Itri <md@linux.it> msgid "" msgstr "" -"POT-Creation-Date: 1999-01-09 18:31+0100\n" +"POT-Creation-Date: 1999-01-20 22:45+0100\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Date: 1998-11-13 10:49:25+0100\n" "From: Urko Lusa <ulusa@lacueva.ddns.org>\n" +"Updated: 1998-01-12\n" +"By: Luca Olivetti <luca@luca.ddns.org>\n" "Xgettext-Options: --default-domain=gnupg --directory=.. --add-comments " "--keyword=_ --keyword=N_ --files-from=./POTFILES.in\n" "Files: util/secmem.c util/argparse.c cipher/random.c cipher/rand-dummy.c " @@ -30,222 +32,199 @@ msgid "yY" msgstr "sS" #: util/errors.c:54 -#, fuzzy msgid "general error" msgstr "Error general" #: util/errors.c:55 -#, fuzzy msgid "unknown packet type" msgstr "Formato desconocido" #: util/errors.c:56 -#, fuzzy msgid "unknown version" msgstr "Versión desconocida" #: util/errors.c:57 -#, fuzzy msgid "unknown pubkey algorithm" msgstr "Algoritmo de clave pública desconocido" #: util/errors.c:58 -#, fuzzy msgid "unknown digest algorithm" msgstr "Algoritmo desconocido de resumen de mensaje" #: util/errors.c:59 -#, fuzzy msgid "bad public key" msgstr "Clave pública incorrecta" #: util/errors.c:60 -#, fuzzy msgid "bad secret key" msgstr "Clave secreta incorrecta" #: util/errors.c:61 -#, fuzzy msgid "bad signature" msgstr "Firma incorrecta" #: util/errors.c:62 -#, fuzzy msgid "checksum error" msgstr "Error en suma de comprobación" #: util/errors.c:63 -#, fuzzy msgid "bad passphrase" msgstr "Contraseña incorrecta" #: util/errors.c:64 -#, fuzzy msgid "public key not found" msgstr "Clave pública no encontrada" #: util/errors.c:65 -#, fuzzy msgid "unknown cipher algorithm" msgstr "Algoritmo de cifrado desconocido" #: util/errors.c:66 -#, fuzzy msgid "can't open the keyring" msgstr "No se puede abrir el anillo" #: util/errors.c:67 -#, fuzzy msgid "invalid packet" msgstr "Valor no válido" #: util/errors.c:68 -#, fuzzy msgid "invalid armor" msgstr "Armadura no válida" #: util/errors.c:69 -#, fuzzy msgid "no such user id" msgstr "No existe el identificativo de usuario" #: util/errors.c:70 -#, fuzzy msgid "secret key not available" msgstr "Clave secreta no disponible" #: util/errors.c:71 -#, fuzzy msgid "wrong secret key used" msgstr "Clave secreta incorrecta" #: util/errors.c:72 -#, fuzzy msgid "not supported" msgstr "No soportado" #: util/errors.c:73 -#, fuzzy msgid "bad key" msgstr "Clave incorrecta" #: util/errors.c:74 -#, fuzzy msgid "file read error" msgstr "Error de lectura" #: util/errors.c:75 -#, fuzzy msgid "file write error" msgstr "Error de escritura" #: util/errors.c:76 -#, fuzzy msgid "unknown compress algorithm" msgstr "Algoritmo de compresión desconocido" #: util/errors.c:77 -#, fuzzy msgid "file open error" msgstr "Error al abrir fichero" #: util/errors.c:78 -#, fuzzy msgid "file create error" -msgstr "Error al cerrar fichero" +msgstr "Error al crear fichero" #: util/errors.c:79 -#, fuzzy msgid "invalid passphrase" msgstr "Contraseña incorrecta" #: util/errors.c:80 -#, fuzzy msgid "unimplemented pubkey algorithm" msgstr "Algoritmo de clave pública no implementado" #: util/errors.c:81 -#, fuzzy msgid "unimplemented cipher algorithm" msgstr "Algoritmo de cifrado no implementado" #: util/errors.c:82 -#, fuzzy msgid "unknown signature class" msgstr "Clase de firma desconocida" #: util/errors.c:83 -#, fuzzy msgid "trust database error" msgstr "Error en la base de datos de confianza" #: util/errors.c:84 -#, fuzzy msgid "bad MPI" msgstr "MPI incorrecto" #: util/errors.c:85 -#, fuzzy msgid "resource limit" msgstr "Límite de recurso" #: util/errors.c:86 -#, fuzzy msgid "invalid keyring" msgstr "Anillo no válido" #: util/errors.c:87 -#, fuzzy msgid "bad certificate" msgstr "Certificado incorrecto" #: util/errors.c:88 -#, fuzzy msgid "malformed user id" msgstr "Identificativo de usuario mal formado" #: util/errors.c:89 -#, fuzzy msgid "file close error" msgstr "Error al cerrar fichero" #: util/errors.c:90 -#, fuzzy msgid "file rename error" msgstr "Error al renombrar fichero" #: util/errors.c:91 -#, fuzzy msgid "file delete error" msgstr "Error al borrar fichero" #: util/errors.c:92 -#, fuzzy msgid "unexpected data" msgstr "Datos inesperados" #: util/errors.c:93 -#, fuzzy msgid "timestamp conflict" msgstr "Conflicto con sello de fecha" #: util/errors.c:94 -#, fuzzy msgid "unusable pubkey algorithm" msgstr "Algoritmo de clave pública no utilizable" #: util/errors.c:95 -#, fuzzy msgid "file exists" msgstr "El fichero existe. " #: util/errors.c:96 -#, fuzzy msgid "weak key" msgstr "Clave débil" +#: util/errors.c:97 +#, fuzzy +msgid "invalid argument" +msgstr "Armadura no válida" + +#: util/errors.c:98 +#, fuzzy +msgid "bad URI" +msgstr "MPI incorrecto" + +#: util/errors.c:99 +#, fuzzy +msgid "unsupported URI" +msgstr "No soportado" + +#: util/errors.c:100 +#, fuzzy +msgid "network error" +msgstr "Error general" + #: util/logger.c:178 -#, fuzzy, c-format +#, c-format msgid "... this is a bug (%s:%d:%s)\n" msgstr "¡Oh! vaya... esto es un bug (%s:%d:%s)\n" @@ -254,12 +233,11 @@ 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:405 -#, fuzzy +#: cipher/random.c:412 msgid "WARNING: using insecure random number generator!!\n" msgstr "Aviso: ¡se está usando un generador de números aleatorios inseguro!\n" -#: cipher/random.c:406 +#: cipher/random.c:413 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -285,7 +263,7 @@ msgstr "" "otro trabajo para que el sistema pueda recolectar más entropía\n" "(se necesitan %d bytes más).\n" -#: g10/g10.c:160 +#: g10/g10.c:163 msgid "" "@Commands:\n" " " @@ -293,123 +271,127 @@ msgstr "" "@Comandos:\n" " " -#: g10/g10.c:163 +#: g10/g10.c:166 msgid "|[file]|make a signature" msgstr "|[file]|hace una firma" -#: g10/g10.c:164 +#: g10/g10.c:167 msgid "|[file]|make a clear text signature" msgstr "|[file]|hace una firma en texto claro" -#: g10/g10.c:165 +#: g10/g10.c:168 msgid "make a detached signature" msgstr "hace una firma separada" -#: g10/g10.c:166 +#: g10/g10.c:169 msgid "encrypt data" msgstr "cifra datos" -#: g10/g10.c:167 +#: g10/g10.c:170 msgid "encryption only with symmetric cipher" msgstr "cifra sólo con un cifrado simétrico" -#: g10/g10.c:168 +#: g10/g10.c:171 msgid "store only" msgstr "sólo almacenar" -#: g10/g10.c:169 +#: g10/g10.c:172 msgid "decrypt data (default)" msgstr "descifra datos (predefinido)" -#: g10/g10.c:170 +#: g10/g10.c:173 msgid "verify a signature" msgstr "verifica una firma" -#: g10/g10.c:172 +#: g10/g10.c:175 msgid "list keys" msgstr "lista las claves" -#: g10/g10.c:173 +#: g10/g10.c:176 msgid "list keys and signatures" msgstr "lista las claves y firmas" -#: g10/g10.c:174 +#: g10/g10.c:177 msgid "check key signatures" msgstr "comprueba las firmas de las claves" -#: g10/g10.c:175 +#: g10/g10.c:178 msgid "list keys and fingerprints" msgstr "lista las claves y huellas dactilares" -#: g10/g10.c:176 +#: g10/g10.c:179 msgid "list secret keys" msgstr "lista las claves secretas" -#: g10/g10.c:178 +#: g10/g10.c:181 msgid "generate a new key pair" msgstr "genera un nuevo par de claves" -#: g10/g10.c:180 +#: g10/g10.c:183 msgid "remove key from the public keyring" msgstr "elimina la clave del anillo público" -#: g10/g10.c:182 +#: g10/g10.c:185 msgid "sign or edit a key" msgstr "firma o modifica una clave" -#: g10/g10.c:183 +#: g10/g10.c:186 msgid "generate a revocation certificate" msgstr "genera un certificado de revocación" -#: g10/g10.c:185 +#: g10/g10.c:188 msgid "export keys" msgstr "exporta las claves" -#: g10/g10.c:188 +#: g10/g10.c:189 +msgid "export keys to a key server" +msgstr "" + +#: g10/g10.c:192 msgid "import/merge keys" msgstr "importa/fusiona las claves" -#: g10/g10.c:190 +#: g10/g10.c:194 msgid "list only the sequence of packets" msgstr "lista sólo la secuencia de paquetes" -#: g10/g10.c:193 +#: g10/g10.c:197 msgid "export the ownertrust values" msgstr "exporta los valores de confianza" -#: g10/g10.c:195 +#: g10/g10.c:199 msgid "import ownertrust values" msgstr "importa los valores de confianza" -#: g10/g10.c:197 +#: g10/g10.c:201 msgid "|[NAMES]|update the trust database" msgstr "|[NOMBRES]|actualiza la base de datos de confianza" -#: g10/g10.c:199 +#: g10/g10.c:203 msgid "|[NAMES]|check the trust database" msgstr "|[NOMBRES]|comprueba la base de datos de confianza" -#: g10/g10.c:200 +#: g10/g10.c:204 msgid "fix a corrupted trust database" msgstr "arregla una base de datos de confianza dañada" -#: g10/g10.c:201 +#: g10/g10.c:205 msgid "De-Armor a file or stdin" msgstr "quita la armadura de un fichero o stdin" -#: g10/g10.c:202 +#: g10/g10.c:206 msgid "En-Armor a file or stdin" msgstr "crea la armadura a un fichero o stdin" -#: g10/g10.c:203 +#: g10/g10.c:207 msgid "|algo [files]|print message digests" msgstr "|algo [files]|imprime resúmenes de mensaje" -#: g10/g10.c:204 +#: g10/g10.c:208 msgid "print all message digests" msgstr "imprime todos los resúmenes de mensaje" -#: g10/g10.c:211 +#: g10/g10.c:215 msgid "" "@\n" "Options:\n" @@ -419,145 +401,148 @@ msgstr "" "Opciones:\n" " " -#: g10/g10.c:213 +#: g10/g10.c:217 msgid "create ascii armored output" msgstr "crea una salida ascii con armadura" -#: g10/g10.c:215 +#: g10/g10.c:219 msgid "use this user-id to sign or decrypt" msgstr "usa este usuario para firmar o descifrar" -#: g10/g10.c:216 +#: g10/g10.c:220 msgid "use this user-id for encryption" msgstr "usa este usuario para cifrar" -#: g10/g10.c:217 +#: g10/g10.c:221 msgid "|N|set compress level N (0 disables)" msgstr "|N|establece nivel de compresión N (0 no comprime)" -#: g10/g10.c:219 +#: g10/g10.c:223 msgid "use canonical text mode" msgstr "usa modo de texto canónico" -#: g10/g10.c:221 +#: g10/g10.c:225 msgid "use as output file" msgstr "usa como fichero de salida" -#: g10/g10.c:222 +#: g10/g10.c:226 msgid "verbose" msgstr "prolijo" -#: g10/g10.c:223 +#: g10/g10.c:227 msgid "be somewhat more quiet" -msgstr "" +msgstr "algo más discreto" -#: g10/g10.c:224 +#: g10/g10.c:228 msgid "force v3 signatures" msgstr "fuerza firmas v3" #. { oDryRun, "dry-run", 0, N_("do not make any changes") }, -#: g10/g10.c:226 +#: g10/g10.c:230 msgid "batch mode: never ask" msgstr "proceso por lotes: nunca preguntar" -#: g10/g10.c:227 +#: g10/g10.c:231 msgid "assume yes on most questions" msgstr "asume \"sí\" en casi todas las preguntas" -#: g10/g10.c:228 +#: g10/g10.c:232 msgid "assume no on most questions" msgstr "asume \"no\" en casi todas las preguntas" -#: g10/g10.c:229 +#: g10/g10.c:233 msgid "add this keyring to the list of keyrings" msgstr "añade este anillo a la lista de anillos" -#: g10/g10.c:230 +#: g10/g10.c:234 msgid "add this secret keyring to the list" msgstr "añade este anillo secreto a la lista" -#: g10/g10.c:231 +#: g10/g10.c:235 msgid "|NAME|use NAME as default secret key" msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto" -#: g10/g10.c:232 -#, fuzzy +#: g10/g10.c:236 +msgid "|HOST|use this keyserver to lookup keys" +msgstr "" + +#: g10/g10.c:237 msgid "|NAME|set terminal charset to NAME" -msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE" +msgstr "|NOMBRE|usa el juego de caracteres NOMBRE" -#: g10/g10.c:233 +#: g10/g10.c:238 msgid "read options from file" msgstr "lee opciones del fichero" -#: g10/g10.c:235 +#: g10/g10.c:240 msgid "set debugging flags" msgstr "establece los parámetros de depuración" -#: g10/g10.c:236 +#: g10/g10.c:241 msgid "enable full debugging" msgstr "habilita depuración completa" -#: g10/g10.c:237 +#: g10/g10.c:242 msgid "|FD|write status info to this FD" msgstr "|DF|escribe información de estado en descriptor DF" -#: g10/g10.c:238 +#: g10/g10.c:243 msgid "do not write comment packets" msgstr "no escribe paquetes de comentario" -#: g10/g10.c:239 +#: g10/g10.c:244 msgid "(default is 1)" msgstr "(por defecto es 1)" -#: g10/g10.c:240 +#: g10/g10.c:245 msgid "(default is 3)" msgstr "(por defecto es 3)" -#: g10/g10.c:242 +#: g10/g10.c:247 msgid "|KEYID|ulimately trust this key" -msgstr "" +msgstr "|ID-CLAVE|confía plenamente en esta clave" -#: g10/g10.c:243 +#: g10/g10.c:248 msgid "|FILE|load extension module FILE" msgstr "|FICHERO|carga módulo de extensiones FICHERO" -#: g10/g10.c:244 +#: g10/g10.c:249 msgid "emulate the mode described in RFC1991" msgstr "emula el modo descrito en la RFC1991" -#: g10/g10.c:245 +#: g10/g10.c:250 msgid "|N|use passphrase mode N" msgstr "|N|usa modo de contraseña N" -#: g10/g10.c:247 +#: g10/g10.c:252 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "" "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE\n" "para las contraseñas" -#: g10/g10.c:249 +#: g10/g10.c:254 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "" "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las\n" "contraseñas" -#: g10/g10.c:251 +#: g10/g10.c:256 msgid "|NAME|use cipher algorithm NAME" msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE" -#: g10/g10.c:252 +#: g10/g10.c:257 msgid "|NAME|use message digest algorithm NAME" msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE" -#: g10/g10.c:253 +#: g10/g10.c:258 msgid "|N|use compress algorithm N" msgstr "|N|usa el algoritmo de compresión N" -#: g10/g10.c:254 +#: g10/g10.c:259 msgid "throw keyid field of encrypted packets" msgstr "elimina el campo keyid de los paquetes cifrados" -#: g10/g10.c:262 +#: g10/g10.c:267 msgid "" "@\n" "Examples:\n" @@ -577,19 +562,19 @@ msgstr "" " --list-keys [nombres] muestra las claves\n" " --fingerprint [nombres] muestra las huellas dactilares\n" -#: g10/g10.c:341 +#: g10/g10.c:346 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n" msgstr "Por favor, informe de posibles \"bugs\" a <gnupg-bugs@gnu.org>.\n" -#: g10/g10.c:346 +#: g10/g10.c:351 msgid "Usage: gpgm [options] [files] (-h for help)" msgstr "Uso: gpgm [opciones] [ficheros] (-h para ayuda)" -#: g10/g10.c:348 +#: g10/g10.c:353 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)" -#: g10/g10.c:353 +#: g10/g10.c:358 msgid "" "Syntax: gpgm [options] [files]\n" "GnuPG maintenance utility\n" @@ -597,7 +582,7 @@ msgstr "" "Sintaxis: gpgm [opciones] [ficheros]\n" "Utilidad de mantenimiento de GnuPG\n" -#: g10/g10.c:356 +#: g10/g10.c:361 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -607,7 +592,7 @@ msgstr "" "firma, comprueba, cifra o descifra\n" "la operación por defecto depende del tipo de datos de entrada\n" -#: g10/g10.c:362 +#: g10/g10.c:367 msgid "" "\n" "Supported algorithms:\n" @@ -615,228 +600,228 @@ msgstr "" "\n" "Algoritmos soportados:\n" -#: g10/g10.c:437 +#: g10/g10.c:442 msgid "usage: gpgm [options] " msgstr "uso: gpgm [opciones] " -#: g10/g10.c:439 +#: g10/g10.c:444 msgid "usage: gpg [options] " msgstr "uso: gpg [opciones] " -#: g10/g10.c:480 +#: g10/g10.c:485 msgid "conflicting commands\n" msgstr "comandos incompatibles\n" -#: g10/g10.c:618 -#, fuzzy, c-format +#: g10/g10.c:623 +#, c-format msgid "NOTE: no default option file `%s'\n" msgstr "nota: no existe fichero de opciones predefinido `%s'\n" -#: g10/g10.c:622 +#: g10/g10.c:627 #, c-format msgid "option file `%s': %s\n" msgstr "fichero de opciones `%s': %s\n" -#: g10/g10.c:629 +#: g10/g10.c:634 #, c-format msgid "reading options from `%s'\n" msgstr "leyendo opciones desde `%s'\n" -#: g10/g10.c:782 -#, fuzzy, c-format +#: g10/g10.c:788 +#, c-format msgid "%s is not a valid character set\n" -msgstr "Caracter no válido en el comentario\n" +msgstr "%s no es un juego de caracteres válido\n" -#: g10/g10.c:817 g10/g10.c:829 +#: g10/g10.c:824 g10/g10.c:836 msgid "selected cipher algorithm is invalid\n" -msgstr "el algoritmo de cifra seleccionado no es válido\n" +msgstr "el algoritmo de cifrado seleccionado no es válido\n" -#: g10/g10.c:823 g10/g10.c:835 +#: g10/g10.c:830 g10/g10.c:842 msgid "selected digest algorithm is invalid\n" msgstr "el algoritmo de resumen seleccionado no es válido\n" -#: g10/g10.c:838 +#: g10/g10.c:845 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "el algoritmo de compresión debe estar en el rango %d-%d\n" -#: g10/g10.c:840 +#: g10/g10.c:847 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed debe ser mayor que 0\n" -#: g10/g10.c:842 +#: g10/g10.c:849 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed debe ser mayor que 1\n" -#: g10/g10.c:844 +#: g10/g10.c:851 msgid "max-cert-depth must be in range 1 to 255\n" -msgstr "" +msgstr "max-cert-depth debe estar en el rango 1-255\n" -#: g10/g10.c:847 -#, fuzzy +#: g10/g10.c:854 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "nota: el modo S2K simple (0) no es nada recomendable\n" -#: g10/g10.c:851 +#: g10/g10.c:858 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n" -#: g10/g10.c:934 +#: g10/g10.c:941 #, c-format msgid "failed to initialize the TrustDB: %s\n" -msgstr "inicialización de la base de datos de confianza `%s' fallida\n" +msgstr "inicialización de la base de datos de confianza fallida: %s\n" -#: g10/g10.c:940 +#: g10/g10.c:947 msgid "--store [filename]" msgstr "--store [nombre_fichero]" -#: g10/g10.c:948 +#: g10/g10.c:955 msgid "--symmetric [filename]" msgstr "--symmetric [nombre_fichero]" -#: g10/g10.c:956 +#: g10/g10.c:963 msgid "--encrypt [filename]" msgstr "--encrypt [nombre_fichero]" -#: g10/g10.c:969 +#: g10/g10.c:976 msgid "--sign [filename]" msgstr "--sign [nombre_fichero]" -#: g10/g10.c:982 +#: g10/g10.c:989 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nombre_fichero]" -#: g10/g10.c:996 +#: g10/g10.c:1003 msgid "--clearsign [filename]" msgstr "--clearsign [nombre_fichero]" -#: g10/g10.c:1008 +#: g10/g10.c:1015 msgid "--decrypt [filename]" msgstr "--decrypt [nombre_fichero]" -#: g10/g10.c:1017 -#, fuzzy +#: g10/g10.c:1024 msgid "--edit-key username [commands]" msgstr "--edit-key nombre_usuario" -#: g10/g10.c:1033 +#: g10/g10.c:1040 msgid "--delete-secret-key username" msgstr "--delete-secret-key nombre_usuario" -#: g10/g10.c:1036 +#: g10/g10.c:1043 msgid "--delete-key username" msgstr "--delete-key nombre_usuario" -#: g10/encode.c:216 g10/g10.c:1059 g10/sign.c:301 +#: g10/encode.c:216 g10/g10.c:1066 g10/sign.c:311 #, c-format msgid "can't open %s: %s\n" msgstr "no puede abrirse `%s': %s\n" -#: g10/g10.c:1070 +#: g10/g10.c:1077 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [id_usuario] [anillo]" -#: g10/g10.c:1127 +#: g10/g10.c:1138 #, c-format msgid "dearmoring failed: %s\n" msgstr "eliminación de armadura fallida: %s\n" -#: g10/g10.c:1135 +#: g10/g10.c:1146 #, c-format msgid "enarmoring failed: %s\n" msgstr "creación de armadura fallida: %s\n" -#: g10/g10.c:1201 +#: g10/g10.c:1212 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de distribución no válido `%s'\n" -#: g10/g10.c:1280 +#: g10/g10.c:1291 msgid "[filename]" msgstr "[nombre_fichero]" -#: g10/g10.c:1284 +#: g10/g10.c:1295 msgid "Go ahead and type your message ...\n" -msgstr "" +msgstr "Adelante, teclee el mensaje ...\n" -#: g10/decrypt.c:59 g10/g10.c:1287 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1298 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "no puede abrirse `%s'\n" -#: g10/armor.c:321 +#: g10/armor.c:297 #, c-format msgid "armor: %s\n" msgstr "armadura: %s\n" -#: g10/armor.c:344 +#: g10/armor.c:320 msgid "invalid armor header: " msgstr "cabecera de armadura no válida: " -#: g10/armor.c:351 +#: g10/armor.c:327 msgid "armor header: " msgstr "cabecera de armadura: " -#: g10/armor.c:362 +#: g10/armor.c:338 msgid "invalid clearsig header\n" msgstr "cabecera de firma clara no válida\n" -#: g10/armor.c:414 -#, fuzzy +#: g10/armor.c:390 msgid "nested clear text signatures\n" -msgstr "|[file]|hace una firma en texto claro" +msgstr "firmas en texto claro anidadas\n" -#: g10/armor.c:530 +#: g10/armor.c:508 msgid "invalid dash escaped line: " msgstr "Línea con guiones no válida: " -#: g10/armor.c:538 -#, fuzzy +#: g10/armor.c:516 msgid "unexpected armor:" -msgstr "Datos inesperados" +msgstr "armadura inesperada" -#: g10/armor.c:624 +#: g10/armor.c:632 #, c-format msgid "invalid radix64 character %02x skipped\n" msgstr "caracteres no válidos radix64 %02x ignorados\n" -#: g10/armor.c:654 +#: g10/armor.c:675 msgid "premature eof (no CRC)\n" msgstr "Fin de fichero prematuro\n" -#: g10/armor.c:671 +#: g10/armor.c:709 msgid "premature eof (in CRC)\n" msgstr "Fin de suma de comprobación prematuro\n" -#: g10/armor.c:675 +#: g10/armor.c:713 msgid "malformed CRC\n" msgstr "Suma de comprobación mal creada\n" -#: g10/armor.c:679 +#: g10/armor.c:717 #, c-format msgid "CRC error; %06lx - %06lx\n" msgstr "Error en suma de comprobación: %06lx - %06lx\n" -#: g10/armor.c:696 +#: g10/armor.c:734 msgid "premature eof (in Trailer)\n" -msgstr "" +msgstr "fin de fichero prematuro (en el cierre)\n" -#: g10/armor.c:700 +#: g10/armor.c:738 msgid "error in trailer line\n" -msgstr "" +msgstr "error en la línea de cierre\n" -#: g10/armor.c:961 -#, fuzzy +#: g10/armor.c:999 msgid "no valid OpenPGP data found.\n" -msgstr "RFC1991 no válida o datos OpenPGP no encontrados\n" +msgstr "no se han encontrados datos OpenPGP válidos\n" -#: g10/armor.c:963 +#: g10/armor.c:1001 #, c-format msgid "invalid armor: line longer than %d characters\n" +msgstr "armadura inválida: línea más larga de %d caracteres\n" + +#: g10/armor.c:1005 +msgid "" +"quoted printable character in armor - probably a buggy MTA has been used\n" msgstr "" #: g10/pkclist.c:138 -#, fuzzy, c-format +#, c-format msgid "" "No trust value assigned to %lu:\n" "%4u%c/%08lX %s \"" @@ -872,11 +857,10 @@ msgstr " m = volver al menú principal\n" #: g10/pkclist.c:159 msgid " q = quit\n" -msgstr "" +msgstr " q = salir\n" #. a string with valid answers #: g10/pkclist.c:164 -#, fuzzy msgid "sSmMqQ" msgstr "iImMqQ" @@ -886,7 +870,7 @@ msgstr "Su decisión: " #: g10/pkclist.c:188 msgid "Certificates leading to an ultimately trusted key:\n" -msgstr "" +msgstr "Certificados que llevan a una clave de confianza absoluta:\n" #: g10/pkclist.c:223 msgid "" @@ -894,7 +878,7 @@ msgid "" "can assign some missing owner trust values.\n" "\n" msgstr "" -"No puede encontrarse una ruta de confianza váida para esta clave. Veamos\n" +"No puede encontrarse una ruta de confianza válida para esta clave. Veamos\n" "si es posible asignar algunos valores de confianza perdidos.\n" "\n" @@ -903,15 +887,16 @@ msgid "" "No path leading to one of our keys found.\n" "\n" msgstr "" +"No se ha encontrado ninguna ruta con una de nuestras claves.\n" +"\n" #: g10/pkclist.c:263 msgid "" "No certificates with undefined trust found.\n" "\n" -msgstr "" +msgstr "No se ha encontrado ningún certificado sin valor de confianza.\n" #: g10/pkclist.c:265 -#, fuzzy msgid "" "No trust values changed.\n" "\n" @@ -920,28 +905,28 @@ msgstr "" "\n" #: g10/pkclist.c:280 -#, fuzzy, c-format +#, c-format msgid "key %08lX: key has been revoked!\n" -msgstr "clave %08lX: aceptada como clave secreta.\n" +msgstr "%08lX: ¡Esta clave ha sido retirada!\n" #: g10/pkclist.c:286 g10/pkclist.c:381 msgid "Use this key anyway? " msgstr "¿Usar esta clave de todas formas? " #: g10/pkclist.c:308 -#, fuzzy, c-format +#, c-format msgid "%08lX: key has expired\n" -msgstr "Nota: ¡Esta clave está caducada!\n" +msgstr "%08lX: ¡Esta clave está caducada!\n" #: g10/pkclist.c:314 #, c-format msgid "%08lX: no info to calculate a trust probability\n" -msgstr "" +msgstr "%08lX: no hay información para calcular la probabilidad de confianza\n" #: g10/pkclist.c:332 -#, fuzzy, c-format +#, c-format msgid "%08lX: We do NOT trust this key\n" -msgstr "ATENCIÓN: ¡Esta firma NO es de confianza!\n" +msgstr "%08lX: ¡Esta clave NO es de confianza!\n" #: g10/pkclist.c:338 #, c-format @@ -949,14 +934,17 @@ msgid "" "%08lX: It is not sure that this key really belongs to the owner\n" "but it is accepted anyway\n" msgstr "" +"%08lX: No hay seguridad que esta clave pertenezca realmente a su " +"proprietario\n" +"pero se acepta igualmente\n" #: g10/pkclist.c:344 msgid "This key probably belongs to the owner\n" -msgstr "" +msgstr "Esta clave probablemente pertenece a su proprietario\n" #: g10/pkclist.c:349 msgid "This key belongs to us\n" -msgstr "" +msgstr "Esta clave nos pertenece\n" #: g10/pkclist.c:376 msgid "" @@ -998,7 +986,7 @@ msgstr " No hay indicios de que la firma pertenezca al propietario.\n" #: g10/pkclist.c:468 msgid "WARNING: We do NOT trust this key!\n" -msgstr "ATENCIÓN: ¡Esta firma NO es de confianza!\n" +msgstr "ATENCIÓN: ¡Esta clave NO es de confianza!\n" #: g10/pkclist.c:469 msgid " The signature is probably a FORGERY.\n" @@ -1050,7 +1038,7 @@ msgstr "escribiendo autofirma\n" #: g10/keygen.c:162 msgid "writing key binding signature\n" -msgstr "" +msgstr "escribiendo la firma de comprobación de clave\n" #: g10/keygen.c:388 msgid "Please select what kind of key you want:\n" @@ -1086,9 +1074,8 @@ msgid "Your selection? " msgstr "Su elección: " #: g10/keygen.c:411 -#, fuzzy msgid "Do you really want to create a sign and encrypt key? " -msgstr "¿Borrar realmente las claves seleccionadas? " +msgstr "¿De verdad quiere crear una clave de firma y cifrado? " #: g10/keygen.c:432 msgid "Invalid selection.\n" @@ -1325,20 +1312,37 @@ msgid "public and secret key created and signed.\n" msgstr "Claves pública y secreta creadas y firmadas.\n" #: g10/keygen.c:931 +#, fuzzy 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" +"the command \"--edit-key\" to generate a secondary key for this purpose.\n" msgstr "" "Tenga en cuenta que esta clave no puede ser usada para cifrado. Puede usar\n" "el comando \"--add-key\" para crear una clave secundaria con este " "propósito.\n" -#: g10/keygen.c:945 g10/keygen.c:1030 +#: g10/keygen.c:945 g10/keygen.c:1044 #, c-format msgid "Key generation failed: %s\n" msgstr "Creación de la clave fallida: %s\n" -#: g10/keygen.c:1008 +#: g10/keygen.c:989 g10/sig-check.c:172 g10/sign.c:52 +#, fuzzy, c-format +msgid "" +"key has been created %lu second in future (time warp or clock problem)\n" +msgstr "" +"clave pública creada %lu %s en el futuro (salto en el tiempo o problemas con " +"el reloj)\n" + +#: g10/keygen.c:991 g10/sig-check.c:174 g10/sign.c:54 +#, fuzzy, c-format +msgid "" +"key has been created %lu seconds in future (time warp or clock problem)\n" +msgstr "" +"clave pública creada %lu %s en el futuro (salto en el tiempo o problemas con " +"el reloj)\n" + +#: g10/keygen.c:1022 msgid "Really create? " msgstr "¿Crear de verdad? " @@ -1354,7 +1358,7 @@ msgid "error creating passphrase: %s\n" msgstr "error creando contraseña: %s\n" #: g10/encode.c:155 g10/encode.c:269 -#, fuzzy, c-format +#, c-format msgid "%s: WARNING: empty file\n" msgstr "%s: atención: fichero vacío\n" @@ -1364,301 +1368,315 @@ msgid "reading from `%s'\n" msgstr "leyendo desde `%s'\n" #: g10/encode.c:397 -#, fuzzy, c-format +#, c-format msgid "%s/%s encrypted for: %s\n" -msgstr "%s cifrado para: %s\n" +msgstr "%s/%s cifrado para: %s\n" -#: g10/export.c:114 -#, fuzzy, c-format +#: g10/export.c:147 +#, c-format msgid "%s: user not found: %s\n" -msgstr "%s: usuario no encontrado\n" +msgstr "%s: usuario no encontrado: %s\n" -#: g10/export.c:123 +#: g10/export.c:156 #, c-format msgid "certificate read problem: %s\n" -msgstr "" +msgstr "problema en la lectura del certificado: %s\n" -#: g10/export.c:132 -#, fuzzy, c-format +#: g10/export.c:165 +#, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" -msgstr "clave %08lX: clave secreta sin clave pública - ignorada\n" +msgstr "clave %08lX: no es conforme a rfc2440 - ignorada\n" -#: g10/export.c:174 -#, fuzzy +#: g10/export.c:203 msgid "WARNING: nothing exported\n" -msgstr "ATENCIÓN: ¡Usando una clave no fiable!\n" +msgstr "ATENCIÓN: no se ha exportado nada\n" #: g10/getkey.c:164 msgid "too many entries in pk cache - disabled\n" -msgstr "" +msgstr "demasiados registros en la cache pk - anulada\n" #: g10/getkey.c:294 msgid "too many entries in unk cache - disabled\n" -msgstr "" +msgstr "demasiados registros en la cache unk - anulada\n" #: g10/getkey.c:1038 #, c-format msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "usando clave secundaria %08lX en vez de clave primaria %08lX\n" -#: g10/import.c:129 g10/trustdb.c:1180 +#: g10/import.c:117 g10/trustdb.c:1180 #, c-format msgid "can't open file: %s\n" msgstr "no puede abrirse el fichero: %s\n" -#: g10/import.c:148 +#: g10/import.c:165 #, c-format msgid "skipping block of type %d\n" msgstr "ignorando bloque de tipo %d\n" -#: g10/import.c:155 g10/trustdb.c:1474 g10/trustdb.c:1543 +#: g10/import.c:172 g10/trustdb.c:1474 g10/trustdb.c:1543 #, c-format msgid "%lu keys so far processed\n" -msgstr "" +msgstr "hasta ahora se han procesado %lu claves\n" -#: g10/import.c:160 g10/trustdb.c:1256 +#: g10/import.c:177 g10/trustdb.c:1256 #, c-format msgid "read error: %s\n" msgstr "error de lectura: %s\n" -#: g10/import.c:162 +#: g10/import.c:179 #, c-format msgid "Total number processed: %lu\n" -msgstr "" +msgstr " Cantidad total procesada: %lu\n" -#: g10/import.c:164 +#: g10/import.c:181 #, c-format msgid " w/o user IDs: %lu\n" -msgstr "" +msgstr " sin identificativo de usuario: %lu\n" -#: g10/import.c:166 +#: g10/import.c:183 #, c-format msgid " imported: %lu" -msgstr "" +msgstr " importadas: %lu" -#: g10/import.c:172 +#: g10/import.c:189 #, c-format msgid " unchanged: %lu\n" -msgstr "" +msgstr " sin cambios: %lu\n" -#: g10/import.c:174 +#: g10/import.c:191 #, c-format msgid " new user IDs: %lu\n" -msgstr "" +msgstr "nuevos identificativos de usuario: %lu\n" -#: g10/import.c:176 +#: g10/import.c:193 #, c-format msgid " new subkeys: %lu\n" -msgstr "" +msgstr " nuevas sub-claves: %lu\n" -#: g10/import.c:178 -#, fuzzy, c-format +#: g10/import.c:195 +#, c-format msgid " new signatures: %lu\n" -msgstr "clave %08lX: %d nuevas firmas\n" +msgstr " nuevas firmas: %lu\n" -#: g10/import.c:180 +#: g10/import.c:197 #, c-format msgid " new key revocations: %lu\n" -msgstr "" +msgstr " nuevas revocaciones de clave: %lu\n" -#: g10/import.c:182 -#, fuzzy, c-format +#: g10/import.c:199 +#, c-format msgid " secret keys read: %lu\n" -msgstr "enum_secret_keys fallido: %s\n" +msgstr " claves secretas leídas: %lu\n" -#: g10/import.c:184 -#, fuzzy, c-format +#: g10/import.c:201 +#, c-format msgid " secret keys imported: %lu\n" -msgstr "clave %08lX: clave secreta importata\n" +msgstr " claves secretas importadas: %lu\n" -#: g10/import.c:186 -#, fuzzy, c-format +#: g10/import.c:203 +#, c-format msgid " secret keys unchanged: %lu\n" -msgstr "enum_secret_keys fallido: %s\n" +msgstr " claves secretas sin cambios: %lu\n" -#: g10/import.c:328 g10/import.c:520 +#: g10/import.c:343 g10/import.c:535 #, c-format msgid "key %08lX: no user id\n" -msgstr "clave %08lX: no hay id de usuario\n" +msgstr "clave %08lX: no hay identificativo de usuario\n" -#: g10/import.c:339 +#: g10/import.c:354 #, c-format msgid "key %08lX: no valid user ids\n" -msgstr "clave %08lX: no hay ids de usuario válidos\n" +msgstr "clave %08lX: no hay identificativos de usuario válidos\n" -#: g10/import.c:341 +#: g10/import.c:356 msgid "this may be caused by a missing self-signature\n" msgstr "esto puede ser debido a la ausencia de autofirma\n" -#: g10/import.c:352 g10/import.c:588 +#: g10/import.c:367 g10/import.c:603 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "clave %08lX: clave pública no encontrada: %s\n" -#: g10/import.c:358 +#: g10/import.c:373 msgid "no default public keyring\n" msgstr "no hay anillo público por defecto\n" -#: g10/import.c:362 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:592 +#: g10/import.c:377 g10/openfile.c:105 g10/sign.c:215 g10/sign.c:601 #, c-format msgid "writing to `%s'\n" msgstr "escribiendo en `%s'\n" -#: g10/import.c:366 g10/import.c:426 g10/import.c:642 +#: g10/import.c:381 g10/import.c:441 g10/import.c:657 #, c-format msgid "can't lock public keyring: %s\n" msgstr "no puede bloquearse el anillo público: %s\n" -#: g10/import.c:369 +#: g10/import.c:384 #, c-format msgid "can't write to keyring: %s\n" msgstr "no puede escribirse en el anillo: %s\n" -#: g10/import.c:373 +#: g10/import.c:388 #, c-format msgid "key %08lX: public key imported\n" msgstr "clave %08lX: clave pública importada\n" -#: g10/import.c:386 +#: g10/import.c:401 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "clave %08lX: no se corresponde con nuestra copia\n" -#: g10/import.c:399 g10/import.c:597 +#: g10/import.c:414 g10/import.c:612 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "clave %08lX: no puede localizarse el bloque de claves original: %s\n" -#: g10/import.c:406 g10/import.c:604 +#: g10/import.c:421 g10/import.c:619 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "clave %08lX: no puede leerse el bloque de claves original: %s\n" -#: g10/import.c:423 g10/import.c:535 g10/import.c:639 +#: g10/import.c:438 g10/import.c:550 g10/import.c:654 msgid "writing keyblock\n" msgstr "escribiendo bloque de claves\n" -#: g10/import.c:429 g10/import.c:645 +#: g10/import.c:444 g10/import.c:660 #, c-format msgid "can't write keyblock: %s\n" msgstr "no puede escribirse el bloque de claves: %s\n" -#: g10/import.c:434 +#: g10/import.c:449 #, c-format msgid "key %08lX: 1 new user-id\n" -msgstr "clave %08lX: 1 nuevo id de usuario\n" +msgstr "clave %08lX: 1 nuevo identificativo de usuario\n" -#: g10/import.c:437 +#: g10/import.c:452 #, c-format msgid "key %08lX: %d new user-ids\n" -msgstr "clave %08lX: %d nuevos ids de usuario\n" +msgstr "clave %08lX: %d nuevos identificativos de usuario\n" -#: g10/import.c:440 +#: g10/import.c:455 #, c-format msgid "key %08lX: 1 new signature\n" msgstr "clave %08lX: 1 nueva firma\n" -#: g10/import.c:443 +#: g10/import.c:458 #, c-format msgid "key %08lX: %d new signatures\n" msgstr "clave %08lX: %d nuevas firmas\n" -#: g10/import.c:446 +#: g10/import.c:461 #, c-format msgid "key %08lX: 1 new subkey\n" -msgstr "clave %08lX: 1 nueva subclave\n" +msgstr "clave %08lX: 1 nueva sub-clave\n" -#: g10/import.c:449 +#: g10/import.c:464 #, c-format msgid "key %08lX: %d new subkeys\n" -msgstr "clave %08lX: %d nuevas subclaves\n" +msgstr "clave %08lX: %d nuevas sub-claves\n" -#: g10/import.c:459 +#: g10/import.c:474 #, c-format msgid "key %08lX: not changed\n" msgstr "clave %08lX: sin cambios\n" -#: g10/import.c:538 +#: g10/import.c:553 #, c-format msgid "can't lock secret keyring: %s\n" msgstr "no puede bloquearse el anillo secreto: %s\n" -#: g10/import.c:541 +#: g10/import.c:556 #, c-format msgid "can't write keyring: %s\n" msgstr "no puede escribirse el anillo: %s\n" #. we are ready -#: g10/import.c:544 +#: g10/import.c:559 #, c-format msgid "key %08lX: secret key imported\n" msgstr "clave %08lX: clave secreta importata\n" #. we can't merge secret keys -#: g10/import.c:548 +#: g10/import.c:563 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "clave %08lX: ya estaba en el anillo secreto\n" -#: g10/import.c:553 +#: g10/import.c:568 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "clave %08lX: clave secreta no encontrada: %s\n" -#: g10/import.c:582 +#: g10/import.c:597 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "clave %08lX: falta la clave pública - imposibile applicar el\n" "certificado de revocación\n" -#: g10/import.c:615 +#: g10/import.c:630 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "clave %08lX: certificado de revocación no válido: %s - rechazado\n" -#: g10/import.c:649 +#: g10/import.c:664 #, c-format msgid "key %08lX: revocation certificate imported\n" msgstr "clave %08lX: certificado de revocación importado\n" -#: g10/import.c:680 +#: g10/import.c:698 #, c-format msgid "key %08lX: no user-id for signature\n" -msgstr "clave %08lX: no hay id de usuario para la firma\n" +msgstr "clave %08lX: no hay identificativo de usuario para la firma\n" -#: g10/import.c:687 +#: g10/import.c:705 g10/import.c:729 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "clave %08lX: algoritmo da clave pública no soportado\n" -#: g10/import.c:688 +#: g10/import.c:706 #, c-format msgid "key %08lX: invalid self-signature\n" msgstr "clave %08lX: autofirma no válida\n" -#: g10/import.c:717 +#: g10/import.c:722 +#, fuzzy, c-format +msgid "key %08lX: no subkey for key binding\n" +msgstr "clave %08lX.%lu: buena unión de sub-clave\n" + +#: g10/import.c:730 +#, fuzzy, c-format +msgid "key %08lX: invalid subkey binding\n" +msgstr "clave %08lX.%lu: unión de sub-clave no válida\n" + +#: g10/import.c:761 #, c-format msgid "key %08lX: skipped userid '" -msgstr "clave %08lX: ignorado id de usuario '" +msgstr "clave %08lX: ignorado identificativo de usuario '" + +#: g10/import.c:781 +#, fuzzy, c-format +msgid "key %08lX: skipped subkey\n" +msgstr "clave %08lX: 1 nueva sub-clave\n" -#: g10/import.c:740 +#: g10/import.c:800 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "" -"clave %08lX: certificado de revocación en sitio equivocado - ignorado\n" +"clave %08lX: certificado de revocación en lugar equivocado - ignorado\n" -#: g10/import.c:748 +#: g10/import.c:808 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "clave %08lX: certificado de revocación no valido: %s - ignorado\n" -#: g10/import.c:807 +#: g10/import.c:867 #, c-format msgid "key %08lX: revocation certificate added\n" msgstr "clave %08lX: certificado de revocación añadido\n" -#: g10/import.c:921 g10/import.c:976 +#: g10/import.c:981 g10/import.c:1036 #, c-format msgid "key %08lX: our copy has no self-signature\n" msgstr "clave %08lX: nuestra copia no tiene autofirma\n" @@ -1701,12 +1719,12 @@ msgstr "%d firmas no comprobadas por causa de un error\n" #: g10/keyedit.c:194 msgid "1 user id without valid self-signature detected\n" -msgstr "Detectado 1 id de usuario sin autofirma válida\n" +msgstr "Detectado 1 identificativo de usuario sin autofirma válida\n" #: g10/keyedit.c:196 #, c-format msgid "%d user ids without valid self-signatures detected\n" -msgstr "Detectados %d ids de usuario sin autofirma válida\n" +msgstr "Detectados %d identificativos de usuario sin autofirma válida\n" #: g10/keyedit.c:258 #, c-format @@ -1730,7 +1748,7 @@ msgstr "" msgid "Really sign? " msgstr "¿Firmar de verdad? " -#: g10/keyedit.c:303 g10/sign.c:65 +#: g10/keyedit.c:303 g10/sign.c:75 #, c-format msgid "signing failed: %s\n" msgstr "firma fallida: %s\n" @@ -1770,7 +1788,7 @@ msgstr "¿Realmente quiere hacer esto? " #: g10/keyedit.c:455 msgid "moving a key signature to the correct place\n" -msgstr "" +msgstr "moviendo la firma de la clave al lugar correcto\n" #: g10/keyedit.c:490 msgid "quit" @@ -1806,7 +1824,7 @@ msgstr "" #: g10/keyedit.c:495 msgid "show fingerprint" -msgstr "muestra huella digital" +msgstr "muestra huella dactilar" #: g10/keyedit.c:496 msgid "list" @@ -1981,7 +1999,7 @@ 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 -#, fuzzy, c-format +#, c-format msgid "update of trustdb failed: %s\n" msgstr "actualización de confianza fallida: %s\n" @@ -2043,7 +2061,7 @@ msgstr "Cambiando caducidad de clave primaria.\n" #: g10/keyedit.c:1250 msgid "You can't change the expiration date of a v3 key\n" -msgstr "" +msgstr "No puede cambiar la fecha de caducidad de una clave v3\n" #: g10/keyedit.c:1266 msgid "No corresponding signature in secret ring\n" @@ -2059,78 +2077,75 @@ msgstr "No hay ningún identificativo de usuario con el índice %d\n" msgid "No secondary key with index %d\n" msgstr "No hay ninguna clave secundaria con el índice %d\n" -#: g10/mainproc.c:198 -#, fuzzy +#: g10/mainproc.c:199 msgid "public key encrypted data: good DEK\n" -msgstr "descifrado de la clave pública fallido: %s\n" +msgstr "datos cifrados de la clave pública: DEK bueno\n" -#: g10/mainproc.c:201 +#: g10/mainproc.c:202 #, c-format msgid "public key decryption failed: %s\n" msgstr "descifrado de la clave pública fallido: %s\n" -#: g10/mainproc.c:228 -#, fuzzy +#: g10/mainproc.c:229 msgid "decryption okay\n" -msgstr "descifrado fallido: %s\n" +msgstr "descifrado correcto\n" -#: g10/mainproc.c:231 +#: g10/mainproc.c:232 #, c-format msgid "decryption failed: %s\n" msgstr "descifrado fallido: %s\n" -#: g10/mainproc.c:248 -#, fuzzy +#: g10/mainproc.c:249 msgid "NOTE: sender requested \"for-your-eyes-only\"\n" msgstr "nota: el remitente solicitó \"sólo-para-tus-ojos\"\n" -#: g10/mainproc.c:250 +#: g10/mainproc.c:251 #, c-format msgid "original file name='%.*s'\n" -msgstr "" +msgstr "nombre fichero original='%.*s'\n" -#: g10/mainproc.c:833 +#: g10/mainproc.c:834 msgid "signature verification suppressed\n" -msgstr "" +msgstr "suprimida la verificación de la firma\n" -#: g10/mainproc.c:839 +#: g10/mainproc.c:840 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" -msgstr "Firma creada %.*s usando identificativo de clave %08lX\n" +msgstr "Firma creada %.*s usando identificativo de clave %s %08lX\n" -#: g10/mainproc.c:847 +#: g10/mainproc.c:852 msgid "BAD signature from \"" msgstr "Firma INCORRECTA de \"" -#: g10/mainproc.c:848 +#: g10/mainproc.c:853 msgid "Good signature from \"" msgstr "Firma correcta de \"" -#: g10/mainproc.c:879 +#: g10/mainproc.c:884 #, c-format msgid "Can't check signature: %s\n" msgstr "Imposible comprobar la firma: %s\n" -#: g10/mainproc.c:952 +#: g10/mainproc.c:957 msgid "old style (PGP 2.x) signature\n" -msgstr "" +msgstr "firma viejo estilo (PGP 2.x)\n" -#: g10/mainproc.c:957 +#: g10/mainproc.c:962 msgid "invalid root packet detected in proc_tree()\n" -msgstr "" +msgstr "paquete raíz no válido detectado en proc_tree()\n" #: g10/misc.c:90 -#, fuzzy, c-format +#, c-format msgid "can't disable core dumps: %s\n" -msgstr "no puede abrirse `%s': %s\n" +msgstr "no se pueden desactivar los core dumps: %s\n" #: g10/misc.c:93 msgid "WARNING: program may create a core file!\n" -msgstr "" +msgstr "ATENCIÓN: ¡el programa podría crear un fichero core dump!\n" #: g10/misc.c:200 msgid "Experimental algorithms should not be used!\n" -msgstr "" +msgstr "¡No se deberían usar algoritmos experimentales!\n" #: g10/misc.c:214 msgid "" @@ -2143,16 +2158,18 @@ msgstr "" #: g10/misc.c:235 msgid "this cipher algorithm is depreciated; please use a more standard one!\n" msgstr "" +"este algoritmo de cifrado está en desuso; considere el uso de uno más " +"estándar.\n" #: g10/parse-packet.c:113 -#, fuzzy, c-format +#, c-format msgid "can't handle public key algorithm %d\n" -msgstr "no puede bloquearse el anillo público: %s\n" +msgstr "no puedo manejar el algoritmo de clave pública %d\n" #: g10/parse-packet.c:892 #, c-format msgid "subpacket of type %d has critical bit set\n" -msgstr "" +msgstr "el sub-paquete de tipo %d tiene el bit crítico activado\n" #: g10/passphrase.c:141 msgid "" @@ -2165,22 +2182,20 @@ msgstr "" "del usuario: \"" #: g10/passphrase.c:150 -#, fuzzy, c-format +#, 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" +msgstr "clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s" #: g10/passphrase.c:155 #, c-format msgid " (main key ID %08lX)" -msgstr "" +msgstr "(ID clave primaria %08lX)" #: g10/passphrase.c:183 -#, fuzzy msgid "Enter passphrase: " msgstr "Introduzca contraseña: " #: g10/passphrase.c:187 -#, fuzzy msgid "Repeat passphrase: " msgstr "Repita contraseña: " @@ -2188,15 +2203,15 @@ msgstr "Repita contraseña: " 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:166 +#: g10/plaintext.c:208 msgid "Please enter name of data file: " msgstr "Introduzca el nombre del fichero de datos: " -#: g10/plaintext.c:187 +#: g10/plaintext.c:229 msgid "reading stdin ...\n" -msgstr "" +msgstr "leyendo stdin...\n" -#: g10/plaintext.c:250 +#: g10/plaintext.c:292 #, c-format msgid "can't open signed data `%s'\n" msgstr "imposible abrir datos firmados `%s'\n" @@ -2207,17 +2222,15 @@ msgid "anonymous receiver; trying secret key %08lX ...\n" msgstr "destinatario anónimo, probando clave secreta %08lX ...\n" #: g10/pubkey-enc.c:84 -#, fuzzy msgid "okay, we are the anonymous recipient.\n" -msgstr "De acuerdo, somo el destinatario anónimo.\n" +msgstr "De acuerdo, somos el destinatario anónimo.\n" #: g10/pubkey-enc.c:136 -#, fuzzy msgid "old encoding of the DEK is not supported\n" -msgstr "el algoritmo de protección %d no está soportado\n" +msgstr "la codificación vieja de DEK no está soportada\n" #: g10/pubkey-enc.c:183 -#, fuzzy, c-format +#, c-format msgid "NOTE: cipher algorithm %d not found in preferences\n" msgstr "nota: algoritmo de cifrado %d no encontrado en las preferencias\n" @@ -2231,7 +2244,6 @@ msgid "Invalid passphrase; please try again ...\n" msgstr "Contraseña incorrecta, inténtelo de nuevo...\n" #: 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" @@ -2242,176 +2254,176 @@ msgstr "" "¡esto es una clave ElGamal generada por PGP que NO es segura para las " "firmas!\n" -#: g10/sig-check.c:166 +#: g10/sig-check.c:163 #, 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:168 -msgid "second" -msgstr "" - -#: g10/sig-check.c:168 -msgid "seconds" -msgstr "" +msgid "public key is %lu second newer than the signature\n" +msgstr "lid %lu: identificativo de usuario sin firma\n" -#: g10/sig-check.c:173 +#: g10/sig-check.c:164 #, fuzzy, c-format +msgid "public key is %lu seconds newer than the signature\n" +msgstr "lid %lu: identificativo de usuario sin firma\n" + +#: g10/sig-check.c:180 +#, c-format msgid "NOTE: signature key expired %s\n" -msgstr "atención: firma de la clave caducada el %s\n" +msgstr "atención: clave de la firma caducada el %s\n" -#: g10/sig-check.c:230 +#: g10/sig-check.c:237 msgid "assuming bad signature due to an unknown critical bit\n" -msgstr "" +msgstr "asumiendo firma mala debido a un bit crítico desconocido\n" -#: g10/sign.c:69 -#, fuzzy, c-format +#: g10/sign.c:79 +#, c-format msgid "%s signature from: %s\n" -msgstr "Firma INCORRECTA de \"" +msgstr "firma %s de %s\n" -#: g10/sign.c:200 g10/sign.c:587 -#, fuzzy, c-format +#: g10/sign.c:210 g10/sign.c:596 +#, c-format msgid "can't create %s: %s\n" -msgstr "no puede abrirse `%s': %s\n" +msgstr "no puede crearse `%s': %s\n" -#: g10/sign.c:296 +#: g10/sign.c:306 msgid "signing:" -msgstr "" +msgstr "firmando:" -#: g10/sign.c:336 -#, fuzzy, c-format +#: g10/sign.c:346 +#, c-format msgid "WARNING: `%s' is an empty file\n" -msgstr "%s: atención: fichero vacío\n" +msgstr "atención: '%s' es un fichero vacío\n" -#: g10/tdbio.c:116 g10/tdbio.c:1418 +#: g10/textfilter.c:199 #, fuzzy, c-format +msgid "can't handle text lines longer than %d characters\n" +msgstr "armadura inválida: línea más larga de %d caracteres\n" + +#: g10/tdbio.c:116 g10/tdbio.c:1418 +#, c-format msgid "trustdb rec %lu: lseek failed: %s\n" -msgstr "actualización de la clave secreta fallida: %s\n" +msgstr "registro base de datos de confianza %lu: lseek fallido: %s\n" #: g10/tdbio.c:122 g10/tdbio.c:1425 #, c-format msgid "trustdb rec %lu: write failed (n=%d): %s\n" msgstr "" +"resgisto base de datos de confianza %lu: escritura fallida (n=%d): %s\n" #: g10/tdbio.c:232 msgid "trustdb transaction too large\n" -msgstr "" +msgstr "transacción en la base de datos de confianza demasiado grande\n" #: g10/tdbio.c:416 -#, fuzzy, c-format +#, c-format msgid "%s: can't access: %s\n" msgstr "%s: no puede abrirse: %s\n" #: g10/ringedit.c:273 g10/tdbio.c:436 -#, fuzzy, c-format +#, c-format msgid "%s: can't create directory: %s\n" -msgstr "%s: no puede abrirse: %s\n" +msgstr "%s: no puede crearse el directorio: %s\n" #: g10/ringedit.c:279 g10/tdbio.c:439 #, c-format msgid "%s: directory created\n" -msgstr "" +msgstr "%s: se ha creado el directorio\n" #: g10/tdbio.c:443 #, c-format msgid "%s: directory does not exist!\n" -msgstr "" +msgstr "%s: el directorio no existe\n" -#: g10/openfile.c:101 g10/openfile.c:165 g10/ringedit.c:1275 g10/tdbio.c:449 -#, fuzzy, c-format +#: g10/openfile.c:101 g10/openfile.c:165 g10/ringedit.c:1292 g10/tdbio.c:449 +#, c-format msgid "%s: can't create: %s\n" -msgstr "%s: no puede abrirse: %s\n" +msgstr "%s: no puede crearse: %s\n" #: g10/tdbio.c:473 #, c-format msgid "%s: failed to create version record: %s" -msgstr "" +msgstr "%s: fallo en la creación del registro de versión: %s" #: g10/tdbio.c:477 -#, fuzzy, c-format +#, c-format msgid "%s: invalid trustdb created\n" -msgstr "actualización de confianza fallida: %s\n" +msgstr "%s: se ha creado base de datos de confianza no válida\n" #: g10/tdbio.c:479 -#, fuzzy, c-format +#, c-format msgid "%s: trustdb created\n" -msgstr "actualización de confianza fallida: %s\n" +msgstr "%s: se ha creado base de datos de confianza\n" #: g10/tdbio.c:512 -#, fuzzy, c-format +#, c-format msgid "%s: invalid trustdb\n" -msgstr "actualización de confianza fallida: %s\n" +msgstr "%s: base de datos de confianza no válida\n" #: g10/tdbio.c:545 #, c-format msgid "%s: failed to create hashtable: %s\n" -msgstr "" +msgstr "%s: fallo en la creación de la tabla hash: %s\n" #: g10/tdbio.c:553 -#, fuzzy, c-format +#, c-format msgid "%s: error updating version record: %s\n" -msgstr "%s: error comprobando la clave: %s\n" +msgstr "%s: error actualizando el registro de versión: %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 +#, c-format msgid "%s: error reading version record: %s\n" -msgstr "%s: error comprobando la clave: %s\n" +msgstr "%s: error lectura registro de versión: %s\n" #: g10/tdbio.c:582 -#, fuzzy, c-format +#, c-format msgid "%s: error writing version record: %s\n" -msgstr "%s: error comprobando la clave: %s\n" +msgstr "%s: error escritura registro de versión: %s\n" #: g10/tdbio.c:1058 -#, fuzzy, c-format +#, c-format msgid "trustdb: lseek failed: %s\n" -msgstr "actualización de la clave secreta fallida: %s\n" +msgstr "base de datos de confianza: fallo lseek: %s\n" #: g10/tdbio.c:1066 -#, fuzzy, c-format +#, c-format msgid "trustdb: read failed (n=%d): %s\n" -msgstr "actualización de confianza fallida: %s\n" +msgstr "base de datos de confianza: error lectura (n=%d): %s\n" #: g10/tdbio.c:1087 -#, fuzzy, c-format +#, c-format msgid "%s: not a trustdb file\n" -msgstr "actualización de confianza fallida: %s\n" +msgstr "%s: no es una base de datos de confianza\n" #: g10/tdbio.c:1103 #, c-format msgid "%s: version record with recnum %lu\n" -msgstr "" +msgstr "%s: registro de versión con numero de registro %lu\n" #: g10/tdbio.c:1108 -#, fuzzy, c-format +#, c-format msgid "%s: invalid file version %d\n" -msgstr "cabecera de firma clara no válida\n" +msgstr "%s: versión del fichero %d no válida\n" #: g10/tdbio.c:1384 -#, fuzzy, c-format +#, c-format msgid "%s: error reading free record: %s\n" -msgstr "%s: error comprobando la clave: %s\n" +msgstr "%s: error lectura registro libre: %s\n" #: g10/tdbio.c:1392 -#, fuzzy, c-format +#, c-format msgid "%s: error writing dir record: %s\n" -msgstr "%s: error comprobando la clave: %s\n" +msgstr "%s: error escritura registro de directorio: %s\n" #: g10/tdbio.c:1402 #, c-format msgid "%s: failed to zero a record: %s\n" -msgstr "" +msgstr "%s: fallo en poner a cero un registro: %s\n" #: g10/tdbio.c:1432 #, c-format msgid "%s: failed to append a record: %s\n" -msgstr "" +msgstr "%s: fallo al añadir un registro: %s\n" #: g10/trustdb.c:142 -#, 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" @@ -2420,57 +2432,57 @@ msgstr "" #: g10/trustdb.c:155 #, c-format msgid "trust record %lu, req type %d: read failed: %s\n" -msgstr "" +msgstr "registro de confianza %lu, petición tipo %d: fallo lectura: %s\n" #: g10/trustdb.c:170 #, c-format msgid "trust record %lu, type %d: write failed: %s\n" -msgstr "" +msgstr "registro de confianza %lu, tipo %d: fallo escritura: %s\n" #: g10/trustdb.c:184 -#, fuzzy, c-format +#, c-format msgid "trust record %lu: delete failed: %s\n" -msgstr "actualización de la clave secreta fallida: %s\n" +msgstr "registro de confianza %lu: fallo al borrar: %s\n" #: g10/trustdb.c:198 -#, fuzzy, c-format +#, c-format msgid "trustdb: sync failed: %s\n" -msgstr "actualización de confianza fallida: %s\n" +msgstr "base de datos de confianza: fallo sincronización: %s\n" #: g10/trustdb.c:327 #, c-format msgid "error reading dir record for LID %lu: %s\n" -msgstr "" +msgstr "error lectura registro de directorio del LID %lu: %s\n" #: g10/trustdb.c:334 #, c-format msgid "lid %lu: expected dir record, got type %d\n" -msgstr "" +msgstr "lid %lu: esperaba registro directorio, encontrado tipo %d\n" #: g10/trustdb.c:339 #, c-format msgid "no primary key for LID %lu\n" -msgstr "" +msgstr "no hay clave primaria para el LID %lu\n" #: g10/trustdb.c:344 -#, fuzzy, c-format +#, c-format msgid "error reading primary key for LID %lu: %s\n" -msgstr "error creando contraseña: %s\n" +msgstr "error lectura clave primaria para el LID %lu: %s\n" #: g10/trustdb.c:420 #, c-format msgid "chained sigrec %lu has a wrong owner\n" -msgstr "" +msgstr "registro de firma encadenado %lu tiene el propietario equivocado\n" #: g10/trustdb.c:463 -#, fuzzy, c-format +#, c-format msgid "'%s' is not a valid long keyID\n" -msgstr "Caracter no válido en el comentario\n" +msgstr "'%s' no es un identificativo largo de clave válido\n" #: g10/trustdb.c:498 -#, fuzzy, c-format +#, c-format msgid "key %08lX: no public key for trusted key - skipped\n" -msgstr "clave %08lX: clave secreta sin clave pública - ignorada\n" +msgstr "clave %08lX: clave de confianza sin clave pública - ignorada\n" #: g10/trustdb.c:507 g10/trustdb.c:565 #, c-format @@ -2483,19 +2495,19 @@ msgid "key %08lX: query record failed\n" msgstr "clave %08lX: petición de registro fallida\n" #: g10/trustdb.c:517 g10/trustdb.c:580 -#, fuzzy, c-format +#, c-format msgid "key %08lX: already in trusted key table\n" -msgstr "clave %08lX: ya está en la tabla secreta\n" +msgstr "clave %08lX: ya está en la tabla de confianza\n" #: g10/trustdb.c:520 g10/trustdb.c:583 -#, fuzzy, c-format +#, c-format msgid "key %08lX: accepted as trusted key.\n" -msgstr "clave %08lX: aceptada como clave secreta.\n" +msgstr "clave %08lX: aceptada como clave de confianza.\n" #: g10/trustdb.c:536 -#, fuzzy, c-format +#, c-format msgid "NOTE: secret key %08lX is NOT protected.\n" -msgstr "Esta clave no está protegida.\n" +msgstr "NOTA: la clave secreta %08lX NO está protegida.\n" #: g10/trustdb.c:548 #, c-format @@ -2508,68 +2520,67 @@ msgid "key %08lX: secret and public key don't match\n" msgstr "clave %08lX: las claves pública y secreta no se corresponden\n" #: g10/trustdb.c:591 -#, fuzzy, c-format +#, c-format msgid "enumerate secret keys failed: %s\n" msgstr "enum_secret_keys fallido: %s\n" #: g10/trustdb.c:774 -#, fuzzy, c-format +#, c-format msgid "lid %lu: read dir record failed: %s\n" -msgstr "clave %08lX: inserción del registro de confianza fallida: %s\n" +msgstr "lid %lu: lectura registro de directorio fallida: %s\n" #: g10/trustdb.c:783 -#, fuzzy, c-format +#, c-format msgid "lid %lu: read key record failed: %s\n" -msgstr "clave %08lX: inserción del registro de confianza fallida: %s\n" +msgstr "lid %lu: lectura registro de clave fallida: %s\n" #: g10/trustdb.c:793 -#, fuzzy, c-format +#, c-format msgid "lid %lu: read uid record failed: %s\n" -msgstr "clave %08lX: inserción del registro de confianza fallida: %s\n" +msgstr "lid %lu: lectura registro identificativo fallida: %s\n" #: g10/trustdb.c:802 -#, fuzzy, c-format +#, c-format msgid "lid %lu: read pref record failed: %s\n" -msgstr "clave %08lX: inserción del registro de confianza fallida: %s\n" +msgstr "lid %lu: lectura registro preferencias fallida: %s\n" #: g10/trustdb.c:812 -#, fuzzy, c-format +#, c-format msgid "lid %lu: read sig record failed: %s\n" -msgstr "clave %08lX: inserción del registro de confianza fallida: %s\n" +msgstr "lid %lu: lectura registro firma fallida: %s\n" #: g10/trustdb.c:1013 msgid "Ooops, no keys\n" -msgstr "" +msgstr "Oh oh, no hay claves\n" #: g10/trustdb.c:1017 -#, fuzzy msgid "Ooops, no user ids\n" -msgstr "lista clave e identificativos de usuario" +msgstr "Oh oh, no hay identificativos de usuario\n" #: g10/trustdb.c:1088 g10/trustdb.c:1106 -#, fuzzy, c-format +#, c-format msgid "user '%s' read problem: %s\n" -msgstr "%s: usuario no encontrado\n" +msgstr "problema de lectura usuario '%s': %s\n" #: g10/trustdb.c:1091 g10/trustdb.c:1109 -#, fuzzy, c-format +#, c-format msgid "user '%s' list problem: %s\n" -msgstr "%s: usuario no encontrado\n" +msgstr "problema lista usuario '%s': %s\n" #: g10/trustdb.c:1099 g10/trustdb.c:1346 -#, fuzzy, c-format +#, c-format msgid "user '%s' not found: %s\n" -msgstr "%s: usuario no encontrado\n" +msgstr "usuario '%s' no encontrado: %s\n" #: g10/trustdb.c:1101 g10/trustdb.c:1348 -#, fuzzy, c-format +#, c-format msgid "problem finding '%s' in trustdb: %s\n" -msgstr "inicialización de la base de datos de confianza `%s' fallida\n" +msgstr "problema buscando '%s' en la tabla de confianza: %s\n" #: g10/trustdb.c:1104 -#, fuzzy, c-format +#, c-format msgid "user '%s' not in trustdb\n" -msgstr "%s: usuario no encontrado\n" +msgstr "usuario '%s' no está en la tabla de confianza\n" #: g10/trustdb.c:1139 #, c-format @@ -2577,163 +2588,163 @@ msgid "" "# List of assigned trustvalues, created %s\n" "# (Use \"gpgm --import-ownertrust\" to restore them)\n" msgstr "" +"# Lista de valores de confianza, creada el %s\n" +"# (Puede usar \"gpgm --import-ownertrust\" para restablecerlos)\n" #: g10/trustdb.c:1145 msgid "directory record w/o primary key\n" -msgstr "" +msgstr "registro de directorio sin clave primaria\n" #: g10/trustdb.c:1152 -#, fuzzy, c-format +#, c-format msgid "error reading key record: %s\n" -msgstr "%s: error comprobando la clave: %s\n" +msgstr "error lectura registro de clave: %s\n" #: g10/trustdb.c:1192 msgid "line too long\n" -msgstr "" +msgstr "linea demasiado larga\n" #: g10/trustdb.c:1200 msgid "error: missing colon\n" -msgstr "" +msgstr "error: falta ':'\n" #: g10/trustdb.c:1205 -#, fuzzy msgid "error: invalid fingerprint\n" -msgstr "muestra huella digital" +msgstr "error: huella dactilar no válida\n" #: g10/trustdb.c:1209 -#, fuzzy msgid "error: no ownertrust value\n" -msgstr "exporta los valores de confianza" +msgstr "error: no hay valor de confianza del propietario\n" #: g10/trustdb.c:1234 msgid "key not in trustdb, searching ring.\n" -msgstr "" +msgstr "la clave no está en tabla de confianza, buscando en el anillo.\n" #: g10/trustdb.c:1237 -#, fuzzy, c-format +#, c-format msgid "key not in ring: %s\n" -msgstr "no puede escribirse el anillo: %s\n" +msgstr "la clave no está en el anillo: %s\n" #: g10/trustdb.c:1241 msgid "Oops: key is now in trustdb???\n" -msgstr "" +msgstr "Oh oh: la clave ahora está en la tabla de confianza???\n" #. update the ownertrust #: g10/trustdb.c:1246 -#, fuzzy, c-format +#, c-format msgid "insert trust record failed: %s\n" -msgstr "clave %08lX: inserción del registro de confianza fallida: %s\n" +msgstr "inserción del registro de confianza fallida: %s\n" #. error #: g10/trustdb.c:1252 -#, fuzzy, c-format +#, c-format msgid "error finding dir record: %s\n" -msgstr "eliminación de armadura fallida: %s\n" +msgstr "error buscando registro de directorio: %s\n" #: g10/trustdb.c:1351 -#, fuzzy, c-format +#, c-format msgid "user '%s' not in trustdb - inserting\n" -msgstr "actualización de confianza fallida: %s\n" +msgstr "usuario '%s' no está en la tabla de confianza - insertando\n" #: g10/trustdb.c:1354 -#, fuzzy, c-format +#, c-format msgid "failed to put '%s' into trustdb: %s\n" -msgstr "inicialización de la base de datos de confianza `%s' fallida\n" +msgstr "fallo al poner '%s' en la tabla de confianza: %s\n" #: g10/trustdb.c:1404 #, c-format msgid "%s: keyblock read problem: %s\n" -msgstr "" +msgstr "%s: problema lectura del bloque de clave: %s\n" #: g10/trustdb.c:1418 -#, fuzzy, c-format +#, c-format msgid "%s: update failed: %s\n" -msgstr "actualización fallida: %s\n" +msgstr "%s: actualización fallida: %s\n" #: g10/trustdb.c:1421 #, c-format msgid "%s: updated\n" -msgstr "" +msgstr "%s: actualizada\n" #: g10/trustdb.c:1423 #, c-format msgid "%s: okay\n" -msgstr "" +msgstr "%s: bien\n" #: g10/trustdb.c:1438 #, c-format msgid "lid %lu: dir record w/o key - skipped\n" -msgstr "" +msgstr "lid %lu: registro de directiorio sin clave - ignorado\n" #: g10/trustdb.c:1451 -#, fuzzy, c-format +#, c-format msgid "lid %lu: keyblock not found: %s\n" -msgstr "clave %08lX: clave pública no encontrada: %s\n" +msgstr "lid %lu: bloque de clave no encontrado: %s\n" #: g10/trustdb.c:1460 g10/trustdb.c:1529 -#, fuzzy, c-format +#, c-format msgid "lid %lu: update failed: %s\n" -msgstr "actualización fallida: %s\n" +msgstr "lid %lu: actualización fallida: %s\n" #: g10/trustdb.c:1466 g10/trustdb.c:1535 #, c-format msgid "lid %lu: updated\n" -msgstr "" +msgstr "lid %lu: actualizado\n" #: g10/trustdb.c:1470 g10/trustdb.c:1539 #, c-format msgid "lid %lu: okay\n" -msgstr "" +msgstr "lid %lu: bien\n" #: g10/trustdb.c:1477 g10/trustdb.c:1545 #, c-format msgid "%lu keys processed\n" -msgstr "" +msgstr "se han procesado %lu claves\n" #: g10/trustdb.c:1479 -#, fuzzy, c-format +#, c-format msgid "\t%lu keys skipped\n" -msgstr "%s: ignorado: %s\n" +msgstr "\t%lu claves ignoradas\n" #: g10/trustdb.c:1481 g10/trustdb.c:1547 -#, fuzzy, c-format +#, c-format msgid "\t%lu keys with errors\n" -msgstr "Error de escritura" +msgstr "\t%lu claves con errores\n" #: g10/trustdb.c:1483 g10/trustdb.c:1549 #, c-format msgid "\t%lu keys updated\n" -msgstr "" +msgstr "\t%lu claves actualizadas\n" #: g10/trustdb.c:1513 -#, fuzzy, c-format +#, c-format msgid "lid ?: insert failed: %s\n" -msgstr "actualización de la clave secreta fallida: %s\n" +msgstr "lid ?: inserción fallida: %s\n" #: g10/trustdb.c:1518 -#, fuzzy, c-format +#, c-format msgid "lid %lu: insert failed: %s\n" -msgstr "actualización de la clave secreta fallida: %s\n" +msgstr "lid %lu: inserción fallida: %s\n" #: g10/trustdb.c:1524 #, c-format msgid "lid %lu: inserted\n" -msgstr "" +msgstr "lid %lu: insertada\n" #: g10/trustdb.c:1551 #, c-format msgid "\t%lu keys inserted\n" -msgstr "" +msgstr "\t%lu claves insertadas\n" #: g10/trustdb.c:1554 -#, fuzzy, c-format +#, c-format msgid "enumerate keyblocks failed: %s\n" -msgstr "enum_secret_keys fallido: %s\n" +msgstr "enumeración bloques de clave fallido: %s\n" #: g10/trustdb.c:1599 -#, fuzzy, c-format +#, c-format msgid "check_trust: search dir record failed: %s\n" -msgstr "clave %08lX: inserción del registro de confianza fallida: %s\n" +msgstr "check_trust: búsqueda registro directorio fallida: %s\n" #: g10/trustdb.c:1606 #, c-format @@ -2764,157 +2775,160 @@ msgstr "clave %08lX.%lu: comprobación de confianza fallida: %s\n" #: g10/trustdb.c:1842 g10/trustdb.c:1871 g10/trustdb.c:2610 msgid "WARNING: can't yet handle long pref records\n" -msgstr "" +msgstr "ATENCÍON: todavía no puedo tratar registros de preferencias largos\n" #: g10/trustdb.c:1893 -#, fuzzy, c-format +#, c-format msgid "get_dir_record: search_record failed: %s\n" -msgstr "actualización de la clave secreta fallida: %s\n" +msgstr "get_dir_record: search_record fallida: %s\n" #: g10/trustdb.c:1956 #, c-format msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but marked as checked\n" msgstr "" +"NOTA: el registro de firma %lu[%d] está en la lista\n" +"de búsqueda de %lu pero está marcado como comprobado\n" #: g10/trustdb.c:1960 #, c-format msgid "NOTE: sig rec %lu[%d] in hintlist of %lu but not marked\n" msgstr "" +"NOTA: el registro de firma %lu[%d] está en la lista\n" +"de búsqueda de %lu pero no está marcado\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 "" +"El registro de firma %lu[%d] en la lista de búsqueda de %lu\n" +"no apunta a un registro de directorio\n" #: g10/trustdb.c:1973 #, c-format msgid "lid %lu: no primary key\n" -msgstr "" +msgstr "lid %lu: ninguna clave primaria\n" #: g10/trustdb.c:2006 #, c-format msgid "lid %lu: user id not found in keyblock\n" msgstr "" +"lid %lu: no se ha encontrado identificativo de usuario\n" +"en el bloque de clave\n" #: g10/trustdb.c:2010 -#, fuzzy, c-format +#, c-format msgid "lid %lu: user id without signature\n" -msgstr "clave %08lX: no hay id de usuario para la firma\n" +msgstr "lid %lu: identificativo de usuario sin firma\n" #: g10/trustdb.c:2017 #, c-format msgid "lid %lu: self-signature in hintlist\n" -msgstr "" +msgstr "lid %lu: autofirma en lista de búsqueda\n" #: g10/trustdb.c:2028 g10/trustdb.c:2747 g10/trustdb.c:2831 -#, fuzzy msgid "Valid certificate revocation" -msgstr "Certificado incorrecto" +msgstr "Revocación de certificado válida" #: g10/trustdb.c:2029 g10/trustdb.c:2748 g10/trustdb.c:2832 -#, fuzzy msgid "Good certificate" -msgstr "Certificado incorrecto" +msgstr "Certificado bueno" #: g10/trustdb.c:2038 msgid "very strange: no public key\n" -msgstr "" +msgstr "muy raro: no hay clave pública\n" #: g10/trustdb.c:2086 #, c-format msgid "hintlist %lu[%d] of %lu does not point to a dir record\n" msgstr "" +"la lista de búsqueda %lu[%d] de %lu no apunta a\n" +"un registro de directorio\n" #: g10/trustdb.c:2092 #, c-format msgid "lid %lu does not have a key\n" -msgstr "" +msgstr "lid %lu no dispone de clave\n" #: g10/trustdb.c:2102 #, c-format msgid "lid %lu: can't get keyblock: %s\n" -msgstr "" +msgstr "lid %lu: no puedo obtener el bloque de clave: %s\n" #: g10/trustdb.c:2159 g10/trustdb.c:3082 -#, fuzzy, c-format +#, c-format msgid "tdbio_search_dir failed: %s\n" -msgstr "eliminación de armadura fallida: %s\n" +msgstr "tdbio_search_dir fallida: %s\n" #: g10/trustdb.c:2312 -#, fuzzy, c-format +#, c-format msgid "key %08lX.%lu: Good subkey binding\n" -msgstr "clave %08lX: no hay id de usuario\n" +msgstr "clave %08lX.%lu: buena unión de sub-clave\n" #: g10/trustdb.c:2318 g10/trustdb.c:2360 -#, fuzzy, c-format +#, c-format msgid "key %08lX.%lu: Invalid subkey binding: %s\n" -msgstr "clave %08lX: no hay ids de usuario válidos\n" +msgstr "clave %08lX.%lu: unión de sub-clave no válida\n" #: g10/trustdb.c:2333 -#, fuzzy, c-format +#, c-format msgid "key %08lX.%lu: Valid key revocation\n" -msgstr "clave %08lX.%lu: caducada el %s\n" +msgstr "clave %08lX.%lu: revocación de clave válida\n" #: g10/trustdb.c:2339 -#, fuzzy, c-format +#, c-format msgid "key %08lX.%lu: Invalid key revocation: %s\n" -msgstr "clave %08lX: clave pública no encontrada: %s\n" +msgstr "clave %08lX.%lu: revocación de clave no válida: %s\n" #: g10/trustdb.c:2354 -#, fuzzy, c-format +#, c-format msgid "key %08lX.%lu: Valid subkey revocation\n" -msgstr "clave %08lX: no hay ids de usuario válidos\n" +msgstr "clave %08lX.%lu: revocación de sub-clave válida\n" #: g10/trustdb.c:2454 -#, fuzzy msgid "Good self-signature" -msgstr "[autofirma]" +msgstr "autofirma buena" #: g10/trustdb.c:2465 -#, fuzzy msgid "Invalid self-signature" -msgstr "clave %08lX: autofirma no válida\n" +msgstr "autofirma no válida" #: g10/trustdb.c:2475 msgid "Valid user ID revocation skipped due to a newer self signature\n" msgstr "" +"Revocación válida de identificativo de usuario ignorada debido auna " +"autofirma más reciente\n" #: g10/trustdb.c:2482 -#, fuzzy msgid "Valid user ID revocation\n" -msgstr "Elección no válida.\n" +msgstr "Revocación identificativo de usuario válida.\n" #: g10/trustdb.c:2489 #, fuzzy msgid "Invalid user ID revocation" -msgstr "Elección no válida.\n" +msgstr "Revocación identificativo de usuario no válida.\n" #: g10/trustdb.c:2573 -#, fuzzy msgid "Too many preferences" -msgstr "muestra preferencias" +msgstr "demasiadas preferencias" #: g10/trustdb.c:2587 msgid "Too many preference items" -msgstr "" +msgstr "demasiados items de preferencias" #: g10/trustdb.c:2726 msgid "Duplicated certificate - deleted" -msgstr "" +msgstr "Certificado duplicado - eliminado" #: g10/trustdb.c:2759 -#, fuzzy msgid "Hmmm, public key lost?" -msgstr "Clave pública incorrecta" +msgstr "Oh oh, ¿se ha perdido la clave pública?" #: g10/trustdb.c:2769 g10/trustdb.c:2852 -#, fuzzy msgid "Invalid certificate revocation" -msgstr "Certificado incorrecto" +msgstr "Certificado de revocación incorrecto" #: g10/trustdb.c:2770 g10/trustdb.c:2853 -#, fuzzy msgid "Invalid certificate" msgstr "Certificado incorrecto" @@ -2926,59 +2940,63 @@ msgstr "" #: g10/trustdb.c:2799 #, c-format msgid "sig record %lu[%d] points to wrong record.\n" -msgstr "" +msgstr "registro de firma %lu[%d] apunta al registro equivocado.\n" #. that should never happen #: g10/trustdb.c:3052 -#, fuzzy, c-format +#, c-format msgid "insert_trust_record: keyblock not found: %s\n" -msgstr "clave %08lX: clave secreta no encontrada: %s\n" +msgstr "insert_trust_record: bloque de clave no encontrado: %s\n" #: g10/trustdb.c:3070 msgid "did not use primary key for insert_trust_record()\n" -msgstr "" +msgstr "no se usó clave primaria para insert_trust_record()\n" #: g10/ringedit.c:293 -#, fuzzy, c-format +#, c-format msgid "%s: can't create keyring: %s\n" -msgstr "no puede escribirse el anillo: %s\n" +msgstr "%s: no se puede crear el anillo: %s\n" -#: g10/ringedit.c:299 g10/ringedit.c:1283 +#: g10/ringedit.c:299 g10/ringedit.c:1300 #, c-format msgid "%s: keyring created\n" -msgstr "" +msgstr "%s: anillo creado\n" -#: g10/ringedit.c:1469 +#: g10/ringedit.c:1486 msgid "WARNING: 2 files with confidential information exists.\n" -msgstr "" +msgstr "ATENCIÓN: existen 2 ficheros con información confidencial.\n" -#: g10/ringedit.c:1470 +#: g10/ringedit.c:1487 #, c-format msgid "%s is the unchanged one\n" -msgstr "" +msgstr "%s es el que no se ha modificado\n" -#: g10/ringedit.c:1471 +#: g10/ringedit.c:1488 #, c-format msgid "%s is the new one\n" -msgstr "" +msgstr "%s es el nuevo\n" -#: g10/ringedit.c:1472 +#: g10/ringedit.c:1489 msgid "Please fix this possible security flaw\n" +msgstr "Por favor arregle este posible fallo de seguridad\n" + +#: g10/skclist.c:88 g10/skclist.c:125 +msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" msgstr "" -#: g10/skclist.c:94 -#, fuzzy, c-format +#: g10/skclist.c:113 +#, c-format msgid "skipped `%s': %s\n" -msgstr "%s: ignorado: %s\n" +msgstr "'%s' ignorado: %s\n" -#: g10/skclist.c:100 -#, fuzzy, c-format +#: g10/skclist.c:119 +#, c-format msgid "" "skipped `%s': this is a PGP generated ElGamal key which is not secure for " "signatures!\n" msgstr "" -"¡esto es una clave ElGamal generada por PGP que NO es segura para las " -"firmas!\n" +"'%s' ignorada: ¡esta es una clave ElGamal generada por PGP\n" +" que NO es segura para las firmas!\n" #. do not overwrite #: g10/openfile.c:58 @@ -2991,36 +3009,34 @@ msgid "Overwrite (y/N)? " msgstr "¿Sobreescribir (s/N)? " #: g10/openfile.c:85 -#, fuzzy msgid "writing to stdout\n" -msgstr "escribiendo en `%s'\n" +msgstr "escribiendo en stdout\n" #: g10/openfile.c:134 -#, fuzzy, c-format +#, c-format msgid "assuming signed data in `%s'\n" -msgstr "imposible abrir datos firmados `%s'\n" +msgstr "asumiendo que hay datos firmados en `%s'\n" #: g10/openfile.c:181 #, c-format msgid "%s: new options file created\n" -msgstr "" +msgstr "%s: se ha creado un nuevo fichero de opciones\n" #: g10/encr-data.c:59 -#, fuzzy, c-format +#, c-format msgid "%s encrypted data\n" -msgstr "cifra datos" +msgstr "datos cifrados %s\n" #: g10/encr-data.c:61 #, c-format msgid "encrypted with unknown algorithm %d\n" -msgstr "" +msgstr "cifrado con algoritmo desconocido %d\n" #: g10/encr-data.c:74 -#, fuzzy msgid "" "WARNING: message was encrypted with a weak key in the symmetric cipher.\n" msgstr "" -"Atención: mensaje cifrado con una clave débil en el cifrado simétrico.\n" +"ATENCIÓN: mensaje cifrado con una clave débil en el cifrado simétrico.\n" #: g10/seskey.c:52 msgid "weak key created - retrying\n" @@ -3155,40 +3171,8 @@ 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" - -#~ msgid "key %08lX.%lu, uid %02X%02X, sig %08lX: good signature (3)\n" -#~ msgstr "clave %08lX.%lu, uid %02X%02X, firma %08lX: firma correcta (3)\n" - -#~ msgid "" -#~ "key %08lX.%lu, uid %02X%02X, sig %08lX: very strange: no public key\n" -#~ msgstr "" -#~ "clave %08lX.%lu, uid %02X%02X, firma %08lX: extraño, no hay clave pública\n" - -#~ msgid "key %08lX.%lu, uid %02X%02X, sig %08lX: invalid signature: %s\n" -#~ msgstr "clave %08lX.%lu, uid %02X%02X, firma %08lX: firma incorrecta: %s\n" - -#~ msgid "key %08lX.%lu, uid %02X%02X: good self-signature\n" -#~ msgstr "clave %08lX.%lu, uid %02X%02X: autofirma correcta\n" - -#~ msgid "" -#~ "key %08lX.%lu, uid %02X%02X, sig %08lX: duplicated signature - deleted\n" -#~ msgstr "" -#~ "clave %08lX.%lu, uid %02X%02X, firma %08lX: firma duplicada - borrada\n" - -#~ msgid "key %08lX.%lu, uid %02X%02X, sig %08lX: good signature (1)\n" -#~ msgstr "clave %08lX.%lu, uid %02X%02X, firma %08lX: firma correcta (1)\n" - -#~ msgid "key %08lX.%lu, uid %02X%02X, sig %08lX: weird: no public key\n" -#~ msgstr "" -#~ "clave %08lX.%lu, uid %02X%02X, firma %08lX: raro, no hay clave pública\n" - -#~ msgid "key %08lX.%lu, uid %02X%02X, sig %08lX: good signature (2)\n" -#~ msgstr "clave %08lX.%lu, uid %02X%02X, firma %08lX: firma correcta (2)\n" +#~ msgid "second" +#~ msgstr "segundo" -#~ msgid "key %08lX.%lu, uid %02X%02X, sig %08lX: no public key\n" -#~ msgstr "clave %08lX.%lu, uid %02X%02X, firma %08lX: no hay clave pública\n" +#~ msgid "seconds" +#~ msgstr "segundos" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 0.9.0a\n" -"POT-Creation-Date: 1999-01-11 02:14+0100\n" +"POT-Creation-Date: 1999-01-20 22:45+0100\n" "PO-Revision-Date: 1999-01-09 00:25+01:00\n" "Last-Translator: Gaël Quéri <gqueri@mail.dotcom.fr>\n" "Language-Team: French <fr@li.org>\n" @@ -197,6 +197,26 @@ msgstr "le fichier existe" msgid "weak key" msgstr "mauvaise clé" +#: util/errors.c:97 +#, fuzzy +msgid "invalid argument" +msgstr "armure invalide" + +#: util/errors.c:98 +#, fuzzy +msgid "bad URI" +msgstr "mauvais entier en précision multiple (MPI)" + +#: util/errors.c:99 +#, fuzzy +msgid "unsupported URI" +msgstr "non supporté" + +#: util/errors.c:100 +#, fuzzy +msgid "network error" +msgstr "erreur générale" + #: util/logger.c:178 #, c-format msgid "... this is a bug (%s:%d:%s)\n" @@ -207,12 +227,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:405 +#: cipher/random.c:412 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:406 +#: cipher/random.c:413 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -237,7 +257,7 @@ msgstr "" "Il n'y a pas assez d'octets aléatoires disponibles. Faites autre chose\n" "pour que l'OS puisse amasser plus d'entropie ! (il faut %d octets de plus)\n" -#: g10/g10.c:160 +#: g10/g10.c:163 msgid "" "@Commands:\n" " " @@ -245,124 +265,128 @@ msgstr "" "@Commandes:\n" " " -#: g10/g10.c:163 +#: g10/g10.c:166 msgid "|[file]|make a signature" msgstr "|[fichier]|faire une signature" -#: g10/g10.c:164 +#: g10/g10.c:167 msgid "|[file]|make a clear text signature" msgstr "|[fichier]|faire une signature en texte clair" -#: g10/g10.c:165 +#: g10/g10.c:168 msgid "make a detached signature" msgstr "faire une signature détachée" -#: g10/g10.c:166 +#: g10/g10.c:169 msgid "encrypt data" msgstr "chiffrer les données" -#: g10/g10.c:167 +#: g10/g10.c:170 msgid "encryption only with symmetric cipher" msgstr "chiffrement symétrique seulement" -#: g10/g10.c:168 +#: g10/g10.c:171 msgid "store only" msgstr "pas d'action" -#: g10/g10.c:169 +#: g10/g10.c:172 msgid "decrypt data (default)" msgstr "déchiffrer les données (défaut)" -#: g10/g10.c:170 +#: g10/g10.c:173 msgid "verify a signature" msgstr "vérifier une signature" -#: g10/g10.c:172 +#: g10/g10.c:175 msgid "list keys" msgstr "lister les clés" -#: g10/g10.c:173 +#: g10/g10.c:176 msgid "list keys and signatures" msgstr "lister les clés et les signatures" -#: g10/g10.c:174 +#: g10/g10.c:177 msgid "check key signatures" msgstr "vérifier les signatures des clés" -#: g10/g10.c:175 +#: g10/g10.c:178 msgid "list keys and fingerprints" msgstr "lister les clés et les empreintes" -#: g10/g10.c:176 +#: g10/g10.c:179 msgid "list secret keys" msgstr "lister les clés secrètes" -#: g10/g10.c:178 +#: g10/g10.c:181 msgid "generate a new key pair" msgstr "générer une nouvelle paire de clés" -#: g10/g10.c:180 +#: g10/g10.c:183 msgid "remove key from the public keyring" msgstr "enlever la clé du porte-clés public" -#: g10/g10.c:182 +#: g10/g10.c:185 msgid "sign or edit a key" msgstr "signer ou éditer une clé" -#: g10/g10.c:183 +#: g10/g10.c:186 msgid "generate a revocation certificate" msgstr "générer un certificat de révocation" -#: g10/g10.c:185 +#: g10/g10.c:188 msgid "export keys" msgstr "exporter les clés" -#: g10/g10.c:188 +#: g10/g10.c:189 +msgid "export keys to a key server" +msgstr "" + +#: g10/g10.c:192 msgid "import/merge keys" msgstr "importer/fusionner les clés" -#: g10/g10.c:190 +#: g10/g10.c:194 msgid "list only the sequence of packets" msgstr "ne lister que les paquets" -#: g10/g10.c:193 +#: g10/g10.c:197 msgid "export the ownertrust values" msgstr "exporter les indices de confiance" -#: g10/g10.c:195 +#: g10/g10.c:199 msgid "import ownertrust values" msgstr "importer les indices de confiance" # -#: g10/g10.c:197 +#: g10/g10.c:201 msgid "|[NAMES]|update the trust database" msgstr "|[NOMS]|mettre la base de confiance à jour" -#: g10/g10.c:199 +#: g10/g10.c:203 msgid "|[NAMES]|check the trust database" msgstr "|[NOMS]|vérifier la base de confiance" -#: g10/g10.c:200 +#: g10/g10.c:204 msgid "fix a corrupted trust database" msgstr "réparer une base de confiance corrompue" -#: g10/g10.c:201 +#: g10/g10.c:205 msgid "De-Armor a file or stdin" msgstr "Enlever l'armure d'un fichier ou de stdin" -#: g10/g10.c:202 +#: g10/g10.c:206 msgid "En-Armor a file or stdin" msgstr "Mettre une armure à un fichier ou à stdin" -#: g10/g10.c:203 +#: g10/g10.c:207 msgid "|algo [files]|print message digests" msgstr "|alg. [fich.]|indiquer les fonctions de hachage" -#: g10/g10.c:204 +#: g10/g10.c:208 msgid "print all message digests" msgstr "écrire toutes les fonctions de hachage" -#: g10/g10.c:211 +#: g10/g10.c:215 msgid "" "@\n" "Options:\n" @@ -372,142 +396,146 @@ msgstr "" "Options:\n" " " -#: g10/g10.c:213 +#: g10/g10.c:217 msgid "create ascii armored output" msgstr "créer une sortie ascii armurée" -#: g10/g10.c:215 +#: g10/g10.c:219 msgid "use this user-id to sign or decrypt" msgstr "utiliser ce nom pour signer ou déchiffrer" -#: g10/g10.c:216 +#: g10/g10.c:220 msgid "use this user-id for encryption" msgstr "utiliser ce nom d'utilisateur pour chiffrer" -#: g10/g10.c:217 +#: g10/g10.c:221 msgid "|N|set compress level N (0 disables)" msgstr "|N|niveau de compression N (0 désactive)" -#: g10/g10.c:219 +#: g10/g10.c:223 msgid "use canonical text mode" msgstr "utiliser le mode de texte canonique" -#: g10/g10.c:221 +#: g10/g10.c:225 msgid "use as output file" msgstr "utiliser comme fichier de sortie" -#: g10/g10.c:222 +#: g10/g10.c:226 msgid "verbose" msgstr "bavard" -#: g10/g10.c:223 +#: g10/g10.c:227 msgid "be somewhat more quiet" msgstr "devenir beaucoup plus silencieux" # -#: g10/g10.c:224 +#: g10/g10.c:228 msgid "force v3 signatures" msgstr "forcer les signatures en v3" #. { oDryRun, "dry-run", 0, N_("do not make any changes") }, -#: g10/g10.c:226 +#: g10/g10.c:230 msgid "batch mode: never ask" msgstr "mode automatique : ne jamais rien demander" -#: g10/g10.c:227 +#: g10/g10.c:231 msgid "assume yes on most questions" msgstr "répondre oui à la plupart des questions" -#: g10/g10.c:228 +#: g10/g10.c:232 msgid "assume no on most questions" msgstr "répondre non à la plupart des questions" -#: g10/g10.c:229 +#: g10/g10.c:233 msgid "add this keyring to the list of keyrings" msgstr "ajouter ce porte-clés à la liste des porte-clés" -#: g10/g10.c:230 +#: g10/g10.c:234 msgid "add this secret keyring to the list" msgstr "ajouter ce porte-clés secret à la liste" -#: g10/g10.c:231 +#: g10/g10.c:235 msgid "|NAME|use NAME as default secret key" msgstr "|NOM|utiliser NOM comme clé secrète par défaut" -#: g10/g10.c:232 +#: g10/g10.c:236 +msgid "|HOST|use this keyserver to lookup keys" +msgstr "" + +#: g10/g10.c:237 msgid "|NAME|set terminal charset to NAME" msgstr "|NOM|le terminal utilise la table de caractères NOM" -#: g10/g10.c:233 +#: g10/g10.c:238 msgid "read options from file" msgstr "lire les options du fichier" -#: g10/g10.c:235 +#: g10/g10.c:240 msgid "set debugging flags" msgstr "choisir les attributs de déboguage" -#: g10/g10.c:236 +#: g10/g10.c:241 msgid "enable full debugging" msgstr "permettre un déboguage complet" -#: g10/g10.c:237 +#: g10/g10.c:242 msgid "|FD|write status info to this FD" msgstr "|FD|écrire l'état sur ce descripteur" -#: g10/g10.c:238 +#: g10/g10.c:243 msgid "do not write comment packets" msgstr "ne pas écrire de paquets de commentaire" -#: g10/g10.c:239 +#: g10/g10.c:244 msgid "(default is 1)" msgstr "(1 par défaut)" -#: g10/g10.c:240 +#: g10/g10.c:245 msgid "(default is 3)" msgstr "(3 par défaut)" -#: g10/g10.c:242 +#: g10/g10.c:247 msgid "|KEYID|ulimately trust this key" msgstr "|ID CLE|donner une confiance totale à cette clé" -#: g10/g10.c:243 +#: g10/g10.c:248 msgid "|FILE|load extension module FILE" msgstr "|FICH|charger le module d'extension FICH" -#: g10/g10.c:244 +#: g10/g10.c:249 msgid "emulate the mode described in RFC1991" msgstr "imiter le mode décrit dans la RFC1991" # FIXMOI : faudra trouver mieux ... -#: g10/g10.c:245 +#: g10/g10.c:250 msgid "|N|use passphrase mode N" msgstr "|N|utiliser le mode de codage des mots de passe N" -#: g10/g10.c:247 +#: g10/g10.c:252 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|NOM|utiliser le hachage NOM pour les mots de passe" -#: g10/g10.c:249 +#: g10/g10.c:254 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe" -#: g10/g10.c:251 +#: g10/g10.c:256 msgid "|NAME|use cipher algorithm NAME" msgstr "|NOM|utiliser l'algorithme de chiffrement NOM" -#: g10/g10.c:252 +#: g10/g10.c:257 msgid "|NAME|use message digest algorithm NAME" msgstr "|NOM|utiliser la fonction de hachage NOM" -#: g10/g10.c:253 +#: g10/g10.c:258 msgid "|N|use compress algorithm N" msgstr "|N|utiliser l'algorithme de compression N" -#: g10/g10.c:254 +#: g10/g10.c:259 msgid "throw keyid field of encrypted packets" msgstr "supprimer l'identification des paquets chiffrés" -#: g10/g10.c:262 +#: g10/g10.c:267 msgid "" "@\n" "Examples:\n" @@ -527,20 +555,20 @@ msgstr "" " --list-keys [utilisateur] montrer les clés\n" " --fingerprint [utilisateur] montrer les empreintes\n" -#: g10/g10.c:341 +#: g10/g10.c:346 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n" msgstr "Rapporter toutes anomalies à <gnupg-bugs@gnu.org>.\n" -#: g10/g10.c:346 +#: g10/g10.c:351 msgid "Usage: gpgm [options] [files] (-h for help)" msgstr "Utilisation: gpgm [options] [fichiers] (-h pour l'aide)" -#: g10/g10.c:348 +#: g10/g10.c:353 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)" # -#: g10/g10.c:353 +#: g10/g10.c:358 msgid "" "Syntax: gpgm [options] [files]\n" "GnuPG maintenance utility\n" @@ -548,7 +576,7 @@ msgstr "" "Syntaxe: gpgm [options] [fichiers]\n" "utilitaire de maitenance de GnuPG\n" -#: g10/g10.c:356 +#: g10/g10.c:361 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -558,7 +586,7 @@ msgstr "" "signer, vérifier, crypter ou décrypter\n" "l'opération par défaut dépend des données entrées\n" -#: g10/g10.c:362 +#: g10/g10.c:367 msgid "" "\n" "Supported algorithms:\n" @@ -566,221 +594,226 @@ msgstr "" "\n" "Algorithmes supportés:\n" -#: g10/g10.c:437 +#: g10/g10.c:442 msgid "usage: gpgm [options] " msgstr "utilisation: gpgm [options] " -#: g10/g10.c:439 +#: g10/g10.c:444 msgid "usage: gpg [options] " msgstr "utilisation: gpg [options] " -#: g10/g10.c:480 +#: g10/g10.c:485 msgid "conflicting commands\n" msgstr "commandes en conflit\n" -#: g10/g10.c:618 +#: g10/g10.c:623 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTE : pas de fichier d'options par défaut `%s'\n" -#: g10/g10.c:622 +#: g10/g10.c:627 #, c-format msgid "option file `%s': %s\n" msgstr "fichier d'options `%s' : %s\n" -#: g10/g10.c:629 +#: g10/g10.c:634 #, c-format msgid "reading options from `%s'\n" msgstr "lire les options de `%s'\n" -#: g10/g10.c:782 +#: g10/g10.c:788 #, c-format msgid "%s is not a valid character set\n" msgstr "%s n'est pas une table de caractères valide\n" -#: g10/g10.c:817 g10/g10.c:829 +#: g10/g10.c:824 g10/g10.c:836 msgid "selected cipher algorithm is invalid\n" msgstr "l'algorithme de chiffrement sélectionné est invalide\n" -#: g10/g10.c:823 g10/g10.c:835 +#: g10/g10.c:830 g10/g10.c:842 msgid "selected digest algorithm is invalid\n" msgstr "la fonction de hachage sélectionnée est invalide\n" -#: g10/g10.c:838 +#: g10/g10.c:845 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "l'algorithme de compression doit faire partie de l'échelle %d..%d\n" -#: g10/g10.c:840 +#: g10/g10.c:847 msgid "completes-needed must be greater than 0\n" msgstr "« completes-needed » doit être supérieur à 0\n" -#: g10/g10.c:842 +#: g10/g10.c:849 msgid "marginals-needed must be greater than 1\n" msgstr "« marginals-needed » doit être supérieur à 1\n" -#: g10/g10.c:844 +#: g10/g10.c:851 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "« max-cert-depth » doit être compris entre 1 et 255\n" -#: g10/g10.c:847 +#: g10/g10.c:854 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTE : le mode S2K simple (0) est fortement déconseillé\n" -#: g10/g10.c:851 +#: g10/g10.c:858 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "mode S2K invalide ; doit être 0, 1 ou 3\n" -#: g10/g10.c:934 +#: g10/g10.c:941 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "n'a pas pu initialiser la base de confiance : %s\n" -#: g10/g10.c:940 +#: g10/g10.c:947 msgid "--store [filename]" msgstr "--store [nom du fichier]" -#: g10/g10.c:948 +#: g10/g10.c:955 msgid "--symmetric [filename]" msgstr "--symmetric [nom du fichier]" -#: g10/g10.c:956 +#: g10/g10.c:963 msgid "--encrypt [filename]" msgstr "--encrypt [nom du fichier]" -#: g10/g10.c:969 +#: g10/g10.c:976 msgid "--sign [filename]" msgstr "--sign [nom du fichier]" -#: g10/g10.c:982 +#: g10/g10.c:989 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nom du fichier]" -#: g10/g10.c:996 +#: g10/g10.c:1003 msgid "--clearsign [filename]" msgstr "--clearsign [nom du fichier]" -#: g10/g10.c:1008 +#: g10/g10.c:1015 msgid "--decrypt [filename]" msgstr "--decrypt [nom du fichier]" -#: g10/g10.c:1017 +#: g10/g10.c:1024 msgid "--edit-key username [commands]" msgstr "--edit-key utilisateur [commandes]" -#: g10/g10.c:1033 +#: g10/g10.c:1040 msgid "--delete-secret-key username" msgstr "--delete-secret-key utilisateur" -#: g10/g10.c:1036 +#: g10/g10.c:1043 msgid "--delete-key username" msgstr "--delete-key utilisateur" -#: g10/encode.c:216 g10/g10.c:1059 g10/sign.c:301 +#: g10/encode.c:216 g10/g10.c:1066 g10/sign.c:311 #, c-format msgid "can't open %s: %s\n" msgstr "ne peut ouvrir %s: %s\n" -#: g10/g10.c:1070 +#: g10/g10.c:1077 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [utilisateur] [porte-clés]" -#: g10/g10.c:1127 +#: g10/g10.c:1138 #, c-format msgid "dearmoring failed: %s\n" msgstr "suppression d'armure non réussie : %s\n" -#: g10/g10.c:1135 +#: g10/g10.c:1146 #, c-format msgid "enarmoring failed: %s\n" msgstr "construction d'armure non réussie : %s \n" -#: g10/g10.c:1201 +#: g10/g10.c:1212 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algorithme de hachage `%s' invalide\n" -#: g10/g10.c:1280 +#: g10/g10.c:1291 msgid "[filename]" msgstr "[nom du fichier]" -#: g10/g10.c:1284 +#: g10/g10.c:1295 msgid "Go ahead and type your message ...\n" msgstr "Continuez et tapez votre message...\n" -#: g10/decrypt.c:59 g10/g10.c:1287 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1298 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "ne peut ouvrir `%s'\n" -#: g10/armor.c:321 +#: g10/armor.c:297 #, c-format msgid "armor: %s\n" msgstr "armure : %s\n" -#: g10/armor.c:344 +#: g10/armor.c:320 msgid "invalid armor header: " msgstr "en-tête d'armure invalide : " -#: g10/armor.c:351 +#: g10/armor.c:327 msgid "armor header: " msgstr "en-tête d'armure : " -#: g10/armor.c:362 +#: g10/armor.c:338 msgid "invalid clearsig header\n" msgstr "en-tête de signature claire invalide\n" -#: g10/armor.c:414 +#: g10/armor.c:390 msgid "nested clear text signatures\n" msgstr "signatures en texte clair imbriquées\n" -#: g10/armor.c:533 +#: g10/armor.c:508 msgid "invalid dash escaped line: " msgstr "ligne de traits d'échappement invalide : " -#: g10/armor.c:541 +#: g10/armor.c:516 msgid "unexpected armor:" msgstr "armure inattendue :" -#: g10/armor.c:627 +#: g10/armor.c:632 #, c-format msgid "invalid radix64 character %02x skipped\n" msgstr "caractère %02x invalide en base 64 ignoré\n" -#: g10/armor.c:657 +#: g10/armor.c:675 msgid "premature eof (no CRC)\n" msgstr "fin de fichier prématurée (pas de CRC)\n" -#: g10/armor.c:674 +#: g10/armor.c:709 msgid "premature eof (in CRC)\n" msgstr "fin de fichier prématurée (dans le CRC)\n" -#: g10/armor.c:678 +#: g10/armor.c:713 msgid "malformed CRC\n" msgstr "CRC malformé\n" -#: g10/armor.c:682 +#: g10/armor.c:717 #, c-format msgid "CRC error; %06lx - %06lx\n" msgstr "Erreur de CRC ; %06lx - %06lx\n" -#: g10/armor.c:699 +#: g10/armor.c:734 msgid "premature eof (in Trailer)\n" msgstr "fin de fichier prématurée (dans la remorque)\n" -#: g10/armor.c:703 +#: g10/armor.c:738 msgid "error in trailer line\n" msgstr "erreur dans la ligne de remorque\n" -#: g10/armor.c:964 +#: g10/armor.c:999 msgid "no valid OpenPGP data found.\n" msgstr "aucune de donnée OpenPGP valide n'a été trouvée.\n" -#: g10/armor.c:966 +#: g10/armor.c:1001 #, c-format msgid "invalid armor: line longer than %d characters\n" msgstr "armure invalide : ligne plus longue que %d caractères\n" +#: g10/armor.c:1005 +msgid "" +"quoted printable character in armor - probably a buggy MTA has been used\n" +msgstr "" + #: g10/pkclist.c:138 #, c-format msgid "" @@ -1277,20 +1310,33 @@ msgid "public and secret key created and signed.\n" msgstr "les clés publique et secrète ont été créées et signées.\n" #: g10/keygen.c:931 +#, fuzzy 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" +"the command \"--edit-key\" to generate a secondary key for this purpose.\n" msgstr "" "Notez que cette clé ne peut être utilisée pour chiffrer. Vous pouvez\n" "utiliser la commande « --add-key » pour générer une clé secondaire à\n" "cette fin.\n" -#: g10/keygen.c:945 g10/keygen.c:1030 +#: g10/keygen.c:945 g10/keygen.c:1044 #, c-format msgid "Key generation failed: %s\n" msgstr "La génération de clé a échoué : %s\n" -#: g10/keygen.c:1008 +#: g10/keygen.c:989 g10/sig-check.c:172 g10/sign.c:52 +#, fuzzy, c-format +msgid "" +"key has been created %lu second in future (time warp or clock problem)\n" +msgstr "clé publique créée %lu %s dans le futur\n" + +#: g10/keygen.c:991 g10/sig-check.c:174 g10/sign.c:54 +#, fuzzy, c-format +msgid "" +"key has been created %lu seconds in future (time warp or clock problem)\n" +msgstr "clé publique créée %lu %s dans le futur\n" + +#: g10/keygen.c:1022 msgid "Really create? " msgstr "Créer vraiment ? " @@ -1320,22 +1366,22 @@ msgstr "lecture de `%s'\n" msgid "%s/%s encrypted for: %s\n" msgstr "%s/%s chiffré pour : %s\n" -#: g10/export.c:114 +#: g10/export.c:147 #, c-format msgid "%s: user not found: %s\n" msgstr "%s : utilisateur non trouvé : %s\n" -#: g10/export.c:123 +#: g10/export.c:156 #, c-format msgid "certificate read problem: %s\n" msgstr "problème lors de lecture du certificat : %s\n" -#: g10/export.c:132 +#: g10/export.c:165 #, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" msgstr "clé %08lX : ce n'est pas une clé rfc2440 - ignorée\n" -#: g10/export.c:174 +#: g10/export.c:203 msgid "WARNING: nothing exported\n" msgstr "ATTENTION : rien n'a été exporté\n" @@ -1354,263 +1400,278 @@ msgstr "" "utilisation de la clé secondaire %08lX à la place de la clé\n" "principale %08lX\n" -#: g10/import.c:129 g10/trustdb.c:1180 +#: g10/import.c:117 g10/trustdb.c:1180 #, c-format msgid "can't open file: %s\n" msgstr "ne peut ouvrir le fichier : %s\n" -#: g10/import.c:148 +#: g10/import.c:165 #, c-format msgid "skipping block of type %d\n" msgstr "ne prend pas en compte le bloc de type %d\n" -#: g10/import.c:155 g10/trustdb.c:1474 g10/trustdb.c:1543 +#: g10/import.c:172 g10/trustdb.c:1474 g10/trustdb.c:1543 #, c-format msgid "%lu keys so far processed\n" msgstr "%lu clés traitées jusqu'ici\n" -#: g10/import.c:160 g10/trustdb.c:1256 +#: g10/import.c:177 g10/trustdb.c:1256 #, c-format msgid "read error: %s\n" msgstr "erreur de lecture : %s\n" -#: g10/import.c:162 +#: g10/import.c:179 #, c-format msgid "Total number processed: %lu\n" msgstr " Quantité totale traitée : %lu\n" -#: g10/import.c:164 +#: g10/import.c:181 #, c-format msgid " w/o user IDs: %lu\n" msgstr " sans nom d'utilisateur : %lu\n" -#: g10/import.c:166 +#: g10/import.c:183 #, c-format msgid " imported: %lu" msgstr " importée : %lu" -#: g10/import.c:172 +#: g10/import.c:189 #, c-format msgid " unchanged: %lu\n" msgstr " inchangée : %lu\n" -#: g10/import.c:174 +#: g10/import.c:191 #, c-format msgid " new user IDs: %lu\n" msgstr " nouveaux noms d'utilisateurs : %lu\n" -#: g10/import.c:176 +#: g10/import.c:193 #, c-format msgid " new subkeys: %lu\n" msgstr " nouvelles sous-clés : %lu\n" -#: g10/import.c:178 +#: g10/import.c:195 #, c-format msgid " new signatures: %lu\n" msgstr " nouvelles signatures : %lu\n" -#: g10/import.c:180 +#: g10/import.c:197 #, c-format msgid " new key revocations: %lu\n" msgstr " nouvelles révocations de clés : %lu\n" -#: g10/import.c:182 +#: g10/import.c:199 #, c-format msgid " secret keys read: %lu\n" msgstr " clés secrètes lues : %lu\n" -#: g10/import.c:184 +#: g10/import.c:201 #, c-format msgid " secret keys imported: %lu\n" msgstr " clés secrètes importées : %lu\n" -#: g10/import.c:186 +#: g10/import.c:203 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " clés secrètes inchangées : %lu\n" -#: g10/import.c:328 g10/import.c:520 +#: g10/import.c:343 g10/import.c:535 #, c-format msgid "key %08lX: no user id\n" msgstr "clé %08lX : pas de nom d'utilisateur\n" -#: g10/import.c:339 +#: g10/import.c:354 #, c-format msgid "key %08lX: no valid user ids\n" msgstr "clé %08lX : pas de nom d'utilisateur valide\n" -#: g10/import.c:341 +#: g10/import.c:356 msgid "this may be caused by a missing self-signature\n" msgstr "cela peut provenir d'une auto-signature manquante\n" -#: g10/import.c:352 g10/import.c:588 +#: g10/import.c:367 g10/import.c:603 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "clé %08lX : clé publique pas trouvée: %s\n" -#: g10/import.c:358 +#: g10/import.c:373 msgid "no default public keyring\n" msgstr "pas de porte-clés public par défaut\n" -#: g10/import.c:362 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:592 +#: g10/import.c:377 g10/openfile.c:105 g10/sign.c:215 g10/sign.c:601 #, c-format msgid "writing to `%s'\n" msgstr "écriture de `%s'\n" -#: g10/import.c:366 g10/import.c:426 g10/import.c:642 +#: g10/import.c:381 g10/import.c:441 g10/import.c:657 #, c-format msgid "can't lock public keyring: %s\n" msgstr "ne peut verrouiller le porte-clés public : %s\n" -#: g10/import.c:369 +#: g10/import.c:384 #, c-format msgid "can't write to keyring: %s\n" msgstr "ne peut écrire le porte-clés : %s\n" -#: g10/import.c:373 +#: g10/import.c:388 #, c-format msgid "key %08lX: public key imported\n" msgstr "clé %08lX : clé publique importée\n" -#: g10/import.c:386 +#: g10/import.c:401 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "clé %08lX : ne ressemble pas à notre copie\n" -#: g10/import.c:399 g10/import.c:597 +#: g10/import.c:414 g10/import.c:612 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "clé %08lX : ne peut trouver le bloc de clés original : %s\n" -#: g10/import.c:406 g10/import.c:604 +#: g10/import.c:421 g10/import.c:619 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "clé %08lX : ne peut lire le bloc de clés original : %s\n" -#: g10/import.c:423 g10/import.c:535 g10/import.c:639 +#: g10/import.c:438 g10/import.c:550 g10/import.c:654 msgid "writing keyblock\n" msgstr "écriture du bloc de clés\n" -#: g10/import.c:429 g10/import.c:645 +#: g10/import.c:444 g10/import.c:660 #, c-format msgid "can't write keyblock: %s\n" msgstr "ne peut écrire le bloc de clés : %s\n" -#: g10/import.c:434 +#: g10/import.c:449 #, c-format msgid "key %08lX: 1 new user-id\n" msgstr "clé %08lX : un nouvel utilisateur\n" -#: g10/import.c:437 +#: g10/import.c:452 #, c-format msgid "key %08lX: %d new user-ids\n" msgstr "clé %08lX : %d nouveaux utilisateurs\n" -#: g10/import.c:440 +#: g10/import.c:455 #, c-format msgid "key %08lX: 1 new signature\n" msgstr "clé %08lX : une nouvelle signature\n" -#: g10/import.c:443 +#: g10/import.c:458 #, c-format msgid "key %08lX: %d new signatures\n" msgstr "clé %08lX : %d nouvelles signatures\n" -#: g10/import.c:446 +#: g10/import.c:461 #, c-format msgid "key %08lX: 1 new subkey\n" msgstr "clé %08lX : une nouvelle sous-clé\n" -#: g10/import.c:449 +#: g10/import.c:464 #, c-format msgid "key %08lX: %d new subkeys\n" msgstr "clé %08lX : %d nouvelles sous-clés\n" -#: g10/import.c:459 +#: g10/import.c:474 #, c-format msgid "key %08lX: not changed\n" msgstr "clé %08lX : n'a pas changé\n" -#: g10/import.c:538 +#: g10/import.c:553 #, c-format msgid "can't lock secret keyring: %s\n" msgstr "ne peut verrouiller le porte-clés secret : %s\n" -#: g10/import.c:541 +#: g10/import.c:556 #, c-format msgid "can't write keyring: %s\n" msgstr "ne peut écrire le porte-clés : %s\n" #. we are ready -#: g10/import.c:544 +#: g10/import.c:559 #, c-format msgid "key %08lX: secret key imported\n" msgstr "clé %08lX : clé secrète importée\n" #. we can't merge secret keys -#: g10/import.c:548 +#: g10/import.c:563 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "clé %08lX : déjà dans le porte-clés secret\n" -#: g10/import.c:553 +#: g10/import.c:568 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "clé %08lX : clé secrète pas trouvée: %s\n" -#: g10/import.c:582 +#: g10/import.c:597 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "clé %08lX : pas de clé publique - ne peut appliquer le certificat de\n" "révocation\n" -#: g10/import.c:615 +#: g10/import.c:630 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "clé %08lX : certificat de révocation invalide : %s - rejeté\n" -#: g10/import.c:649 +#: g10/import.c:664 #, c-format msgid "key %08lX: revocation certificate imported\n" msgstr "clé %08lX : certificat de révocation importé\n" -#: g10/import.c:680 +#: g10/import.c:698 #, c-format msgid "key %08lX: no user-id for signature\n" msgstr "clé %08lX : pas d'utilisateur pour la signature\n" -#: g10/import.c:687 +#: g10/import.c:705 g10/import.c:729 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "clé %08lX : algorithme de clé publique non supporté\n" -#: g10/import.c:688 +#: g10/import.c:706 #, c-format msgid "key %08lX: invalid self-signature\n" msgstr "clé %08lX : auto-signature invalide\n" -#: g10/import.c:717 +#: g10/import.c:722 +#, fuzzy, c-format +msgid "key %08lX: no subkey for key binding\n" +msgstr "clé %08lX.%lu : bonne liaison avec la sous-clé\n" + +#: g10/import.c:730 +#, fuzzy, c-format +msgid "key %08lX: invalid subkey binding\n" +msgstr "clé %08lX.%lu : liaison avec la sous-clé invalide : %s\n" + +#: g10/import.c:761 #, c-format msgid "key %08lX: skipped userid '" msgstr "clé %08lX : utilisateur non pris en compte '" -#: g10/import.c:740 +#: g10/import.c:781 +#, fuzzy, c-format +msgid "key %08lX: skipped subkey\n" +msgstr "clé %08lX : une nouvelle sous-clé\n" + +#: g10/import.c:800 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "clé %08lX : certificat de révocation au mauvais endroit - ignorée\n" -#: g10/import.c:748 +#: g10/import.c:808 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "clé %08lX : certificat de révocation invalide : %s - ignorée\n" -#: g10/import.c:807 +#: g10/import.c:867 #, c-format msgid "key %08lX: revocation certificate added\n" msgstr "clé %08lX : certificat de révocation ajouté\n" -#: g10/import.c:921 g10/import.c:976 +#: g10/import.c:981 g10/import.c:1036 #, c-format msgid "key %08lX: our copy has no self-signature\n" msgstr "clé %08lX : notre copie n'a pas d'auto-signature\n" @@ -1682,7 +1743,7 @@ msgstr "" msgid "Really sign? " msgstr "Signer réellement ? " -#: g10/keyedit.c:303 g10/sign.c:65 +#: g10/keyedit.c:303 g10/sign.c:75 #, c-format msgid "signing failed: %s\n" msgstr "la signature a échoué : %s\n" @@ -2012,60 +2073,60 @@ msgstr "Pas d'utilisateur avec l'index %d\n" msgid "No secondary key with index %d\n" msgstr "Pas de clé secondaire avec l'index %d\n" -#: g10/mainproc.c:198 +#: g10/mainproc.c:199 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 +#: g10/mainproc.c:202 #, c-format msgid "public key decryption failed: %s\n" msgstr "le déchiffrement de la clé publique a échoué : %s\n" -#: g10/mainproc.c:228 +#: g10/mainproc.c:229 msgid "decryption okay\n" msgstr "le déchiffrement a réussi\n" -#: g10/mainproc.c:231 +#: g10/mainproc.c:232 #, c-format msgid "decryption failed: %s\n" msgstr "le déchiffrement a échoué : %s\n" -#: g10/mainproc.c:248 +#: g10/mainproc.c:249 msgid "NOTE: sender requested \"for-your-eyes-only\"\n" msgstr "NOTE : l'expéditeur a demandé « pour vos yeux seulement »\n" -#: g10/mainproc.c:250 +#: g10/mainproc.c:251 #, c-format msgid "original file name='%.*s'\n" msgstr "nom de fichier original : '%.*s'\n" -#: g10/mainproc.c:833 +#: g10/mainproc.c:834 msgid "signature verification suppressed\n" msgstr "vérification de signature supprimée\n" -#: g10/mainproc.c:839 +#: g10/mainproc.c:840 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Signature faite %.*s avec une clé %s ID %08lX\n" -#: g10/mainproc.c:847 +#: g10/mainproc.c:852 msgid "BAD signature from \"" msgstr "MAUVAISE signature de \"" -#: g10/mainproc.c:848 +#: g10/mainproc.c:853 msgid "Good signature from \"" msgstr "Bonne signature de \"" -#: g10/mainproc.c:879 +#: g10/mainproc.c:884 #, c-format msgid "Can't check signature: %s\n" msgstr "Ne peut vérifier la signature : %s\n" -#: g10/mainproc.c:952 +#: g10/mainproc.c:957 msgid "old style (PGP 2.x) signature\n" msgstr "signature d'un ancien style (PGP 2.x)\n" -#: g10/mainproc.c:957 +#: g10/mainproc.c:962 msgid "invalid root packet detected in proc_tree()\n" msgstr "paquet racine invalide détecté dans proc_tree()\n" @@ -2140,15 +2201,15 @@ msgstr "" "données non enregistrées ; utilisez l'option \"--output\" pour\n" "les enregistrer\n" -#: g10/plaintext.c:166 +#: g10/plaintext.c:208 msgid "Please enter name of data file: " msgstr "Entrez le nom d'un fichier de données : " -#: g10/plaintext.c:187 +#: g10/plaintext.c:229 msgid "reading stdin ...\n" msgstr "lecture de l'entrée standard...\n" -#: g10/plaintext.c:250 +#: g10/plaintext.c:292 #, c-format msgid "can't open signed data `%s'\n" msgstr "ne peut ouvir les données signées `%s'\n" @@ -2193,50 +2254,51 @@ 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:166 -#, c-format -msgid "public key created %lu %s in future (time warp or clock problem)\n" -msgstr "" -"clé publique créée %lu %s dans le futur\n" - -#: g10/sig-check.c:168 -msgid "second" -msgstr "seconde" +#: g10/sig-check.c:163 +#, fuzzy, c-format +msgid "public key is %lu second newer than the signature\n" +msgstr "lid %lu : utilisateur sans signature\n" -#: g10/sig-check.c:168 -msgid "seconds" -msgstr "secondes" +#: g10/sig-check.c:164 +#, fuzzy, c-format +msgid "public key is %lu seconds newer than the signature\n" +msgstr "lid %lu : utilisateur sans signature\n" -#: g10/sig-check.c:173 +#: g10/sig-check.c:180 #, c-format msgid "NOTE: signature key expired %s\n" msgstr "NOTE : la clé de signature a expiré le %s\n" -#: g10/sig-check.c:230 +#: g10/sig-check.c:237 msgid "assuming bad signature due to an unknown critical bit\n" msgstr "" "la signature est supposée être fausse car un bit critique est\n" "inconnu\n" -#: g10/sign.c:69 +#: g10/sign.c:79 #, c-format msgid "%s signature from: %s\n" msgstr "Signature %s de : %s\n" -#: g10/sign.c:200 g10/sign.c:587 +#: g10/sign.c:210 g10/sign.c:596 #, c-format msgid "can't create %s: %s\n" msgstr "ne peut créer %s : %s\n" -#: g10/sign.c:296 +#: g10/sign.c:306 msgid "signing:" msgstr "signature :" -#: g10/sign.c:336 +#: g10/sign.c:346 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "ATTENTION : `%s' est un fichier vide\n" +#: g10/textfilter.c:199 +#, fuzzy, c-format +msgid "can't handle text lines longer than %d characters\n" +msgstr "armure invalide : ligne plus longue que %d caractères\n" + #: g10/tdbio.c:116 g10/tdbio.c:1418 #, c-format msgid "trustdb rec %lu: lseek failed: %s\n" @@ -2273,7 +2335,7 @@ msgstr "%s : répertoire créé\n" msgid "%s: directory does not exist!\n" msgstr "%s : le répertoire n'existe pas !\n" -#: g10/openfile.c:101 g10/openfile.c:165 g10/ringedit.c:1275 g10/tdbio.c:449 +#: g10/openfile.c:101 g10/openfile.c:165 g10/ringedit.c:1292 g10/tdbio.c:449 #, c-format msgid "%s: can't create: %s\n" msgstr "%s : ne peut créer : %s\n" @@ -2908,36 +2970,40 @@ msgstr "n'a pas utilisé la clé principale pour « insert_trust_record() »\n" msgid "%s: can't create keyring: %s\n" msgstr "%s : ne peut créer le porte-clés : %s\n" -#: g10/ringedit.c:299 g10/ringedit.c:1283 +#: g10/ringedit.c:299 g10/ringedit.c:1300 #, c-format msgid "%s: keyring created\n" msgstr "%s : porte-clés créé\n" -#: g10/ringedit.c:1469 +#: g10/ringedit.c:1486 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "" "ATTENTION : 2 fichiers avec des informations confidentielles existent.\n" -#: g10/ringedit.c:1470 +#: g10/ringedit.c:1487 #, c-format msgid "%s is the unchanged one\n" msgstr "%s est le fichier original\n" -#: g10/ringedit.c:1471 +#: g10/ringedit.c:1488 #, c-format msgid "%s is the new one\n" msgstr "%s est le nouveau\n" -#: g10/ringedit.c:1472 +#: g10/ringedit.c:1489 msgid "Please fix this possible security flaw\n" msgstr "Réparez ce problème de sécurité possible\n" -#: g10/skclist.c:94 +#: g10/skclist.c:88 g10/skclist.c:125 +msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" +msgstr "" + +#: g10/skclist.c:113 #, c-format msgid "skipped `%s': %s\n" msgstr "`%s' a été ignoré : %s\n" -#: g10/skclist.c:100 +#: g10/skclist.c:119 #, c-format msgid "" "skipped `%s': this is a PGP generated ElGamal key which is not secure for " @@ -3153,3 +3219,9 @@ msgstr "Pas d'aide disponible" #, c-format msgid "No help available for `%s'" msgstr "Pas d'aide disponible pour `%s'" + +#~ msgid "second" +#~ msgstr "seconde" + +#~ msgid "seconds" +#~ msgstr "secondes" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-0.4.3\n" -"POT-Creation-Date: 1999-01-09 18:31+0100\n" +"POT-Creation-Date: 1999-01-20 22:45+0100\n" "PO-Revision-Date: 1998-11-09 16:19+01:00\n" "Last-Translator: Marco d'Itri <md@linux.it>\n" "Language-Team: Italian <it@li.org>\n" @@ -240,6 +240,26 @@ msgstr "Il file esiste" msgid "weak key" msgstr "Chiave debole" +#: util/errors.c:97 +#, fuzzy +msgid "invalid argument" +msgstr "Armatura non valida" + +#: util/errors.c:98 +#, fuzzy +msgid "bad URI" +msgstr "MPI danneggiato" + +#: util/errors.c:99 +#, fuzzy +msgid "unsupported URI" +msgstr "Non gestito" + +#: util/errors.c:100 +#, fuzzy +msgid "network error" +msgstr "Errore generale" + #: util/logger.c:178 #, c-format msgid "... this is a bug (%s:%d:%s)\n" @@ -250,13 +270,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:405 +#: cipher/random.c:412 #, 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:406 +#: cipher/random.c:413 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -279,7 +299,7 @@ msgstr "" "altra cosa per dare all'OS la possibilità di raccogliere altra entropia!\n" "(Servono ancora %d altri byte)\n" -#: g10/g10.c:160 +#: g10/g10.c:163 msgid "" "@Commands:\n" " " @@ -287,123 +307,127 @@ msgstr "" "@Comandi:\n" " " -#: g10/g10.c:163 +#: g10/g10.c:166 msgid "|[file]|make a signature" msgstr "|[file]|fai una firma" -#: g10/g10.c:164 +#: g10/g10.c:167 msgid "|[file]|make a clear text signature" msgstr "|[file]|fai una firma mantenendo il testo in chiaro" -#: g10/g10.c:165 +#: g10/g10.c:168 msgid "make a detached signature" msgstr "fai una firma separata" -#: g10/g10.c:166 +#: g10/g10.c:169 msgid "encrypt data" msgstr "cifra dati" -#: g10/g10.c:167 +#: g10/g10.c:170 msgid "encryption only with symmetric cipher" msgstr "cifra solo con un cifrario simmetrico" -#: g10/g10.c:168 +#: g10/g10.c:171 msgid "store only" msgstr "immagazzina soltanto" -#: g10/g10.c:169 +#: g10/g10.c:172 msgid "decrypt data (default)" msgstr "decifra dati (predefinito)" -#: g10/g10.c:170 +#: g10/g10.c:173 msgid "verify a signature" msgstr "verifica una firma" -#: g10/g10.c:172 +#: g10/g10.c:175 msgid "list keys" msgstr "elenca le chiavi" -#: g10/g10.c:173 +#: g10/g10.c:176 msgid "list keys and signatures" msgstr "elenca le chiavi e le firme" -#: g10/g10.c:174 +#: g10/g10.c:177 msgid "check key signatures" msgstr "controlla le firme delle chiavi" -#: g10/g10.c:175 +#: g10/g10.c:178 msgid "list keys and fingerprints" msgstr "elenca le chiavi e le impronte digitali" -#: g10/g10.c:176 +#: g10/g10.c:179 msgid "list secret keys" msgstr "elenca le chiavi segrete" -#: g10/g10.c:178 +#: g10/g10.c:181 msgid "generate a new key pair" msgstr "genera una nuova coppia di chiavi" -#: g10/g10.c:180 +#: g10/g10.c:183 msgid "remove key from the public keyring" msgstr "rimuove una chiave dal portachiavi pubblico" -#: g10/g10.c:182 +#: g10/g10.c:185 msgid "sign or edit a key" msgstr "firma o modifica una chiave" -#: g10/g10.c:183 +#: g10/g10.c:186 msgid "generate a revocation certificate" msgstr "genera un certificato di revoca" -#: g10/g10.c:185 +#: g10/g10.c:188 msgid "export keys" msgstr "esporta delle chiavi" -#: g10/g10.c:188 +#: g10/g10.c:189 +msgid "export keys to a key server" +msgstr "" + +#: g10/g10.c:192 msgid "import/merge keys" msgstr "importa/aggiungi delle chiavi" -#: g10/g10.c:190 +#: g10/g10.c:194 msgid "list only the sequence of packets" msgstr "elenca solo la sequenza dei pacchetti" -#: g10/g10.c:193 +#: g10/g10.c:197 msgid "export the ownertrust values" msgstr "esporta i valori di fiducia" -#: g10/g10.c:195 +#: g10/g10.c:199 msgid "import ownertrust values" msgstr "importa i valori di fiducia" -#: g10/g10.c:197 +#: g10/g10.c:201 msgid "|[NAMES]|update the trust database" msgstr "|[NAMES]|controlla il database della fiducia" -#: g10/g10.c:199 +#: g10/g10.c:203 msgid "|[NAMES]|check the trust database" msgstr "|[NAMES]|controlla il database della fiducia" -#: g10/g10.c:200 +#: g10/g10.c:204 msgid "fix a corrupted trust database" msgstr "ripara un database della fiducia rovinato" -#: g10/g10.c:201 +#: g10/g10.c:205 msgid "De-Armor a file or stdin" msgstr "rimuovi l'armatura a un file o a stdin" -#: g10/g10.c:202 +#: g10/g10.c:206 msgid "En-Armor a file or stdin" msgstr "crea l'armatura a un file o a stdin" -#: g10/g10.c:203 +#: g10/g10.c:207 msgid "|algo [files]|print message digests" msgstr "|algo [files]|stampa tutti i message digests" -#: g10/g10.c:204 +#: g10/g10.c:208 msgid "print all message digests" msgstr "stampa tutti i message digests" -#: g10/g10.c:211 +#: g10/g10.c:215 msgid "" "@\n" "Options:\n" @@ -413,141 +437,145 @@ msgstr "" "Opzioni:\n" " " -#: g10/g10.c:213 +#: g10/g10.c:217 msgid "create ascii armored output" msgstr "crea un output ascii con armatura" -#: g10/g10.c:215 +#: g10/g10.c:219 msgid "use this user-id to sign or decrypt" msgstr "usa questo user-id per firmare o decifrare" -#: g10/g10.c:216 +#: g10/g10.c:220 msgid "use this user-id for encryption" msgstr "usa questo user-id per cifrare" -#: g10/g10.c:217 +#: g10/g10.c:221 msgid "|N|set compress level N (0 disables)" msgstr "|N|imposta il livello di compressione (0 disabilita)" -#: g10/g10.c:219 +#: g10/g10.c:223 msgid "use canonical text mode" msgstr "usa il modo testo canonico" -#: g10/g10.c:221 +#: g10/g10.c:225 msgid "use as output file" msgstr "usa come file di output" -#: g10/g10.c:222 +#: g10/g10.c:226 msgid "verbose" msgstr "prolisso" -#: g10/g10.c:223 +#: g10/g10.c:227 msgid "be somewhat more quiet" msgstr "meno prolisso" -#: g10/g10.c:224 +#: g10/g10.c:228 msgid "force v3 signatures" msgstr "forza l'uso di firme v3" #. { oDryRun, "dry-run", 0, N_("do not make any changes") }, -#: g10/g10.c:226 +#: g10/g10.c:230 msgid "batch mode: never ask" msgstr "modo batch: non fare domande" -#: g10/g10.c:227 +#: g10/g10.c:231 msgid "assume yes on most questions" msgstr "assumi \"sì\" a quasi tutte le domande" -#: g10/g10.c:228 +#: g10/g10.c:232 msgid "assume no on most questions" msgstr "assumi \"no\" a quasi tutte le domande" -#: g10/g10.c:229 +#: g10/g10.c:233 msgid "add this keyring to the list of keyrings" msgstr "aggiungi questo portachiavi alla lista" -#: g10/g10.c:230 +#: g10/g10.c:234 msgid "add this secret keyring to the list" msgstr "aggiungi questo portachiavi segreto alla lista" -#: g10/g10.c:231 +#: g10/g10.c:235 msgid "|NAME|use NAME as default secret key" msgstr "|NAME|usa NAME come chiave segreta predefinita" -#: g10/g10.c:232 +#: g10/g10.c:236 +msgid "|HOST|use this keyserver to lookup keys" +msgstr "" + +#: g10/g10.c:237 #, fuzzy msgid "|NAME|set terminal charset to NAME" msgstr "|NAME|usa l'algoritmo di cifratura NOME" -#: g10/g10.c:233 +#: g10/g10.c:238 msgid "read options from file" msgstr "leggi le opzioni dal file" -#: g10/g10.c:235 +#: g10/g10.c:240 msgid "set debugging flags" msgstr "imposta i flag di debugging" -#: g10/g10.c:236 +#: g10/g10.c:241 msgid "enable full debugging" msgstr "abilita il debugging completo" -#: g10/g10.c:237 +#: g10/g10.c:242 msgid "|FD|write status info to this FD" msgstr "|FD|scrivi le informazioni di stato su questo fd" -#: g10/g10.c:238 +#: g10/g10.c:243 msgid "do not write comment packets" msgstr "non scrivere pacchetti di commento" -#: g10/g10.c:239 +#: g10/g10.c:244 msgid "(default is 1)" msgstr "(predefinito è 1)" -#: g10/g10.c:240 +#: g10/g10.c:245 msgid "(default is 3)" msgstr "(predefinito è 3)" -#: g10/g10.c:242 +#: g10/g10.c:247 msgid "|KEYID|ulimately trust this key" msgstr "" -#: g10/g10.c:243 +#: g10/g10.c:248 msgid "|FILE|load extension module FILE" msgstr "|FILE|carica il modulo di estensione FILE" -#: g10/g10.c:244 +#: g10/g10.c:249 msgid "emulate the mode described in RFC1991" msgstr "emula il modo descritto nel RFC1991" -#: g10/g10.c:245 +#: g10/g10.c:250 msgid "|N|use passphrase mode N" msgstr "|N|usa il modo N per la passphrase" -#: g10/g10.c:247 +#: g10/g10.c:252 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|NAME|usa l'algoritmo di message digest NOME" -#: g10/g10.c:249 +#: g10/g10.c:254 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|NAME|usa l'alg. di cifratura NOME per le passphrase" -#: g10/g10.c:251 +#: g10/g10.c:256 msgid "|NAME|use cipher algorithm NAME" msgstr "|NAME|usa l'algoritmo di cifratura NOME" -#: g10/g10.c:252 +#: g10/g10.c:257 msgid "|NAME|use message digest algorithm NAME" msgstr "|NAME|usa l'algoritmo di message digest NOME" -#: g10/g10.c:253 +#: g10/g10.c:258 msgid "|N|use compress algorithm N" msgstr "|N|usa l'algoritmo di compressione N" -#: g10/g10.c:254 +#: g10/g10.c:259 msgid "throw keyid field of encrypted packets" msgstr "elimina il campo keyid dei pacchetti crittografati" -#: g10/g10.c:262 +#: g10/g10.c:267 msgid "" "@\n" "Examples:\n" @@ -567,19 +595,19 @@ msgstr "" " --list-keys [nomi] mostra le chiavi\n" " --fingerprint [nomi] mostra le impronte digitali\n" -#: g10/g10.c:341 +#: g10/g10.c:346 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n" msgstr "Per favore segnala i bug a <gnupg-bugs@gnu.org>.\n" -#: g10/g10.c:346 +#: g10/g10.c:351 msgid "Usage: gpgm [options] [files] (-h for help)" msgstr "Uso: gpgm [opzioni] [file] (-h per l'aiuto)" -#: g10/g10.c:348 +#: g10/g10.c:353 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opzioni] [file] (-h per l'aiuto)" -#: g10/g10.c:353 +#: g10/g10.c:358 msgid "" "Syntax: gpgm [options] [files]\n" "GnuPG maintenance utility\n" @@ -587,7 +615,7 @@ msgstr "" "Sintassi: gpgm [opzioni] [file]\n" "Utility di manutenzione di GnuPG\n" -#: g10/g10.c:356 +#: g10/g10.c:361 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -597,7 +625,7 @@ msgstr "" "firma, controlla, cifra o decifra\n" "l'operazione predefinita dipende dai dati di input\n" -#: g10/g10.c:362 +#: g10/g10.c:367 msgid "" "\n" "Supported algorithms:\n" @@ -605,226 +633,231 @@ msgstr "" "\n" "Algoritmi gestiti:\n" -#: g10/g10.c:437 +#: g10/g10.c:442 msgid "usage: gpgm [options] " msgstr "uso: gpgm [options] " -#: g10/g10.c:439 +#: g10/g10.c:444 msgid "usage: gpg [options] " msgstr "uso: gpg [options] " -#: g10/g10.c:480 +#: g10/g10.c:485 msgid "conflicting commands\n" msgstr "comandi in conflitto\n" -#: g10/g10.c:618 +#: g10/g10.c:623 #, fuzzy, c-format msgid "NOTE: no default option file `%s'\n" msgstr "nota: nessun file con opzioni predefinite `%s'\n" -#: g10/g10.c:622 +#: g10/g10.c:627 #, c-format msgid "option file `%s': %s\n" msgstr "file con opzioni predefinite `%s': %s\n" -#: g10/g10.c:629 +#: g10/g10.c:634 #, c-format msgid "reading options from `%s'\n" msgstr "lettura delle opzioni da `%s'\n" -#: g10/g10.c:782 +#: g10/g10.c:788 #, fuzzy, c-format msgid "%s is not a valid character set\n" msgstr "Carattere non valido nel commento\n" -#: g10/g10.c:817 g10/g10.c:829 +#: g10/g10.c:824 g10/g10.c:836 msgid "selected cipher algorithm is invalid\n" msgstr "l'algoritmo di cifratura selezionato non è valido\n" -#: g10/g10.c:823 g10/g10.c:835 +#: g10/g10.c:830 g10/g10.c:842 msgid "selected digest algorithm is invalid\n" msgstr "l'algoritmo di digest selezionato non è valido\n" -#: g10/g10.c:838 +#: g10/g10.c:845 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "l'algoritmo di compressione deve essere tra %d e %d\n" -#: g10/g10.c:840 +#: g10/g10.c:847 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve essere maggiore di 0\n" -#: g10/g10.c:842 +#: g10/g10.c:849 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve essere maggiore di 1\n" -#: g10/g10.c:844 +#: g10/g10.c:851 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "" -#: g10/g10.c:847 +#: g10/g10.c:854 #, fuzzy msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "nota: il modo S2K semplice (0) è fortemente scoraggiato\n" -#: g10/g10.c:851 +#: g10/g10.c:858 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K non valido; deve essere 0, 1 o 3\n" -#: g10/g10.c:934 +#: g10/g10.c:941 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "inizializzazione del trustdb fallita: %s\n" -#: g10/g10.c:940 +#: g10/g10.c:947 msgid "--store [filename]" msgstr "--store [nomefile]" -#: g10/g10.c:948 +#: g10/g10.c:955 msgid "--symmetric [filename]" msgstr "--symmetric [nomefile]" -#: g10/g10.c:956 +#: g10/g10.c:963 msgid "--encrypt [filename]" msgstr "--encrypt [nomefile]" -#: g10/g10.c:969 +#: g10/g10.c:976 msgid "--sign [filename]" msgstr "--sign [nomefile]" -#: g10/g10.c:982 +#: g10/g10.c:989 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nomefile]" -#: g10/g10.c:996 +#: g10/g10.c:1003 msgid "--clearsign [filename]" msgstr "--clearsign [nomefile]" -#: g10/g10.c:1008 +#: g10/g10.c:1015 msgid "--decrypt [filename]" msgstr "--decrypt [nomefile]" -#: g10/g10.c:1017 +#: g10/g10.c:1024 #, fuzzy msgid "--edit-key username [commands]" msgstr "--edit-key nomeutente" -#: g10/g10.c:1033 +#: g10/g10.c:1040 msgid "--delete-secret-key username" msgstr "--delete-secret-key nomeutente" -#: g10/g10.c:1036 +#: g10/g10.c:1043 msgid "--delete-key username" msgstr "--delete-key nomeutente" -#: g10/encode.c:216 g10/g10.c:1059 g10/sign.c:301 +#: g10/encode.c:216 g10/g10.c:1066 g10/sign.c:311 #, c-format msgid "can't open %s: %s\n" msgstr "impossibile aprire `%s': %s\n" -#: g10/g10.c:1070 +#: g10/g10.c:1077 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [userid] [portachiavi]" -#: g10/g10.c:1127 +#: g10/g10.c:1138 #, c-format msgid "dearmoring failed: %s\n" msgstr "rimozione dell'armatura fallita: %s\n" -#: g10/g10.c:1135 +#: g10/g10.c:1146 #, c-format msgid "enarmoring failed: %s\n" msgstr "creazione dell'armatura fallita: %s\n" -#: g10/g10.c:1201 +#: g10/g10.c:1212 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo di hash non valido `%s'\n" -#: g10/g10.c:1280 +#: g10/g10.c:1291 msgid "[filename]" msgstr "[nomefile]" -#: g10/g10.c:1284 +#: g10/g10.c:1295 msgid "Go ahead and type your message ...\n" msgstr "" -#: g10/decrypt.c:59 g10/g10.c:1287 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1298 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "impossibile aprire `%s'\n" -#: g10/armor.c:321 +#: g10/armor.c:297 #, c-format msgid "armor: %s\n" msgstr "armatura: %s\n" -#: g10/armor.c:344 +#: g10/armor.c:320 msgid "invalid armor header: " msgstr "header dell'armatura non valido: " -#: g10/armor.c:351 +#: g10/armor.c:327 msgid "armor header: " msgstr "header dell'armatura: " -#: g10/armor.c:362 +#: g10/armor.c:338 msgid "invalid clearsig header\n" msgstr "header della firma in chiaro non valido\n" -#: g10/armor.c:414 +#: g10/armor.c:390 #, fuzzy msgid "nested clear text signatures\n" msgstr "|[file]|fai una firma mantenendo il testo in chiaro" -#: g10/armor.c:530 +#: g10/armor.c:508 msgid "invalid dash escaped line: " msgstr "riga protetta con il trattino non valida: " -#: g10/armor.c:538 +#: g10/armor.c:516 #, fuzzy msgid "unexpected armor:" msgstr "Dati inaspettati" -#: g10/armor.c:624 +#: g10/armor.c:632 #, c-format msgid "invalid radix64 character %02x skipped\n" msgstr "Carattere radix64 non valido %02x saltato\n" -#: g10/armor.c:654 +#: g10/armor.c:675 msgid "premature eof (no CRC)\n" msgstr "eof prematura (nessun CRC)\n" -#: g10/armor.c:671 +#: g10/armor.c:709 msgid "premature eof (in CRC)\n" msgstr "eof prematura (nel CRC)\n" -#: g10/armor.c:675 +#: g10/armor.c:713 msgid "malformed CRC\n" msgstr "CRC malformato\n" -#: g10/armor.c:679 +#: g10/armor.c:717 #, c-format msgid "CRC error; %06lx - %06lx\n" msgstr "errore nel CRC; %06lx - %06lx\n" -#: g10/armor.c:696 +#: g10/armor.c:734 msgid "premature eof (in Trailer)\n" msgstr "eof prematura (nella coda)\n" -#: g10/armor.c:700 +#: g10/armor.c:738 msgid "error in trailer line\n" msgstr "errore nella riga della coda\n" -#: g10/armor.c:961 +#: g10/armor.c:999 #, fuzzy msgid "no valid OpenPGP data found.\n" msgstr "Non sono stati trovati dati RFC1991 o OpenPGP validi.\n" -#: g10/armor.c:963 +#: g10/armor.c:1001 #, c-format msgid "invalid armor: line longer than %d characters\n" msgstr "" +#: g10/armor.c:1005 +msgid "" +"quoted printable character in armor - probably a buggy MTA has been used\n" +msgstr "" + #: g10/pkclist.c:138 #, fuzzy, c-format msgid "" @@ -1314,20 +1347,37 @@ msgid "public and secret key created and signed.\n" msgstr "chiavi pubbliche e segrete create e firmate.\n" #: g10/keygen.c:931 +#, fuzzy 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" +"the command \"--edit-key\" to generate a secondary key for this purpose.\n" msgstr "" "Nota che questa chiave non può essere usata per la crittografia. Forse\n" "vorrai usare il comando \"--add-key\" per generare una chiave secondaria\n" "per questo scopo.\n" -#: g10/keygen.c:945 g10/keygen.c:1030 +#: g10/keygen.c:945 g10/keygen.c:1044 #, c-format msgid "Key generation failed: %s\n" msgstr "Generazione della chiave fallita: %s\n" -#: g10/keygen.c:1008 +#: g10/keygen.c:989 g10/sig-check.c:172 g10/sign.c:52 +#, fuzzy, c-format +msgid "" +"key has been created %lu second in future (time warp or clock problem)\n" +msgstr "" +"chiave pubblica creata nel futuro (salto nel tempo o problema con\n" +"l'orologio)\n" + +#: g10/keygen.c:991 g10/sig-check.c:174 g10/sign.c:54 +#, fuzzy, c-format +msgid "" +"key has been created %lu seconds in future (time warp or clock problem)\n" +msgstr "" +"chiave pubblica creata nel futuro (salto nel tempo o problema con\n" +"l'orologio)\n" + +#: g10/keygen.c:1022 msgid "Really create? " msgstr "Crea davvero? " @@ -1357,22 +1407,22 @@ msgstr "lettura da `%s'\n" msgid "%s/%s encrypted for: %s\n" msgstr "%s crittografato per: %s\n" -#: g10/export.c:114 +#: g10/export.c:147 #, fuzzy, c-format msgid "%s: user not found: %s\n" msgstr "%s: utente non trovato\n" -#: g10/export.c:123 +#: g10/export.c:156 #, c-format msgid "certificate read problem: %s\n" msgstr "" -#: g10/export.c:132 +#: g10/export.c:165 #, fuzzy, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n" -#: g10/export.c:174 +#: g10/export.c:203 #, fuzzy msgid "WARNING: nothing exported\n" msgstr "ATTENZIONE: uso di una chiave non fidata!\n" @@ -1390,263 +1440,278 @@ msgstr "" msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n" -#: g10/import.c:129 g10/trustdb.c:1180 +#: g10/import.c:117 g10/trustdb.c:1180 #, c-format msgid "can't open file: %s\n" msgstr "impossibile aprire il file: %s\n" -#: g10/import.c:148 +#: g10/import.c:165 #, c-format msgid "skipping block of type %d\n" msgstr "salto un blocco di tipo %d\n" -#: g10/import.c:155 g10/trustdb.c:1474 g10/trustdb.c:1543 +#: g10/import.c:172 g10/trustdb.c:1474 g10/trustdb.c:1543 #, c-format msgid "%lu keys so far processed\n" msgstr "Per ora sono state esaminate %lu chiavi\n" -#: g10/import.c:160 g10/trustdb.c:1256 +#: g10/import.c:177 g10/trustdb.c:1256 #, c-format msgid "read error: %s\n" msgstr "errore di lettura: %s\n" -#: g10/import.c:162 +#: g10/import.c:179 #, c-format msgid "Total number processed: %lu\n" msgstr "Numero totale esaminato: %lu\n" -#: g10/import.c:164 +#: g10/import.c:181 #, c-format msgid " w/o user IDs: %lu\n" msgstr "senza user ID: %lu\n" -#: g10/import.c:166 +#: g10/import.c:183 #, c-format msgid " imported: %lu" msgstr "importate: %lu" -#: g10/import.c:172 +#: g10/import.c:189 #, c-format msgid " unchanged: %lu\n" msgstr "non modificate: %lu\n" -#: g10/import.c:174 +#: g10/import.c:191 #, c-format msgid " new user IDs: %lu\n" msgstr "nuovi user ID: %lu\n" -#: g10/import.c:176 +#: g10/import.c:193 #, c-format msgid " new subkeys: %lu\n" msgstr "nuove subchiavi: %lu\n" -#: g10/import.c:178 +#: g10/import.c:195 #, c-format msgid " new signatures: %lu\n" msgstr "nuove firme: %lu\n" -#: g10/import.c:180 +#: g10/import.c:197 #, c-format msgid " new key revocations: %lu\n" msgstr "nuove revoche di chiavi: %lu\n" -#: g10/import.c:182 +#: g10/import.c:199 #, c-format msgid " secret keys read: %lu\n" msgstr "chiavi segrete lette: %lu\n" -#: g10/import.c:184 +#: g10/import.c:201 #, c-format msgid " secret keys imported: %lu\n" msgstr "chiavi segrete importate %lu\n" -#: g10/import.c:186 +#: g10/import.c:203 #, c-format msgid " secret keys unchanged: %lu\n" msgstr "chiavi segrete non cambiate %lu\n" -#: g10/import.c:328 g10/import.c:520 +#: g10/import.c:343 g10/import.c:535 #, c-format msgid "key %08lX: no user id\n" msgstr "chiave %08lX: nessun user id\n" -#: g10/import.c:339 +#: g10/import.c:354 #, c-format msgid "key %08lX: no valid user ids\n" msgstr "chiave %08lX: nessun user id valido\n" -#: g10/import.c:341 +#: g10/import.c:356 msgid "this may be caused by a missing self-signature\n" msgstr "questo può essere causato da una autofirma mancante\n" -#: g10/import.c:352 g10/import.c:588 +#: g10/import.c:367 g10/import.c:603 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "chiave %08lX: chiave pubblica non trovata: %s\n" -#: g10/import.c:358 +#: g10/import.c:373 msgid "no default public keyring\n" msgstr "nessun portachiavi pubblico predefinito\n" -#: g10/import.c:362 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:592 +#: g10/import.c:377 g10/openfile.c:105 g10/sign.c:215 g10/sign.c:601 #, c-format msgid "writing to `%s'\n" msgstr "scrittura in `%s'\n" -#: g10/import.c:366 g10/import.c:426 g10/import.c:642 +#: g10/import.c:381 g10/import.c:441 g10/import.c:657 #, c-format msgid "can't lock public keyring: %s\n" msgstr "impossibile bloccare il portachiavi pubblico: %s\n" -#: g10/import.c:369 +#: g10/import.c:384 #, c-format msgid "can't write to keyring: %s\n" msgstr "impossibile scrivere sul portachiavi pubblico: %s\n" -#: g10/import.c:373 +#: g10/import.c:388 #, c-format msgid "key %08lX: public key imported\n" msgstr "chiave %08lX: chiave pubblica importata\n" -#: g10/import.c:386 +#: g10/import.c:401 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "chiave %08lX: non corrisponde alla nostra copia\n" -#: g10/import.c:399 g10/import.c:597 +#: g10/import.c:414 g10/import.c:612 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n" -#: g10/import.c:406 g10/import.c:604 +#: g10/import.c:421 g10/import.c:619 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n" -#: g10/import.c:423 g10/import.c:535 g10/import.c:639 +#: g10/import.c:438 g10/import.c:550 g10/import.c:654 msgid "writing keyblock\n" msgstr "scrittura del keyblock\n" -#: g10/import.c:429 g10/import.c:645 +#: g10/import.c:444 g10/import.c:660 #, c-format msgid "can't write keyblock: %s\n" msgstr "impossibile aprire il keyblock: %s\n" -#: g10/import.c:434 +#: g10/import.c:449 #, c-format msgid "key %08lX: 1 new user-id\n" msgstr "chiave %08lX: un nuovo user id\n" -#: g10/import.c:437 +#: g10/import.c:452 #, c-format msgid "key %08lX: %d new user-ids\n" msgstr "chiave %08lX: %d nuovi user id\n" -#: g10/import.c:440 +#: g10/import.c:455 #, c-format msgid "key %08lX: 1 new signature\n" msgstr "chiave %08lX: una nuova firma\n" -#: g10/import.c:443 +#: g10/import.c:458 #, c-format msgid "key %08lX: %d new signatures\n" msgstr "chiave %08lX: %d nuove firme\n" -#: g10/import.c:446 +#: g10/import.c:461 #, c-format msgid "key %08lX: 1 new subkey\n" msgstr "chiave %08lX: una nuova subchiave\n" -#: g10/import.c:449 +#: g10/import.c:464 #, c-format msgid "key %08lX: %d new subkeys\n" msgstr "chiave %08lX: %d nuove subchiavi\n" -#: g10/import.c:459 +#: g10/import.c:474 #, c-format msgid "key %08lX: not changed\n" msgstr "chiave %08lX: non cambiata\n" -#: g10/import.c:538 +#: g10/import.c:553 #, c-format msgid "can't lock secret keyring: %s\n" msgstr "impossibile bloccare il portachiavi segreto: %s\n" -#: g10/import.c:541 +#: g10/import.c:556 #, c-format msgid "can't write keyring: %s\n" msgstr "impossibile scrivere il portachiavi: %s\n" #. we are ready -#: g10/import.c:544 +#: g10/import.c:559 #, c-format msgid "key %08lX: secret key imported\n" msgstr "chiave %08lX: chiave segreta importata\n" #. we can't merge secret keys -#: g10/import.c:548 +#: g10/import.c:563 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "chiave %08lX: già nel portachiavi segreto\n" -#: g10/import.c:553 +#: g10/import.c:568 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "chiave %08lX: chiave segreta non trovata: %s\n" -#: g10/import.c:582 +#: g10/import.c:597 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "chiave %08lX: manca la chiave pubblica - impossibile applicare il\n" "certificato di revoca\n" -#: g10/import.c:615 +#: g10/import.c:630 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n" -#: g10/import.c:649 +#: g10/import.c:664 #, c-format msgid "key %08lX: revocation certificate imported\n" msgstr "chiave %08lX: certificato di revoca importato\n" -#: g10/import.c:680 +#: g10/import.c:698 #, c-format msgid "key %08lX: no user-id for signature\n" msgstr "chiave %08lX: nessun user id per la firma\n" -#: g10/import.c:687 +#: g10/import.c:705 g10/import.c:729 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n" -#: g10/import.c:688 +#: g10/import.c:706 #, c-format msgid "key %08lX: invalid self-signature\n" msgstr "chiave %08lX: autofirma non valida\n" -#: g10/import.c:717 +#: g10/import.c:722 +#, fuzzy, c-format +msgid "key %08lX: no subkey for key binding\n" +msgstr "chiave %08lX.%lu: Legame con la subchiave corretto\n" + +#: g10/import.c:730 +#, fuzzy, c-format +msgid "key %08lX: invalid subkey binding\n" +msgstr "chiave %08lX.%lu: Legame con la subchiave non valido: %s\n" + +#: g10/import.c:761 #, c-format msgid "key %08lX: skipped userid '" msgstr "chiave %08lX: saltato l'user id '" -#: g10/import.c:740 +#: g10/import.c:781 +#, fuzzy, c-format +msgid "key %08lX: skipped subkey\n" +msgstr "chiave %08lX: una nuova subchiave\n" + +#: g10/import.c:800 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltato\n" -#: g10/import.c:748 +#: g10/import.c:808 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "chiave %08lX: certificato di revoca non valido: %s - saltato\n" -#: g10/import.c:807 +#: g10/import.c:867 #, c-format msgid "key %08lX: revocation certificate added\n" msgstr "chiave %08lX: certificato di revoca aggiunto\n" -#: g10/import.c:921 g10/import.c:976 +#: g10/import.c:981 g10/import.c:1036 #, c-format msgid "key %08lX: our copy has no self-signature\n" msgstr "chiave %08lX: la nostra copia non ha autofirma\n" @@ -1718,7 +1783,7 @@ msgstr "" msgid "Really sign? " msgstr "Firmo davvero? " -#: g10/keyedit.c:303 g10/sign.c:65 +#: g10/keyedit.c:303 g10/sign.c:75 #, c-format msgid "signing failed: %s\n" msgstr "firma fallita: %s\n" @@ -2047,63 +2112,63 @@ msgstr "Nessun user id con l'indice %d\n" msgid "No secondary key with index %d\n" msgstr "Nessuna chiave secondaria con l'indice %d\n" -#: g10/mainproc.c:198 +#: g10/mainproc.c:199 #, fuzzy msgid "public key encrypted data: good DEK\n" msgstr "Decifratura della chiave pubblica fallita: %s\n" -#: g10/mainproc.c:201 +#: g10/mainproc.c:202 #, c-format msgid "public key decryption failed: %s\n" msgstr "Decifratura della chiave pubblica fallita: %s\n" -#: g10/mainproc.c:228 +#: g10/mainproc.c:229 #, fuzzy msgid "decryption okay\n" msgstr "decifratura fallita: %s\n" -#: g10/mainproc.c:231 +#: g10/mainproc.c:232 #, c-format msgid "decryption failed: %s\n" msgstr "decifratura fallita: %s\n" -#: g10/mainproc.c:248 +#: g10/mainproc.c:249 #, fuzzy msgid "NOTE: sender requested \"for-your-eyes-only\"\n" msgstr "nota: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n" -#: g10/mainproc.c:250 +#: g10/mainproc.c:251 #, c-format msgid "original file name='%.*s'\n" msgstr "" -#: g10/mainproc.c:833 +#: g10/mainproc.c:834 msgid "signature verification suppressed\n" msgstr "" -#: g10/mainproc.c:839 +#: g10/mainproc.c:840 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Firma fatta %.*s usando %s key ID %08lX\n" -#: g10/mainproc.c:847 +#: g10/mainproc.c:852 msgid "BAD signature from \"" msgstr "Firma NON corretta da \"" -#: g10/mainproc.c:848 +#: g10/mainproc.c:853 msgid "Good signature from \"" msgstr "Buona firma da \"" -#: g10/mainproc.c:879 +#: g10/mainproc.c:884 #, c-format msgid "Can't check signature: %s\n" msgstr "Impossibile controllare la firma: %s\n" -#: g10/mainproc.c:952 +#: g10/mainproc.c:957 msgid "old style (PGP 2.x) signature\n" msgstr "" -#: g10/mainproc.c:957 +#: g10/mainproc.c:962 msgid "invalid root packet detected in proc_tree()\n" msgstr "" @@ -2177,15 +2242,15 @@ 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:166 +#: g10/plaintext.c:208 msgid "Please enter name of data file: " msgstr "Inserisci il nome del file di dati: " -#: g10/plaintext.c:187 +#: g10/plaintext.c:229 msgid "reading stdin ...\n" msgstr "" -#: g10/plaintext.c:250 +#: g10/plaintext.c:292 #, c-format msgid "can't open signed data `%s'\n" msgstr "impossibile aprire i dati firmati `%s'\n" @@ -2232,50 +2297,50 @@ msgid "" msgstr "" "questa è una chiave ElGamal generata da PGP che NON è sicura per le firme!\n" -#: g10/sig-check.c:166 +#: g10/sig-check.c:163 #, 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:168 -msgid "second" -msgstr "" +msgid "public key is %lu second newer than the signature\n" +msgstr "chiave %08lX: user id senza firma\n" -#: g10/sig-check.c:168 -msgid "seconds" -msgstr "" +#: g10/sig-check.c:164 +#, fuzzy, c-format +msgid "public key is %lu seconds newer than the signature\n" +msgstr "chiave %08lX: user id senza firma\n" -#: g10/sig-check.c:173 +#: g10/sig-check.c:180 #, fuzzy, c-format msgid "NOTE: signature key expired %s\n" msgstr "attenzione: firma della chiave scaduta il %s\n" -#: g10/sig-check.c:230 +#: g10/sig-check.c:237 msgid "assuming bad signature due to an unknown critical bit\n" msgstr "" -#: g10/sign.c:69 +#: g10/sign.c:79 #, fuzzy, c-format msgid "%s signature from: %s\n" msgstr "Firma NON corretta da \"" -#: g10/sign.c:200 g10/sign.c:587 +#: g10/sign.c:210 g10/sign.c:596 #, fuzzy, c-format msgid "can't create %s: %s\n" msgstr "%s: impossibile creare: %s\n" -#: g10/sign.c:296 +#: g10/sign.c:306 #, fuzzy msgid "signing:" msgstr "sign" -#: g10/sign.c:336 +#: g10/sign.c:346 #, fuzzy, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "%s: attenzione: file vuoto\n" +#: g10/textfilter.c:199 +#, c-format +msgid "can't handle text lines longer than %d characters\n" +msgstr "" + #: g10/tdbio.c:116 g10/tdbio.c:1418 #, fuzzy, c-format msgid "trustdb rec %lu: lseek failed: %s\n" @@ -2310,7 +2375,7 @@ msgstr "%s: impossibile creare: %s\n" msgid "%s: directory does not exist!\n" msgstr "" -#: g10/openfile.c:101 g10/openfile.c:165 g10/ringedit.c:1275 g10/tdbio.c:449 +#: g10/openfile.c:101 g10/openfile.c:165 g10/ringedit.c:1292 g10/tdbio.c:449 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: impossibile creare: %s\n" @@ -2925,35 +2990,39 @@ msgstr "" msgid "%s: can't create keyring: %s\n" msgstr "%s: impossibile creare: %s\n" -#: g10/ringedit.c:299 g10/ringedit.c:1283 +#: g10/ringedit.c:299 g10/ringedit.c:1300 #, fuzzy, c-format msgid "%s: keyring created\n" msgstr "%s: creato un nuovo file delle opzioni\n" -#: g10/ringedit.c:1469 +#: g10/ringedit.c:1486 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "" -#: g10/ringedit.c:1470 +#: g10/ringedit.c:1487 #, fuzzy, c-format msgid "%s is the unchanged one\n" msgstr "chiavi segrete non cambiate %lu\n" -#: g10/ringedit.c:1471 +#: g10/ringedit.c:1488 #, c-format msgid "%s is the new one\n" msgstr "" -#: g10/ringedit.c:1472 +#: g10/ringedit.c:1489 msgid "Please fix this possible security flaw\n" msgstr "" -#: g10/skclist.c:94 +#: g10/skclist.c:88 g10/skclist.c:125 +msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" +msgstr "" + +#: g10/skclist.c:113 #, fuzzy, c-format msgid "skipped `%s': %s\n" msgstr "%s: saltata: %s\n" -#: g10/skclist.c:100 +#: g10/skclist.c:119 #, fuzzy, c-format msgid "" "skipped `%s': this is a PGP generated ElGamal key which is not secure for " @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-0.4.0\n" -"POT-Creation-Date: 1999-01-09 18:31+0100\n" +"POT-Creation-Date: 1999-01-20 22:45+0100\n" "PO-Revision-Date: 1998-12-24 03:12+01:00\n" "Last-Translator: Janusz A. Urbanowicz <alex@bofh.net.pl>\n" "Language-Team: Polish <pl@li.org>\n" @@ -229,6 +229,23 @@ msgstr "Plik `%s' ju¿ istnieje. " msgid "weak key" msgstr "" +#: util/errors.c:97 +#, fuzzy +msgid "invalid argument" +msgstr "niepoprawna warto¶æ\n" + +#: util/errors.c:98 +msgid "bad URI" +msgstr "" + +#: util/errors.c:99 +msgid "unsupported URI" +msgstr "" + +#: util/errors.c:100 +msgid "network error" +msgstr "" + #: util/logger.c:178 #, c-format msgid "... this is a bug (%s:%d:%s)\n" @@ -239,14 +256,14 @@ msgstr "" msgid "you found a bug ... (%s:%d)\n" msgstr "" -#: cipher/random.c:405 +#: cipher/random.c:412 #, fuzzy msgid "WARNING: using insecure random number generator!!\n" msgstr "" "ostrze¿enie: u¿ywany generator liczb losowych\n" "nie jest kryptograficznie bezpieczny!!\n" -#: cipher/random.c:406 +#: cipher/random.c:413 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -272,7 +289,7 @@ msgstr "" "Proszê kontynuowaæ inne dzia³ania aby system móg³ zebraæ odpowiedni±\n" "ilo¶æ entropii do ich wygenerowania (brakuje %d bajtów).\n" -#: g10/g10.c:160 +#: g10/g10.c:163 msgid "" "@Commands:\n" " " @@ -280,130 +297,134 @@ msgstr "" "@Polecenia:\n" " " -#: g10/g10.c:163 +#: g10/g10.c:166 msgid "|[file]|make a signature" msgstr "|[plik]|z³o¿enie podpisu" -#: g10/g10.c:164 +#: g10/g10.c:167 msgid "|[file]|make a clear text signature" msgstr "|[plik]|z³o¿enie podpisu na czytelnym dokumencie" -#: g10/g10.c:165 +#: g10/g10.c:168 msgid "make a detached signature" msgstr "sporz±dzenie podpisu oddzielonego od dokumentu" -#: g10/g10.c:166 +#: g10/g10.c:169 msgid "encrypt data" msgstr "szyfrowanie danych" -#: g10/g10.c:167 +#: g10/g10.c:170 msgid "encryption only with symmetric cipher" msgstr "szyfrowanie tylko szyfrem symetrycznym" -#: g10/g10.c:168 +#: g10/g10.c:171 msgid "store only" msgstr "tylko zapis" -#: g10/g10.c:169 +#: g10/g10.c:172 msgid "decrypt data (default)" msgstr "odszyfrowywanie danych (domy¶lnie)" -#: g10/g10.c:170 +#: g10/g10.c:173 msgid "verify a signature" msgstr "sprawdzenie podpisu" -#: g10/g10.c:172 +#: g10/g10.c:175 msgid "list keys" msgstr "lista kluczy" -#: g10/g10.c:173 +#: g10/g10.c:176 msgid "list keys and signatures" msgstr "lista kluczy i podpisów" -#: g10/g10.c:174 +#: g10/g10.c:177 msgid "check key signatures" msgstr "sprawdzenie podpisów kluczy" -#: g10/g10.c:175 +#: g10/g10.c:178 msgid "list keys and fingerprints" msgstr "lista kluczy i ich odcisków" -#: g10/g10.c:176 +#: g10/g10.c:179 msgid "list secret keys" msgstr "lista kluczy tajnych" -#: g10/g10.c:178 +#: g10/g10.c:181 msgid "generate a new key pair" msgstr "generacja nowej pary klucza" -#: g10/g10.c:180 +#: g10/g10.c:183 msgid "remove key from the public keyring" msgstr "usuniêcie klucza ze zbioru kluczy publicznych" -#: g10/g10.c:182 +#: g10/g10.c:185 msgid "sign or edit a key" msgstr "podpisanie lub modyfikacja klucza" -#: g10/g10.c:183 +#: g10/g10.c:186 msgid "generate a revocation certificate" msgstr "generacja certyfikatu uniewa¿nienia klucza" -#: g10/g10.c:185 +#: g10/g10.c:188 msgid "export keys" msgstr "eksport kluczy do pliku" -#: g10/g10.c:188 +#: g10/g10.c:189 +msgid "export keys to a key server" +msgstr "" + +#: g10/g10.c:192 msgid "import/merge keys" msgstr "do³±czanie klucza do zbioru" -#: g10/g10.c:190 +#: g10/g10.c:194 msgid "list only the sequence of packets" msgstr "wypisane sekwencji pakietów" -#: g10/g10.c:193 +#: g10/g10.c:197 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:195 +#: g10/g10.c:199 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:197 +#: g10/g10.c:201 #, fuzzy msgid "|[NAMES]|update the trust database" msgstr "|[NAZWY]|sprawdzenie bazy zaufania" -#: g10/g10.c:199 +#: g10/g10.c:203 msgid "|[NAMES]|check the trust database" msgstr "|[NAZWY]|sprawdzenie bazy zaufania" -#: g10/g10.c:200 +#: g10/g10.c:204 msgid "fix a corrupted trust database" msgstr "" -#: g10/g10.c:201 +#: g10/g10.c:205 msgid "De-Armor a file or stdin" msgstr "Zdjêcie opakowania ASCII pliku lub potoku" -#: g10/g10.c:202 +#: g10/g10.c:206 msgid "En-Armor a file or stdin" msgstr "Opakowanie ASCII pliku lub potoku" -#: g10/g10.c:203 +#: g10/g10.c:207 msgid "|algo [files]|print message digests" msgstr "|algo [pliki]|skróty wiadomo¶ci" -#: g10/g10.c:204 +#: g10/g10.c:208 msgid "print all message digests" msgstr "wszystkie skróty wiadomo¶ci" -#: g10/g10.c:211 +#: g10/g10.c:215 msgid "" "@\n" "Options:\n" @@ -413,146 +434,150 @@ msgstr "" "Opcje:\n" " " -#: g10/g10.c:213 +#: g10/g10.c:217 msgid "create ascii armored output" msgstr "plik wynikowy w opakowaniu ASCII" -#: g10/g10.c:215 +#: g10/g10.c:219 msgid "use this user-id to sign or decrypt" msgstr "u¿yæ tego identyfikatora do podpisania lub odszyfrowania" -#: g10/g10.c:216 +#: g10/g10.c:220 msgid "use this user-id for encryption" msgstr "u¿yæ tego identyfikatora do szyfrowania" -#: g10/g10.c:217 +#: g10/g10.c:221 msgid "|N|set compress level N (0 disables)" msgstr "|N|poziom kompresji N (0 - brak)" -#: g10/g10.c:219 +#: g10/g10.c:223 msgid "use canonical text mode" msgstr "kanoniczny format tekstowy" -#: g10/g10.c:221 +#: g10/g10.c:225 msgid "use as output file" msgstr "plik wyj¶ciowy" -#: g10/g10.c:222 +#: g10/g10.c:226 msgid "verbose" msgstr "z informacjami dodatkowymi" -#: g10/g10.c:223 +#: g10/g10.c:227 msgid "be somewhat more quiet" msgstr "" -#: g10/g10.c:224 +#: g10/g10.c:228 #, fuzzy msgid "force v3 signatures" msgstr "sprawdzenie podpisów kluczy" #. { oDryRun, "dry-run", 0, N_("do not make any changes") }, -#: g10/g10.c:226 +#: g10/g10.c:230 msgid "batch mode: never ask" msgstr "tryb wsadowy: ¿adnych pytañ" -#: g10/g10.c:227 +#: g10/g10.c:231 msgid "assume yes on most questions" msgstr "automatyczna odpowied¼ tak na wiêkszo¶æ pytañ" -#: g10/g10.c:228 +#: g10/g10.c:232 msgid "assume no on most questions" msgstr "automatyczna odpowied¼ nie na wiêkszo¶æ pytañ" -#: g10/g10.c:229 +#: g10/g10.c:233 msgid "add this keyring to the list of keyrings" msgstr "dodaæ zbiór kluczy do listy" -#: g10/g10.c:230 +#: g10/g10.c:234 msgid "add this secret keyring to the list" msgstr "dodaæ zbiór kluczy tajnych do listy" -#: g10/g10.c:231 +#: g10/g10.c:235 msgid "|NAME|use NAME as default secret key" msgstr "|NAZWA|u¿ycie NAZWA jako domy¶lnego klucza tajnego" -#: g10/g10.c:232 +#: g10/g10.c:236 +msgid "|HOST|use this keyserver to lookup keys" +msgstr "" + +#: g10/g10.c:237 #, fuzzy msgid "|NAME|set terminal charset to NAME" msgstr "|NAZWA|algorytm szyfruj±cy NAZWA" -#: g10/g10.c:233 +#: g10/g10.c:238 msgid "read options from file" msgstr "wczytanie opcji z pliku" -#: g10/g10.c:235 +#: g10/g10.c:240 msgid "set debugging flags" msgstr "ustawienie opcji ¶ledzenia wykonania programu" -#: g10/g10.c:236 +#: g10/g10.c:241 msgid "enable full debugging" msgstr "umo¿liwienie pe³nego ¶ledzenia programu" -#: g10/g10.c:237 +#: g10/g10.c:242 msgid "|FD|write status info to this FD" msgstr "|FD|zapisaæ opis stanu do FD" -#: g10/g10.c:238 +#: g10/g10.c:243 msgid "do not write comment packets" msgstr "nie zapisywaæ pakietów z komentarzem" -#: g10/g10.c:239 +#: g10/g10.c:244 msgid "(default is 1)" msgstr "(domy¶lnie 1)" -#: g10/g10.c:240 +#: g10/g10.c:245 msgid "(default is 3)" msgstr "(domy¶lnie 3)" -#: g10/g10.c:242 +#: g10/g10.c:247 msgid "|KEYID|ulimately trust this key" msgstr "" -#: g10/g10.c:243 +#: g10/g10.c:248 #, fuzzy msgid "|FILE|load extension module FILE" msgstr "|plik|³adowanie modu³u rozszerzenia" -#: g10/g10.c:244 +#: g10/g10.c:249 msgid "emulate the mode described in RFC1991" msgstr "emulacja trybu opisanego w RFC1991" -#: g10/g10.c:245 +#: g10/g10.c:250 #, fuzzy msgid "|N|use passphrase mode N" msgstr "Wyra¿enie przej¶ciowe: " -#: g10/g10.c:247 +#: g10/g10.c:252 #, fuzzy msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|NAZWA|algorytm obliczania skrótów wiadomo¶ci NAZWA" -#: g10/g10.c:249 +#: g10/g10.c:254 #, fuzzy msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|NAZWA|algorytm szyfruj±cy NAZWA" -#: g10/g10.c:251 +#: g10/g10.c:256 msgid "|NAME|use cipher algorithm NAME" msgstr "|NAZWA|algorytm szyfruj±cy NAZWA" -#: g10/g10.c:252 +#: g10/g10.c:257 msgid "|NAME|use message digest algorithm NAME" msgstr "|NAZWA|algorytm obliczania skrótów wiadomo¶ci NAZWA" -#: g10/g10.c:253 +#: g10/g10.c:258 msgid "|N|use compress algorithm N" msgstr "|N|algorytm kompresji N" -#: g10/g10.c:254 +#: g10/g10.c:259 msgid "throw keyid field of encrypted packets" msgstr "usuniêcie identyfikatora klucza zaszyfrowanych pakietów" -#: g10/g10.c:262 +#: g10/g10.c:267 #, fuzzy msgid "" "@\n" @@ -575,19 +600,19 @@ msgstr "" " -k [identyfikator] pokazuje klucz\n" " -kc [identyfikator] pokazuje odcisk klucza\n" -#: g10/g10.c:341 +#: g10/g10.c:346 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n" msgstr "B³êdy prosimy zg³aszaæ na adres <gnupg-bugs@gnu.org>.\n" -#: g10/g10.c:346 +#: g10/g10.c:351 msgid "Usage: gpgm [options] [files] (-h for help)" msgstr "Sposób u¿ycia: gpgm [opcje] [pliki] (-h podaje pomoc)" -#: g10/g10.c:348 +#: g10/g10.c:353 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Sposób u¿ycia: gpg [opcje] [pliki] (-h podaje pomoc)" -#: g10/g10.c:353 +#: g10/g10.c:358 #, fuzzy msgid "" "Syntax: gpgm [options] [files]\n" @@ -596,7 +621,7 @@ msgstr "" "Sk³adnia: gpgm [opcje] [pliki]\n" "GNUPG program obs³uguj±cy\n" -#: g10/g10.c:356 +#: g10/g10.c:361 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -606,7 +631,7 @@ msgstr "" "podpisywanie, sprawdzanie podpisów, szyfrowanie, deszyfrowanie\n" "domy¶lnie wykonywana operacja zale¿y od danych wej¶ciowych\n" -#: g10/g10.c:362 +#: g10/g10.c:367 msgid "" "\n" "Supported algorithms:\n" @@ -614,224 +639,229 @@ msgstr "" "\n" "Obs³ugiwane algorytmy:\n" -#: g10/g10.c:437 +#: g10/g10.c:442 msgid "usage: gpgm [options] " msgstr "sposób u¿ycia: gpgm [opcje]" -#: g10/g10.c:439 +#: g10/g10.c:444 msgid "usage: gpg [options] " msgstr "sposób u¿ycia: gpg [opcje]" -#: g10/g10.c:480 +#: g10/g10.c:485 msgid "conflicting commands\n" msgstr "sprzeczne polecenia\n" -#: g10/g10.c:618 +#: g10/g10.c:623 #, fuzzy, c-format msgid "NOTE: no default option file `%s'\n" msgstr "uwaga: brak domy¶lnego pliku opcji '%s\"\n" -#: g10/g10.c:622 +#: g10/g10.c:627 #, c-format msgid "option file `%s': %s\n" msgstr "plik opcji `%s': %s\n" -#: g10/g10.c:629 +#: g10/g10.c:634 #, c-format msgid "reading options from `%s'\n" msgstr "odczyt opcji z `%s'\n" -#: g10/g10.c:782 +#: g10/g10.c:788 #, 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 +#: g10/g10.c:824 g10/g10.c:836 msgid "selected cipher algorithm is invalid\n" msgstr "wybrany algorytm szyfruj±cy jest niepoprawny\n" -#: g10/g10.c:823 g10/g10.c:835 +#: g10/g10.c:830 g10/g10.c:842 msgid "selected digest algorithm is invalid\n" msgstr "wybrany algorytm geenracji skrótów wiadomo¶ci jest niepoprawny\n" -#: g10/g10.c:838 +#: g10/g10.c:845 #, 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:840 +#: g10/g10.c:847 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:842 +#: g10/g10.c:849 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:844 +#: g10/g10.c:851 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "" -#: g10/g10.c:847 +#: g10/g10.c:854 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "" -#: g10/g10.c:851 +#: g10/g10.c:858 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "" -#: g10/g10.c:934 +#: g10/g10.c:941 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "Inicjowanie Bazy Zaufania nie powiod³o siê: %s\n" -#: g10/g10.c:940 +#: g10/g10.c:947 msgid "--store [filename]" msgstr "--store [plik]" -#: g10/g10.c:948 +#: g10/g10.c:955 msgid "--symmetric [filename]" msgstr "--symmetric [plik]" -#: g10/g10.c:956 +#: g10/g10.c:963 msgid "--encrypt [filename]" msgstr "--encrypt [plik]" -#: g10/g10.c:969 +#: g10/g10.c:976 msgid "--sign [filename]" msgstr "--sign [plik]" -#: g10/g10.c:982 +#: g10/g10.c:989 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [plik]" -#: g10/g10.c:996 +#: g10/g10.c:1003 msgid "--clearsign [filename]" msgstr "--clearsign [plik]\"" -#: g10/g10.c:1008 +#: g10/g10.c:1015 msgid "--decrypt [filename]" msgstr "--decrypt [plik]" -#: g10/g10.c:1017 +#: g10/g10.c:1024 #, fuzzy msgid "--edit-key username [commands]" msgstr "--edit-key nazwa u¿ytkownika" -#: g10/g10.c:1033 +#: g10/g10.c:1040 msgid "--delete-secret-key username" msgstr "--delete-secret-key nazwa u¿ytkownika" -#: g10/g10.c:1036 +#: g10/g10.c:1043 msgid "--delete-key username" msgstr "--delete-key nazwa u¿ytkownika" -#: g10/encode.c:216 g10/g10.c:1059 g10/sign.c:301 +#: g10/encode.c:216 g10/g10.c:1066 g10/sign.c:311 #, c-format msgid "can't open %s: %s\n" msgstr "nie mogê otworzyæ %s: %s\n" -#: g10/g10.c:1070 +#: g10/g10.c:1077 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [identyfikator] [zbiór kluczy]" -#: g10/g10.c:1127 +#: g10/g10.c:1138 #, c-format msgid "dearmoring failed: %s\n" msgstr "Usuniêcie opakowania ASCII nie powiod³o siê: %s\n" -#: g10/g10.c:1135 +#: g10/g10.c:1146 #, c-format msgid "enarmoring failed: %s\n" msgstr "Opakowywanie ASCII nie powiod³o siê: %s\n" -#: g10/g10.c:1201 +#: g10/g10.c:1212 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "niew³a¶ciwy algorytm skrótu `%s'\n" -#: g10/g10.c:1280 +#: g10/g10.c:1291 msgid "[filename]" msgstr "[nazwa pliku]" -#: g10/g10.c:1284 +#: g10/g10.c:1295 msgid "Go ahead and type your message ...\n" msgstr "" -#: g10/decrypt.c:59 g10/g10.c:1287 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1298 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "nie mogê otworzyæ '%s\"\n" -#: g10/armor.c:321 +#: g10/armor.c:297 #, fuzzy, c-format msgid "armor: %s\n" msgstr "b³±d odczytu: %s\n" -#: g10/armor.c:344 +#: g10/armor.c:320 msgid "invalid armor header: " msgstr "" -#: g10/armor.c:351 +#: g10/armor.c:327 msgid "armor header: " msgstr "" -#: g10/armor.c:362 +#: g10/armor.c:338 #, fuzzy msgid "invalid clearsig header\n" msgstr "Niew³a¶ciwy znak w imieniu lub nazwisku\n" -#: g10/armor.c:414 +#: g10/armor.c:390 #, fuzzy msgid "nested clear text signatures\n" msgstr "|[plik]|z³o¿enie podpisu na czytelnym dokumencie" -#: g10/armor.c:530 +#: g10/armor.c:508 msgid "invalid dash escaped line: " msgstr "" -#: g10/armor.c:538 +#: g10/armor.c:516 msgid "unexpected armor:" msgstr "" -#: g10/armor.c:624 +#: g10/armor.c:632 #, fuzzy, c-format msgid "invalid radix64 character %02x skipped\n" msgstr "Niew³a¶ciwy znak w imieniu lub nazwisku\n" -#: g10/armor.c:654 +#: g10/armor.c:675 msgid "premature eof (no CRC)\n" msgstr "" -#: g10/armor.c:671 +#: g10/armor.c:709 msgid "premature eof (in CRC)\n" msgstr "" -#: g10/armor.c:675 +#: g10/armor.c:713 msgid "malformed CRC\n" msgstr "" -#: g10/armor.c:679 +#: g10/armor.c:717 #, c-format msgid "CRC error; %06lx - %06lx\n" msgstr "" -#: g10/armor.c:696 +#: g10/armor.c:734 msgid "premature eof (in Trailer)\n" msgstr "" -#: g10/armor.c:700 +#: g10/armor.c:738 msgid "error in trailer line\n" msgstr "" -#: g10/armor.c:961 +#: g10/armor.c:999 msgid "no valid OpenPGP data found.\n" msgstr "" -#: g10/armor.c:963 +#: g10/armor.c:1001 #, c-format msgid "invalid armor: line longer than %d characters\n" msgstr "" +#: g10/armor.c:1005 +msgid "" +"quoted printable character in armor - probably a buggy MTA has been used\n" +msgstr "" + #: g10/pkclist.c:138 #, fuzzy, c-format msgid "" @@ -1327,21 +1357,38 @@ msgid "public and secret key created and signed.\n" msgstr "Prywatny i publiczny klucz zosta³ stworzony i podpisany.\n" #: g10/keygen.c:931 +#, fuzzy 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" +"the command \"--edit-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" "do obs³ugi szyfrowania i deszyfrowania.\n" -#: g10/keygen.c:945 g10/keygen.c:1030 +#: g10/keygen.c:945 g10/keygen.c:1044 #, c-format msgid "Key generation failed: %s\n" msgstr "Generacja klucza nie powiod³a siê: %s\n" -#: g10/keygen.c:1008 +#: g10/keygen.c:989 g10/sig-check.c:172 g10/sign.c:52 +#, fuzzy, c-format +msgid "" +"key has been created %lu second 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/keygen.c:991 g10/sig-check.c:174 g10/sign.c:54 +#, fuzzy, c-format +msgid "" +"key has been created %lu seconds 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/keygen.c:1022 msgid "Really create? " msgstr "Na pewno generowaæ? " @@ -1371,22 +1418,22 @@ msgstr "odczyt z `%s'\n" msgid "%s/%s encrypted for: %s\n" msgstr "%s zaszyfrowany dla: %s\n" -#: g10/export.c:114 +#: g10/export.c:147 #, fuzzy, c-format msgid "%s: user not found: %s\n" msgstr "%s: nie znaleziono u¿ytkownika\n" -#: g10/export.c:123 +#: g10/export.c:156 #, c-format msgid "certificate read problem: %s\n" msgstr "" -#: g10/export.c:132 +#: g10/export.c:165 #, 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 +#: g10/export.c:203 #, fuzzy msgid "WARNING: nothing exported\n" msgstr "OSTRZE¯ENIE: u¿ywany jest klucz nie obdarzony zaufaniem!\n" @@ -1404,268 +1451,283 @@ msgstr "" msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "" -#: g10/import.c:129 g10/trustdb.c:1180 +#: g10/import.c:117 g10/trustdb.c:1180 #, c-format msgid "can't open file: %s\n" msgstr "nie mo¿na otworzyæ pliku: %s\n" -#: g10/import.c:148 +#: g10/import.c:165 #, c-format msgid "skipping block of type %d\n" msgstr "pomijam blok typu %d\n" -#: g10/import.c:155 g10/trustdb.c:1474 g10/trustdb.c:1543 +#: g10/import.c:172 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 +#: g10/import.c:177 g10/trustdb.c:1256 #, c-format msgid "read error: %s\n" msgstr "b³±d odczytu: %s\n" -#: g10/import.c:162 +#: g10/import.c:179 #, c-format msgid "Total number processed: %lu\n" msgstr "" -#: g10/import.c:164 +#: g10/import.c:181 #, c-format msgid " w/o user IDs: %lu\n" msgstr "" -#: g10/import.c:166 +#: g10/import.c:183 #, c-format msgid " imported: %lu" msgstr "" -#: g10/import.c:172 +#: g10/import.c:189 #, c-format msgid " unchanged: %lu\n" msgstr "" -#: g10/import.c:174 +#: g10/import.c:191 #, c-format msgid " new user IDs: %lu\n" msgstr "" -#: g10/import.c:176 +#: g10/import.c:193 #, c-format msgid " new subkeys: %lu\n" msgstr "" -#: g10/import.c:178 +#: g10/import.c:195 #, fuzzy, c-format msgid " new signatures: %lu\n" msgstr "klucz %08lX: %d nowych podpisów\n" -#: g10/import.c:180 +#: g10/import.c:197 #, c-format msgid " new key revocations: %lu\n" msgstr "" -#: g10/import.c:182 +#: g10/import.c:199 #, fuzzy, c-format msgid " secret keys read: %lu\n" msgstr "b³±d procedury enum_secret_keys: %s\n" -#: g10/import.c:184 +#: g10/import.c:201 #, fuzzy, c-format msgid " secret keys imported: %lu\n" msgstr "Klucz %08lX: klucz tajny wczytany do zbioru\n" -#: g10/import.c:186 +#: g10/import.c:203 #, 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 +#: g10/import.c:343 g10/import.c:535 #, c-format msgid "key %08lX: no user id\n" msgstr "klucz %08lX: brak identyfikatora u¿ytkownika\n" -#: g10/import.c:339 +#: g10/import.c:354 #, c-format msgid "key %08lX: no valid user ids\n" msgstr "klucz %08lX: brak poprawnych identyfikatorów u¿ytkownika\n" -#: g10/import.c:341 +#: g10/import.c:356 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:352 g10/import.c:588 +#: g10/import.c:367 g10/import.c:603 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "klucz %08lX: brak klucza publicznegoL %s\n" -#: g10/import.c:358 +#: g10/import.c:373 msgid "no default public keyring\n" msgstr "brak domy¶lnego zbioru kluczy publicznych\n" -#: g10/import.c:362 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:592 +#: g10/import.c:377 g10/openfile.c:105 g10/sign.c:215 g10/sign.c:601 #, c-format msgid "writing to `%s'\n" msgstr "zapisywanie '%s\"\n" -#: g10/import.c:366 g10/import.c:426 g10/import.c:642 +#: g10/import.c:381 g10/import.c:441 g10/import.c:657 #, c-format msgid "can't lock public keyring: %s\n" msgstr "nie mogê zablokowaæ zbioru kluczy publicznych: %s\n" -#: g10/import.c:369 +#: g10/import.c:384 #, c-format msgid "can't write to keyring: %s\n" msgstr "niemo¿liwy jest zapis do zbioru kluczy: %s\n" -#: g10/import.c:373 +#: g10/import.c:388 #, c-format msgid "key %08lX: public key imported\n" msgstr "klucz %08lX: klucz publiczny wczytany\n" -#: g10/import.c:386 +#: g10/import.c:401 #, 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:399 g10/import.c:597 +#: g10/import.c:414 g10/import.c:612 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "klucz %08lX: brak oryginalnego bloku klucza; %s\n" -#: g10/import.c:406 g10/import.c:604 +#: g10/import.c:421 g10/import.c:619 #, 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:423 g10/import.c:535 g10/import.c:639 +#: g10/import.c:438 g10/import.c:550 g10/import.c:654 msgid "writing keyblock\n" msgstr "zapisujê blok klucza\n" -#: g10/import.c:429 g10/import.c:645 +#: g10/import.c:444 g10/import.c:660 #, c-format msgid "can't write keyblock: %s\n" msgstr "nie mogê zapisaæ bloku klucza: %s\n" -#: g10/import.c:434 +#: g10/import.c:449 #, c-format msgid "key %08lX: 1 new user-id\n" msgstr "klucz %08lX: 1 nowy identyfikator u¿ytkownika\n" -#: g10/import.c:437 +#: g10/import.c:452 #, c-format msgid "key %08lX: %d new user-ids\n" msgstr "klucz %08lX: %d nowych identyfikatorów u¿ytkownika\n" -#: g10/import.c:440 +#: g10/import.c:455 #, c-format msgid "key %08lX: 1 new signature\n" msgstr "klucz %08lX: 1 nowy podpis\n" -#: g10/import.c:443 +#: g10/import.c:458 #, c-format msgid "key %08lX: %d new signatures\n" msgstr "klucz %08lX: %d nowych podpisów\n" -#: g10/import.c:446 +#: g10/import.c:461 #, c-format msgid "key %08lX: 1 new subkey\n" msgstr "klucz %08lX: 1 nowy podklucz\n" -#: g10/import.c:449 +#: g10/import.c:464 #, c-format msgid "key %08lX: %d new subkeys\n" msgstr "klucz %08lX: %d nowych podkluczy\n" -#: g10/import.c:459 +#: g10/import.c:474 #, c-format msgid "key %08lX: not changed\n" msgstr "klucz %08lX: pozostawiony bez zmian\n" -#: g10/import.c:538 +#: g10/import.c:553 #, c-format msgid "can't lock secret keyring: %s\n" msgstr "nie mogê zablokowaæ zbioru kluczy tajnych: %s\n" -#: g10/import.c:541 +#: g10/import.c:556 #, 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:544 +#: g10/import.c:559 #, 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:548 +#: g10/import.c:563 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "Klucz %08lX: ten klucz ju¿ znajduje siê w zbiorze\n" -#: g10/import.c:553 +#: g10/import.c:568 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "klucz %08lX: brak klucza tajnego: %s\n" -#: g10/import.c:582 +#: g10/import.c:597 #, 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:615 +#: g10/import.c:630 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "" "klucz %08lX: niepoprawny certyfikat uniewa¿nienia:\n" "%s - odrzucony\n" -#: g10/import.c:649 +#: g10/import.c:664 #, c-format msgid "key %08lX: revocation certificate imported\n" msgstr "klucz %08lX: wczytany certyfikat uniewa¿nienia\n" -#: g10/import.c:680 +#: g10/import.c:698 #, c-format msgid "key %08lX: no user-id for signature\n" msgstr "klucz %08lX: brak identyfikatora u¿ytkownika do podpisu\n" -#: g10/import.c:687 +#: g10/import.c:705 g10/import.c:729 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "" "klucz %08lX: nie obs³ugiwany algorytm szyfrowania z kluczem publicznym\n" -#: g10/import.c:688 +#: g10/import.c:706 #, c-format msgid "key %08lX: invalid self-signature\n" msgstr "klucz %08lX: niepoprawny podpis w³a¶ciciela klucza\n" -#: g10/import.c:717 +#: g10/import.c:722 +#, fuzzy, c-format +msgid "key %08lX: no subkey for key binding\n" +msgstr "klucz %08lX: brak identyfikatora u¿ytkownika\n" + +#: g10/import.c:730 +#, fuzzy, c-format +msgid "key %08lX: invalid subkey binding\n" +msgstr "klucz %08lX: brak poprawnych identyfikatorów u¿ytkownika\n" + +#: g10/import.c:761 #, c-format msgid "key %08lX: skipped userid '" msgstr "klucz %08lX: zosta³ pominiêty identyfikator u¿ytkownika '" -#: g10/import.c:740 +#: g10/import.c:781 +#, fuzzy, c-format +msgid "key %08lX: skipped subkey\n" +msgstr "klucz %08lX: 1 nowy podklucz\n" + +#: g10/import.c:800 #, 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:748 +#: g10/import.c:808 #, 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:807 +#: g10/import.c:867 #, c-format msgid "key %08lX: revocation certificate added\n" msgstr "klucz %08lX: dodany certyfikat uniewa¿nienia\n" -#: g10/import.c:921 g10/import.c:976 +#: g10/import.c:981 g10/import.c:1036 #, c-format msgid "key %08lX: our copy has no self-signature\n" msgstr "klucz %08lX: dostêpna kopia nie jest podpisana ni± sam±\n" @@ -1738,7 +1800,7 @@ msgstr "" msgid "Really sign? " msgstr "Na pewno podpisaæ? " -#: g10/keyedit.c:303 g10/sign.c:65 +#: g10/keyedit.c:303 g10/sign.c:75 #, c-format msgid "signing failed: %s\n" msgstr "podpisywanie nie powiod³o siê: %s\n" @@ -2072,64 +2134,64 @@ msgstr "Brak identyfikatora u¿ytkownika o numerze %d.\n" msgid "No secondary key with index %d\n" msgstr "Brak podklucza o indeksie %d\n" -#: g10/mainproc.c:198 +#: g10/mainproc.c:199 #, fuzzy msgid "public key encrypted data: good DEK\n" msgstr "b³±d odszyfrowywania klucza publicznego: %s\n" -#: g10/mainproc.c:201 +#: g10/mainproc.c:202 #, c-format msgid "public key decryption failed: %s\n" msgstr "b³±d odszyfrowywania klucza publicznego: %s\n" -#: g10/mainproc.c:228 +#: g10/mainproc.c:229 #, fuzzy msgid "decryption okay\n" msgstr "b³±d odszyfrowywania: %s\n" -#: g10/mainproc.c:231 +#: g10/mainproc.c:232 #, c-format msgid "decryption failed: %s\n" msgstr "b³±d odszyfrowywania: %s\n" -#: g10/mainproc.c:248 +#: g10/mainproc.c:249 msgid "NOTE: sender requested \"for-your-eyes-only\"\n" msgstr "" -#: g10/mainproc.c:250 +#: g10/mainproc.c:251 #, c-format msgid "original file name='%.*s'\n" msgstr "" -#: g10/mainproc.c:833 +#: g10/mainproc.c:834 msgid "signature verification suppressed\n" msgstr "" -#: g10/mainproc.c:839 +#: g10/mainproc.c:840 #, 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:847 +#: g10/mainproc.c:852 msgid "BAD signature from \"" msgstr "NIEPOPRAWNY podpis z³o¿ony przez \"" -#: g10/mainproc.c:848 +#: g10/mainproc.c:853 msgid "Good signature from \"" msgstr "Poprawny podpis z³o¿ony przez \"" -#: g10/mainproc.c:879 +#: g10/mainproc.c:884 #, c-format msgid "Can't check signature: %s\n" msgstr "Nie mogê sprawdziæ podpisu: %s\n" -#: g10/mainproc.c:952 +#: g10/mainproc.c:957 msgid "old style (PGP 2.x) signature\n" msgstr "" -#: g10/mainproc.c:957 +#: g10/mainproc.c:962 msgid "invalid root packet detected in proc_tree()\n" msgstr "" @@ -2202,15 +2264,15 @@ msgstr "Proszê powtórzyæ wyra¿enie przej¶ciowe: " msgid "data not saved; use option \"--output\" to save it\n" msgstr "" -#: g10/plaintext.c:166 +#: g10/plaintext.c:208 msgid "Please enter name of data file: " msgstr "Nazwa pliku: " -#: g10/plaintext.c:187 +#: g10/plaintext.c:229 msgid "reading stdin ...\n" msgstr "" -#: g10/plaintext.c:250 +#: g10/plaintext.c:292 #, c-format msgid "can't open signed data `%s'\n" msgstr "nie mogê otworzyæ podpisanego pliku `%s'\n" @@ -2257,50 +2319,50 @@ msgid "" "this is a PGP generated ElGamal key which is NOT secure for signatures!\n" msgstr "" -#: g10/sig-check.c:166 +#: g10/sig-check.c:163 #, 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:168 -msgid "second" -msgstr "" +msgid "public key is %lu second newer than the signature\n" +msgstr "klucz %08lX: brak identyfikatora u¿ytkownika do podpisu\n" -#: g10/sig-check.c:168 -msgid "seconds" -msgstr "" +#: g10/sig-check.c:164 +#, fuzzy, c-format +msgid "public key is %lu seconds newer than the signature\n" +msgstr "klucz %08lX: brak identyfikatora u¿ytkownika do podpisu\n" -#: g10/sig-check.c:173 +#: g10/sig-check.c:180 #, fuzzy, c-format msgid "NOTE: signature key expired %s\n" msgstr "ostrze¿enie: klucz podpisuj±cy przekroczy³ datê wa¿no¶ci %s\n" -#: g10/sig-check.c:230 +#: g10/sig-check.c:237 msgid "assuming bad signature due to an unknown critical bit\n" msgstr "" -#: g10/sign.c:69 +#: g10/sign.c:79 #, fuzzy, c-format msgid "%s signature from: %s\n" msgstr "NIEPOPRAWNY podpis z³o¿ony przez \"" -#: g10/sign.c:200 g10/sign.c:587 +#: g10/sign.c:210 g10/sign.c:596 #, fuzzy, c-format msgid "can't create %s: %s\n" msgstr "nie mogê otworzyæ %s: %s\n" -#: g10/sign.c:296 +#: g10/sign.c:306 #, fuzzy msgid "signing:" msgstr "podpis" -#: g10/sign.c:336 +#: g10/sign.c:346 #, fuzzy, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "%s: ostrze¿enie: plik jest pusty\n" +#: g10/textfilter.c:199 +#, c-format +msgid "can't handle text lines longer than %d characters\n" +msgstr "" + #: g10/tdbio.c:116 g10/tdbio.c:1418 #, fuzzy, c-format msgid "trustdb rec %lu: lseek failed: %s\n" @@ -2335,7 +2397,7 @@ msgstr "" msgid "%s: directory does not exist!\n" msgstr "" -#: g10/openfile.c:101 g10/openfile.c:165 g10/ringedit.c:1275 g10/tdbio.c:449 +#: g10/openfile.c:101 g10/openfile.c:165 g10/ringedit.c:1292 g10/tdbio.c:449 #, fuzzy, c-format msgid "%s: can't create: %s\n" msgstr "%s: nie mogê otworzyæ: %s\n" @@ -2956,35 +3018,39 @@ msgstr "" 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 +#: g10/ringedit.c:299 g10/ringedit.c:1300 #, c-format msgid "%s: keyring created\n" msgstr "" -#: g10/ringedit.c:1469 +#: g10/ringedit.c:1486 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "" -#: g10/ringedit.c:1470 +#: g10/ringedit.c:1487 #, c-format msgid "%s is the unchanged one\n" msgstr "" -#: g10/ringedit.c:1471 +#: g10/ringedit.c:1488 #, c-format msgid "%s is the new one\n" msgstr "" -#: g10/ringedit.c:1472 +#: g10/ringedit.c:1489 msgid "Please fix this possible security flaw\n" msgstr "" -#: g10/skclist.c:94 +#: g10/skclist.c:88 g10/skclist.c:125 +msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" +msgstr "" + +#: g10/skclist.c:113 #, fuzzy, c-format msgid "skipped `%s': %s\n" msgstr "%s: pominiêty: %s\n" -#: g10/skclist.c:100 +#: g10/skclist.c:119 #, c-format msgid "" "skipped `%s': this is a PGP generated ElGamal key which is not secure for " diff --git a/po/pt_BR.po b/po/pt_BR.po index 3c9ec4c84..722403bd2 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"POT-Creation-Date: 1999-01-09 18:31+0100\n" +"POT-Creation-Date: 1999-01-20 22: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 <jungmann@usa.net>\n" @@ -243,6 +243,26 @@ msgstr "O arquivo já existe" msgid "weak key" msgstr "Chave fraca" +#: util/errors.c:97 +#, fuzzy +msgid "invalid argument" +msgstr "Armadura inválida" + +#: util/errors.c:98 +#, fuzzy +msgid "bad URI" +msgstr "MPI incorreto" + +#: util/errors.c:99 +#, fuzzy +msgid "unsupported URI" +msgstr "Não suportado" + +#: util/errors.c:100 +#, fuzzy +msgid "network error" +msgstr "Erro geral" + #: util/logger.c:178 #, c-format msgid "... this is a bug (%s:%d:%s)\n" @@ -253,11 +273,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:405 +#: cipher/random.c:412 msgid "WARNING: using insecure random number generator!!\n" msgstr "AVISO: usando gerador de números aleatórios inseguro!\n" -#: cipher/random.c:406 +#: cipher/random.c:413 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -283,7 +303,7 @@ msgstr "" "para que o sistema possa coletar mais entropia!\n" "(São necessários mais %d bytes)\n" -#: g10/g10.c:160 +#: g10/g10.c:163 msgid "" "@Commands:\n" " " @@ -291,123 +311,127 @@ msgstr "" "@Comandos:\n" " " -#: g10/g10.c:163 +#: g10/g10.c:166 msgid "|[file]|make a signature" msgstr "|[arquivo]|faz uma assinatura" -#: g10/g10.c:164 +#: g10/g10.c:167 msgid "|[file]|make a clear text signature" msgstr "|[arquivo]|faz uma assinatura em texto puro" -#: g10/g10.c:165 +#: g10/g10.c:168 msgid "make a detached signature" msgstr "faz uma assinatura separada" -#: g10/g10.c:166 +#: g10/g10.c:169 msgid "encrypt data" msgstr "codifica dados" -#: g10/g10.c:167 +#: g10/g10.c:170 msgid "encryption only with symmetric cipher" msgstr "codifica apenas com criptografia simétrica" -#: g10/g10.c:168 +#: g10/g10.c:171 msgid "store only" msgstr "apenas armazena" -#: g10/g10.c:169 +#: g10/g10.c:172 msgid "decrypt data (default)" msgstr "decodifica dados (padrão)" -#: g10/g10.c:170 +#: g10/g10.c:173 msgid "verify a signature" msgstr "verifica uma assinatura" -#: g10/g10.c:172 +#: g10/g10.c:175 msgid "list keys" msgstr "lista as chaves" -#: g10/g10.c:173 +#: g10/g10.c:176 msgid "list keys and signatures" msgstr "lista as chaves e as assinaturas" -#: g10/g10.c:174 +#: g10/g10.c:177 msgid "check key signatures" msgstr "confere as assinaturas das chaves" -#: g10/g10.c:175 +#: g10/g10.c:178 msgid "list keys and fingerprints" msgstr "lista as chaves e as impressões digitais" -#: g10/g10.c:176 +#: g10/g10.c:179 msgid "list secret keys" msgstr "lista as chaves secretas" -#: g10/g10.c:178 +#: g10/g10.c:181 msgid "generate a new key pair" msgstr "gera um novo par de chaves" -#: g10/g10.c:180 +#: g10/g10.c:183 msgid "remove key from the public keyring" msgstr "remove a chave do anel de chaves público" -#: g10/g10.c:182 +#: g10/g10.c:185 msgid "sign or edit a key" msgstr "assina ou edita uma chave" -#: g10/g10.c:183 +#: g10/g10.c:186 msgid "generate a revocation certificate" msgstr "gera um certificado de revogação" -#: g10/g10.c:185 +#: g10/g10.c:188 msgid "export keys" msgstr "exporta as chaves" -#: g10/g10.c:188 +#: g10/g10.c:189 +msgid "export keys to a key server" +msgstr "" + +#: g10/g10.c:192 msgid "import/merge keys" msgstr "importa/funde as chaves" -#: g10/g10.c:190 +#: g10/g10.c:194 msgid "list only the sequence of packets" msgstr "lista apenas as seqüências de pacotes" -#: g10/g10.c:193 +#: g10/g10.c:197 msgid "export the ownertrust values" msgstr "exporta os valores de confiança" -#: g10/g10.c:195 +#: g10/g10.c:199 msgid "import ownertrust values" msgstr "importa os valores de confiança" -#: g10/g10.c:197 +#: g10/g10.c:201 msgid "|[NAMES]|update the trust database" msgstr "|[NOMES]|atualiza o banco de dados de confiança" -#: g10/g10.c:199 +#: g10/g10.c:203 msgid "|[NAMES]|check the trust database" msgstr "|[NOMES]|confere o banco de dados de confiança" -#: g10/g10.c:200 +#: g10/g10.c:204 msgid "fix a corrupted trust database" msgstr "conserta um banco de dados de confiança danificado" -#: g10/g10.c:201 +#: g10/g10.c:205 msgid "De-Armor a file or stdin" msgstr "Retira a armadura de um arquivo ou \"stdin\"" -#: g10/g10.c:202 +#: g10/g10.c:206 msgid "En-Armor a file or stdin" msgstr "Cria armadura para um arquivo ou \"stdin\"" -#: g10/g10.c:203 +#: g10/g10.c:207 msgid "|algo [files]|print message digests" msgstr "|algo [arquivos]|imprime \"digests\" de mensagens" -#: g10/g10.c:204 +#: g10/g10.c:208 msgid "print all message digests" msgstr "imprime todos os \"digests\" de mensagens" -#: g10/g10.c:211 +#: g10/g10.c:215 msgid "" "@\n" "Options:\n" @@ -417,145 +441,149 @@ msgstr "" "Opções:\n" " " -#: g10/g10.c:213 +#: g10/g10.c:217 msgid "create ascii armored output" msgstr "cria uma saída ascii com armadura" -#: g10/g10.c:215 +#: g10/g10.c:219 msgid "use this user-id to sign or decrypt" msgstr "usa este identificador de usuário para assinar ou decodificar" -#: g10/g10.c:216 +#: g10/g10.c:220 msgid "use this user-id for encryption" msgstr "usa este identificador de usuário para codificar" -#: g10/g10.c:217 +#: g10/g10.c:221 msgid "|N|set compress level N (0 disables)" msgstr "|N|estabelece nível de compressão N (0 desabilita)" -#: g10/g10.c:219 +#: g10/g10.c:223 msgid "use canonical text mode" msgstr "usa modo de texto canônico" -#: g10/g10.c:221 +#: g10/g10.c:225 msgid "use as output file" msgstr "usa como arquivo de saída" -#: g10/g10.c:222 +#: g10/g10.c:226 msgid "verbose" msgstr "prolixo" -#: g10/g10.c:223 +#: g10/g10.c:227 msgid "be somewhat more quiet" msgstr "ser mais silencioso" -#: g10/g10.c:224 +#: g10/g10.c:228 msgid "force v3 signatures" msgstr "força assinaturas v3" #. { oDryRun, "dry-run", 0, N_("do not make any changes") }, -#: g10/g10.c:226 +#: g10/g10.c:230 msgid "batch mode: never ask" msgstr "processo de lote: nunca perguntar" -#: g10/g10.c:227 +#: g10/g10.c:231 msgid "assume yes on most questions" msgstr "assumir sim para a maioria das perguntas" -#: g10/g10.c:228 +#: g10/g10.c:232 msgid "assume no on most questions" msgstr "assumir não para a maioria das perguntas" -#: g10/g10.c:229 +#: g10/g10.c:233 msgid "add this keyring to the list of keyrings" msgstr "adiciona este anel de chaves à lista de anéis de chaves" -#: g10/g10.c:230 +#: g10/g10.c:234 msgid "add this secret keyring to the list" msgstr "adiciona este anel de chaves secreto à lista" -#: g10/g10.c:231 +#: g10/g10.c:235 msgid "|NAME|use NAME as default secret key" msgstr "|NOME|usa NOME como chave secreta padrão" -#: g10/g10.c:232 +#: g10/g10.c:236 +msgid "|HOST|use this keyserver to lookup keys" +msgstr "" + +#: g10/g10.c:237 #, fuzzy msgid "|NAME|set terminal charset to NAME" msgstr "|NOME| estabelece mapa de caracteres do terminal para NOME" -#: g10/g10.c:233 +#: g10/g10.c:238 msgid "read options from file" msgstr "lê opções do arquivo" -#: g10/g10.c:235 +#: g10/g10.c:240 msgid "set debugging flags" msgstr "estabelece parâmetros de depuração" -#: g10/g10.c:236 +#: g10/g10.c:241 msgid "enable full debugging" msgstr "habilita depuração completa" -#: g10/g10.c:237 +#: g10/g10.c:242 msgid "|FD|write status info to this FD" msgstr "|DA|escreve informações de status para este DA" -#: g10/g10.c:238 +#: g10/g10.c:243 msgid "do not write comment packets" msgstr "não escreve pacotes de comentário" -#: g10/g10.c:239 +#: g10/g10.c:244 msgid "(default is 1)" msgstr "(o padrão é 1)" -#: g10/g10.c:240 +#: g10/g10.c:245 msgid "(default is 3)" msgstr "(o padrão é 3)" -#: g10/g10.c:242 +#: g10/g10.c:247 msgid "|KEYID|ulimately trust this key" msgstr "" -#: g10/g10.c:243 +#: g10/g10.c:248 msgid "|FILE|load extension module FILE" msgstr "|ARQUIVO|carrega módulo de extensão ARQUIVO" -#: g10/g10.c:244 +#: g10/g10.c:249 msgid "emulate the mode described in RFC1991" msgstr "emula o modo descrito no RFC1991" -#: g10/g10.c:245 +#: g10/g10.c:250 msgid "|N|use passphrase mode N" msgstr "|N|usa frase secreta modo N" -#: g10/g10.c:247 +#: g10/g10.c:252 msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "" "|NOME|usa algoritmo de \"digest\" de mensagens NOME para\n" "frases secretas" -#: g10/g10.c:249 +#: g10/g10.c:254 msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "" "|NOME|usa algoritmo de criptografia NOME para\n" "frases secretas" -#: g10/g10.c:251 +#: g10/g10.c:256 msgid "|NAME|use cipher algorithm NAME" msgstr "|NOME|usa algoritmo de criptografia NOME" -#: g10/g10.c:252 +#: g10/g10.c:257 msgid "|NAME|use message digest algorithm NAME" msgstr "|NOME|usa algoritmo de \"digest\" de mensagens NOME" -#: g10/g10.c:253 +#: g10/g10.c:258 msgid "|N|use compress algorithm N" msgstr "|N|usa algoritmo de compressão N" -#: g10/g10.c:254 +#: g10/g10.c:259 msgid "throw keyid field of encrypted packets" msgstr "elimina o campo keyid dos pacotes codificados" -#: g10/g10.c:262 +#: g10/g10.c:267 msgid "" "@\n" "Examples:\n" @@ -575,19 +603,19 @@ msgstr "" " --list-keys [nomes] mostra chaves\n" " --fingerprint [nomes] mostra impressões digitais\n" -#: g10/g10.c:341 +#: g10/g10.c:346 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n" msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n" -#: g10/g10.c:346 +#: g10/g10.c:351 msgid "Usage: gpgm [options] [files] (-h for help)" msgstr "Uso: gpgm [opções] [arquivos] (-h para ajuda)" -#: g10/g10.c:348 +#: g10/g10.c:353 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "Uso: gpg [opções] [arquivos] (-h para ajuda)" -#: g10/g10.c:353 +#: g10/g10.c:358 msgid "" "Syntax: gpgm [options] [files]\n" "GnuPG maintenance utility\n" @@ -595,7 +623,7 @@ msgstr "" "Sintaxe: gpgm [opções] [arquivos]\n" "Utilitário de manutenção do GnuPG\n" -#: g10/g10.c:356 +#: g10/g10.c:361 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -605,7 +633,7 @@ msgstr "" "assina, verifica, codifica ou decodifica\n" "a operação padrão depende dos dados de entrada\n" -#: g10/g10.c:362 +#: g10/g10.c:367 msgid "" "\n" "Supported algorithms:\n" @@ -613,224 +641,229 @@ msgstr "" "\n" "Algoritmos suportados:\n" -#: g10/g10.c:437 +#: g10/g10.c:442 msgid "usage: gpgm [options] " msgstr "Uso: gpgm [opções] " -#: g10/g10.c:439 +#: g10/g10.c:444 msgid "usage: gpg [options] " msgstr "uso: gpg [opções] " -#: g10/g10.c:480 +#: g10/g10.c:485 msgid "conflicting commands\n" msgstr "comandos conflitantes\n" -#: g10/g10.c:618 +#: g10/g10.c:623 #, c-format msgid "NOTE: no default option file `%s'\n" msgstr "NOTA: arquivo de opções padrão `%s' inexistente\n" -#: g10/g10.c:622 +#: g10/g10.c:627 #, c-format msgid "option file `%s': %s\n" msgstr "arquivo de opções `%s': %s\n" -#: g10/g10.c:629 +#: g10/g10.c:634 #, c-format msgid "reading options from `%s'\n" msgstr "lendo opções de `%s'\n" -#: g10/g10.c:782 +#: g10/g10.c:788 #, c-format msgid "%s is not a valid character set\n" msgstr "%s não é um mapa de caracteres válido\n" -#: g10/g10.c:817 g10/g10.c:829 +#: g10/g10.c:824 g10/g10.c:836 msgid "selected cipher algorithm is invalid\n" msgstr "algoritmo de criptografia selecionado não é válido\n" -#: g10/g10.c:823 g10/g10.c:835 +#: g10/g10.c:830 g10/g10.c:842 msgid "selected digest algorithm is invalid\n" msgstr "algoritmo de \"digest\" selecionado não é válido\n" -#: g10/g10.c:838 +#: g10/g10.c:845 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "algoritmo de compressão deve estar na faixa %d..%d\n" -#: g10/g10.c:840 +#: g10/g10.c:847 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed deve ser maior que 0\n" -#: g10/g10.c:842 +#: g10/g10.c:849 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed deve ser maior que 1\n" -#: g10/g10.c:844 +#: g10/g10.c:851 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "max-cert-depth deve estar na faixa 1 a 255\n" -#: g10/g10.c:847 +#: g10/g10.c:854 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "NOTA: o modo S2K simples (0) não é recomendável\n" -#: g10/g10.c:851 +#: g10/g10.c:858 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n" -#: g10/g10.c:934 +#: g10/g10.c:941 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "falha ao inicializar o banco de dados de confiança: %s\n" -#: g10/g10.c:940 +#: g10/g10.c:947 msgid "--store [filename]" msgstr "--store [nome_do_arquivo]" -#: g10/g10.c:948 +#: g10/g10.c:955 msgid "--symmetric [filename]" msgstr "--symmetric [nome_do_arquivo]" -#: g10/g10.c:956 +#: g10/g10.c:963 msgid "--encrypt [filename]" msgstr "--encrypt [nome_do_arquivo]" -#: g10/g10.c:969 +#: g10/g10.c:976 msgid "--sign [filename]" msgstr "--sign [nome_do_arquivo]" -#: g10/g10.c:982 +#: g10/g10.c:989 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [nome_do_arquivo]" -#: g10/g10.c:996 +#: g10/g10.c:1003 msgid "--clearsign [filename]" msgstr "--clearsign [nome_do_arquivo]" -#: g10/g10.c:1008 +#: g10/g10.c:1015 msgid "--decrypt [filename]" msgstr "--decrypt [nome_do_arquivo]" -#: g10/g10.c:1017 +#: g10/g10.c:1024 msgid "--edit-key username [commands]" msgstr "--edit-key nome_do_usuário [comandos]" -#: g10/g10.c:1033 +#: g10/g10.c:1040 msgid "--delete-secret-key username" msgstr "--delete-secret-key nome_do_usuário" -#: g10/g10.c:1036 +#: g10/g10.c:1043 msgid "--delete-key username" msgstr "--delete-key nome_do_usuário" -#: g10/encode.c:216 g10/g10.c:1059 g10/sign.c:301 +#: g10/encode.c:216 g10/g10.c:1066 g10/sign.c:311 #, c-format msgid "can't open %s: %s\n" msgstr "impossível abrir %s: %s\n" -#: g10/g10.c:1070 +#: g10/g10.c:1077 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [id_do_usuário] [anel_de_chaves]" -#: g10/g10.c:1127 +#: g10/g10.c:1138 #, c-format msgid "dearmoring failed: %s\n" msgstr "retirada de armadura falhou: %s\n" -#: g10/g10.c:1135 +#: g10/g10.c:1146 #, c-format msgid "enarmoring failed: %s\n" msgstr "criação de armadura falhou: %s\n" -#: g10/g10.c:1201 +#: g10/g10.c:1212 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "algoritmo de distribuição inválido `%s'\n" -#: g10/g10.c:1280 +#: g10/g10.c:1291 msgid "[filename]" msgstr "[nome_do_arquivo]" -#: g10/g10.c:1284 +#: g10/g10.c:1295 msgid "Go ahead and type your message ...\n" msgstr "Vá em frente e digite sua mensagem ...\n" -#: g10/decrypt.c:59 g10/g10.c:1287 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1298 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "impossível abrir `%s'\n" -#: g10/armor.c:321 +#: g10/armor.c:297 #, c-format msgid "armor: %s\n" msgstr "armadura: %s\n" -#: g10/armor.c:344 +#: g10/armor.c:320 msgid "invalid armor header: " msgstr "cabeçalho de armadura inválido: " -#: g10/armor.c:351 +#: g10/armor.c:327 msgid "armor header: " msgstr "cabeçalho de armadura: " -#: g10/armor.c:362 +#: g10/armor.c:338 msgid "invalid clearsig header\n" msgstr "cabeçalho de assinatura em texto puro inválido\n" -#: g10/armor.c:414 +#: g10/armor.c:390 #, fuzzy msgid "nested clear text signatures\n" msgstr "|[arquivo]|faz uma assinatura em texto puro" -#: g10/armor.c:530 +#: g10/armor.c:508 msgid "invalid dash escaped line: " msgstr "linha com hífen inválida: " -#: g10/armor.c:538 +#: g10/armor.c:516 #, fuzzy msgid "unexpected armor:" msgstr "Dados inesperados" -#: g10/armor.c:624 +#: g10/armor.c:632 #, c-format msgid "invalid radix64 character %02x skipped\n" msgstr "caractere radix64 inválido %02x ignorado\n" -#: g10/armor.c:654 +#: g10/armor.c:675 msgid "premature eof (no CRC)\n" msgstr "fim de arquivo prematuro (sem CRC)\n" -#: g10/armor.c:671 +#: g10/armor.c:709 msgid "premature eof (in CRC)\n" msgstr "fim de arquivo prematuro (no CRC)\n" -#: g10/armor.c:675 +#: g10/armor.c:713 msgid "malformed CRC\n" msgstr "CRC malformado\n" -#: g10/armor.c:679 +#: g10/armor.c:717 #, c-format msgid "CRC error; %06lx - %06lx\n" msgstr "erro de CRC; %06lx - %06lx\n" -#: g10/armor.c:696 +#: g10/armor.c:734 msgid "premature eof (in Trailer)\n" msgstr "fim de arquivo prematuro (no \"Trailer\")\n" -#: g10/armor.c:700 +#: g10/armor.c:738 msgid "error in trailer line\n" msgstr "erro na linha \"trailer\"\n" -#: g10/armor.c:961 +#: g10/armor.c:999 #, fuzzy msgid "no valid OpenPGP data found.\n" msgstr "nenum dado RFC1991 ou OpenPGP válido encontrado.\n" -#: g10/armor.c:963 +#: g10/armor.c:1001 #, c-format msgid "invalid armor: line longer than %d characters\n" msgstr "" +#: g10/armor.c:1005 +msgid "" +"quoted printable character in armor - probably a buggy MTA has been used\n" +msgstr "" + #: g10/pkclist.c:138 #, c-format msgid "" @@ -1321,20 +1354,35 @@ msgid "public and secret key created and signed.\n" msgstr "chaves pública e privada criadas e assinadas.\n" #: g10/keygen.c:931 +#, fuzzy 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" +"the command \"--edit-key\" to generate a secondary key for this purpose.\n" msgstr "" "Note que esta chave não pode ser usada para criptografia. Você pode usar\n" "o comando \"--add-key\" para gerar uma chave secundária para esse " "propósito.\n" -#: g10/keygen.c:945 g10/keygen.c:1030 +#: g10/keygen.c:945 g10/keygen.c:1044 #, c-format msgid "Key generation failed: %s\n" msgstr "A geração de chaves falhou: %s\n" -#: g10/keygen.c:1008 +#: g10/keygen.c:989 g10/sig-check.c:172 g10/sign.c:52 +#, fuzzy, c-format +msgid "" +"key has been created %lu second in future (time warp or clock problem)\n" +msgstr "" +"chave pública criada no futuro (viagem no tempo ou problema no relógio)\n" + +#: g10/keygen.c:991 g10/sig-check.c:174 g10/sign.c:54 +#, fuzzy, c-format +msgid "" +"key has been created %lu seconds in future (time warp or clock problem)\n" +msgstr "" +"chave pública criada no futuro (viagem no tempo ou problema no relógio)\n" + +#: g10/keygen.c:1022 msgid "Really create? " msgstr "Realmente criar? " @@ -1364,22 +1412,22 @@ msgstr "lendo de `%s'\n" msgid "%s/%s encrypted for: %s\n" msgstr "%s codificado para: %s\n" -#: g10/export.c:114 +#: g10/export.c:147 #, fuzzy, c-format msgid "%s: user not found: %s\n" msgstr "%s: usuário não encontrado\n" -#: g10/export.c:123 +#: g10/export.c:156 #, fuzzy, c-format msgid "certificate read problem: %s\n" msgstr "erro de leitura do usuário `%s': %s\n" -#: g10/export.c:132 +#: g10/export.c:165 #, fuzzy, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" msgstr "chave %08lX: chave secreta sem chave pública - ignorada\n" -#: g10/export.c:174 +#: g10/export.c:203 msgid "WARNING: nothing exported\n" msgstr "AVISO: nada exportado\n" @@ -1396,263 +1444,278 @@ msgstr "entradas demais no cache unk - desabilitado\n" 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" -#: g10/import.c:129 g10/trustdb.c:1180 +#: g10/import.c:117 g10/trustdb.c:1180 #, c-format msgid "can't open file: %s\n" msgstr "impossível abrir arquivo: %s\n" -#: g10/import.c:148 +#: g10/import.c:165 #, c-format msgid "skipping block of type %d\n" msgstr "ignorando bloco do tipo %d\n" -#: g10/import.c:155 g10/trustdb.c:1474 g10/trustdb.c:1543 +#: g10/import.c:172 g10/trustdb.c:1474 g10/trustdb.c:1543 #, c-format msgid "%lu keys so far processed\n" msgstr "%lu chaves processadas até agora\n" -#: g10/import.c:160 g10/trustdb.c:1256 +#: g10/import.c:177 g10/trustdb.c:1256 #, c-format msgid "read error: %s\n" msgstr "erro de leitura: %s\n" -#: g10/import.c:162 +#: g10/import.c:179 #, c-format msgid "Total number processed: %lu\n" msgstr "Número total processado: %lu\n" -#: g10/import.c:164 +#: g10/import.c:181 #, c-format msgid " w/o user IDs: %lu\n" msgstr " sem IDs de usuários: %lu\n" -#: g10/import.c:166 +#: g10/import.c:183 #, c-format msgid " imported: %lu" msgstr " importados: %lu" -#: g10/import.c:172 +#: g10/import.c:189 #, c-format msgid " unchanged: %lu\n" msgstr " não modificados: %lu\n" -#: g10/import.c:174 +#: g10/import.c:191 #, c-format msgid " new user IDs: %lu\n" msgstr " novos IDs de usuários: %lu\n" -#: g10/import.c:176 +#: g10/import.c:193 #, c-format msgid " new subkeys: %lu\n" msgstr " novas subchaves: %lu\n" -#: g10/import.c:178 +#: g10/import.c:195 #, c-format msgid " new signatures: %lu\n" msgstr " novas assinaturas: %lu\n" -#: g10/import.c:180 +#: g10/import.c:197 #, c-format msgid " new key revocations: %lu\n" msgstr " novas revogações de chaves: %lu\n" -#: g10/import.c:182 +#: g10/import.c:199 #, c-format msgid " secret keys read: %lu\n" msgstr " chaves secretas lidas: %lu\n" -#: g10/import.c:184 +#: g10/import.c:201 #, c-format msgid " secret keys imported: %lu\n" msgstr " chaves secretas importadas: %lu\n" -#: g10/import.c:186 +#: g10/import.c:203 #, c-format msgid " secret keys unchanged: %lu\n" msgstr " chaves secretas não modificadas: %lu\n" -#: g10/import.c:328 g10/import.c:520 +#: g10/import.c:343 g10/import.c:535 #, c-format msgid "key %08lX: no user id\n" msgstr "chave %08lX: sem id de usuário\n" -#: g10/import.c:339 +#: g10/import.c:354 #, c-format msgid "key %08lX: no valid user ids\n" msgstr "chave %08lX: sem ids de usuários válidos\n" -#: g10/import.c:341 +#: g10/import.c:356 msgid "this may be caused by a missing self-signature\n" msgstr "isto pode ser causado por falta de auto-assinatura\n" -#: g10/import.c:352 g10/import.c:588 +#: g10/import.c:367 g10/import.c:603 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "chave %08lX: chave pública não encontrada: %s\n" -#: g10/import.c:358 +#: g10/import.c:373 msgid "no default public keyring\n" msgstr "sem anel de chaves público padrão\n" -#: g10/import.c:362 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:592 +#: g10/import.c:377 g10/openfile.c:105 g10/sign.c:215 g10/sign.c:601 #, c-format msgid "writing to `%s'\n" msgstr "escrevendo para `%s'\n" -#: g10/import.c:366 g10/import.c:426 g10/import.c:642 +#: g10/import.c:381 g10/import.c:441 g10/import.c:657 #, c-format msgid "can't lock public keyring: %s\n" msgstr "impossível bloquear anel de chaves público: %s\n" -#: g10/import.c:369 +#: g10/import.c:384 #, c-format msgid "can't write to keyring: %s\n" msgstr "impossível escrever para o anel de chaves: %s\n" -#: g10/import.c:373 +#: g10/import.c:388 #, c-format msgid "key %08lX: public key imported\n" msgstr "chave %08lX: chave pública importada\n" -#: g10/import.c:386 +#: g10/import.c:401 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "chave %08lX: não corresponde à nossa cópia\n" -#: g10/import.c:399 g10/import.c:597 +#: g10/import.c:414 g10/import.c:612 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "chave %08lX: impossível localizar bloco de chaves original: %s\n" -#: g10/import.c:406 g10/import.c:604 +#: g10/import.c:421 g10/import.c:619 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "chave %08lX: impossível ler bloco de chaves original: %s\n" -#: g10/import.c:423 g10/import.c:535 g10/import.c:639 +#: g10/import.c:438 g10/import.c:550 g10/import.c:654 msgid "writing keyblock\n" msgstr "escrevendo bloco de chaves\n" -#: g10/import.c:429 g10/import.c:645 +#: g10/import.c:444 g10/import.c:660 #, c-format msgid "can't write keyblock: %s\n" msgstr "impossível escrever bloco de chaves: %s\n" -#: g10/import.c:434 +#: g10/import.c:449 #, c-format msgid "key %08lX: 1 new user-id\n" msgstr "chave %8lX: 1 novo id de usuário\n" -#: g10/import.c:437 +#: g10/import.c:452 #, c-format msgid "key %08lX: %d new user-ids\n" msgstr "chave %08lX: %d novos ids de usuários\n" -#: g10/import.c:440 +#: g10/import.c:455 #, c-format msgid "key %08lX: 1 new signature\n" msgstr "chave %08lX: 1 nova assinatura\n" -#: g10/import.c:443 +#: g10/import.c:458 #, c-format msgid "key %08lX: %d new signatures\n" msgstr "chave %08lX: %d novas assinaturas\n" -#: g10/import.c:446 +#: g10/import.c:461 #, c-format msgid "key %08lX: 1 new subkey\n" msgstr "chave %08lX: 1 nova subchave\n" -#: g10/import.c:449 +#: g10/import.c:464 #, c-format msgid "key %08lX: %d new subkeys\n" msgstr "chave %08lX: %d novas subchaves\n" -#: g10/import.c:459 +#: g10/import.c:474 #, c-format msgid "key %08lX: not changed\n" msgstr "chave %08lX: não modificada\n" -#: g10/import.c:538 +#: g10/import.c:553 #, c-format msgid "can't lock secret keyring: %s\n" msgstr "impossível bloquear anel de chaves secreto: %s\n" -#: g10/import.c:541 +#: g10/import.c:556 #, c-format msgid "can't write keyring: %s\n" msgstr "impossível escrever anel de chaves: %s\n" #. we are ready -#: g10/import.c:544 +#: g10/import.c:559 #, c-format msgid "key %08lX: secret key imported\n" msgstr "chave %08lX: chave secreta importada\n" #. we can't merge secret keys -#: g10/import.c:548 +#: g10/import.c:563 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "chave %08lX: já no anel de chaves secreto\n" -#: g10/import.c:553 +#: g10/import.c:568 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "chave %08lX: chave secreta não encontrada: %s\n" -#: g10/import.c:582 +#: g10/import.c:597 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "chave %08lX: sem chave pública - impossível aplicar certificado\n" "de revogação\n" -#: g10/import.c:615 +#: g10/import.c:630 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "chave %08lX: certificado de revogação inválido: %s - rejeitado\n" -#: g10/import.c:649 +#: g10/import.c:664 #, c-format msgid "key %08lX: revocation certificate imported\n" msgstr "chave %08lX: certificado de revogação importado\n" -#: g10/import.c:680 +#: g10/import.c:698 #, c-format msgid "key %08lX: no user-id for signature\n" msgstr "chave %08lX: sem id de usuário para assinatura\n" -#: g10/import.c:687 +#: g10/import.c:705 g10/import.c:729 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "chave %08lX: algoritmo de chave pública não suportado\n" -#: g10/import.c:688 +#: g10/import.c:706 #, c-format msgid "key %08lX: invalid self-signature\n" msgstr "chave %08lX: auto-assinatura inválida\n" -#: g10/import.c:717 +#: g10/import.c:722 +#, fuzzy, c-format +msgid "key %08lX: no subkey for key binding\n" +msgstr "chave %08lX.%lu: Ligação de subchave válida\n" + +#: g10/import.c:730 +#, fuzzy, c-format +msgid "key %08lX: invalid subkey binding\n" +msgstr "chave %08lX.%lu: Ligação de subchave inválida: %s\n" + +#: g10/import.c:761 #, c-format msgid "key %08lX: skipped userid '" msgstr "chave %08lX: id de usuário ignorado '" -#: g10/import.c:740 +#: g10/import.c:781 +#, fuzzy, c-format +msgid "key %08lX: skipped subkey\n" +msgstr "chave %08lX: 1 nova subchave\n" + +#: g10/import.c:800 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "chave %08lX: certificado de revogação no local errado - ignorado\n" -#: g10/import.c:748 +#: g10/import.c:808 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "chave %08lX: certificado de revogação inválido: %s - ignorado\n" -#: g10/import.c:807 +#: g10/import.c:867 #, c-format msgid "key %08lX: revocation certificate added\n" msgstr "chave %08lX: certificado de revogação adicionado\n" -#: g10/import.c:921 g10/import.c:976 +#: g10/import.c:981 g10/import.c:1036 #, c-format msgid "key %08lX: our copy has no self-signature\n" msgstr "chave %08lX: nossa cópia não tem auto-assinatura\n" @@ -1724,7 +1787,7 @@ msgstr "" msgid "Really sign? " msgstr "Realmente assinar? " -#: g10/keyedit.c:303 g10/sign.c:65 +#: g10/keyedit.c:303 g10/sign.c:75 #, c-format msgid "signing failed: %s\n" msgstr "assinatura falhou: %s\n" @@ -2054,61 +2117,61 @@ msgstr "Nenhum id de usuário com índice %d\n" msgid "No secondary key with index %d\n" msgstr "Nenhuma chave secundária com índice %d\n" -#: g10/mainproc.c:198 +#: g10/mainproc.c:199 #, fuzzy msgid "public key encrypted data: good DEK\n" msgstr "dados codificados com chave pública: DEK bom\n" -#: g10/mainproc.c:201 +#: g10/mainproc.c:202 #, c-format msgid "public key decryption failed: %s\n" msgstr "decodificação de chave pública falhou: %s\n" -#: g10/mainproc.c:228 +#: g10/mainproc.c:229 msgid "decryption okay\n" msgstr "decodificação correta\n" -#: g10/mainproc.c:231 +#: g10/mainproc.c:232 #, c-format msgid "decryption failed: %s\n" msgstr "decodifiação falhou: %s\n" -#: g10/mainproc.c:248 +#: g10/mainproc.c:249 msgid "NOTE: sender requested \"for-your-eyes-only\"\n" msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n" -#: g10/mainproc.c:250 +#: g10/mainproc.c:251 #, c-format msgid "original file name='%.*s'\n" msgstr "nome de arquivo original='%.*s'\n" -#: g10/mainproc.c:833 +#: g10/mainproc.c:834 msgid "signature verification suppressed\n" msgstr "verifiação de assinatura suprimida\n" -#: g10/mainproc.c:839 +#: g10/mainproc.c:840 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "Assinatura feita %.*s usando %s ID da chave %08lX\n" -#: g10/mainproc.c:847 +#: g10/mainproc.c:852 msgid "BAD signature from \"" msgstr "Assinatura INCORRETA de \"" -#: g10/mainproc.c:848 +#: g10/mainproc.c:853 msgid "Good signature from \"" msgstr "Assinatura correta de\"" -#: g10/mainproc.c:879 +#: g10/mainproc.c:884 #, c-format msgid "Can't check signature: %s\n" msgstr "Impossível verificar assinatura: %s\n" -#: g10/mainproc.c:952 +#: g10/mainproc.c:957 msgid "old style (PGP 2.x) signature\n" msgstr "assinatura antiga (PGP2.x)\n" -#: g10/mainproc.c:957 +#: g10/mainproc.c:962 msgid "invalid root packet detected in proc_tree()\n" msgstr "pacote raiz inválido detectado em proc_tree()\n" @@ -2180,15 +2243,15 @@ msgstr "Repita a frase secreta: " msgid "data not saved; use option \"--output\" to save it\n" msgstr "dados não salvos; use a opção \"--output\" para salvá-los\n" -#: g10/plaintext.c:166 +#: g10/plaintext.c:208 msgid "Please enter name of data file: " msgstr "Por favor digite o nome do arquivo de dados: " -#: g10/plaintext.c:187 +#: g10/plaintext.c:229 msgid "reading stdin ...\n" msgstr "lendo \"stdin\" ...\n" -#: g10/plaintext.c:250 +#: g10/plaintext.c:292 #, c-format msgid "can't open signed data `%s'\n" msgstr "impossível abrir dados assinados `%s'\n" @@ -2232,48 +2295,49 @@ msgid "" msgstr "" "esta é uma chave ElGamal gerada pelo PGP que NÃO é segura para assinaturas!\n" -#: g10/sig-check.c:166 +#: g10/sig-check.c:163 #, 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:168 -msgid "second" -msgstr "" +msgid "public key is %lu second newer than the signature\n" +msgstr "lid %lu: id de usuário sem assinatura\n" -#: g10/sig-check.c:168 -msgid "seconds" -msgstr "" +#: g10/sig-check.c:164 +#, fuzzy, c-format +msgid "public key is %lu seconds newer than the signature\n" +msgstr "lid %lu: id de usuário sem assinatura\n" -#: g10/sig-check.c:173 +#: g10/sig-check.c:180 #, c-format msgid "NOTE: signature key expired %s\n" msgstr "NOTA: chave de assinatura expirou %s\n" -#: g10/sig-check.c:230 +#: g10/sig-check.c:237 msgid "assuming bad signature due to an unknown critical bit\n" msgstr "" -#: g10/sign.c:69 +#: g10/sign.c:79 #, c-format msgid "%s signature from: %s\n" msgstr "%s assinatura de: %s\n" -#: g10/sign.c:200 g10/sign.c:587 +#: g10/sign.c:210 g10/sign.c:596 #, c-format msgid "can't create %s: %s\n" msgstr "impossível criar %s: %s\n" -#: g10/sign.c:296 +#: g10/sign.c:306 msgid "signing:" msgstr "assinando:" -#: g10/sign.c:336 +#: g10/sign.c:346 #, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "AVISO: `%s' é um arquivo vazio\n" +#: g10/textfilter.c:199 +#, c-format +msgid "can't handle text lines longer than %d characters\n" +msgstr "" + #: g10/tdbio.c:116 g10/tdbio.c:1418 #, fuzzy, c-format msgid "trustdb rec %lu: lseek failed: %s\n" @@ -2309,7 +2373,7 @@ msgstr "%s: diretório criado\n" 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:449 +#: g10/openfile.c:101 g10/openfile.c:165 g10/ringedit.c:1292 g10/tdbio.c:449 #, c-format msgid "%s: can't create: %s\n" msgstr "%s: impossível criar: %s\n" @@ -2932,35 +2996,39 @@ msgstr "você usou a chave primária para insert_trust_record()\n" msgid "%s: can't create keyring: %s\n" msgstr "%s: impossível criar anel de chaves: %s\n" -#: g10/ringedit.c:299 g10/ringedit.c:1283 +#: g10/ringedit.c:299 g10/ringedit.c:1300 #, c-format msgid "%s: keyring created\n" msgstr "%s: anel de chaves criado\n" -#: g10/ringedit.c:1469 +#: g10/ringedit.c:1486 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "AVISO: 2 arquivos com informações confidenciais existem.\n" -#: g10/ringedit.c:1470 +#: g10/ringedit.c:1487 #, c-format msgid "%s is the unchanged one\n" msgstr "%s é o não modificado\n" -#: g10/ringedit.c:1471 +#: g10/ringedit.c:1488 #, c-format msgid "%s is the new one\n" msgstr "%s é o novo\n" -#: g10/ringedit.c:1472 +#: g10/ringedit.c:1489 msgid "Please fix this possible security flaw\n" msgstr "Por favor conserte este possível furo de segurança\n" -#: g10/skclist.c:94 +#: g10/skclist.c:88 g10/skclist.c:125 +msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" +msgstr "" + +#: g10/skclist.c:113 #, c-format msgid "skipped `%s': %s\n" msgstr "ignorado `%s': %s\n" -#: g10/skclist.c:100 +#: g10/skclist.c:119 #, c-format msgid "" "skipped `%s': this is a PGP generated ElGamal key which is not secure for " @@ -9,7 +9,7 @@ # QingLong <qinglong@Bolizm> (couldn't send an email to let you know) msgid "" msgstr "" -"POT-Creation-Date: 1999-01-09 18:31+0100\n" +"POT-Creation-Date: 1999-01-20 22:45+0100\n" "Content-Type: text/plain; charset=\n" "Date: 1998-01-26 22:08:36+0100\n" "From: Gregory Steuck <steuck@iname.com>\n" @@ -250,6 +250,25 @@ msgstr "æÁÊÌ ÓÕÝÅÓÔ×ÕÅÔ" msgid "weak key" msgstr "óÌÁÂÙÊ ËÌÀÞ" +#: util/errors.c:97 +#, fuzzy +msgid "invalid argument" +msgstr "îÅÄÏÐÕÓÔÉÍÁÑ ASCII-ËÏÄÉÒÏ×ËÁ" + +#: util/errors.c:98 +msgid "bad URI" +msgstr "" + +#: util/errors.c:99 +#, fuzzy +msgid "unsupported URI" +msgstr "îÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ" + +#: util/errors.c:100 +#, fuzzy +msgid "network error" +msgstr "ïÂÝÁÑ ÏÛÉÂËÁ" + #: util/logger.c:178 #, fuzzy, c-format msgid "... this is a bug (%s:%d:%s)\n" @@ -260,12 +279,12 @@ msgstr "ïÊ-ÊÏ ... ÏÛÉÂËÁ × ÐÒÏÇÒÁÍÍÅ (%s:%d:%s)\n" msgid "you found a bug ... (%s:%d)\n" msgstr "÷Ù ÎÁÛÌÉ ÏÛÉÂËÕ × ÐÒÏÇÒÁÍÍÅ ... (%s:%d)\n" -#: cipher/random.c:405 +#: cipher/random.c:412 #, fuzzy msgid "WARNING: using insecure random number generator!!\n" msgstr "÷ÎÉÍÁÎÉÅ: ÉÓÐÏÌØÚÕÅÔÓÑ ÎÅÎÁÄÅÖÎÙÊ ÇÅÎÅÒÁÔÏÒ ÓÌÕÞÁÊÎÙÈ ÞÉÓÅÌ!\n" -#: cipher/random.c:406 +#: cipher/random.c:413 msgid "" "The random number generator is only a kludge to let\n" "it run - it is in no way a strong RNG!\n" @@ -290,7 +309,7 @@ msgstr "" "îÅÄÏÓÔÁÔÏÞÎÏ ÓÌÕÞÁÊÎÙÈ ÄÁÎÎÙÈ. ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÅÌÁÊÔÅ ÞÔÏ-ÎÉÂÕÄØ, ÞÔÏÂÙ\n" "ïó ÍÏÇÌÁ ÎÁÂÒÁÔØ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÓÌÕÞÁÊÎÙÅ ÞÉÓÌÁ! (ÎÕÖÎÏ ÅÝÅ %d ÂÁÊÔ)\n" -#: g10/g10.c:160 +#: g10/g10.c:163 msgid "" "@Commands:\n" " " @@ -298,128 +317,132 @@ msgstr "" "@ëÏÍÁÎÄÙ:\n" " " -#: g10/g10.c:163 +#: g10/g10.c:166 #, fuzzy msgid "|[file]|make a signature" msgstr "|[ÆÁÊÌ]|ÓÏÚÄÁÔØ ÐÏÄÐÉÓØ" -#: g10/g10.c:164 +#: g10/g10.c:167 #, fuzzy msgid "|[file]|make a clear text signature" msgstr "|[ÆÁÊÌ]|ÓÏÚÄÁÔØ ÔÅËÓÔÏ×ÕÀ ÐÏÄÐÉÓØ" -#: g10/g10.c:165 +#: g10/g10.c:168 msgid "make a detached signature" msgstr "ÓÏÚÄÁÔØ ÏÔÄÅÌØÎÕÀ ÐÏÄÐÉÓØ" -#: g10/g10.c:166 +#: g10/g10.c:169 msgid "encrypt data" msgstr "ÚÁÛÉÆÒÏ×ÁÔØ ÄÁÎÎÙÅ" -#: g10/g10.c:167 +#: g10/g10.c:170 msgid "encryption only with symmetric cipher" msgstr "ÚÁÛÉÆÒÏ×ÁÔØ ÓÉÍÍÅÔÒÉÞÎÙÍ ÁÌÇÏÒÉÔÍÏÍ" -#: g10/g10.c:168 +#: g10/g10.c:171 msgid "store only" msgstr "ÔÏÌØËÏ ÓÏÈÒÁÎÉÔØ" -#: g10/g10.c:169 +#: g10/g10.c:172 msgid "decrypt data (default)" msgstr "ÒÁÓÛÉÆÒÏ×ÁÔØ ÄÁÎÎÙÅ (ÐÏ ÕÍÏÌÞÁÎÉÀ)" -#: g10/g10.c:170 +#: g10/g10.c:173 msgid "verify a signature" msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ" -#: g10/g10.c:172 +#: g10/g10.c:175 msgid "list keys" msgstr "ÓÐÉÓÏË ËÌÀÞÅÊ" -#: g10/g10.c:173 +#: g10/g10.c:176 msgid "list keys and signatures" msgstr "ÓÐÉÓÏË ËÌÀÞÅÊ É ÐÏÄÐÉÓÅÊ" -#: g10/g10.c:174 +#: g10/g10.c:177 msgid "check key signatures" msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ ÎÁ ËÌÀÞÅ" -#: g10/g10.c:175 +#: g10/g10.c:178 msgid "list keys and fingerprints" msgstr "ÓÐÉÓÏË ËÌÀÞÅÊ Ó ÉÈ \"ÏÔÐÅÞÁÔËÁÍÉ ÐÁÌØÃÅ×\"" -#: g10/g10.c:176 +#: g10/g10.c:179 msgid "list secret keys" msgstr "ÓÐÉÓÏË ÓÅËÒÅÔÎÙÈ ËÌÀÞÅÊ" -#: g10/g10.c:178 +#: g10/g10.c:181 msgid "generate a new key pair" msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÎÏ×ÕÀ ÐÁÒÕ ËÌÀÞÅÊ (ÏÔËÒÙÔÙÊ É ÓÅËÒÅÔÎÙÊ)" -#: g10/g10.c:180 +#: g10/g10.c:183 msgid "remove key from the public keyring" msgstr "ÕÄÁÌÉÔØ ËÌÀÞ ÓÏ Ó×ÑÚËÉ" -#: g10/g10.c:182 +#: g10/g10.c:185 msgid "sign or edit a key" msgstr "ÐÏÄÐÉÓÁÔØ ÉÌÉ ÒÅÄÁËÔÉÒÏ×ÁÔØ ËÌÀÞ" -#: g10/g10.c:183 +#: g10/g10.c:186 msgid "generate a revocation certificate" msgstr "ÓÇÅÎÅÒÉÒÏ×ÁÔØ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ" -#: g10/g10.c:185 +#: g10/g10.c:188 msgid "export keys" msgstr "ÜËÓÐÏÒÔÉÒÏ×ÁÔØ ËÌÀÞÉ" -#: g10/g10.c:188 +#: g10/g10.c:189 +msgid "export keys to a key server" +msgstr "" + +#: g10/g10.c:192 msgid "import/merge keys" msgstr "ÉÍÐÏÒÔÉÒÏ×ÁÔØ/ÄÏÂÁ×ÉÔØ ËÌÀÞÉ" -#: g10/g10.c:190 +#: g10/g10.c:194 msgid "list only the sequence of packets" msgstr "ÎÁÐÅÞÁÔÁÔØ ÔÏÌØËÏ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ÐÁËÅÔÏ×" -#: g10/g10.c:193 +#: g10/g10.c:197 #, fuzzy msgid "export the ownertrust values" msgstr "ÜËÓÐÏÒÔÉÒÏ×ÁÔØ ÐÁÒÁÍÅÔÒÙ ÄÏ×ÅÒÉÑ\n" -#: g10/g10.c:195 +#: g10/g10.c:199 #, fuzzy msgid "import ownertrust values" msgstr "ÉÍÐÏÒÔÉÒÏ×ÁÔØ ÐÁÒÁÍÅÔÒÙ ÄÏ×ÅÒÉÑ\n" -#: g10/g10.c:197 +#: g10/g10.c:201 #, fuzzy msgid "|[NAMES]|update the trust database" msgstr "|[éíåîá]|ÐÒÏ×ÅÒÉÔØ ÂÁÚÕ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ" -#: g10/g10.c:199 +#: g10/g10.c:203 msgid "|[NAMES]|check the trust database" msgstr "|[éíåîá]|ÐÒÏ×ÅÒÉÔØ ÂÁÚÕ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ" -#: g10/g10.c:200 +#: g10/g10.c:204 msgid "fix a corrupted trust database" msgstr "ÉÓÐÒÁ×ÉÔØ ÒÁÚÒÕÛÅÎÎÕÀ ÂÁÚÕ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ" -#: g10/g10.c:201 +#: g10/g10.c:205 msgid "De-Armor a file or stdin" msgstr "äÅËÏÄÉÒÏ×ÁÔØ stdin ÉÌÉ ÆÁÊÌ ÉÚ ASCII-ÐÒÅÄÓÔÁ×ÌÅÎÉÑ" -#: g10/g10.c:202 +#: g10/g10.c:206 msgid "En-Armor a file or stdin" msgstr "úÁËÏÄÉÒÏ×ÁÔØ stdin ÉÌÉ ÆÁÊÌ × ASCII-ÐÒÅÄÓÔÁ×ÌÅÎÉÅ" -#: g10/g10.c:203 +#: g10/g10.c:207 msgid "|algo [files]|print message digests" msgstr "|algo [files]|ÎÁÐÅÞÁÔÁÔØ ÄÁÊÄÖÅÓÔ ÓÏÏÂÝÅÎÉÑ" -#: g10/g10.c:204 +#: g10/g10.c:208 msgid "print all message digests" msgstr "ÎÁÐÅÞÁÔÁÔØ ×ÓÅ ÄÁÊÄÖÅÓÔÙ ÓÏÏÂÝÅÎÉÑ" -#: g10/g10.c:211 +#: g10/g10.c:215 msgid "" "@\n" "Options:\n" @@ -429,147 +452,151 @@ msgstr "" "ðÁÒÁÍÅÔÒÙ:\n" " " -#: g10/g10.c:213 +#: g10/g10.c:217 msgid "create ascii armored output" msgstr "×Ù×ÏÄ × ASCII-ÐÒÅÄÓÔÁ×ÌÅÎÉÉ" -#: g10/g10.c:215 +#: g10/g10.c:219 msgid "use this user-id to sign or decrypt" msgstr "" "ÉÓÐÏÌØÚÏ×ÁÔØ ÕËÁÚÁÎÎÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÐÏÄÐÉÓÉ ÉÌÉ ÒÁÓÛÉÆÒÏ×ËÉ" -#: g10/g10.c:216 +#: g10/g10.c:220 msgid "use this user-id for encryption" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ ÕËÁÚÁÎÎÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÛÉÆÒÏ×ÁÎÉÑ" -#: g10/g10.c:217 +#: g10/g10.c:221 msgid "|N|set compress level N (0 disables)" msgstr "|N|ÕÓÔÁÎÏ×ÉÔØ ÕÒÏ×ÅÎØ ÓÖÁÔÉÑ (0 - ÎÅ ÓÖÉÍÁÔØ)" -#: g10/g10.c:219 +#: g10/g10.c:223 msgid "use canonical text mode" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ ËÁÎÏÎÉÞÅÓËÉÊ ÔÅËÓÔÏ×ÙÊ ÒÅÖÉÍ" -#: g10/g10.c:221 +#: g10/g10.c:225 msgid "use as output file" msgstr "ÉÓÐÏÌØÚÏ×ÁÔØ × ËÁÞÅÓÔ×Å ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ" -#: g10/g10.c:222 +#: g10/g10.c:226 msgid "verbose" msgstr "ÍÎÏÇÏÓÌÏ×ÎÙÊ" -#: g10/g10.c:223 +#: g10/g10.c:227 msgid "be somewhat more quiet" msgstr "" -#: g10/g10.c:224 +#: g10/g10.c:228 #, fuzzy msgid "force v3 signatures" msgstr "ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ ÎÁ ËÌÀÞÅ" #. { oDryRun, "dry-run", 0, N_("do not make any changes") }, -#: g10/g10.c:226 +#: g10/g10.c:230 msgid "batch mode: never ask" msgstr "ÐÁËÅÔÎÙÊ ÒÅÖÉÍ: ÎÉÞÅÇÏ ÎÅ ÓÐÒÁÛÉ×ÁÔØ" -#: g10/g10.c:227 +#: g10/g10.c:231 msgid "assume yes on most questions" msgstr "ÏÔ×ÅÞÁÔØ \"ÄÁ\" ÎÁ ÂÏÌØÛÉÎÓÔ×Ï ×ÏÐÒÏÓÏ×" -#: g10/g10.c:228 +#: g10/g10.c:232 msgid "assume no on most questions" msgstr "ÏÔ×ÅÞÁÔØ \"ÎÅÔ\" ÎÁ ÂÏÌØÛÉÎÓÔ×Ï ×ÏÐÒÏÓÏ×" -#: g10/g10.c:229 +#: g10/g10.c:233 msgid "add this keyring to the list of keyrings" msgstr "ÄÏÂÁ×ÉÔØ ÜÔÕ Ó×ÑÚËÕ Ë ÓÐÉÓËÕ Ó×ÑÚÏË ËÌÀÞÅÊ" -#: g10/g10.c:230 +#: g10/g10.c:234 msgid "add this secret keyring to the list" msgstr "ÄÏÂÁ×ÉÔØ ÜÔÕ ÓÅËÒÅÔÎÕÀ Ó×ÑÚËÕ Ë ÓÐÉÓËÕ Ó×ÑÚÏË ËÌÀÞÅÊ" -#: g10/g10.c:231 +#: g10/g10.c:235 msgid "|NAME|use NAME as default secret key" msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ éíñ × ËÁÞÅÓÔ×Å ÓÅËÒÅÔÎÏÇÏ ËÌÀÞÁ ÐÏ ÕÍÏÌÞÁÎÉÀ" -#: g10/g10.c:232 +#: g10/g10.c:236 +msgid "|HOST|use this keyserver to lookup keys" +msgstr "" + +#: g10/g10.c:237 #, fuzzy msgid "|NAME|set terminal charset to NAME" msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÛÉÆÒÏ×ÁÌØÎÙÊ ÁÌÇÏÒÉÔÍÏÍ éíñ" -#: g10/g10.c:233 +#: g10/g10.c:238 msgid "read options from file" msgstr "ÞÉÔÁÔØ ÐÁÒÁÍÅÔÒÙ ÉÚ ÆÁÊÌÁ" -#: g10/g10.c:235 +#: g10/g10.c:240 msgid "set debugging flags" msgstr "ÕÓÔÁÎÏ×ÉÔØ ÏÔÌÁÄÏÞÎÙÅ ÆÌÁÇÉ" -#: g10/g10.c:236 +#: g10/g10.c:241 msgid "enable full debugging" msgstr "ÒÁÚÒÅÛÉÔØ ×ÓÀ ÏÔÌÁÄËÕ" -#: g10/g10.c:237 +#: g10/g10.c:242 msgid "|FD|write status info to this FD" msgstr "|FD| ÚÁÐÉÓÙ×ÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ÓÏÓÔÏÑÎÉÉ × ÄÅÓËÒÉÐÔÏÒ (FD)" -#: g10/g10.c:238 +#: g10/g10.c:243 msgid "do not write comment packets" msgstr "ÎÅ ÐÉÓÁÔØ ÐÁËÅÔÙ Ó ËÏÍÍÅÎÔÁÒÉÑÍÉ" -#: g10/g10.c:239 +#: g10/g10.c:244 msgid "(default is 1)" msgstr "(ÐÏ ÕÍÏÌÞÁÎÉÀ 1)" -#: g10/g10.c:240 +#: g10/g10.c:245 msgid "(default is 3)" msgstr "(ÐÏ ÕÍÏÌÞÁÎÉÀ 3)" -#: g10/g10.c:242 +#: g10/g10.c:247 msgid "|KEYID|ulimately trust this key" msgstr "" -#: g10/g10.c:243 +#: g10/g10.c:248 #, fuzzy msgid "|FILE|load extension module FILE" msgstr "|æáêì|ÚÁÇÒÕÚÉÔØ æáêì Ó ÒÁÓÛÉÒÑÀÝÉÍÉ ÍÏÄÕÌÑÍÉ" -#: g10/g10.c:244 +#: g10/g10.c:249 msgid "emulate the mode described in RFC1991" msgstr "ÜÍÕÌÉÒÏ×ÁÔØ ÒÅÖÉÍ ÏÐÉÓÁÎÎÙÊ × RFC1991" -#: g10/g10.c:245 +#: g10/g10.c:250 #, fuzzy msgid "|N|use passphrase mode N" msgstr "|N|ÉÓÐÏÌØÚÏ×ÁÔØ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ ÒÅÖÉÍÁ N\n" -#: g10/g10.c:247 +#: g10/g10.c:252 #, fuzzy msgid "|NAME|use message digest algorithm NAME for passphrases" msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÈÜÛ-ÁÌÇÏÒÉÔÍ éíñ ÄÌÑ ËÌÀÞÅ×ÙÈ ÆÒÁÚ" -#: g10/g10.c:249 +#: g10/g10.c:254 #, fuzzy msgid "|NAME|use cipher algorithm NAME for passphrases" msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÛÉÆÒÏ×ÁÌØÎÙÊ ÁÌÇÏÒÉÔÍÏÍ éíñ ÄÌÑ ËÌÀÞÅ×ÙÈ ÆÒÁÚ" -#: g10/g10.c:251 +#: g10/g10.c:256 msgid "|NAME|use cipher algorithm NAME" msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÛÉÆÒÏ×ÁÌØÎÙÊ ÁÌÇÏÒÉÔÍÏÍ éíñ" -#: g10/g10.c:252 +#: g10/g10.c:257 msgid "|NAME|use message digest algorithm NAME" msgstr "|éíñ|ÉÓÐÏÌØÚÏ×ÁÔØ ÈÜÛ-ÁÌÇÏÒÉÔÍ éíñ" -#: g10/g10.c:253 +#: g10/g10.c:258 msgid "|N|use compress algorithm N" msgstr "|N|ÉÓÐÏÌØÚÏ×ÁÔØ ÁÌÇÏÒÉÔÍ ÓÖÁÔÉÑ N" -#: g10/g10.c:254 +#: g10/g10.c:259 msgid "throw keyid field of encrypted packets" msgstr "×ÙÂÒÁÓÙ×ÁÔØ ÐÏÌÅ keyid Õ ÚÁÛÉÆÒÏ×ÁÎÎÙÈ ÐÁËÅÔÏ×" -#: g10/g10.c:262 +#: g10/g10.c:267 #, fuzzy msgid "" "@\n" @@ -590,21 +617,21 @@ msgstr "" " --list-keys [names] ÐÏËÁÚÁÔØ ÓÐÉÓÏË ËÌÀÞÅÊ\n" " --fingerprint [names] ÐÏËÁÚÁÔØ \"ÏÔÐÅÞÁÔËÉ ÐÁÌØÃÅ×\" ËÌÀÞÅÊ\n" -#: g10/g10.c:341 +#: g10/g10.c:346 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n" msgstr "" "ðÏÖÁÌÕÊÓÔÁ, ÏÔÐÒÁ×ÌÑÊÔÅ ÓÏÏÂÝÅÎÉÑ Ï ÏÛÉÂËÁÈ ÐÏ ÁÄÒÅÓÕ " "<gnupg-bugs@gnu.org>.\n" -#: g10/g10.c:346 +#: g10/g10.c:351 msgid "Usage: gpgm [options] [files] (-h for help)" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: gpgm [ÐÁÒÁÍÅÔÒÙ] [ÆÁÊÌÙ] (-h ÄÌÑ ÐÏÍÏÝÉ)" -#: g10/g10.c:348 +#: g10/g10.c:353 msgid "Usage: gpg [options] [files] (-h for help)" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: gpg [ÐÁÒÁÍÅÔÒÙ] [ÆÁÊÌÙ] (-h ÄÌÑ ÐÏÍÏÝÉ)" -#: g10/g10.c:353 +#: g10/g10.c:358 #, fuzzy msgid "" "Syntax: gpgm [options] [files]\n" @@ -613,7 +640,7 @@ msgstr "" "óÉÎÔÁËÓÉÓ: gpgm [ÐÁÒÁÍÅÔÒÙ] [ÆÁÊÌÙ]\n" "ðÒÏÇÒÁÍÍÁ ÓÏÐÒÏ×ÏÖÄÅÎÉÑ GNUPG\n" -#: g10/g10.c:356 +#: g10/g10.c:361 msgid "" "Syntax: gpg [options] [files]\n" "sign, check, encrypt or decrypt\n" @@ -623,7 +650,7 @@ msgstr "" "ÐÏÄÐÉÓÙ×ÁÅÔ, ÐÒÏ×ÅÒÑÅÔ ÐÏÄÐÉÓÉ, ÛÉÆÒÕÅÔ ÉÌÉ ÒÁÓÛÉÆÒÏ×Ù×ÁÅÔ\n" "ÒÅÖÉÍ ÒÁÂÏÔÙ ÚÁ×ÉÓÉÔ ÏÔ ×ÈÏÄÎÙÈ ÄÁÎÎÙÈ\n" -#: g10/g10.c:362 +#: g10/g10.c:367 msgid "" "\n" "Supported algorithms:\n" @@ -631,227 +658,232 @@ msgstr "" "\n" "ðÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÁÌÇÏÒÉÔÍÙ:\n" -#: g10/g10.c:437 +#: g10/g10.c:442 msgid "usage: gpgm [options] " msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: gpgm [ÐÁÒÁÍÅÔÒÙ] " -#: g10/g10.c:439 +#: g10/g10.c:444 msgid "usage: gpg [options] " msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: gpg [ÐÁÒÁÍÅÔÒÙ] " -#: g10/g10.c:480 +#: g10/g10.c:485 msgid "conflicting commands\n" msgstr "Widersprüchliche Kommandos\n" -#: g10/g10.c:618 +#: g10/g10.c:623 #, fuzzy, c-format msgid "NOTE: no default option file `%s'\n" msgstr "ÚÁÍÅÞÁÎÉÅ: ÆÁÊÌ ÐÁÒÁÍÅÔÒÏ× ÐÏ ÕÍÏÌÞÁÎÉÀ `%s' ÏÔÓÕÔÓÔ×ÕÅÔ\n" -#: g10/g10.c:622 +#: g10/g10.c:627 #, c-format msgid "option file `%s': %s\n" msgstr "ÆÁÊÌ ÐÁÒÁÍÅÔÒÏ× `%s': %s\n" -#: g10/g10.c:629 +#: g10/g10.c:634 #, c-format msgid "reading options from `%s'\n" msgstr "ÞÉÔÁÀÔÓÑ ÐÁÒÁÍÅÔÒÙ ÉÚ `%s'\n" -#: g10/g10.c:782 +#: g10/g10.c:788 #, fuzzy, c-format msgid "%s is not a valid character set\n" msgstr "îÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ × ËÏÍÍÅÎÔÁÒÉÉ.\n" -#: g10/g10.c:817 g10/g10.c:829 +#: g10/g10.c:824 g10/g10.c:836 msgid "selected cipher algorithm is invalid\n" msgstr "×ÙÂÒÁÎ ÎÅÄÏÐÕÓÔÉÍÙÊ ÁÌÇÏÒÉÔÍ ÛÉÆÒÏ×ÁÎÉÑ\n" -#: g10/g10.c:823 g10/g10.c:835 +#: g10/g10.c:830 g10/g10.c:842 msgid "selected digest algorithm is invalid\n" msgstr "×ÙÂÒÁÎ ÎÅÄÏÐÕÓÔÉÍÙÊ ÄÁÊÄÖÅÓÔ-ÁÌÇÏÒÉÔÍ\n" -#: g10/g10.c:838 +#: g10/g10.c:845 #, c-format msgid "compress algorithm must be in range %d..%d\n" msgstr "ÁÌÇÏÒÉÔÍ ÕÐÁËÏ×ËÉ ÍÏÖÅÔ ÉÍÅÔØ ÚÎÁÞÅÎÉÑ ÏÔ %d ÄÏ %d\n" -#: g10/g10.c:840 +#: g10/g10.c:847 msgid "completes-needed must be greater than 0\n" msgstr "completes-needed ÄÏÌÖÅÎ ÂÙÔØ ÂÏÌØÛÅ 0\n" -#: g10/g10.c:842 +#: g10/g10.c:849 msgid "marginals-needed must be greater than 1\n" msgstr "marginals-needed ÄÏÌÖÅÎ ÂÙÔØ ÂÏÌØÛÅ 1\n" -#: g10/g10.c:844 +#: g10/g10.c:851 msgid "max-cert-depth must be in range 1 to 255\n" msgstr "" -#: g10/g10.c:847 +#: g10/g10.c:854 #, fuzzy msgid "NOTE: simple S2K mode (0) is strongly discouraged\n" msgstr "ÚÁÍÅÞÁÎÉÅ: ÐÒÏÓÔÏÊ S2K ÒÅÖÉÍ (0) ÏÞÅÎØ ÎÅ ÒÅËÏÍÅÎÄÕÅÔÓÑ\n" -#: g10/g10.c:851 +#: g10/g10.c:858 msgid "invalid S2K mode; must be 0, 1 or 3\n" msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÒÅÖÉÍ S2K: ÄÏÌÖÅÎ ÂÙÔØ 0, 1 ÉÌÉ 3\n" -#: g10/g10.c:934 +#: g10/g10.c:941 #, c-format msgid "failed to initialize the TrustDB: %s\n" msgstr "ïÛÉÂËÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ ÂÁÚÙ ÄÁÎÎÙÈ ÄÏ×ÅÒÉÑ: %s\n" -#: g10/g10.c:940 +#: g10/g10.c:947 msgid "--store [filename]" msgstr "--store [ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:948 +#: g10/g10.c:955 msgid "--symmetric [filename]" msgstr "--symmetric [ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:956 +#: g10/g10.c:963 msgid "--encrypt [filename]" msgstr "--encrypt [ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:969 +#: g10/g10.c:976 msgid "--sign [filename]" msgstr "--sign [ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:982 +#: g10/g10.c:989 msgid "--sign --encrypt [filename]" msgstr "--sign --encrypt [ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:996 +#: g10/g10.c:1003 msgid "--clearsign [filename]" msgstr "--clearsign [ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:1008 +#: g10/g10.c:1015 msgid "--decrypt [filename]" msgstr "--decrypt [ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:1017 +#: g10/g10.c:1024 #, fuzzy msgid "--edit-key username [commands]" msgstr "--edit-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ" -#: g10/g10.c:1033 +#: g10/g10.c:1040 msgid "--delete-secret-key username" msgstr "--delete-secret-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ" -#: g10/g10.c:1036 +#: g10/g10.c:1043 msgid "--delete-key username" msgstr "--delete-key ÉÍÑ-ÐÏÌØÚÏ×ÁÔÅÌÑ" -#: g10/encode.c:216 g10/g10.c:1059 g10/sign.c:301 +#: g10/encode.c:216 g10/g10.c:1066 g10/sign.c:311 #, c-format msgid "can't open %s: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s': %s\n" -#: g10/g10.c:1070 +#: g10/g10.c:1077 msgid "-k[v][v][v][c] [userid] [keyring]" msgstr "-k[v][v][v][c] [ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ] [Ó×ÑÚËÁ ËÌÀÞÅÊ]" -#: g10/g10.c:1127 +#: g10/g10.c:1138 #, c-format msgid "dearmoring failed: %s\n" msgstr "ÏÛÉÂËÁ ÄÅËÏÄÉÒÏ×ÁÎÉÑ: %s\n" -#: g10/g10.c:1135 +#: g10/g10.c:1146 #, c-format msgid "enarmoring failed: %s\n" msgstr "ÏÛÉÂËÁ ËÏÄÉÒÏ×ÁÎÉÑ: %s\n" -#: g10/g10.c:1201 +#: g10/g10.c:1212 #, c-format msgid "invalid hash algorithm `%s'\n" msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÈÜÛ-ÁÌÇÏÒÉÔÍ `%s'\n" -#: g10/g10.c:1280 +#: g10/g10.c:1291 msgid "[filename]" msgstr "[ÉÍÑ ÆÁÊÌÁ]" -#: g10/g10.c:1284 +#: g10/g10.c:1295 msgid "Go ahead and type your message ...\n" msgstr "" -#: g10/decrypt.c:59 g10/g10.c:1287 g10/verify.c:66 +#: g10/decrypt.c:59 g10/g10.c:1298 g10/verify.c:66 #, c-format msgid "can't open `%s'\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ `%s'\n" -#: g10/armor.c:321 +#: g10/armor.c:297 #, fuzzy, c-format msgid "armor: %s\n" msgstr "ëÏÄÉÒÏ×ËÁ: %s\n" -#: g10/armor.c:344 +#: g10/armor.c:320 msgid "invalid armor header: " msgstr "" -#: g10/armor.c:351 +#: g10/armor.c:327 msgid "armor header: " msgstr "" -#: g10/armor.c:362 +#: g10/armor.c:338 #, fuzzy msgid "invalid clearsig header\n" msgstr "ÎÅÄÏÐÕÓÔÉÍÏÅ ÎÁÞÁÌÏ ÔÅËÓÔÏ×ÏÊ ÐÏÄÐÉÓÉ\n" -#: g10/armor.c:414 +#: g10/armor.c:390 #, fuzzy msgid "nested clear text signatures\n" msgstr "|[ÆÁÊÌ]|ÓÏÚÄÁÔØ ÔÅËÓÔÏ×ÕÀ ÐÏÄÐÉÓØ" -#: g10/armor.c:530 +#: g10/armor.c:508 msgid "invalid dash escaped line: " msgstr "ÎÅÄÏÐÕÓÔÉÍÁÑ ÓÔÒÏËÁ ÎÁÞÉÎÁÀÝÁÑÓÑ Ó ÍÉÎÕÓÏ×: " -#: g10/armor.c:538 +#: g10/armor.c:516 #, fuzzy msgid "unexpected armor:" msgstr "îÅÏÖÉÄÁÎÎÙÅ ÄÁÎÎÙÅ" -#: g10/armor.c:624 +#: g10/armor.c:632 #, fuzzy, c-format msgid "invalid radix64 character %02x skipped\n" msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÄÌÑ ËÏÄÉÒÏ×ËÉ radix64 ÓÉÍ×ÏÌ %02x ÐÒÏÐÕÝÅÎ\n" -#: g10/armor.c:654 +#: g10/armor.c:675 msgid "premature eof (no CRC)\n" msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ (ÎÅÔ CRC)\n" -#: g10/armor.c:671 +#: g10/armor.c:709 msgid "premature eof (in CRC)\n" msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ (× CRC)\n" -#: g10/armor.c:675 +#: g10/armor.c:713 msgid "malformed CRC\n" msgstr "ÎÅÐÒÁ×ÉÌØÎÁÑ ÆÏÒÍÁ CRC\n" -#: g10/armor.c:679 +#: g10/armor.c:717 #, c-format msgid "CRC error; %06lx - %06lx\n" msgstr "ÏÛÉÂËÁ CRC; %06lx - %06lx\n" -#: g10/armor.c:696 +#: g10/armor.c:734 msgid "premature eof (in Trailer)\n" msgstr "ÎÅÏÖÉÄÁÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ (× È×ÏÓÔÅ)\n" -#: g10/armor.c:700 +#: g10/armor.c:738 msgid "error in trailer line\n" msgstr "ÏÛÉÂËÁ × ÚÁ×ÅÒÛÁÀÝÅÊ ÓÔÒÏËÅ\n" -#: g10/armor.c:961 +#: g10/armor.c:999 #, fuzzy msgid "no valid OpenPGP data found.\n" msgstr "ÎÅ ÎÁÊÄÅÎÏ ÄÏÐÕÓÔÉÍÙÈ RFC1991 ÉÌÉ OpenPGP ÄÁÎÎÙÈ.\n" -#: g10/armor.c:963 +#: g10/armor.c:1001 #, c-format msgid "invalid armor: line longer than %d characters\n" msgstr "" +#: g10/armor.c:1005 +msgid "" +"quoted printable character in armor - probably a buggy MTA has been used\n" +msgstr "" + #: g10/pkclist.c:138 #, fuzzy, c-format msgid "" @@ -1343,21 +1375,38 @@ msgid "public and secret key created and signed.\n" msgstr "ÏÔËÒÙÔÙÊ É ÓÅËÒÅÔÎÙÊ ËÌÀÞÉ ÓÏÚÄÁÎÙ É ÐÏÄÐÉÓÁÎÙ.\n" #: g10/keygen.c:931 +#, fuzzy 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" +"the command \"--edit-key\" to generate a secondary key for this purpose.\n" msgstr "" "ïÂÒÁÔÉÔÅ ×ÎÉÍÁÎÉÅ, ÞÔÏ ÜÔÏÔ ËÌÀÞ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ÄÌÑ ÛÉÆÒÏ×ÁÎÉÑ.\n" "÷Ù ÍÏÖÅÔÅ ×ÏÓÐÏÌØÚÏ×ÁÔØÓÑ ÐÁÒÁÍÅÔÒÏÍ --add-key ÄÌÑ ÇÅÎÅÒÁÃÉÉ " "ÄÏÐÏÌÎÉÔÅÌØÎÏÇÏ\n" "ËÌÀÞÁ ÄÌÑ ÛÉÆÒÏ×ÁÎÉÑ.\n" -#: g10/keygen.c:945 g10/keygen.c:1030 +#: g10/keygen.c:945 g10/keygen.c:1044 #, c-format msgid "Key generation failed: %s\n" msgstr "çÅÎÅÒÁÃÉÑ ËÌÀÞÁ ÎÅ ÕÄÁÌÁÓØ: %s\n" -#: g10/keygen.c:1008 +#: g10/keygen.c:989 g10/sig-check.c:172 g10/sign.c:52 +#, fuzzy, c-format +msgid "" +"key has been created %lu second in future (time warp or clock problem)\n" +msgstr "" +"ÏÔËÒÙÔÙÊ ËÌÀÞ ÓÇÅÎÅÒÉÒÏ×ÁÎ × ÂÕÄÕÝÅÍ (ÉÓËÒÉ×ÌÅÎÉÅ ×ÒÅÍÅÎÉ ÉÌÉ ÎÅÐÒÁ×ÉÌØÎÏ " +"ÕÓÔÁÎÏ×ÌÅÎÙ ÞÁÓÙ)\n" + +#: g10/keygen.c:991 g10/sig-check.c:174 g10/sign.c:54 +#, fuzzy, c-format +msgid "" +"key has been created %lu seconds in future (time warp or clock problem)\n" +msgstr "" +"ÏÔËÒÙÔÙÊ ËÌÀÞ ÓÇÅÎÅÒÉÒÏ×ÁÎ × ÂÕÄÕÝÅÍ (ÉÓËÒÉ×ÌÅÎÉÅ ×ÒÅÍÅÎÉ ÉÌÉ ÎÅÐÒÁ×ÉÌØÎÏ " +"ÕÓÔÁÎÏ×ÌÅÎÙ ÞÁÓÙ)\n" + +#: g10/keygen.c:1022 #, fuzzy msgid "Really create? " msgstr "äÅÊÓÔ×ÉÔÅÌØÎÏ ÓÏÚÄÁÔØ? " @@ -1388,22 +1437,22 @@ msgstr "þÉÔÁÅÔÓÑ ÉÚ `%s'\n" msgid "%s/%s encrypted for: %s\n" msgstr "%s ÚÁÛÉÆÒÏ×ÁÎÏ ÄÌÑ: %s\n" -#: g10/export.c:114 +#: g10/export.c:147 #, fuzzy, c-format msgid "%s: user not found: %s\n" msgstr "%s: ÐÏÌØÚÏ×ÁÔÅÌØ ÎÅ ÎÁÊÄÅÎ\n" -#: g10/export.c:123 +#: g10/export.c:156 #, c-format msgid "certificate read problem: %s\n" msgstr "" -#: g10/export.c:132 +#: g10/export.c:165 #, fuzzy, c-format msgid "key %08lX: not a rfc2440 key - skipped\n" msgstr "ÓÅËÒÅÔÎÙÊ ËÌÀÞ %08lX: ÎÅ ÉÍÅÅÔ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ ÏÔËÒÙÔÏÇÏ ËÌÀÞÁ.\n" -#: g10/export.c:174 +#: g10/export.c:203 #, fuzzy msgid "WARNING: nothing exported\n" msgstr "÷îéíáîéå: éÓÐÏÌØÚÕÅÔÓÑ ËÌÀÞ Ë ËÏÔÏÒÏÍÕ ÎÅÔ ÄÏ×ÅÒÉÑ!\n" @@ -1421,263 +1470,278 @@ msgstr "" msgid "using secondary key %08lX instead of primary key %08lX\n" msgstr "ÉÓÐÏÌØÚÕÅÔÓÑ ÄÏÐÏÌÎÉÔÅÌØÎÙÊ ËÌÀÞ %09lX ×ÍÅÓÔÏ ÏÓÎÏ×ÎÏÇÏ %08lX%\n" -#: g10/import.c:129 g10/trustdb.c:1180 +#: g10/import.c:117 g10/trustdb.c:1180 #, c-format msgid "can't open file: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ: %s\n" -#: g10/import.c:148 +#: g10/import.c:165 #, c-format msgid "skipping block of type %d\n" msgstr "ÐÒÏÐÕÓËÁÅÍ ÂÌÏË ÔÉÐÁ %d\n" -#: g10/import.c:155 g10/trustdb.c:1474 g10/trustdb.c:1543 +#: g10/import.c:172 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 +#: g10/import.c:177 g10/trustdb.c:1256 #, c-format msgid "read error: %s\n" msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ: %s\n" -#: g10/import.c:162 +#: g10/import.c:179 #, c-format msgid "Total number processed: %lu\n" msgstr "" -#: g10/import.c:164 +#: g10/import.c:181 #, c-format msgid " w/o user IDs: %lu\n" msgstr "" -#: g10/import.c:166 +#: g10/import.c:183 #, c-format msgid " imported: %lu" msgstr "" -#: g10/import.c:172 +#: g10/import.c:189 #, c-format msgid " unchanged: %lu\n" msgstr "" -#: g10/import.c:174 +#: g10/import.c:191 #, c-format msgid " new user IDs: %lu\n" msgstr "" -#: g10/import.c:176 +#: g10/import.c:193 #, c-format msgid " new subkeys: %lu\n" msgstr "" -#: g10/import.c:178 +#: g10/import.c:195 #, fuzzy, c-format msgid " new signatures: %lu\n" msgstr "ËÌÀÞ %08lX: %d ÎÏ×ÙÈ ÐÏÄÐÉÓÅÊ\n" -#: g10/import.c:180 +#: g10/import.c:197 #, c-format msgid " new key revocations: %lu\n" msgstr "" -#: g10/import.c:182 +#: g10/import.c:199 #, c-format msgid " secret keys read: %lu\n" msgstr "" -#: g10/import.c:184 +#: g10/import.c:201 #, fuzzy, c-format msgid " secret keys imported: %lu\n" msgstr "ËÌÀÞ %08lX: ÓÅËÒÅÔÎÙÊ ËÌÀÞ ÉÍÐÏÒÔÉÒÏ×ÁÎ\n" -#: g10/import.c:186 +#: g10/import.c:203 #, fuzzy, c-format msgid " secret keys unchanged: %lu\n" msgstr "éÓÐÏÌØÚÏ×ÁÎ ÎÅÐÒÁ×ÉÌØÎÙÊ ÓÅËÒÅÔÎÙÊ ËÌÀÞ" -#: g10/import.c:328 g10/import.c:520 +#: g10/import.c:343 g10/import.c:535 #, c-format msgid "key %08lX: no user id\n" msgstr "ËÌÀÞ %08lX: ÎÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ\n" -#: g10/import.c:339 +#: g10/import.c:354 #, c-format msgid "key %08lX: no valid user ids\n" msgstr "ËÌÀÞ %08lX: ÎÅÔ ÄÏÐÕÓÔÉÍÙÈ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× ÐÏÌØÚÏ×ÁÔÅÌÅÊ\n" -#: g10/import.c:341 +#: g10/import.c:356 msgid "this may be caused by a missing self-signature\n" msgstr "ÜÔÏ ÍÏÖÅÔ ÂÙÔØ ×ÙÚ×ÁÎÏ ÏÔÓÕÔÓÔ×ÉÅÍ ÓÁÍÏ-ÐÏÄÐÉÓÉ\n" -#: g10/import.c:352 g10/import.c:588 +#: g10/import.c:367 g10/import.c:603 #, c-format msgid "key %08lX: public key not found: %s\n" msgstr "ËÌÀÞ %08lX: ÏÔËÒÙÔÙÊ ËÌÀÞ ÎÅ ÎÁÊÄÅÎ: %s\n" -#: g10/import.c:358 +#: g10/import.c:373 msgid "no default public keyring\n" msgstr "ÎÅÔ Ó×ÑÚËÉ ÏÔËÒÙÔÙÈ ËÌÀÞÅÊ ÐÏ ÕÍÏÌÞÁÎÉÀ\n" -#: g10/import.c:362 g10/openfile.c:105 g10/sign.c:205 g10/sign.c:592 +#: g10/import.c:377 g10/openfile.c:105 g10/sign.c:215 g10/sign.c:601 #, c-format msgid "writing to `%s'\n" msgstr "ÚÁÐÉÓÙ×ÁÅÔÓÑ × `%s'\n" -#: g10/import.c:366 g10/import.c:426 g10/import.c:642 +#: g10/import.c:381 g10/import.c:441 g10/import.c:657 #, c-format msgid "can't lock public keyring: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÂÌÏËÉÒÏ×ÁÔØ Ó×ÑÚËÕ ÏÔËÒÙÔÙÈ ËÌÀÞÅÊ: %s\n" -#: g10/import.c:369 +#: g10/import.c:384 #, c-format msgid "can't write to keyring: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ × Ó×ÑÚËÕ ËÌÀÞÅÊ: %s\n" -#: g10/import.c:373 +#: g10/import.c:388 #, c-format msgid "key %08lX: public key imported\n" msgstr "ËÌÀÞ %08lX: ÏÔËÒÙÔÙÊ ËÌÀÞ ÉÍÐÏÒÔÉÒÏ×ÁÎ\n" -#: g10/import.c:386 +#: g10/import.c:401 #, c-format msgid "key %08lX: doesn't match our copy\n" msgstr "ËÌÀÞ %08lX: ÎÅ ÓÏ×ÐÁÄÁÅÔ Ó ÎÁÛÅÊ ËÏÐÉÅÊ\n" -#: g10/import.c:399 g10/import.c:597 +#: g10/import.c:414 g10/import.c:612 #, c-format msgid "key %08lX: can't locate original keyblock: %s\n" msgstr "ËÌÀÞ %08lX: ÎÅ×ÏÚÍÏÖÎÏ ÏÂÎÁÒÕÖÉÔØ original keyblock: %s\n" -#: g10/import.c:406 g10/import.c:604 +#: g10/import.c:421 g10/import.c:619 #, c-format msgid "key %08lX: can't read original keyblock: %s\n" msgstr "ËÌÀÞ %08lX: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ original keyblock: %s\n" -#: g10/import.c:423 g10/import.c:535 g10/import.c:639 +#: g10/import.c:438 g10/import.c:550 g10/import.c:654 msgid "writing keyblock\n" msgstr "ÚÁÐÉÓÙ×ÁÅÔÓÑ ÂÌÏË ËÌÀÞÁ\n" -#: g10/import.c:429 g10/import.c:645 +#: g10/import.c:444 g10/import.c:660 #, c-format msgid "can't write keyblock: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÂÌÏË ËÌÀÞÁ: %s\n" -#: g10/import.c:434 +#: g10/import.c:449 #, c-format msgid "key %08lX: 1 new user-id\n" msgstr "ËÌÀÞ %08lX: 1 ÎÏ×ÙÊ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ\n" -#: g10/import.c:437 +#: g10/import.c:452 #, c-format msgid "key %08lX: %d new user-ids\n" msgstr "ËÌÀÞ %08lX: %d ÎÏ×ÙÈ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× ÐÏÌØÚÏ×ÁÔÅÌÅÊ\n" -#: g10/import.c:440 +#: g10/import.c:455 #, c-format msgid "key %08lX: 1 new signature\n" msgstr "ËÌÀÞ %08lX: 1 ÎÏ×ÁÑ ÐÏÄÐÉÓØ\n" -#: g10/import.c:443 +#: g10/import.c:458 #, c-format msgid "key %08lX: %d new signatures\n" msgstr "ËÌÀÞ %08lX: %d ÎÏ×ÙÈ ÐÏÄÐÉÓÅÊ\n" -#: g10/import.c:446 +#: g10/import.c:461 #, c-format msgid "key %08lX: 1 new subkey\n" msgstr "ËÌÀÞ %08lX: 1 ÎÏ×ÙÊ ÐÏÄ-ËÌÀÞ\n" -#: g10/import.c:449 +#: g10/import.c:464 #, c-format msgid "key %08lX: %d new subkeys\n" msgstr "ËÌÀÞ %08lX: %d ÎÏ×ÙÈ ÐÏÄ-ËÌÀÞÅÊ\n" -#: g10/import.c:459 +#: g10/import.c:474 #, c-format msgid "key %08lX: not changed\n" msgstr "ËÌÀÞ %08lX: ÎÅ ÉÚÍÅÎÅÎ\n" -#: g10/import.c:538 +#: g10/import.c:553 #, c-format msgid "can't lock secret keyring: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÂÌÏËÉÒÏ×ÁÔØ Ó×ÑÚËÕ ÓÅËÒÅÔÎÙÈ ËÌÀÞÅÊ: %s\n" -#: g10/import.c:541 +#: g10/import.c:556 #, fuzzy, c-format msgid "can't write keyring: %s\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ Ó×ÑÚËÕ ËÌÀÞÅÊ: %s\n" #. we are ready -#: g10/import.c:544 +#: g10/import.c:559 #, c-format msgid "key %08lX: secret key imported\n" msgstr "ËÌÀÞ %08lX: ÓÅËÒÅÔÎÙÊ ËÌÀÞ ÉÍÐÏÒÔÉÒÏ×ÁÎ\n" #. we can't merge secret keys -#: g10/import.c:548 +#: g10/import.c:563 #, c-format msgid "key %08lX: already in secret keyring\n" msgstr "ËÌÀÞ %08lX: ÕÖÅ ÎÁ Ó×ÑÚËÅ ÓÅËÒÅÔÎÙÈ ËÌÀÞÅÊ\n" -#: g10/import.c:553 +#: g10/import.c:568 #, c-format msgid "key %08lX: secret key not found: %s\n" msgstr "ËÌÀÞ %08lX: ÓÅËÒÅÔÎÙÊ ËÌÀÞ ÎÅ ÎÁÊÄÅÎ: %s\n" -#: g10/import.c:582 +#: g10/import.c:597 #, c-format msgid "key %08lX: no public key - can't apply revocation certificate\n" msgstr "" "ËÌÀÞ %08lX: ÎÅÔ ÏÔËÒÙÔÏÇÏ ËÌÀÞÁ - ÎÅ×ÏÚÍÏÖÎÏ ÐÒÉÍÅÎÉÔØ ÏÔÚÙ×ÁÀÝÉÊ " "ÓÅÒÔÉÆÉËÁÔ\n" -#: g10/import.c:615 +#: g10/import.c:630 #, c-format msgid "key %08lX: invalid revocation certificate: %s - rejected\n" msgstr "ËÌÀÞ %08lX: ÎÅÄÏÐÕÓÔÉÍÙÊ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ: %s - ÏÔ×ÅÒÇÎÕÔ\n" -#: g10/import.c:649 +#: g10/import.c:664 #, c-format msgid "key %08lX: revocation certificate imported\n" msgstr "ËÌÀÞ %08lX: ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ ÉÍÐÏÒÔÉÒÏ×ÁÎ\n" -#: g10/import.c:680 +#: g10/import.c:698 #, c-format msgid "key %08lX: no user-id for signature\n" msgstr "ËÌÀÞ %08lX: ÎÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÐÏÄÐÉÓÉ\n" -#: g10/import.c:687 +#: g10/import.c:705 g10/import.c:729 #, c-format msgid "key %08lX: unsupported public key algorithm\n" msgstr "ËÌÀÞ %08lX: ÎÅÐÏÄÄÅÒÖÉ×ÁÅÍÙÊ ÁÌÇÏÒÉÔÍ ÏÔËÒÙÔÏÇÏ ËÌÀÞÁ\n" -#: g10/import.c:688 +#: g10/import.c:706 #, c-format msgid "key %08lX: invalid self-signature\n" msgstr "ËÌÀÞ %08lX: ÎÅÄÏÐÕÓÔÉÍÁÑ ÓÁÍÏ-ÐÏÄÐÉÓØ\n" -#: g10/import.c:717 +#: g10/import.c:722 +#, fuzzy, c-format +msgid "key %08lX: no subkey for key binding\n" +msgstr "ËÌÀÞ %08lX: ÎÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ\n" + +#: g10/import.c:730 +#, fuzzy, c-format +msgid "key %08lX: invalid subkey binding\n" +msgstr "ËÌÀÞ %08lX: ÎÅÔ ÄÏÐÕÓÔÉÍÙÈ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× ÐÏÌØÚÏ×ÁÔÅÌÅÊ\n" + +#: g10/import.c:761 #, c-format msgid "key %08lX: skipped userid '" msgstr "ËÌÀÞ %08lX: ÐÒÏÐÕÝÅÎ ÉÄÅÎÔÉÆÉËÁÔÏÒ ÐÏÌØÚÏ×ÁÔÅÌÑ '" -#: g10/import.c:740 +#: g10/import.c:781 +#, fuzzy, c-format +msgid "key %08lX: skipped subkey\n" +msgstr "ËÌÀÞ %08lX: 1 ÎÏ×ÙÊ ÐÏÄ-ËÌÀÞ\n" + +#: g10/import.c:800 #, c-format msgid "key %08lX: revocation certificate at wrong place - skipped\n" msgstr "ËÌÀÞ %08lX: ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ × ÎÅÐÒÁ×ÉÌØÎÏÍ ÍÅÓÔÅ - ÐÒÏÐÕÝÅÎ\n" -#: g10/import.c:748 +#: g10/import.c:808 #, c-format msgid "key %08lX: invalid revocation certificate: %s - skipped\n" msgstr "ËÌÀÞ %08lX: ÎÅÄÏÐÕÓÔÉÍÙÊ ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ: %s - ÐÒÏÐÕÝÅÎ\n" -#: g10/import.c:807 +#: g10/import.c:867 #, c-format msgid "key %08lX: revocation certificate added\n" msgstr "ËÌÀÞ %08lX: ÏÔÚÙ×ÁÀÝÉÊ ÓÅÒÔÉÆÉËÁÔ ÄÏÂÁ×ÌÅÎ\n" -#: g10/import.c:921 g10/import.c:976 +#: g10/import.c:981 g10/import.c:1036 #, c-format msgid "key %08lX: our copy has no self-signature\n" msgstr "ËÌÀÞ %08lX: ÎÁÛÁ ËÏÐÉÑ ÎÅ ÉÍÅÅÔ ÓÁÍÏ-ÐÏÄÐÉÓÉ\n" @@ -1754,7 +1818,7 @@ msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ Õ×ÅÒÅÎÙ, ÞÔÏ ÈÏÔÉÔÅ ÐÏÄÐÉÓÁÔØ ÜÔÏÔ ËÌÀÞ Ó×ÏÉÍ:\n" msgid "Really sign? " msgstr "äÅÊÓÔ×ÉÔÅÌØÎÏ ÐÏÄÐÉÓÁÔØ? " -#: g10/keyedit.c:303 g10/sign.c:65 +#: g10/keyedit.c:303 g10/sign.c:75 #, fuzzy, c-format msgid "signing failed: %s\n" msgstr "ÏÛÉÂËÁ ÐÏÄÐÉÓÙ×ÁÎÉÑ: %s\n" @@ -2101,63 +2165,63 @@ msgstr "îÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ Ó ÉÎÄÅËÓÏÍ %d\n" msgid "No secondary key with index %d\n" msgstr "îÅÔ ÄÏÐÏÌÎÉÔÅÌØÎÏÇÏ ËÌÀÞÁ Ó ÉÎÄÅËÓÏÍ %d\n" -#: g10/mainproc.c:198 +#: g10/mainproc.c:199 #, fuzzy msgid "public key encrypted data: good DEK\n" msgstr "ÒÁÓÛÉÆÒÏ×ËÁ ÏÔËÒÙÔÙÍ ËÌÀÞÏÍ ÎÅ ÕÄÁÌÁÓØ %s\n" -#: g10/mainproc.c:201 +#: g10/mainproc.c:202 #, c-format msgid "public key decryption failed: %s\n" msgstr "ÒÁÓÛÉÆÒÏ×ËÁ ÏÔËÒÙÔÙÍ ËÌÀÞÏÍ ÎÅ ÕÄÁÌÁÓØ %s\n" -#: g10/mainproc.c:228 +#: g10/mainproc.c:229 #, fuzzy msgid "decryption okay\n" msgstr "ÒÁÓÛÉÆÒÏ×ËÁ ÎÅ ÕÄÁÌÁÓØ: %s\n" -#: g10/mainproc.c:231 +#: g10/mainproc.c:232 #, c-format msgid "decryption failed: %s\n" msgstr "ÒÁÓÛÉÆÒÏ×ËÁ ÎÅ ÕÄÁÌÁÓØ: %s\n" -#: g10/mainproc.c:248 +#: g10/mainproc.c:249 #, fuzzy msgid "NOTE: sender requested \"for-your-eyes-only\"\n" msgstr "ÚÁÍÅÞÁÎÉÅ: ÏÔÐÒÁ×ÉÔÅÌØ ÚÁÐÒÏÓÉÌ \"ÔÏÌØËÏ-ÄÌÑ-÷ÁÛÉÈ-ÇÌÁÚ\"\n" -#: g10/mainproc.c:250 +#: g10/mainproc.c:251 #, c-format msgid "original file name='%.*s'\n" msgstr "" -#: g10/mainproc.c:833 +#: g10/mainproc.c:834 msgid "signature verification suppressed\n" msgstr "" -#: g10/mainproc.c:839 +#: g10/mainproc.c:840 #, c-format msgid "Signature made %.*s using %s key ID %08lX\n" msgstr "ðÏÄÐÉÓØ ÓÄÅÌÁÎÁ %.*s, ÉÓÐÏÌØÚÕÑ %s ËÌÀÞ %08lX\n" -#: g10/mainproc.c:847 +#: g10/mainproc.c:852 msgid "BAD signature from \"" msgstr "ðìïèáñ ÐÏÄÐÉÓØ ÏÔ \"" -#: g10/mainproc.c:848 +#: g10/mainproc.c:853 msgid "Good signature from \"" msgstr "èÏÒÏÛÁÑ ÐÏÄÐÉÓØ ÏÔ \"" -#: g10/mainproc.c:879 +#: g10/mainproc.c:884 #, c-format msgid "Can't check signature: %s\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏ×ÅÒÉÔØ ÐÏÄÐÉÓØ: %s\n" -#: g10/mainproc.c:952 +#: g10/mainproc.c:957 msgid "old style (PGP 2.x) signature\n" msgstr "" -#: g10/mainproc.c:957 +#: g10/mainproc.c:962 msgid "invalid root packet detected in proc_tree()\n" msgstr "" @@ -2230,15 +2294,15 @@ msgstr "ðÏ×ÔÏÒÉÔÅ ËÌÀÞÅ×ÕÀ ÆÒÁÚÕ: %s\n" msgid "data not saved; use option \"--output\" to save it\n" msgstr "ÄÁÎÎÙÅ ÎÅ ÂÙÌÉ ÓÏÈÒÁÎÅÎÙ; ×ÏÓÐÏÌØÚÕÊÔÅÓØ --\"output\" ÄÌÑ ÓÏÈÒÁÎÅÎÉÑ\n" -#: g10/plaintext.c:166 +#: g10/plaintext.c:208 msgid "Please enter name of data file: " msgstr "ðÏÖÁÌÕÊÓÔÁ, ××ÅÄÉÔÅ ÉÍÑ ÆÁÊÌÁ ÄÁÎÎÙÈ: " -#: g10/plaintext.c:187 +#: g10/plaintext.c:229 msgid "reading stdin ...\n" msgstr "" -#: g10/plaintext.c:250 +#: g10/plaintext.c:292 #, c-format msgid "can't open signed data `%s'\n" msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÐÏÄÐÉÓÁÎÎÙÅ ÄÁÎÎÙÅ `%s' .\n" @@ -2282,50 +2346,50 @@ msgid "" "this is a PGP generated ElGamal key which is NOT secure for signatures!\n" msgstr "ÜÔÏÔ ElGamal ËÌÀÞ, ÓÏÚÄÁÎÎÙÊ PGP, ÎÅ ÎÁÄÅÖÅÎ ÄÌÑ ÓÏÚÄÁÎÉÑ ÐÏÄÐÉÓÅÊ!\n" -#: g10/sig-check.c:166 +#: g10/sig-check.c:163 #, fuzzy, c-format -msgid "public key created %lu %s in future (time warp or clock problem)\n" -msgstr "" -"ÏÔËÒÙÔÙÊ ËÌÀÞ ÓÇÅÎÅÒÉÒÏ×ÁÎ × ÂÕÄÕÝÅÍ (ÉÓËÒÉ×ÌÅÎÉÅ ×ÒÅÍÅÎÉ ÉÌÉ ÎÅÐÒÁ×ÉÌØÎÏ " -"ÕÓÔÁÎÏ×ÌÅÎÙ ÞÁÓÙ)\n" - -#: g10/sig-check.c:168 -msgid "second" -msgstr "" +msgid "public key is %lu second newer than the signature\n" +msgstr "ËÌÀÞ %08lX: ÎÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÐÏÄÐÉÓÉ\n" -#: g10/sig-check.c:168 -msgid "seconds" -msgstr "" +#: g10/sig-check.c:164 +#, fuzzy, c-format +msgid "public key is %lu seconds newer than the signature\n" +msgstr "ËÌÀÞ %08lX: ÎÅÔ ÉÄÅÎÔÉÆÉËÁÔÏÒÁ ÐÏÌØÚÏ×ÁÔÅÌÑ ÄÌÑ ÐÏÄÐÉÓÉ\n" -#: g10/sig-check.c:173 +#: g10/sig-check.c:180 #, fuzzy, c-format msgid "NOTE: signature key expired %s\n" msgstr "ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ËÌÀÞ ÐÏÄÐÉÓÉ ÕÓÔÁÒÅÌ %s\n" -#: g10/sig-check.c:230 +#: g10/sig-check.c:237 msgid "assuming bad signature due to an unknown critical bit\n" msgstr "" -#: g10/sign.c:69 +#: g10/sign.c:79 #, fuzzy, c-format msgid "%s signature from: %s\n" msgstr "ðìïèáñ ÐÏÄÐÉÓØ ÏÔ \"" -#: g10/sign.c:200 g10/sign.c:587 +#: g10/sign.c:210 g10/sign.c:596 #, fuzzy, c-format msgid "can't create %s: %s\n" msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n" -#: g10/sign.c:296 +#: g10/sign.c:306 #, fuzzy msgid "signing:" msgstr "ÐÏÄÐÉÓÁÔØ" -#: g10/sign.c:336 +#: g10/sign.c:346 #, fuzzy, c-format msgid "WARNING: `%s' is an empty file\n" msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: ÐÕÓÔÏÊ ÆÁÊÌ.\n" +#: g10/textfilter.c:199 +#, c-format +msgid "can't handle text lines longer than %d characters\n" +msgstr "" + #: g10/tdbio.c:116 g10/tdbio.c:1418 #, fuzzy, c-format msgid "trustdb rec %lu: lseek failed: %s\n" @@ -2360,7 +2424,7 @@ msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n" msgid "%s: directory does not exist!\n" msgstr "" -#: g10/openfile.c:101 g10/openfile.c:165 g10/ringedit.c:1275 g10/tdbio.c:449 +#: g10/openfile.c:101 g10/openfile.c:165 g10/ringedit.c:1292 g10/tdbio.c:449 #, fuzzy, c-format msgid "%s: can't create: %s\n" msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n" @@ -2980,35 +3044,39 @@ msgstr "" msgid "%s: can't create keyring: %s\n" msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n" -#: g10/ringedit.c:299 g10/ringedit.c:1283 +#: g10/ringedit.c:299 g10/ringedit.c:1300 #, fuzzy, c-format msgid "%s: keyring created\n" msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ: %s\n" -#: g10/ringedit.c:1469 +#: g10/ringedit.c:1486 msgid "WARNING: 2 files with confidential information exists.\n" msgstr "" -#: g10/ringedit.c:1470 +#: g10/ringedit.c:1487 #, fuzzy, c-format msgid "%s is the unchanged one\n" msgstr "éÓÐÏÌØÚÏ×ÁÎ ÎÅÐÒÁ×ÉÌØÎÙÊ ÓÅËÒÅÔÎÙÊ ËÌÀÞ" -#: g10/ringedit.c:1471 +#: g10/ringedit.c:1488 #, c-format msgid "%s is the new one\n" msgstr "" -#: g10/ringedit.c:1472 +#: g10/ringedit.c:1489 msgid "Please fix this possible security flaw\n" msgstr "" -#: g10/skclist.c:94 +#: g10/skclist.c:88 g10/skclist.c:125 +msgid "key is not flagged as insecure - can't use it with the faked RNG!\n" +msgstr "" + +#: g10/skclist.c:113 #, fuzzy, c-format msgid "skipped `%s': %s\n" msgstr "%s: ÐÒÏÐÕÝÅÎ: %s\n" -#: g10/skclist.c:100 +#: g10/skclist.c:119 #, fuzzy, c-format msgid "" "skipped `%s': this is a PGP generated ElGamal key which is not secure for " diff --git a/scripts/config.sub b/scripts/config.sub index b95132478..34c7b07b4 100755 --- a/scripts/config.sub +++ b/scripts/config.sub @@ -968,7 +968,7 @@ case $os in -xenix) os=-xenix ;; - -MiNT | -mint) + -mint) os=-mint ;; -none) diff --git a/util/ChangeLog b/util/ChangeLog index 1afdf7602..0c1597a51 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,3 +1,7 @@ +Wed Jan 20 21:40:21 CET 1999 Werner Koch <wk@isil.d.shuttle.de> + + * http.c (http_wait_response): Moved the shutdown behind the dup + Wed Jan 20 18:59:49 CET 1999 Werner Koch <wk@isil.d.shuttle.de> * http.c (send_request): Removed double LF diff --git a/util/http.c b/util/http.c index 4f04b62e9..408209213 100644 --- a/util/http.c +++ b/util/http.c @@ -118,14 +118,14 @@ http_wait_response( HTTP_HD hd, unsigned int *ret_status ) http_start_data( hd ); /* make sure that we are in the data */ iobuf_flush( hd->fp_write ); - shutdown( hd->socket, 1 ); - hd->in_data = 0; hd->socket = dup( hd->socket ); if( hd->socket == -1 ) return G10ERR_GENERAL; iobuf_close( hd->fp_write ); hd->fp_write = NULL; + shutdown( hd->socket, 1 ); + hd->in_data = 0; hd->fp_read = iobuf_fdopen( hd->socket , "r" ); if( !hd->fp_read ) @@ -674,6 +674,7 @@ write_server( int socket, const char *data, size_t length ) select(0, NULL, NULL, NULL, &tv); continue; } + log_info("write failed: %s\n", strerror(errno)); return G10ERR_NETWORK; } nleft -=nwritten; diff --git a/zlib/ChangeLog b/zlib/ChangeLog index 5c0abb87b..67a513941 100644 --- a/zlib/ChangeLog +++ b/zlib/ChangeLog @@ -1,3 +1,7 @@ +Wed Jan 20 21:40:21 CET 1999 Werner Koch <wk@isil.d.shuttle.de> + + * Makefile.am: Corrected the list of sources + Wed Jan 13 14:10:15 CET 1999 Werner Koch <wk@isil.d.shuttle.de> diff --git a/zlib/Makefile.am b/zlib/Makefile.am index 2f2f65a29..91610af4d 100644 --- a/zlib/Makefile.am +++ b/zlib/Makefile.am @@ -5,7 +5,7 @@ CFLAGS = -O -Wall -EXTRA_DIST = README algorithm.doc ChangeLog example.c +EXTRA_DIST = README algorithm.doc ChangeLog # I found no other easy way to use this only if zlib is neede # doing this with SUBDIR = @xxx@ in the top Makefile.am does not @@ -15,15 +15,16 @@ noinst_LIBRARIES = libzlib.a endif -libzlib_a_SOURCES = adler32.c compress.c crc32.c gzio.c \ +libzlib_a_SOURCES = adler32.c compress.c crc32.c \ uncompr.c deflate.c trees.c zutil.c \ inflate.c infblock.c inftrees.c \ infcodes.c infutil.c inffast.c \ - zlib.h zconf.h deflate.h infblock.h \ - infcodes.h inffast.h inftrees.h infutil.h zutil.h + deflate.h infblock.h infcodes.h inffast.h \ + inffixed.h inftrees.h infutil.h trees.h \ + zconf.h zlib.h zutil.h -CLEANFILES = example foo.gz +CLEANFILES = foo.gz diff --git a/zlib/Makefile.am~ b/zlib/Makefile.am~ deleted file mode 100644 index 71103692f..000000000 --- a/zlib/Makefile.am~ +++ /dev/null @@ -1,29 +0,0 @@ -# Process this file with automake to produce Makefile.in -# Copyright (C) 1995-1996 Jean-loup Gailly. -# For conditions of distribution and use, see copyright notice in zlib.h -# This is used if a systems lacks support of zlib - -CFLAGS = -O -Wall - -EXTRA_DIST = README algorithm.doc ChangeLog gzio.c example.c - -# I found no other easy way to use this only if zlib is neede -# doing this with SUBDIR = @xxx@ in the top Makefile.am does not -# work because automake doesn't scan this Makefile.am here. -if ENABLE_LOCAL_ZLIB -noinst_LIBRARIES = libzlib.a -endif - - -libzlib_a_SOURCES = adler32.c compress.c crc32.c \ - uncompr.c deflate.c trees.c zutil.c \ - inflate.c infblock.c inftrees.c \ - infcodes.c infutil.c inffast.c \ - zlib.h zconf.h deflate.h infblock.h \ - infcodes.h inffast.h inftrees.h infutil.h zutil.h - - -CLEANFILES = example foo.gz - - - diff --git a/zlib/gzio.c b/zlib/gzio.c deleted file mode 100644 index f7c336a55..000000000 --- a/zlib/gzio.c +++ /dev/null @@ -1,875 +0,0 @@ -/* gzio.c -- IO on .gz files - * Copyright (C) 1995-1998 Jean-loup Gailly. - * For conditions of distribution and use, see copyright notice in zlib.h - * - * Compile this file with -DNO_DEFLATE to avoid the compression code. - */ - -/* @(#) $Id$ */ - -#include <stdio.h> - -#include "zutil.h" - -struct internal_state {int dummy;}; /* for buggy compilers */ - -#ifndef Z_BUFSIZE -# ifdef MAXSEG_64K -# define Z_BUFSIZE 4096 /* minimize memory usage for 16-bit DOS */ -# else -# define Z_BUFSIZE 16384 -# endif -#endif -#ifndef Z_PRINTF_BUFSIZE -# define Z_PRINTF_BUFSIZE 4096 -#endif - -#define ALLOC(size) malloc(size) -#define TRYFREE(p) {if (p) free(p);} - -static int gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */ - -/* gzip flag byte */ -#define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */ -#define HEAD_CRC 0x02 /* bit 1 set: header CRC present */ -#define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */ -#define ORIG_NAME 0x08 /* bit 3 set: original file name present */ -#define COMMENT 0x10 /* bit 4 set: file comment present */ -#define RESERVED 0xE0 /* bits 5..7: reserved */ - -typedef struct gz_stream { - z_stream stream; - int z_err; /* error code for last stream operation */ - int z_eof; /* set if end of input file */ - FILE *file; /* .gz file */ - Byte *inbuf; /* input buffer */ - Byte *outbuf; /* output buffer */ - uLong crc; /* crc32 of uncompressed data */ - char *msg; /* error message */ - char *path; /* path name for debugging only */ - int transparent; /* 1 if input file is not a .gz file */ - char mode; /* 'w' or 'r' */ - long startpos; /* start of compressed data in file (header skipped) */ -} gz_stream; - - -local gzFile gz_open OF((const char *path, const char *mode, int fd)); -local int do_flush OF((gzFile file, int flush)); -local int get_byte OF((gz_stream *s)); -local void check_header OF((gz_stream *s)); -local int destroy OF((gz_stream *s)); -local void putLong OF((FILE *file, uLong x)); -local uLong getLong OF((gz_stream *s)); - -/* =========================================================================== - Opens a gzip (.gz) file for reading or writing. The mode parameter - is as in fopen ("rb" or "wb"). The file is given either by file descriptor - or path name (if fd == -1). - gz_open return NULL if the file could not be opened or if there was - insufficient memory to allocate the (de)compression state; errno - can be checked to distinguish the two cases (if errno is zero, the - zlib error is Z_MEM_ERROR). -*/ -local gzFile gz_open (path, mode, fd) - const char *path; - const char *mode; - int fd; -{ - int err; - int level = Z_DEFAULT_COMPRESSION; /* compression level */ - int strategy = Z_DEFAULT_STRATEGY; /* compression strategy */ - char *p = (char*)mode; - gz_stream *s; - char fmode[80]; /* copy of mode, without the compression level */ - char *m = fmode; - - if (!path || !mode) return Z_NULL; - - s = (gz_stream *)ALLOC(sizeof(gz_stream)); - if (!s) return Z_NULL; - - s->stream.zalloc = (alloc_func)0; - s->stream.zfree = (free_func)0; - s->stream.opaque = (voidpf)0; - s->stream.next_in = s->inbuf = Z_NULL; - s->stream.next_out = s->outbuf = Z_NULL; - s->stream.avail_in = s->stream.avail_out = 0; - s->file = NULL; - s->z_err = Z_OK; - s->z_eof = 0; - s->crc = crc32(0L, Z_NULL, 0); - s->msg = NULL; - s->transparent = 0; - - s->path = (char*)ALLOC(strlen(path)+1); - if (s->path == NULL) { - return destroy(s), (gzFile)Z_NULL; - } - strcpy(s->path, path); /* do this early for debugging */ - - s->mode = '\0'; - do { - if (*p == 'r') s->mode = 'r'; - if (*p == 'w' || *p == 'a') s->mode = 'w'; - if (*p >= '0' && *p <= '9') { - level = *p - '0'; - } else if (*p == 'f') { - strategy = Z_FILTERED; - } else if (*p == 'h') { - strategy = Z_HUFFMAN_ONLY; - } else { - *m++ = *p; /* copy the mode */ - } - } while (*p++ && m != fmode + sizeof(fmode)); - if (s->mode == '\0') return destroy(s), (gzFile)Z_NULL; - - if (s->mode == 'w') { -#ifdef NO_DEFLATE - err = Z_STREAM_ERROR; -#else - err = deflateInit2(&(s->stream), level, - Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy); - /* windowBits is passed < 0 to suppress zlib header */ - - s->stream.next_out = s->outbuf = (Byte*)ALLOC(Z_BUFSIZE); -#endif - if (err != Z_OK || s->outbuf == Z_NULL) { - return destroy(s), (gzFile)Z_NULL; - } - } else { - s->stream.next_in = s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); - - err = inflateInit2(&(s->stream), -MAX_WBITS); - /* windowBits is passed < 0 to tell that there is no zlib header. - * Note that in this case inflate *requires* an extra "dummy" byte - * after the compressed stream in order to complete decompression and - * return Z_STREAM_END. Here the gzip CRC32 ensures that 4 bytes are - * present after the compressed stream. - */ - if (err != Z_OK || s->inbuf == Z_NULL) { - return destroy(s), (gzFile)Z_NULL; - } - } - s->stream.avail_out = Z_BUFSIZE; - - errno = 0; - s->file = fd < 0 ? F_OPEN(path, fmode) : (FILE*)fdopen(fd, fmode); - - if (s->file == NULL) { - return destroy(s), (gzFile)Z_NULL; - } - if (s->mode == 'w') { - /* Write a very simple .gz header: - */ - fprintf(s->file, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1], - Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE); - s->startpos = 10L; - /* We use 10L instead of ftell(s->file) to because ftell causes an - * fflush on some systems. This version of the library doesn't use - * startpos anyway in write mode, so this initialization is not - * necessary. - */ - } else { - check_header(s); /* skip the .gz header */ - s->startpos = (ftell(s->file) - s->stream.avail_in); - } - - return (gzFile)s; -} - -/* =========================================================================== - Opens a gzip (.gz) file for reading or writing. -*/ -gzFile ZEXPORT gzopen (path, mode) - const char *path; - const char *mode; -{ - return gz_open (path, mode, -1); -} - -/* =========================================================================== - Associate a gzFile with the file descriptor fd. fd is not dup'ed here - to mimic the behavio(u)r of fdopen. -*/ -gzFile ZEXPORT gzdopen (fd, mode) - int fd; - const char *mode; -{ - char name[20]; - - if (fd < 0) return (gzFile)Z_NULL; - sprintf(name, "<fd:%d>", fd); /* for debugging */ - - return gz_open (name, mode, fd); -} - -/* =========================================================================== - * Update the compression level and strategy - */ -int ZEXPORT gzsetparams (file, level, strategy) - gzFile file; - int level; - int strategy; -{ - gz_stream *s = (gz_stream*)file; - - if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR; - - /* Make room to allow flushing */ - if (s->stream.avail_out == 0) { - - s->stream.next_out = s->outbuf; - if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) { - s->z_err = Z_ERRNO; - } - s->stream.avail_out = Z_BUFSIZE; - } - - return deflateParams (&(s->stream), level, strategy); -} - -/* =========================================================================== - Read a byte from a gz_stream; update next_in and avail_in. Return EOF - for end of file. - IN assertion: the stream s has been sucessfully opened for reading. -*/ -local int get_byte(s) - gz_stream *s; -{ - if (s->z_eof) return EOF; - if (s->stream.avail_in == 0) { - errno = 0; - s->stream.avail_in = fread(s->inbuf, 1, Z_BUFSIZE, s->file); - if (s->stream.avail_in == 0) { - s->z_eof = 1; - if (ferror(s->file)) s->z_err = Z_ERRNO; - return EOF; - } - s->stream.next_in = s->inbuf; - } - s->stream.avail_in--; - return *(s->stream.next_in)++; -} - -/* =========================================================================== - Check the gzip header of a gz_stream opened for reading. Set the stream - mode to transparent if the gzip magic header is not present; set s->err - to Z_DATA_ERROR if the magic header is present but the rest of the header - is incorrect. - IN assertion: the stream s has already been created sucessfully; - s->stream.avail_in is zero for the first time, but may be non-zero - for concatenated .gz files. -*/ -local void check_header(s) - gz_stream *s; -{ - int method; /* method byte */ - int flags; /* flags byte */ - uInt len; - int c; - - /* Check the gzip magic header */ - for (len = 0; len < 2; len++) { - c = get_byte(s); - if (c != gz_magic[len]) { - if (len != 0) s->stream.avail_in++, s->stream.next_in--; - if (c != EOF) { - s->stream.avail_in++, s->stream.next_in--; - s->transparent = 1; - } - s->z_err = s->stream.avail_in != 0 ? Z_OK : Z_STREAM_END; - return; - } - } - method = get_byte(s); - flags = get_byte(s); - if (method != Z_DEFLATED || (flags & RESERVED) != 0) { - s->z_err = Z_DATA_ERROR; - return; - } - - /* Discard time, xflags and OS code: */ - for (len = 0; len < 6; len++) (void)get_byte(s); - - if ((flags & EXTRA_FIELD) != 0) { /* skip the extra field */ - len = (uInt)get_byte(s); - len += ((uInt)get_byte(s))<<8; - /* len is garbage if EOF but the loop below will quit anyway */ - while (len-- != 0 && get_byte(s) != EOF) ; - } - if ((flags & ORIG_NAME) != 0) { /* skip the original file name */ - while ((c = get_byte(s)) != 0 && c != EOF) ; - } - if ((flags & COMMENT) != 0) { /* skip the .gz file comment */ - while ((c = get_byte(s)) != 0 && c != EOF) ; - } - if ((flags & HEAD_CRC) != 0) { /* skip the header crc */ - for (len = 0; len < 2; len++) (void)get_byte(s); - } - s->z_err = s->z_eof ? Z_DATA_ERROR : Z_OK; -} - - /* =========================================================================== - * Cleanup then free the given gz_stream. Return a zlib error code. - Try freeing in the reverse order of allocations. - */ -local int destroy (s) - gz_stream *s; -{ - int err = Z_OK; - - if (!s) return Z_STREAM_ERROR; - - TRYFREE(s->msg); - - if (s->stream.state != NULL) { - if (s->mode == 'w') { -#ifdef NO_DEFLATE - err = Z_STREAM_ERROR; -#else - err = deflateEnd(&(s->stream)); -#endif - } else if (s->mode == 'r') { - err = inflateEnd(&(s->stream)); - } - } - if (s->file != NULL && fclose(s->file)) { -#ifdef ESPIPE - if (errno != ESPIPE) /* fclose is broken for pipes in HP/UX */ -#endif - err = Z_ERRNO; - } - if (s->z_err < 0) err = s->z_err; - - TRYFREE(s->inbuf); - TRYFREE(s->outbuf); - TRYFREE(s->path); - TRYFREE(s); - return err; -} - -/* =========================================================================== - Reads the given number of uncompressed bytes from the compressed file. - gzread returns the number of bytes actually read (0 for end of file). -*/ -int ZEXPORT gzread (file, buf, len) - gzFile file; - voidp buf; - unsigned len; -{ - gz_stream *s = (gz_stream*)file; - Bytef *start = (Bytef*)buf; /* starting point for crc computation */ - Byte *next_out; /* == stream.next_out but not forced far (for MSDOS) */ - - if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR; - - if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO) return -1; - if (s->z_err == Z_STREAM_END) return 0; /* EOF */ - - next_out = (Byte*)buf; - s->stream.next_out = (Bytef*)buf; - s->stream.avail_out = len; - - while (s->stream.avail_out != 0) { - - if (s->transparent) { - /* Copy first the lookahead bytes: */ - uInt n = s->stream.avail_in; - if (n > s->stream.avail_out) n = s->stream.avail_out; - if (n > 0) { - zmemcpy(s->stream.next_out, s->stream.next_in, n); - next_out += n; - s->stream.next_out = next_out; - s->stream.next_in += n; - s->stream.avail_out -= n; - s->stream.avail_in -= n; - } - if (s->stream.avail_out > 0) { - s->stream.avail_out -= fread(next_out, 1, s->stream.avail_out, - s->file); - } - len -= s->stream.avail_out; - s->stream.total_in += (uLong)len; - s->stream.total_out += (uLong)len; - if (len == 0) s->z_eof = 1; - return (int)len; - } - if (s->stream.avail_in == 0 && !s->z_eof) { - - errno = 0; - s->stream.avail_in = fread(s->inbuf, 1, Z_BUFSIZE, s->file); - if (s->stream.avail_in == 0) { - s->z_eof = 1; - if (ferror(s->file)) { - s->z_err = Z_ERRNO; - break; - } - } - s->stream.next_in = s->inbuf; - } - s->z_err = inflate(&(s->stream), Z_NO_FLUSH); - - if (s->z_err == Z_STREAM_END) { - /* Check CRC and original size */ - s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start)); - start = s->stream.next_out; - - if (getLong(s) != s->crc) { - s->z_err = Z_DATA_ERROR; - } else { - (void)getLong(s); - /* The uncompressed length returned by above getlong() may - * be different from s->stream.total_out) in case of - * concatenated .gz files. Check for such files: - */ - check_header(s); - if (s->z_err == Z_OK) { - uLong total_in = s->stream.total_in; - uLong total_out = s->stream.total_out; - - inflateReset(&(s->stream)); - s->stream.total_in = total_in; - s->stream.total_out = total_out; - s->crc = crc32(0L, Z_NULL, 0); - } - } - } - if (s->z_err != Z_OK || s->z_eof) break; - } - s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start)); - - return (int)(len - s->stream.avail_out); -} - - -/* =========================================================================== - Reads one byte from the compressed file. gzgetc returns this byte - or -1 in case of end of file or error. -*/ -int ZEXPORT gzgetc(file) - gzFile file; -{ - unsigned char c; - - return gzread(file, &c, 1) == 1 ? c : -1; -} - - -/* =========================================================================== - Reads bytes from the compressed file until len-1 characters are - read, or a newline character is read and transferred to buf, or an - end-of-file condition is encountered. The string is then terminated - with a null character. - gzgets returns buf, or Z_NULL in case of error. - - The current implementation is not optimized at all. -*/ -char * ZEXPORT gzgets(file, buf, len) - gzFile file; - char *buf; - int len; -{ - char *b = buf; - if (buf == Z_NULL || len <= 0) return Z_NULL; - - while (--len > 0 && gzread(file, buf, 1) == 1 && *buf++ != '\n') ; - *buf = '\0'; - return b == buf && len > 0 ? Z_NULL : b; -} - - -#ifndef NO_DEFLATE -/* =========================================================================== - Writes the given number of uncompressed bytes into the compressed file. - gzwrite returns the number of bytes actually written (0 in case of error). -*/ -int ZEXPORT gzwrite (file, buf, len) - gzFile file; - const voidp buf; - unsigned len; -{ - gz_stream *s = (gz_stream*)file; - - if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR; - - s->stream.next_in = (Bytef*)buf; - s->stream.avail_in = len; - - while (s->stream.avail_in != 0) { - - if (s->stream.avail_out == 0) { - - s->stream.next_out = s->outbuf; - if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) { - s->z_err = Z_ERRNO; - break; - } - s->stream.avail_out = Z_BUFSIZE; - } - s->z_err = deflate(&(s->stream), Z_NO_FLUSH); - if (s->z_err != Z_OK) break; - } - s->crc = crc32(s->crc, (const Bytef *)buf, len); - - return (int)(len - s->stream.avail_in); -} - -/* =========================================================================== - Converts, formats, and writes the args to the compressed file under - control of the format string, as in fprintf. gzprintf returns the number of - uncompressed bytes actually written (0 in case of error). -*/ -#ifdef STDC -#include <stdarg.h> - -int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...) -{ - char buf[Z_PRINTF_BUFSIZE]; - va_list va; - int len; - - va_start(va, format); -#ifdef HAS_vsnprintf - (void)vsnprintf(buf, sizeof(buf), format, va); -#else - (void)vsprintf(buf, format, va); -#endif - va_end(va); - len = strlen(buf); /* some *sprintf don't return the nb of bytes written */ - if (len <= 0) return 0; - - return gzwrite(file, buf, (unsigned)len); -} -#else /* not ANSI C */ - -int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, - a11, a12, a13, a14, a15, a16, a17, a18, a19, a20) - gzFile file; - const char *format; - int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, - a11, a12, a13, a14, a15, a16, a17, a18, a19, a20; -{ - char buf[Z_PRINTF_BUFSIZE]; - int len; - -#ifdef HAS_snprintf - snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8, - a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); -#else - sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8, - a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); -#endif - len = strlen(buf); /* old sprintf doesn't return the nb of bytes written */ - if (len <= 0) return 0; - - return gzwrite(file, buf, len); -} -#endif - -/* =========================================================================== - Writes c, converted to an unsigned char, into the compressed file. - gzputc returns the value that was written, or -1 in case of error. -*/ -int ZEXPORT gzputc(file, c) - gzFile file; - int c; -{ - unsigned char cc = (unsigned char) c; /* required for big endian systems */ - - return gzwrite(file, &cc, 1) == 1 ? (int)cc : -1; -} - - -/* =========================================================================== - Writes the given null-terminated string to the compressed file, excluding - the terminating null character. - gzputs returns the number of characters written, or -1 in case of error. -*/ -int ZEXPORT gzputs(file, s) - gzFile file; - const char *s; -{ - return gzwrite(file, (char*)s, (unsigned)strlen(s)); -} - - -/* =========================================================================== - Flushes all pending output into the compressed file. The parameter - flush is as in the deflate() function. -*/ -local int do_flush (file, flush) - gzFile file; - int flush; -{ - uInt len; - int done = 0; - gz_stream *s = (gz_stream*)file; - - if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR; - - s->stream.avail_in = 0; /* should be zero already anyway */ - - for (;;) { - len = Z_BUFSIZE - s->stream.avail_out; - - if (len != 0) { - if ((uInt)fwrite(s->outbuf, 1, len, s->file) != len) { - s->z_err = Z_ERRNO; - return Z_ERRNO; - } - s->stream.next_out = s->outbuf; - s->stream.avail_out = Z_BUFSIZE; - } - if (done) break; - s->z_err = deflate(&(s->stream), flush); - - /* Ignore the second of two consecutive flushes: */ - if (len == 0 && s->z_err == Z_BUF_ERROR) s->z_err = Z_OK; - - /* deflate has finished flushing only when it hasn't used up - * all the available space in the output buffer: - */ - done = (s->stream.avail_out != 0 || s->z_err == Z_STREAM_END); - - if (s->z_err != Z_OK && s->z_err != Z_STREAM_END) break; - } - return s->z_err == Z_STREAM_END ? Z_OK : s->z_err; -} - -int ZEXPORT gzflush (file, flush) - gzFile file; - int flush; -{ - gz_stream *s = (gz_stream*)file; - int err = do_flush (file, flush); - - if (err) return err; - fflush(s->file); - return s->z_err == Z_STREAM_END ? Z_OK : s->z_err; -} -#endif /* NO_DEFLATE */ - -/* =========================================================================== - Sets the starting position for the next gzread or gzwrite on the given - compressed file. The offset represents a number of bytes in the - gzseek returns the resulting offset location as measured in bytes from - the beginning of the uncompressed stream, or -1 in case of error. - SEEK_END is not implemented, returns error. - In this version of the library, gzseek can be extremely slow. -*/ -z_off_t ZEXPORT gzseek (file, offset, whence) - gzFile file; - z_off_t offset; - int whence; -{ - gz_stream *s = (gz_stream*)file; - - if (s == NULL || whence == SEEK_END || - s->z_err == Z_ERRNO || s->z_err == Z_DATA_ERROR) { - return -1L; - } - - if (s->mode == 'w') { -#ifdef NO_DEFLATE - return -1L; -#else - if (whence == SEEK_SET) { - offset -= s->stream.total_in; - } - if (offset < 0) return -1L; - - /* At this point, offset is the number of zero bytes to write. */ - if (s->inbuf == Z_NULL) { - s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); /* for seeking */ - zmemzero(s->inbuf, Z_BUFSIZE); - } - while (offset > 0) { - uInt size = Z_BUFSIZE; - if (offset < Z_BUFSIZE) size = (uInt)offset; - - size = gzwrite(file, s->inbuf, size); - if (size == 0) return -1L; - - offset -= size; - } - return (z_off_t)s->stream.total_in; -#endif - } - /* Rest of function is for reading only */ - - /* compute absolute position */ - if (whence == SEEK_CUR) { - offset += s->stream.total_out; - } - if (offset < 0) return -1L; - - if (s->transparent) { - /* map to fseek */ - s->stream.avail_in = 0; - s->stream.next_in = s->inbuf; - if (fseek(s->file, offset, SEEK_SET) < 0) return -1L; - - s->stream.total_in = s->stream.total_out = (uLong)offset; - return offset; - } - - /* For a negative seek, rewind and use positive seek */ - if ((uLong)offset >= s->stream.total_out) { - offset -= s->stream.total_out; - } else if (gzrewind(file) < 0) { - return -1L; - } - /* offset is now the number of bytes to skip. */ - - if (offset != 0 && s->outbuf == Z_NULL) { - s->outbuf = (Byte*)ALLOC(Z_BUFSIZE); - } - while (offset > 0) { - int size = Z_BUFSIZE; - if (offset < Z_BUFSIZE) size = (int)offset; - - size = gzread(file, s->outbuf, (uInt)size); - if (size <= 0) return -1L; - offset -= size; - } - return (z_off_t)s->stream.total_out; -} - -/* =========================================================================== - Rewinds input file. -*/ -int ZEXPORT gzrewind (file) - gzFile file; -{ - gz_stream *s = (gz_stream*)file; - - if (s == NULL || s->mode != 'r') return -1; - - s->z_err = Z_OK; - s->z_eof = 0; - s->stream.avail_in = 0; - s->stream.next_in = s->inbuf; - s->crc = crc32(0L, Z_NULL, 0); - - if (s->startpos == 0) { /* not a compressed file */ - rewind(s->file); - return 0; - } - - (void) inflateReset(&s->stream); - return fseek(s->file, s->startpos, SEEK_SET); -} - -/* =========================================================================== - Returns the starting position for the next gzread or gzwrite on the - given compressed file. This position represents a number of bytes in the - uncompressed data stream. -*/ -z_off_t ZEXPORT gztell (file) - gzFile file; -{ - return gzseek(file, 0L, SEEK_CUR); -} - -/* =========================================================================== - Returns 1 when EOF has previously been detected reading the given - input stream, otherwise zero. -*/ -int ZEXPORT gzeof (file) - gzFile file; -{ - gz_stream *s = (gz_stream*)file; - - return (s == NULL || s->mode != 'r') ? 0 : s->z_eof; -} - -/* =========================================================================== - Outputs a long in LSB order to the given file -*/ -local void putLong (file, x) - FILE *file; - uLong x; -{ - int n; - for (n = 0; n < 4; n++) { - fputc((int)(x & 0xff), file); - x >>= 8; - } -} - -/* =========================================================================== - Reads a long in LSB order from the given gz_stream. Sets z_err in case - of error. -*/ -local uLong getLong (s) - gz_stream *s; -{ - uLong x = (uLong)get_byte(s); - int c; - - x += ((uLong)get_byte(s))<<8; - x += ((uLong)get_byte(s))<<16; - c = get_byte(s); - if (c == EOF) s->z_err = Z_DATA_ERROR; - x += ((uLong)c)<<24; - return x; -} - -/* =========================================================================== - Flushes all pending output if necessary, closes the compressed file - and deallocates all the (de)compression state. -*/ -int ZEXPORT gzclose (file) - gzFile file; -{ - int err; - gz_stream *s = (gz_stream*)file; - - if (s == NULL) return Z_STREAM_ERROR; - - if (s->mode == 'w') { -#ifdef NO_DEFLATE - return Z_STREAM_ERROR; -#else - err = do_flush (file, Z_FINISH); - if (err != Z_OK) return destroy((gz_stream*)file); - - putLong (s->file, s->crc); - putLong (s->file, s->stream.total_in); -#endif - } - return destroy((gz_stream*)file); -} - -/* =========================================================================== - Returns the error message for the last error which occured on the - given compressed file. errnum is set to zlib error number. If an - error occured in the file system and not in the compression library, - errnum is set to Z_ERRNO and the application may consult errno - to get the exact error code. -*/ -const char* ZEXPORT gzerror (file, errnum) - gzFile file; - int *errnum; -{ - char *m; - gz_stream *s = (gz_stream*)file; - - if (s == NULL) { - *errnum = Z_STREAM_ERROR; - return (const char*)ERR_MSG(Z_STREAM_ERROR); - } - *errnum = s->z_err; - if (*errnum == Z_OK) return (const char*)""; - - m = (char*)(*errnum == Z_ERRNO ? zstrerror(errno) : s->stream.msg); - - if (m == NULL || *m == '\0') m = (char*)ERR_MSG(s->z_err); - - TRYFREE(s->msg); - s->msg = (char*)ALLOC(strlen(s->path) + strlen(m) + 3); - strcpy(s->msg, s->path); - strcat(s->msg, ": "); - strcat(s->msg, m); - return (const char*)s->msg; -} diff --git a/zlib/inffixed.h b/zlib/inffixed.h new file mode 100644 index 000000000..77f7e7631 --- /dev/null +++ b/zlib/inffixed.h @@ -0,0 +1,151 @@ +/* inffixed.h -- table for decoding fixed codes + * Generated automatically by the maketree.c program + */ + +/* WARNING: this file should *not* be used by applications. It is + part of the implementation of the compression library and is + subject to change. Applications should only use zlib.h. + */ + +local uInt fixed_bl = 9; +local uInt fixed_bd = 5; +local inflate_huft fixed_tl[] = { + {{{96,7}},256}, {{{0,8}},80}, {{{0,8}},16}, {{{84,8}},115}, + {{{82,7}},31}, {{{0,8}},112}, {{{0,8}},48}, {{{0,9}},192}, + {{{80,7}},10}, {{{0,8}},96}, {{{0,8}},32}, {{{0,9}},160}, + {{{0,8}},0}, {{{0,8}},128}, {{{0,8}},64}, {{{0,9}},224}, + {{{80,7}},6}, {{{0,8}},88}, {{{0,8}},24}, {{{0,9}},144}, + {{{83,7}},59}, {{{0,8}},120}, {{{0,8}},56}, {{{0,9}},208}, + {{{81,7}},17}, {{{0,8}},104}, {{{0,8}},40}, {{{0,9}},176}, + {{{0,8}},8}, {{{0,8}},136}, {{{0,8}},72}, {{{0,9}},240}, + {{{80,7}},4}, {{{0,8}},84}, {{{0,8}},20}, {{{85,8}},227}, + {{{83,7}},43}, {{{0,8}},116}, {{{0,8}},52}, {{{0,9}},200}, + {{{81,7}},13}, {{{0,8}},100}, {{{0,8}},36}, {{{0,9}},168}, + {{{0,8}},4}, {{{0,8}},132}, {{{0,8}},68}, {{{0,9}},232}, + {{{80,7}},8}, {{{0,8}},92}, {{{0,8}},28}, {{{0,9}},152}, + {{{84,7}},83}, {{{0,8}},124}, {{{0,8}},60}, {{{0,9}},216}, + {{{82,7}},23}, {{{0,8}},108}, {{{0,8}},44}, {{{0,9}},184}, + {{{0,8}},12}, {{{0,8}},140}, {{{0,8}},76}, {{{0,9}},248}, + {{{80,7}},3}, {{{0,8}},82}, {{{0,8}},18}, {{{85,8}},163}, + {{{83,7}},35}, {{{0,8}},114}, {{{0,8}},50}, {{{0,9}},196}, + {{{81,7}},11}, {{{0,8}},98}, {{{0,8}},34}, {{{0,9}},164}, + {{{0,8}},2}, {{{0,8}},130}, {{{0,8}},66}, {{{0,9}},228}, + {{{80,7}},7}, {{{0,8}},90}, {{{0,8}},26}, {{{0,9}},148}, + {{{84,7}},67}, {{{0,8}},122}, {{{0,8}},58}, {{{0,9}},212}, + {{{82,7}},19}, {{{0,8}},106}, {{{0,8}},42}, {{{0,9}},180}, + {{{0,8}},10}, {{{0,8}},138}, {{{0,8}},74}, {{{0,9}},244}, + {{{80,7}},5}, {{{0,8}},86}, {{{0,8}},22}, {{{192,8}},0}, + {{{83,7}},51}, {{{0,8}},118}, {{{0,8}},54}, {{{0,9}},204}, + {{{81,7}},15}, {{{0,8}},102}, {{{0,8}},38}, {{{0,9}},172}, + {{{0,8}},6}, {{{0,8}},134}, {{{0,8}},70}, {{{0,9}},236}, + {{{80,7}},9}, {{{0,8}},94}, {{{0,8}},30}, {{{0,9}},156}, + {{{84,7}},99}, {{{0,8}},126}, {{{0,8}},62}, {{{0,9}},220}, + {{{82,7}},27}, {{{0,8}},110}, {{{0,8}},46}, {{{0,9}},188}, + {{{0,8}},14}, {{{0,8}},142}, {{{0,8}},78}, {{{0,9}},252}, + {{{96,7}},256}, {{{0,8}},81}, {{{0,8}},17}, {{{85,8}},131}, + {{{82,7}},31}, {{{0,8}},113}, {{{0,8}},49}, {{{0,9}},194}, + {{{80,7}},10}, {{{0,8}},97}, {{{0,8}},33}, {{{0,9}},162}, + {{{0,8}},1}, {{{0,8}},129}, {{{0,8}},65}, {{{0,9}},226}, + {{{80,7}},6}, {{{0,8}},89}, {{{0,8}},25}, {{{0,9}},146}, + {{{83,7}},59}, {{{0,8}},121}, {{{0,8}},57}, {{{0,9}},210}, + {{{81,7}},17}, {{{0,8}},105}, {{{0,8}},41}, {{{0,9}},178}, + {{{0,8}},9}, {{{0,8}},137}, {{{0,8}},73}, {{{0,9}},242}, + {{{80,7}},4}, {{{0,8}},85}, {{{0,8}},21}, {{{80,8}},258}, + {{{83,7}},43}, {{{0,8}},117}, {{{0,8}},53}, {{{0,9}},202}, + {{{81,7}},13}, {{{0,8}},101}, {{{0,8}},37}, {{{0,9}},170}, + {{{0,8}},5}, {{{0,8}},133}, {{{0,8}},69}, {{{0,9}},234}, + {{{80,7}},8}, {{{0,8}},93}, {{{0,8}},29}, {{{0,9}},154}, + {{{84,7}},83}, {{{0,8}},125}, {{{0,8}},61}, {{{0,9}},218}, + {{{82,7}},23}, {{{0,8}},109}, {{{0,8}},45}, {{{0,9}},186}, + {{{0,8}},13}, {{{0,8}},141}, {{{0,8}},77}, {{{0,9}},250}, + {{{80,7}},3}, {{{0,8}},83}, {{{0,8}},19}, {{{85,8}},195}, + {{{83,7}},35}, {{{0,8}},115}, {{{0,8}},51}, {{{0,9}},198}, + {{{81,7}},11}, {{{0,8}},99}, {{{0,8}},35}, {{{0,9}},166}, + {{{0,8}},3}, {{{0,8}},131}, {{{0,8}},67}, {{{0,9}},230}, + {{{80,7}},7}, {{{0,8}},91}, {{{0,8}},27}, {{{0,9}},150}, + {{{84,7}},67}, {{{0,8}},123}, {{{0,8}},59}, {{{0,9}},214}, + {{{82,7}},19}, {{{0,8}},107}, {{{0,8}},43}, {{{0,9}},182}, + {{{0,8}},11}, {{{0,8}},139}, {{{0,8}},75}, {{{0,9}},246}, + {{{80,7}},5}, {{{0,8}},87}, {{{0,8}},23}, {{{192,8}},0}, + {{{83,7}},51}, {{{0,8}},119}, {{{0,8}},55}, {{{0,9}},206}, + {{{81,7}},15}, {{{0,8}},103}, {{{0,8}},39}, {{{0,9}},174}, + {{{0,8}},7}, {{{0,8}},135}, {{{0,8}},71}, {{{0,9}},238}, + {{{80,7}},9}, {{{0,8}},95}, {{{0,8}},31}, {{{0,9}},158}, + {{{84,7}},99}, {{{0,8}},127}, {{{0,8}},63}, {{{0,9}},222}, + {{{82,7}},27}, {{{0,8}},111}, {{{0,8}},47}, {{{0,9}},190}, + {{{0,8}},15}, {{{0,8}},143}, {{{0,8}},79}, {{{0,9}},254}, + {{{96,7}},256}, {{{0,8}},80}, {{{0,8}},16}, {{{84,8}},115}, + {{{82,7}},31}, {{{0,8}},112}, {{{0,8}},48}, {{{0,9}},193}, + {{{80,7}},10}, {{{0,8}},96}, {{{0,8}},32}, {{{0,9}},161}, + {{{0,8}},0}, {{{0,8}},128}, {{{0,8}},64}, {{{0,9}},225}, + {{{80,7}},6}, {{{0,8}},88}, {{{0,8}},24}, {{{0,9}},145}, + {{{83,7}},59}, {{{0,8}},120}, {{{0,8}},56}, {{{0,9}},209}, + {{{81,7}},17}, {{{0,8}},104}, {{{0,8}},40}, {{{0,9}},177}, + {{{0,8}},8}, {{{0,8}},136}, {{{0,8}},72}, {{{0,9}},241}, + {{{80,7}},4}, {{{0,8}},84}, {{{0,8}},20}, {{{85,8}},227}, + {{{83,7}},43}, {{{0,8}},116}, {{{0,8}},52}, {{{0,9}},201}, + {{{81,7}},13}, {{{0,8}},100}, {{{0,8}},36}, {{{0,9}},169}, + {{{0,8}},4}, {{{0,8}},132}, {{{0,8}},68}, {{{0,9}},233}, + {{{80,7}},8}, {{{0,8}},92}, {{{0,8}},28}, {{{0,9}},153}, + {{{84,7}},83}, {{{0,8}},124}, {{{0,8}},60}, {{{0,9}},217}, + {{{82,7}},23}, {{{0,8}},108}, {{{0,8}},44}, {{{0,9}},185}, + {{{0,8}},12}, {{{0,8}},140}, {{{0,8}},76}, {{{0,9}},249}, + {{{80,7}},3}, {{{0,8}},82}, {{{0,8}},18}, {{{85,8}},163}, + {{{83,7}},35}, {{{0,8}},114}, {{{0,8}},50}, {{{0,9}},197}, + {{{81,7}},11}, {{{0,8}},98}, {{{0,8}},34}, {{{0,9}},165}, + {{{0,8}},2}, {{{0,8}},130}, {{{0,8}},66}, {{{0,9}},229}, + {{{80,7}},7}, {{{0,8}},90}, {{{0,8}},26}, {{{0,9}},149}, + {{{84,7}},67}, {{{0,8}},122}, {{{0,8}},58}, {{{0,9}},213}, + {{{82,7}},19}, {{{0,8}},106}, {{{0,8}},42}, {{{0,9}},181}, + {{{0,8}},10}, {{{0,8}},138}, {{{0,8}},74}, {{{0,9}},245}, + {{{80,7}},5}, {{{0,8}},86}, {{{0,8}},22}, {{{192,8}},0}, + {{{83,7}},51}, {{{0,8}},118}, {{{0,8}},54}, {{{0,9}},205}, + {{{81,7}},15}, {{{0,8}},102}, {{{0,8}},38}, {{{0,9}},173}, + {{{0,8}},6}, {{{0,8}},134}, {{{0,8}},70}, {{{0,9}},237}, + {{{80,7}},9}, {{{0,8}},94}, {{{0,8}},30}, {{{0,9}},157}, + {{{84,7}},99}, {{{0,8}},126}, {{{0,8}},62}, {{{0,9}},221}, + {{{82,7}},27}, {{{0,8}},110}, {{{0,8}},46}, {{{0,9}},189}, + {{{0,8}},14}, {{{0,8}},142}, {{{0,8}},78}, {{{0,9}},253}, + {{{96,7}},256}, {{{0,8}},81}, {{{0,8}},17}, {{{85,8}},131}, + {{{82,7}},31}, {{{0,8}},113}, {{{0,8}},49}, {{{0,9}},195}, + {{{80,7}},10}, {{{0,8}},97}, {{{0,8}},33}, {{{0,9}},163}, + {{{0,8}},1}, {{{0,8}},129}, {{{0,8}},65}, {{{0,9}},227}, + {{{80,7}},6}, {{{0,8}},89}, {{{0,8}},25}, {{{0,9}},147}, + {{{83,7}},59}, {{{0,8}},121}, {{{0,8}},57}, {{{0,9}},211}, + {{{81,7}},17}, {{{0,8}},105}, {{{0,8}},41}, {{{0,9}},179}, + {{{0,8}},9}, {{{0,8}},137}, {{{0,8}},73}, {{{0,9}},243}, + {{{80,7}},4}, {{{0,8}},85}, {{{0,8}},21}, {{{80,8}},258}, + {{{83,7}},43}, {{{0,8}},117}, {{{0,8}},53}, {{{0,9}},203}, + {{{81,7}},13}, {{{0,8}},101}, {{{0,8}},37}, {{{0,9}},171}, + {{{0,8}},5}, {{{0,8}},133}, {{{0,8}},69}, {{{0,9}},235}, + {{{80,7}},8}, {{{0,8}},93}, {{{0,8}},29}, {{{0,9}},155}, + {{{84,7}},83}, {{{0,8}},125}, {{{0,8}},61}, {{{0,9}},219}, + {{{82,7}},23}, {{{0,8}},109}, {{{0,8}},45}, {{{0,9}},187}, + {{{0,8}},13}, {{{0,8}},141}, {{{0,8}},77}, {{{0,9}},251}, + {{{80,7}},3}, {{{0,8}},83}, {{{0,8}},19}, {{{85,8}},195}, + {{{83,7}},35}, {{{0,8}},115}, {{{0,8}},51}, {{{0,9}},199}, + {{{81,7}},11}, {{{0,8}},99}, {{{0,8}},35}, {{{0,9}},167}, + {{{0,8}},3}, {{{0,8}},131}, {{{0,8}},67}, {{{0,9}},231}, + {{{80,7}},7}, {{{0,8}},91}, {{{0,8}},27}, {{{0,9}},151}, + {{{84,7}},67}, {{{0,8}},123}, {{{0,8}},59}, {{{0,9}},215}, + {{{82,7}},19}, {{{0,8}},107}, {{{0,8}},43}, {{{0,9}},183}, + {{{0,8}},11}, {{{0,8}},139}, {{{0,8}},75}, {{{0,9}},247}, + {{{80,7}},5}, {{{0,8}},87}, {{{0,8}},23}, {{{192,8}},0}, + {{{83,7}},51}, {{{0,8}},119}, {{{0,8}},55}, {{{0,9}},207}, + {{{81,7}},15}, {{{0,8}},103}, {{{0,8}},39}, {{{0,9}},175}, + {{{0,8}},7}, {{{0,8}},135}, {{{0,8}},71}, {{{0,9}},239}, + {{{80,7}},9}, {{{0,8}},95}, {{{0,8}},31}, {{{0,9}},159}, + {{{84,7}},99}, {{{0,8}},127}, {{{0,8}},63}, {{{0,9}},223}, + {{{82,7}},27}, {{{0,8}},111}, {{{0,8}},47}, {{{0,9}},191}, + {{{0,8}},15}, {{{0,8}},143}, {{{0,8}},79}, {{{0,9}},255} + }; +local inflate_huft fixed_td[] = { + {{{80,5}},1}, {{{87,5}},257}, {{{83,5}},17}, {{{91,5}},4097}, + {{{81,5}},5}, {{{89,5}},1025}, {{{85,5}},65}, {{{93,5}},16385}, + {{{80,5}},3}, {{{88,5}},513}, {{{84,5}},33}, {{{92,5}},8193}, + {{{82,5}},9}, {{{90,5}},2049}, {{{86,5}},129}, {{{192,5}},24577}, + {{{80,5}},2}, {{{87,5}},385}, {{{83,5}},25}, {{{91,5}},6145}, + {{{81,5}},7}, {{{89,5}},1537}, {{{85,5}},97}, {{{93,5}},24577}, + {{{80,5}},4}, {{{88,5}},769}, {{{84,5}},49}, {{{92,5}},12289}, + {{{82,5}},13}, {{{90,5}},3073}, {{{86,5}},193}, {{{192,5}},24577} + }; diff --git a/zlib/trees.h b/zlib/trees.h new file mode 100644 index 000000000..72facf900 --- /dev/null +++ b/zlib/trees.h @@ -0,0 +1,128 @@ +/* header created automatically with -DGEN_TREES_H */ + +local const ct_data static_ltree[L_CODES+2] = { +{{ 12},{ 8}}, {{140},{ 8}}, {{ 76},{ 8}}, {{204},{ 8}}, {{ 44},{ 8}}, +{{172},{ 8}}, {{108},{ 8}}, {{236},{ 8}}, {{ 28},{ 8}}, {{156},{ 8}}, +{{ 92},{ 8}}, {{220},{ 8}}, {{ 60},{ 8}}, {{188},{ 8}}, {{124},{ 8}}, +{{252},{ 8}}, {{ 2},{ 8}}, {{130},{ 8}}, {{ 66},{ 8}}, {{194},{ 8}}, +{{ 34},{ 8}}, {{162},{ 8}}, {{ 98},{ 8}}, {{226},{ 8}}, {{ 18},{ 8}}, +{{146},{ 8}}, {{ 82},{ 8}}, {{210},{ 8}}, {{ 50},{ 8}}, {{178},{ 8}}, +{{114},{ 8}}, {{242},{ 8}}, {{ 10},{ 8}}, {{138},{ 8}}, {{ 74},{ 8}}, +{{202},{ 8}}, {{ 42},{ 8}}, {{170},{ 8}}, {{106},{ 8}}, {{234},{ 8}}, +{{ 26},{ 8}}, {{154},{ 8}}, {{ 90},{ 8}}, {{218},{ 8}}, {{ 58},{ 8}}, +{{186},{ 8}}, {{122},{ 8}}, {{250},{ 8}}, {{ 6},{ 8}}, {{134},{ 8}}, +{{ 70},{ 8}}, {{198},{ 8}}, {{ 38},{ 8}}, {{166},{ 8}}, {{102},{ 8}}, +{{230},{ 8}}, {{ 22},{ 8}}, {{150},{ 8}}, {{ 86},{ 8}}, {{214},{ 8}}, +{{ 54},{ 8}}, {{182},{ 8}}, {{118},{ 8}}, {{246},{ 8}}, {{ 14},{ 8}}, +{{142},{ 8}}, {{ 78},{ 8}}, {{206},{ 8}}, {{ 46},{ 8}}, {{174},{ 8}}, +{{110},{ 8}}, {{238},{ 8}}, {{ 30},{ 8}}, {{158},{ 8}}, {{ 94},{ 8}}, +{{222},{ 8}}, {{ 62},{ 8}}, {{190},{ 8}}, {{126},{ 8}}, {{254},{ 8}}, +{{ 1},{ 8}}, {{129},{ 8}}, {{ 65},{ 8}}, {{193},{ 8}}, {{ 33},{ 8}}, +{{161},{ 8}}, {{ 97},{ 8}}, {{225},{ 8}}, {{ 17},{ 8}}, {{145},{ 8}}, +{{ 81},{ 8}}, {{209},{ 8}}, {{ 49},{ 8}}, {{177},{ 8}}, {{113},{ 8}}, +{{241},{ 8}}, {{ 9},{ 8}}, {{137},{ 8}}, {{ 73},{ 8}}, {{201},{ 8}}, +{{ 41},{ 8}}, {{169},{ 8}}, {{105},{ 8}}, {{233},{ 8}}, {{ 25},{ 8}}, +{{153},{ 8}}, {{ 89},{ 8}}, {{217},{ 8}}, {{ 57},{ 8}}, {{185},{ 8}}, +{{121},{ 8}}, {{249},{ 8}}, {{ 5},{ 8}}, {{133},{ 8}}, {{ 69},{ 8}}, +{{197},{ 8}}, {{ 37},{ 8}}, {{165},{ 8}}, {{101},{ 8}}, {{229},{ 8}}, +{{ 21},{ 8}}, {{149},{ 8}}, {{ 85},{ 8}}, {{213},{ 8}}, {{ 53},{ 8}}, +{{181},{ 8}}, {{117},{ 8}}, {{245},{ 8}}, {{ 13},{ 8}}, {{141},{ 8}}, +{{ 77},{ 8}}, {{205},{ 8}}, {{ 45},{ 8}}, {{173},{ 8}}, {{109},{ 8}}, +{{237},{ 8}}, {{ 29},{ 8}}, {{157},{ 8}}, {{ 93},{ 8}}, {{221},{ 8}}, +{{ 61},{ 8}}, {{189},{ 8}}, {{125},{ 8}}, {{253},{ 8}}, {{ 19},{ 9}}, +{{275},{ 9}}, {{147},{ 9}}, {{403},{ 9}}, {{ 83},{ 9}}, {{339},{ 9}}, +{{211},{ 9}}, {{467},{ 9}}, {{ 51},{ 9}}, {{307},{ 9}}, {{179},{ 9}}, +{{435},{ 9}}, {{115},{ 9}}, {{371},{ 9}}, {{243},{ 9}}, {{499},{ 9}}, +{{ 11},{ 9}}, {{267},{ 9}}, {{139},{ 9}}, {{395},{ 9}}, {{ 75},{ 9}}, +{{331},{ 9}}, {{203},{ 9}}, {{459},{ 9}}, {{ 43},{ 9}}, {{299},{ 9}}, +{{171},{ 9}}, {{427},{ 9}}, {{107},{ 9}}, {{363},{ 9}}, {{235},{ 9}}, +{{491},{ 9}}, {{ 27},{ 9}}, {{283},{ 9}}, {{155},{ 9}}, {{411},{ 9}}, +{{ 91},{ 9}}, {{347},{ 9}}, {{219},{ 9}}, {{475},{ 9}}, {{ 59},{ 9}}, +{{315},{ 9}}, {{187},{ 9}}, {{443},{ 9}}, {{123},{ 9}}, {{379},{ 9}}, +{{251},{ 9}}, {{507},{ 9}}, {{ 7},{ 9}}, {{263},{ 9}}, {{135},{ 9}}, +{{391},{ 9}}, {{ 71},{ 9}}, {{327},{ 9}}, {{199},{ 9}}, {{455},{ 9}}, +{{ 39},{ 9}}, {{295},{ 9}}, {{167},{ 9}}, {{423},{ 9}}, {{103},{ 9}}, +{{359},{ 9}}, {{231},{ 9}}, {{487},{ 9}}, {{ 23},{ 9}}, {{279},{ 9}}, +{{151},{ 9}}, {{407},{ 9}}, {{ 87},{ 9}}, {{343},{ 9}}, {{215},{ 9}}, +{{471},{ 9}}, {{ 55},{ 9}}, {{311},{ 9}}, {{183},{ 9}}, {{439},{ 9}}, +{{119},{ 9}}, {{375},{ 9}}, {{247},{ 9}}, {{503},{ 9}}, {{ 15},{ 9}}, +{{271},{ 9}}, {{143},{ 9}}, {{399},{ 9}}, {{ 79},{ 9}}, {{335},{ 9}}, +{{207},{ 9}}, {{463},{ 9}}, {{ 47},{ 9}}, {{303},{ 9}}, {{175},{ 9}}, +{{431},{ 9}}, {{111},{ 9}}, {{367},{ 9}}, {{239},{ 9}}, {{495},{ 9}}, +{{ 31},{ 9}}, {{287},{ 9}}, {{159},{ 9}}, {{415},{ 9}}, {{ 95},{ 9}}, +{{351},{ 9}}, {{223},{ 9}}, {{479},{ 9}}, {{ 63},{ 9}}, {{319},{ 9}}, +{{191},{ 9}}, {{447},{ 9}}, {{127},{ 9}}, {{383},{ 9}}, {{255},{ 9}}, +{{511},{ 9}}, {{ 0},{ 7}}, {{ 64},{ 7}}, {{ 32},{ 7}}, {{ 96},{ 7}}, +{{ 16},{ 7}}, {{ 80},{ 7}}, {{ 48},{ 7}}, {{112},{ 7}}, {{ 8},{ 7}}, +{{ 72},{ 7}}, {{ 40},{ 7}}, {{104},{ 7}}, {{ 24},{ 7}}, {{ 88},{ 7}}, +{{ 56},{ 7}}, {{120},{ 7}}, {{ 4},{ 7}}, {{ 68},{ 7}}, {{ 36},{ 7}}, +{{100},{ 7}}, {{ 20},{ 7}}, {{ 84},{ 7}}, {{ 52},{ 7}}, {{116},{ 7}}, +{{ 3},{ 8}}, {{131},{ 8}}, {{ 67},{ 8}}, {{195},{ 8}}, {{ 35},{ 8}}, +{{163},{ 8}}, {{ 99},{ 8}}, {{227},{ 8}} +}; + +local const ct_data static_dtree[D_CODES] = { +{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}}, +{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}}, +{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}}, +{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}}, +{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}}, +{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}} +}; + +const uch _dist_code[DIST_CODE_LEN] = { + 0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, + 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, +10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, +11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, +12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13, +13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, +13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, +14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, +14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, +14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, +15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, +15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, +15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 0, 0, 16, 17, +18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, +23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, +24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, +26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, +26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, +27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, +27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, +28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, +28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, +28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, +29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, +29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, +29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29 +}; + +const uch _length_code[MAX_MATCH-MIN_MATCH+1]= { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, +13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, +17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19, +19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, +21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22, +22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, +23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, +24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, +25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, +25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, +26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, +26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, +27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28 +}; + +local const int base_length[LENGTH_CODES] = { +0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56, +64, 80, 96, 112, 128, 160, 192, 224, 0 +}; + +local const int base_dist[D_CODES] = { + 0, 1, 2, 3, 4, 6, 8, 12, 16, 24, + 32, 48, 64, 96, 128, 192, 256, 384, 512, 768, + 1024, 1536, 2048, 3072, 4096, 6144, 8192, 12288, 16384, 24576 +}; + diff --git a/zlib/zconf.h~ b/zlib/zconf.h~ deleted file mode 100644 index 12e6a8487..000000000 --- a/zlib/zconf.h~ +++ /dev/null @@ -1,186 +0,0 @@ -#warning local zconf - -/* zconf.h -- configuration of the zlib compression library - * Copyright (C) 1995-1996 Jean-loup Gailly. - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* $Id$ */ - -#ifndef _ZCONF_H -#define _ZCONF_H - -/* - * If you *really* need a unique prefix for all types and library functions, - * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. - */ -#ifdef Z_PREFIX -# define deflateInit_ z_deflateInit_ -# define deflate z_deflate -# define deflateEnd z_deflateEnd -# define inflateInit_ z_inflateInit_ -# define inflate z_inflate -# define inflateEnd z_inflateEnd -# define deflateInit2_ z_deflateInit2_ -# define deflateSetDictionary z_deflateSetDictionary -# define deflateCopy z_deflateCopy -# define deflateReset z_deflateReset -# define deflateParams z_deflateParams -# define inflateInit2_ z_inflateInit2_ -# define inflateSetDictionary z_inflateSetDictionary -# define inflateSync z_inflateSync -# define inflateReset z_inflateReset -# define compress z_compress -# define uncompress z_uncompress -# define adler32 z_adler32 -# define crc32 z_crc32 -# define get_crc_table z_get_crc_table - -# define Byte z_Byte -# define uInt z_uInt -# define uLong z_uLong -# define Bytef z_Bytef -# define charf z_charf -# define intf z_intf -# define uIntf z_uIntf -# define uLongf z_uLongf -# define voidpf z_voidpf -# define voidp z_voidp -#endif - -#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32) -# define WIN32 -#endif -#if defined(__GNUC__) || defined(WIN32) || defined(__386__) || defined(i386) -# ifndef __32BIT__ -# define __32BIT__ -# endif -#endif -#if defined(__MSDOS__) && !defined(MSDOS) -# define MSDOS -#endif - -/* - * Compile with -DMAXSEG_64K if the alloc function cannot allocate more - * than 64k bytes at a time (needed on systems with 16-bit int). - */ -#if defined(MSDOS) && !defined(__32BIT__) -# define MAXSEG_64K -#endif -#ifdef MSDOS -# define UNALIGNED_OK -#endif - -#if (defined(MSDOS) || defined(_WINDOWS) || defined(WIN32)) && !defined(STDC) -# define STDC -#endif -#if (defined(__STDC__) || defined(__cplusplus)) && !defined(STDC) -# define STDC -#endif - -#ifndef STDC -# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */ -# define const -# endif -#endif - -/* Some Mac compilers merge all .h files incorrectly: */ -#if defined(__MWERKS__) || defined(applec) ||defined(THINK_C) ||defined(__SC__) -# define NO_DUMMY_DECL -#endif - -/* Maximum value for memLevel in deflateInit2 */ -#ifndef MAX_MEM_LEVEL -# ifdef MAXSEG_64K -# define MAX_MEM_LEVEL 8 -# else -# define MAX_MEM_LEVEL 9 -# endif -#endif - -/* Maximum value for windowBits in deflateInit2 and inflateInit2 */ -#ifndef MAX_WBITS -# define MAX_WBITS 15 /* 32K LZ77 window */ -#endif - -/* The memory requirements for deflate are (in bytes): - 1 << (windowBits+2) + 1 << (memLevel+9) - that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values) - plus a few kilobytes for small objects. For example, if you want to reduce - the default memory requirements from 256K to 128K, compile with - make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7" - Of course this will generally degrade compression (there's no free lunch). - - The memory requirements for inflate are (in bytes) 1 << windowBits - that is, 32K for windowBits=15 (default value) plus a few kilobytes - for small objects. -*/ - - /* Type declarations */ - -#ifndef OF /* function prototypes */ -# ifdef STDC -# define OF(args) args -# else -# define OF(args) () -# endif -#endif - -/* The following definitions for FAR are needed only for MSDOS mixed - * model programming (small or medium model with some far allocations). - * This was tested only with MSC; for other MSDOS compilers you may have - * to define NO_MEMCPY in zutil.h. If you don't need the mixed model, - * just define FAR to be empty. - */ -#if (defined(M_I86SM) || defined(M_I86MM)) && !defined(__32BIT__) - /* MSC small or medium model */ -# define SMALL_MEDIUM -# ifdef _MSC_VER -# define FAR __far -# else -# define FAR far -# endif -#endif -#if defined(__BORLANDC__) && (defined(__SMALL__) || defined(__MEDIUM__)) -# ifndef __32BIT__ -# define SMALL_MEDIUM -# define FAR __far -# endif -#endif -#ifndef FAR -# define FAR -#endif - -typedef unsigned char Byte; /* 8 bits */ -typedef unsigned int uInt; /* 16 bits or more */ -typedef unsigned long uLong; /* 32 bits or more */ - -#if defined(__BORLANDC__) && defined(SMALL_MEDIUM) - /* Borland C/C++ ignores FAR inside typedef */ -# define Bytef Byte FAR -#else - typedef Byte FAR Bytef; -#endif -typedef char FAR charf; -typedef int FAR intf; -typedef uInt FAR uIntf; -typedef uLong FAR uLongf; - -#ifdef STDC - typedef void FAR *voidpf; - typedef void *voidp; -#else - typedef Byte FAR *voidpf; - typedef Byte *voidp; -#endif - - -/* Compile with -DZLIB_DLL for Windows DLL support */ -#if (defined(_WINDOWS) || defined(WINDOWS)) && defined(ZLIB_DLL) -# include <windows.h> -# define EXPORT WINAPI -#else -# define EXPORT -#endif - -#endif /* _ZCONF_H */ diff --git a/zlib/zlib.h~ b/zlib/zlib.h~ deleted file mode 100644 index 28b56d186..000000000 --- a/zlib/zlib.h~ +++ /dev/null @@ -1,782 +0,0 @@ - -#warning static zlib -/* zlib.h -- interface of the 'zlib' general purpose compression library - version 1.0.4, Jul 24th, 1996. - - Copyright (C) 1995-1996 Jean-loup Gailly and Mark Adler - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - - Jean-loup Gailly Mark Adler - gzip@prep.ai.mit.edu madler@alumni.caltech.edu - - - The data format used by the zlib library is described by RFCs (Request for - Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt - (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format). -*/ - -#ifndef _ZLIB_H -#define _ZLIB_H - -#ifdef __cplusplus -extern "C" { -#endif - -#include "zconf.h" - -#define ZLIB_VERSION "1.0.4" - -/* - The 'zlib' compression library provides in-memory compression and - decompression functions, including integrity checks of the uncompressed - data. This version of the library supports only one compression method - (deflation) but other algorithms may be added later and will have the same - stream interface. - - For compression the application must provide the output buffer and - may optionally provide the input buffer for optimization. For decompression, - the application must provide the input buffer and may optionally provide - the output buffer for optimization. - - Compression can be done in a single step if the buffers are large - enough (for example if an input file is mmap'ed), or can be done by - repeated calls of the compression function. In the latter case, the - application must provide more input and/or consume the output - (providing more output space) before each call. - - The library does not install any signal handler. It is recommended to - add at least a handler for SIGSEGV when decompressing; the library checks - the consistency of the input data whenever possible but may go nuts - for some forms of corrupted input. -*/ - -typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size)); -typedef void (*free_func) OF((voidpf opaque, voidpf address)); - -struct internal_state; - -typedef struct z_stream_s { - Bytef *next_in; /* next input byte */ - uInt avail_in; /* number of bytes available at next_in */ - uLong total_in; /* total nb of input bytes read so far */ - - Bytef *next_out; /* next output byte should be put there */ - uInt avail_out; /* remaining free space at next_out */ - uLong total_out; /* total nb of bytes output so far */ - - char *msg; /* last error message, NULL if no error */ - struct internal_state FAR *state; /* not visible by applications */ - - alloc_func zalloc; /* used to allocate the internal state */ - free_func zfree; /* used to free the internal state */ - voidpf opaque; /* private data object passed to zalloc and zfree */ - - int data_type; /* best guess about the data type: ascii or binary */ - uLong adler; /* adler32 value of the uncompressed data */ - uLong reserved; /* reserved for future use */ -} z_stream; - -typedef z_stream FAR *z_streamp; - -/* - The application must update next_in and avail_in when avail_in has - dropped to zero. It must update next_out and avail_out when avail_out - has dropped to zero. The application must initialize zalloc, zfree and - opaque before calling the init function. All other fields are set by the - compression library and must not be updated by the application. - - The opaque value provided by the application will be passed as the first - parameter for calls of zalloc and zfree. This can be useful for custom - memory management. The compression library attaches no meaning to the - opaque value. - - zalloc must return Z_NULL if there is not enough memory for the object. - On 16-bit systems, the functions zalloc and zfree must be able to allocate - exactly 65536 bytes, but will not be required to allocate more than this - if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS, - pointers returned by zalloc for objects of exactly 65536 bytes *must* - have their offset normalized to zero. The default allocation function - provided by this library ensures this (see zutil.c). To reduce memory - requirements and avoid any allocation of 64K objects, at the expense of - compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h). - - The fields total_in and total_out can be used for statistics or - progress reports. After compression, total_in holds the total size of - the uncompressed data and may be saved for use in the decompressor - (particularly if the decompressor wants to decompress everything in - a single step). -*/ - - /* constants */ - -#define Z_NO_FLUSH 0 -#define Z_PARTIAL_FLUSH 1 -#define Z_SYNC_FLUSH 2 -#define Z_FULL_FLUSH 3 -#define Z_FINISH 4 -/* Allowed flush values; see deflate() below for details */ - -#define Z_OK 0 -#define Z_STREAM_END 1 -#define Z_NEED_DICT 2 -#define Z_ERRNO (-1) -#define Z_STREAM_ERROR (-2) -#define Z_DATA_ERROR (-3) -#define Z_MEM_ERROR (-4) -#define Z_BUF_ERROR (-5) -#define Z_VERSION_ERROR (-6) -/* Return codes for the compression/decompression functions. Negative - * values are errors, positive values are used for special but normal events. - */ - -#define Z_NO_COMPRESSION 0 -#define Z_BEST_SPEED 1 -#define Z_BEST_COMPRESSION 9 -#define Z_DEFAULT_COMPRESSION (-1) -/* compression levels */ - -#define Z_FILTERED 1 -#define Z_HUFFMAN_ONLY 2 -#define Z_DEFAULT_STRATEGY 0 -/* compression strategy; see deflateInit2() below for details */ - -#define Z_BINARY 0 -#define Z_ASCII 1 -#define Z_UNKNOWN 2 -/* Possible values of the data_type field */ - -#define Z_DEFLATED 8 -/* The deflate compression method (the only one supported in this version) */ - -#define Z_NULL 0 /* for initializing zalloc, zfree, opaque */ - -#define zlib_version zlibVersion() -/* for compatibility with versions < 1.0.2 */ - - /* basic functions */ - -extern const char * EXPORT zlibVersion OF((void)); -/* The application can compare zlibVersion and ZLIB_VERSION for consistency. - If the first character differs, the library code actually used is - not compatible with the zlib.h header file used by the application. - This check is automatically made by deflateInit and inflateInit. - */ - -/* -extern int EXPORT deflateInit OF((z_streamp strm, int level)); - - Initializes the internal stream state for compression. The fields - zalloc, zfree and opaque must be initialized before by the caller. - If zalloc and zfree are set to Z_NULL, deflateInit updates them to - use default allocation functions. - - The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9: - 1 gives best speed, 9 gives best compression, 0 gives no compression at - all (the input data is simply copied a block at a time). - Z_DEFAULT_COMPRESSION requests a default compromise between speed and - compression (currently equivalent to level 6). - - deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_STREAM_ERROR if level is not a valid compression level, - Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible - with the version assumed by the caller (ZLIB_VERSION). - msg is set to null if there is no error message. deflateInit does not - perform any compression: this will be done by deflate(). -*/ - - -extern int EXPORT deflate OF((z_streamp strm, int flush)); -/* - Performs one or both of the following actions: - - - Compress more input starting at next_in and update next_in and avail_in - accordingly. If not all input can be processed (because there is not - enough room in the output buffer), next_in and avail_in are updated and - processing will resume at this point for the next call of deflate(). - - - Provide more output starting at next_out and update next_out and avail_out - accordingly. This action is forced if the parameter flush is non zero. - Forcing flush frequently degrades the compression ratio, so this parameter - should be set only when necessary (in interactive applications). - Some output may be provided even if flush is not set. - - Before the call of deflate(), the application should ensure that at least - one of the actions is possible, by providing more input and/or consuming - more output, and updating avail_in or avail_out accordingly; avail_out - should never be zero before the call. The application can consume the - compressed output when it wants, for example when the output buffer is full - (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK - and with zero avail_out, it must be called again after making room in the - output buffer because there might be more output pending. - - If the parameter flush is set to Z_PARTIAL_FLUSH, the current compression - block is terminated and flushed to the output buffer so that the - decompressor can get all input data available so far. For method 9, a future - variant on method 8, the current block will be flushed but not terminated. - Z_SYNC_FLUSH has the same effect as partial flush except that the compressed - output is byte aligned (the compressor can clear its internal bit buffer) - and the current block is always terminated; this can be useful if the - compressor has to be restarted from scratch after an interruption (in which - case the internal state of the compressor may be lost). - If flush is set to Z_FULL_FLUSH, the compression block is terminated, a - special marker is output and the compression dictionary is discarded; this - is useful to allow the decompressor to synchronize if one compressed block - has been damaged (see inflateSync below). Flushing degrades compression and - so should be used only when necessary. Using Z_FULL_FLUSH too often can - seriously degrade the compression. If deflate returns with avail_out == 0, - this function must be called again with the same value of the flush - parameter and more output space (updated avail_out), until the flush is - complete (deflate returns with non-zero avail_out). - - If the parameter flush is set to Z_FINISH, pending input is processed, - pending output is flushed and deflate returns with Z_STREAM_END if there - was enough output space; if deflate returns with Z_OK, this function must be - called again with Z_FINISH and more output space (updated avail_out) but no - more input data, until it returns with Z_STREAM_END or an error. After - deflate has returned Z_STREAM_END, the only possible operations on the - stream are deflateReset or deflateEnd. - - Z_FINISH can be used immediately after deflateInit if all the compression - is to be done in a single step. In this case, avail_out must be at least - 0.1% larger than avail_in plus 12 bytes. If deflate does not return - Z_STREAM_END, then it must be called again as described above. - - deflate() may update data_type if it can make a good guess about - the input data type (Z_ASCII or Z_BINARY). In doubt, the data is considered - binary. This field is only for information purposes and does not affect - the compression algorithm in any manner. - - deflate() returns Z_OK if some progress has been made (more input - processed or more output produced), Z_STREAM_END if all input has been - consumed and all output has been produced (only when flush is set to - Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example - if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible. -*/ - - -extern int EXPORT deflateEnd OF((z_streamp strm)); -/* - All dynamically allocated data structures for this stream are freed. - This function discards any unprocessed input and does not flush any - pending output. - - deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the - stream state was inconsistent, Z_DATA_ERROR if the stream was freed - prematurely (some input or output was discarded). In the error case, - msg may be set but then points to a static string (which must not be - deallocated). -*/ - - -/* -extern int EXPORT inflateInit OF((z_streamp strm)); - - Initializes the internal stream state for decompression. The fields - zalloc, zfree and opaque must be initialized before by the caller. If - zalloc and zfree are set to Z_NULL, inflateInit updates them to use default - allocation functions. - - inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_VERSION_ERROR if the zlib library version is incompatible - with the version assumed by the caller. msg is set to null if there is no - error message. inflateInit does not perform any decompression: this will be - done by inflate(). -*/ - - -extern int EXPORT inflate OF((z_streamp strm, int flush)); -/* - Performs one or both of the following actions: - - - Decompress more input starting at next_in and update next_in and avail_in - accordingly. If not all input can be processed (because there is not - enough room in the output buffer), next_in is updated and processing - will resume at this point for the next call of inflate(). - - - Provide more output starting at next_out and update next_out and avail_out - accordingly. inflate() provides as much output as possible, until there - is no more input data or no more space in the output buffer (see below - about the flush parameter). - - Before the call of inflate(), the application should ensure that at least - one of the actions is possible, by providing more input and/or consuming - more output, and updating the next_* and avail_* values accordingly. - The application can consume the uncompressed output when it wants, for - example when the output buffer is full (avail_out == 0), or after each - call of inflate(). If inflate returns Z_OK and with zero avail_out, it - must be called again after making room in the output buffer because there - might be more output pending. - - If the parameter flush is set to Z_PARTIAL_FLUSH, inflate flushes as much - output as possible to the output buffer. The flushing behavior of inflate is - not specified for values of the flush parameter other than Z_PARTIAL_FLUSH - and Z_FINISH, but the current implementation actually flushes as much output - as possible anyway. - - inflate() should normally be called until it returns Z_STREAM_END or an - error. However if all decompression is to be performed in a single step - (a single call of inflate), the parameter flush should be set to - Z_FINISH. In this case all pending input is processed and all pending - output is flushed; avail_out must be large enough to hold all the - uncompressed data. (The size of the uncompressed data may have been saved - by the compressor for this purpose.) The next operation on this stream must - be inflateEnd to deallocate the decompression state. The use of Z_FINISH - is never required, but can be used to inform inflate that a faster routine - may be used for the single inflate() call. - - inflate() returns Z_OK if some progress has been made (more input - processed or more output produced), Z_STREAM_END if the end of the - compressed data has been reached and all uncompressed output has been - produced, Z_NEED_DICT if a preset dictionary is needed at this point (see - inflateSetDictionary below), Z_DATA_ERROR if the input data was corrupted, - Z_STREAM_ERROR if the stream structure was inconsistent (for example if - next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory, - Z_BUF_ERROR if no progress is possible or if there was not enough room in - the output buffer when Z_FINISH is used. In the Z_DATA_ERROR case, the - application may then call inflateSync to look for a good compression block. - In the Z_NEED_DICT case, strm->adler is set to the Adler32 value of the - dictionary chosen by the compressor. -*/ - - -extern int EXPORT inflateEnd OF((z_streamp strm)); -/* - All dynamically allocated data structures for this stream are freed. - This function discards any unprocessed input and does not flush any - pending output. - - inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state - was inconsistent. In the error case, msg may be set but then points to a - static string (which must not be deallocated). -*/ - - /* Advanced functions */ - -/* - The following functions are needed only in some special applications. -*/ - -/* -extern int EXPORT deflateInit2 OF((z_streamp strm, - int level, - int method, - int windowBits, - int memLevel, - int strategy)); - - This is another version of deflateInit with more compression options. The - fields next_in, zalloc, zfree and opaque must be initialized before by - the caller. - - The method parameter is the compression method. It must be Z_DEFLATED in - this version of the library. (Method 9 will allow a 64K history buffer and - partial block flushes.) - - The windowBits parameter is the base two logarithm of the window size - (the size of the history buffer). It should be in the range 8..15 for this - version of the library (the value 16 will be allowed for method 9). Larger - values of this parameter result in better compression at the expense of - memory usage. The default value is 15 if deflateInit is used instead. - - The memLevel parameter specifies how much memory should be allocated - for the internal compression state. memLevel=1 uses minimum memory but - is slow and reduces compression ratio; memLevel=9 uses maximum memory - for optimal speed. The default value is 8. See zconf.h for total memory - usage as a function of windowBits and memLevel. - - The strategy parameter is used to tune the compression algorithm. Use the - value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a - filter (or predictor), or Z_HUFFMAN_ONLY to force Huffman encoding only (no - string match). Filtered data consists mostly of small values with a - somewhat random distribution. In this case, the compression algorithm is - tuned to compress them better. The effect of Z_FILTERED is to force more - Huffman coding and less string matching; it is somewhat intermediate - between Z_DEFAULT and Z_HUFFMAN_ONLY. The strategy parameter only affects - the compression ratio but not the correctness of the compressed output even - if it is not set appropriately. - - If next_in is not null, the library will use this buffer to hold also - some history information; the buffer must either hold the entire input - data, or have at least 1<<(windowBits+1) bytes and be writable. If next_in - is null, the library will allocate its own history buffer (and leave next_in - null). next_out need not be provided here but must be provided by the - application for the next call of deflate(). - - If the history buffer is provided by the application, next_in must - must never be changed by the application since the compressor maintains - information inside this buffer from call to call; the application - must provide more input only by increasing avail_in. next_in is always - reset by the library in this case. - - deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was - not enough memory, Z_STREAM_ERROR if a parameter is invalid (such as - an invalid method). msg is set to null if there is no error message. - deflateInit2 does not perform any compression: this will be done by - deflate(). -*/ - -extern int EXPORT deflateSetDictionary OF((z_streamp strm, - const Bytef *dictionary, - uInt dictLength)); -/* - Initializes the compression dictionary (history buffer) from the given - byte sequence without producing any compressed output. This function must - be called immediately after deflateInit or deflateInit2, before any call - of deflate. The compressor and decompressor must use exactly the same - dictionary (see inflateSetDictionary). - The dictionary should consist of strings (byte sequences) that are likely - to be encountered later in the data to be compressed, with the most commonly - used strings preferably put towards the end of the dictionary. Using a - dictionary is most useful when the data to be compressed is short and - can be predicted with good accuracy; the data can then be compressed better - than with the default empty dictionary. In this version of the library, - only the last 32K bytes of the dictionary are used. - Upon return of this function, strm->adler is set to the Adler32 value - of the dictionary; the decompressor may later use this value to determine - which dictionary has been used by the compressor. (The Adler32 value - applies to the whole dictionary even if only a subset of the dictionary is - actually used by the compressor.) - - deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a - parameter is invalid (such as NULL dictionary) or the stream state - is inconsistent (for example if deflate has already been called for this - stream). deflateSetDictionary does not perform any compression: this will - be done by deflate(). -*/ - -extern int EXPORT deflateCopy OF((z_streamp dest, - z_streamp source)); -/* - Sets the destination stream as a complete copy of the source stream. If - the source stream is using an application-supplied history buffer, a new - buffer is allocated for the destination stream. The compressed output - buffer is always application-supplied. It's the responsibility of the - application to provide the correct values of next_out and avail_out for the - next call of deflate. - - This function can be useful when several compression strategies will be - tried, for example when there are several ways of pre-processing the input - data with a filter. The streams that will be discarded should then be freed - by calling deflateEnd. Note that deflateCopy duplicates the internal - compression state which can be quite large, so this strategy is slow and - can consume lots of memory. - - deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_STREAM_ERROR if the source stream state was inconsistent - (such as zalloc being NULL). msg is left unchanged in both source and - destination. -*/ - -extern int EXPORT deflateReset OF((z_streamp strm)); -/* - This function is equivalent to deflateEnd followed by deflateInit, - but does not free and reallocate all the internal compression state. - The stream will keep the same compression level and any other attributes - that may have been set by deflateInit2. - - deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent (such as zalloc or state being NULL). -*/ - -extern int EXPORT deflateParams OF((z_streamp strm, int level, int strategy)); -/* - Dynamically update the compression level and compression strategy. - This can be used to switch between compression and straight copy of - the input data, or to switch to a different kind of input data requiring - a different strategy. If the compression level is changed, the input - available so far is compressed with the old level (and may be flushed); - the new level will take effect only at the next call of deflate(). - - Before the call of deflateParams, the stream state must be set as for - a call of deflate(), since the currently available input may have to - be compressed and flushed. In particular, strm->avail_out must be non-zero. - - deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source - stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR - if strm->avail_out was zero. -*/ - -/* -extern int EXPORT inflateInit2 OF((z_streamp strm, - int windowBits)); - - This is another version of inflateInit with more compression options. The - fields next_out, zalloc, zfree and opaque must be initialized before by - the caller. - - The windowBits parameter is the base two logarithm of the maximum window - size (the size of the history buffer). It should be in the range 8..15 for - this version of the library (the value 16 will be allowed soon). The - default value is 15 if inflateInit is used instead. If a compressed stream - with a larger window size is given as input, inflate() will return with - the error code Z_DATA_ERROR instead of trying to allocate a larger window. - - If next_out is not null, the library will use this buffer for the history - buffer; the buffer must either be large enough to hold the entire output - data, or have at least 1<<windowBits bytes. If next_out is null, the - library will allocate its own buffer (and leave next_out null). next_in - need not be provided here but must be provided by the application for the - next call of inflate(). - - If the history buffer is provided by the application, next_out must - never be changed by the application since the decompressor maintains - history information inside this buffer from call to call; the application - can only reset next_out to the beginning of the history buffer when - avail_out is zero and all output has been consumed. - - inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was - not enough memory, Z_STREAM_ERROR if a parameter is invalid (such as - windowBits < 8). msg is set to null if there is no error message. - inflateInit2 does not perform any decompression: this will be done by - inflate(). -*/ - -extern int EXPORT inflateSetDictionary OF((z_streamp strm, - const Bytef *dictionary, - uInt dictLength)); -/* - Initializes the decompression dictionary (history buffer) from the given - uncompressed byte sequence. This function must be called immediately after - a call of inflate if this call returned Z_NEED_DICT. The dictionary chosen - by the compressor can be determined from the Adler32 value returned by this - call of inflate. The compressor and decompressor must use exactly the same - dictionary (see deflateSetDictionary). - - inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a - parameter is invalid (such as NULL dictionary) or the stream state is - inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the - expected one (incorrect Adler32 value). inflateSetDictionary does not - perform any decompression: this will be done by subsequent calls of - inflate(). -*/ - -extern int EXPORT inflateSync OF((z_streamp strm)); -/* - Skips invalid compressed data until the special marker (see deflate() - above) can be found, or until all available input is skipped. No output - is provided. - - inflateSync returns Z_OK if the special marker has been found, Z_BUF_ERROR - if no more input was provided, Z_DATA_ERROR if no marker has been found, - or Z_STREAM_ERROR if the stream structure was inconsistent. In the success - case, the application may save the current current value of total_in which - indicates where valid compressed data was found. In the error case, the - application may repeatedly call inflateSync, providing more input each time, - until success or end of the input data. -*/ - -extern int EXPORT inflateReset OF((z_streamp strm)); -/* - This function is equivalent to inflateEnd followed by inflateInit, - but does not free and reallocate all the internal decompression state. - The stream will keep attributes that may have been set by inflateInit2. - - inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent (such as zalloc or state being NULL). -*/ - - - /* utility functions */ - -/* - The following utility functions are implemented on top of the - basic stream-oriented functions. To simplify the interface, some - default options are assumed (compression level, window size, - standard memory allocation functions). The source code of these - utility functions can easily be modified if you need special options. -*/ - -extern int EXPORT compress OF((Bytef *dest, uLongf *destLen, - const Bytef *source, uLong sourceLen)); -/* - Compresses the source buffer into the destination buffer. sourceLen is - the byte length of the source buffer. Upon entry, destLen is the total - size of the destination buffer, which must be at least 0.1% larger than - sourceLen plus 12 bytes. Upon exit, destLen is the actual size of the - compressed buffer. - This function can be used to compress a whole file at once if the - input file is mmap'ed. - compress returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_BUF_ERROR if there was not enough room in the output - buffer. -*/ - -extern int EXPORT uncompress OF((Bytef *dest, uLongf *destLen, - const Bytef *source, uLong sourceLen)); -/* - Decompresses the source buffer into the destination buffer. sourceLen is - the byte length of the source buffer. Upon entry, destLen is the total - size of the destination buffer, which must be large enough to hold the - entire uncompressed data. (The size of the uncompressed data must have - been saved previously by the compressor and transmitted to the decompressor - by some mechanism outside the scope of this compression library.) - Upon exit, destLen is the actual size of the compressed buffer. - This function can be used to decompress a whole file at once if the - input file is mmap'ed. - - uncompress returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_BUF_ERROR if there was not enough room in the output - buffer, or Z_DATA_ERROR if the input data was corrupted. -*/ - - -typedef voidp gzFile; - -extern gzFile EXPORT gzopen OF((const char *path, const char *mode)); -/* - Opens a gzip (.gz) file for reading or writing. The mode parameter - is as in fopen ("rb" or "wb") but can also include a compression level - ("wb9"). gzopen can be used to read a file which is not in gzip format; - in this case gzread will directly read from the file without decompression. - gzopen returns NULL if the file could not be opened or if there was - insufficient memory to allocate the (de)compression state; errno - can be checked to distinguish the two cases (if errno is zero, the - zlib error is Z_MEM_ERROR). -*/ - -extern gzFile EXPORT gzdopen OF((int fd, const char *mode)); -/* - gzdopen() associates a gzFile with the file descriptor fd. File - descriptors are obtained from calls like open, dup, creat, pipe or - fileno (in the file has been previously opened with fopen). - The mode parameter is as in gzopen. - The next call of gzclose on the returned gzFile will also close the - file descriptor fd, just like fclose(fdopen(fd), mode) closes the file - descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode). - gzdopen returns NULL if there was insufficient memory to allocate - the (de)compression state. -*/ - -extern int EXPORT gzread OF((gzFile file, voidp buf, unsigned len)); -/* - Reads the given number of uncompressed bytes from the compressed file. - If the input file was not in gzip format, gzread copies the given number - of bytes into the buffer. - gzread returns the number of uncompressed bytes actually read (0 for - end of file, -1 for error). */ - -extern int EXPORT gzwrite OF((gzFile file, const voidp buf, unsigned len)); -/* - Writes the given number of uncompressed bytes into the compressed file. - gzwrite returns the number of uncompressed bytes actually written - (0 in case of error). -*/ - -extern int EXPORT gzflush OF((gzFile file, int flush)); -/* - Flushes all pending output into the compressed file. The parameter - flush is as in the deflate() function. The return value is the zlib - error number (see function gzerror below). gzflush returns Z_OK if - the flush parameter is Z_FINISH and all output could be flushed. - gzflush should be called only when strictly necessary because it can - degrade compression. -*/ - -extern int EXPORT gzclose OF((gzFile file)); -/* - Flushes all pending output if necessary, closes the compressed file - and deallocates all the (de)compression state. The return value is the zlib - error number (see function gzerror below). -*/ - -extern const char * EXPORT gzerror OF((gzFile file, int *errnum)); -/* - Returns the error message for the last error which occurred on the - given compressed file. errnum is set to zlib error number. If an - error occurred in the file system and not in the compression library, - errnum is set to Z_ERRNO and the application may consult errno - to get the exact error code. -*/ - - /* checksum functions */ - -/* - These functions are not related to compression but are exported - anyway because they might be useful in applications using the - compression library. -*/ - -extern uLong EXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); - -/* - Update a running Adler-32 checksum with the bytes buf[0..len-1] and - return the updated checksum. If buf is NULL, this function returns - the required initial value for the checksum. - An Adler-32 checksum is almost as reliable as a CRC32 but can be computed - much faster. Usage example: - - uLong adler = adler32(0L, Z_NULL, 0); - - while (read_buffer(buffer, length) != EOF) { - adler = adler32(adler, buffer, length); - } - if (adler != original_adler) error(); -*/ - -extern uLong EXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); -/* - Update a running crc with the bytes buf[0..len-1] and return the updated - crc. If buf is NULL, this function returns the required initial value - for the crc. Pre- and post-conditioning (one's complement) is performed - within this function so it shouldn't be done by the application. - Usage example: - - uLong crc = crc32(0L, Z_NULL, 0); - - while (read_buffer(buffer, length) != EOF) { - crc = crc32(crc, buffer, length); - } - if (crc != original_crc) error(); -*/ - - - /* various hacks, don't look :) */ - -/* deflateInit and inflateInit are macros to allow checking the zlib version - * and the compiler's view of z_stream: - */ -extern int EXPORT deflateInit_ OF((z_streamp strm, int level, - const char *version, int stream_size)); -extern int EXPORT inflateInit_ OF((z_streamp strm, - const char *version, int stream_size)); -extern int EXPORT deflateInit2_ OF((z_streamp strm, int level, int method, - int windowBits, int memLevel, int strategy, - const char *version, int stream_size)); -extern int EXPORT inflateInit2_ OF((z_streamp strm, int windowBits, - const char *version, int stream_size)); -#define deflateInit(strm, level) \ - deflateInit_((strm), (level), ZLIB_VERSION, sizeof(z_stream)) -#define inflateInit(strm) \ - inflateInit_((strm), ZLIB_VERSION, sizeof(z_stream)) -#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \ - deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\ - (strategy), ZLIB_VERSION, sizeof(z_stream)) -#define inflateInit2(strm, windowBits) \ - inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream)) - -#if !defined(_Z_UTIL_H) && !defined(NO_DUMMY_DECL) - struct internal_state {int dummy;}; /* hack for buggy compilers */ -#endif - -uLongf *get_crc_table OF((void)); /* can be used by asm versions of crc32() */ - -#ifdef __cplusplus -} -#endif - -#endif /* _ZLIB_H */ |